kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-30 18:11:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11290 from firefly-iii/release-1764179030

Browse Source 
🤖 Automatically merge the PR into the develop branch.
This commit is contained in:
github-actions[bot]
2025-11-26 18:43:56 +01:00
committed by GitHub
parent 3603ef1cc7 8722d264dc
commit 034b14eb0b
4 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PiggyBank/CreateController.php
View File

@@ -75,7 +75,7 @@ class CreateController extends Controller
$subTitleIcon = 'fa-plus'; $subTitleIcon = 'fa-plus';
$request->old('_token'); $request->old('_token');
$preFilled = $request->old(); $preFilled = $request->old();
if(!array_key_exists('transaction_currency_id', $preFilled)) { if (!array_key_exists('transaction_currency_id', $preFilled)) {
$preFilled['transaction_currency_id'] = $this->primaryCurrency->id; $preFilled['transaction_currency_id'] = $this->primaryCurrency->id;
} }

4
app/Support/Navigation.php
View File

@@ -260,9 +260,10 @@ class Navigation
if ($today->isSameMonth($end)) { if ($today->isSameMonth($end)) {
$res = $today->endOfDay()->milli(0); $res = $today->endOfDay()->milli(0);
// add sanity check. // add sanity check.
if($res->lt($end)) { if ($res->lt($end)) {
throw new FireflyException(sprintf('[b] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $res->toW3cString())); throw new FireflyException(sprintf('[b] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $res->toW3cString()));
} }
return $res; return $res;
} }
@@ -270,6 +271,7 @@ class Navigation
if ($currentEnd->lt($end)) { if ($currentEnd->lt($end)) {
throw new FireflyException(sprintf('[c] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $currentEnd->toW3cString())); throw new FireflyException(sprintf('[c] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $currentEnd->toW3cString()));
} }
return $end->endOfMonth(); return $end->endOfMonth();
} }

1
app/Support/Observers/RecalculatesAvailableBudgetsTrait.php
View File

@@ -35,7 +35,6 @@ use Illuminate\Support\Facades\Log;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
use Spatie\Period\Boundaries; use Spatie\Period\Boundaries;
use Spatie\Period\Exceptions\InvalidPeriod;
use Spatie\Period\Period; use Spatie\Period\Period;
use Spatie\Period\Precision; use Spatie\Period\Precision;

2
config/firefly.php
View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2025-11-26', 'version' => 'develop/2025-11-26',
'build_time' => 1764136346, 'build_time' => 1764178914,
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used. 'db_version' => 28, // field is no longer used.