mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-11-30 10:01:51 +00:00
Merge pull request #11290 from firefly-iii/release-1764179030
🤖 Automatically merge the PR into the develop branch.
This commit is contained in:
@@ -75,7 +75,7 @@ class CreateController extends Controller
|
||||
$subTitleIcon = 'fa-plus';
|
||||
$request->old('_token');
|
||||
$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;
|
||||
}
|
||||
|
||||
|
||||
@@ -260,9 +260,10 @@ class Navigation
|
||||
if ($today->isSameMonth($end)) {
|
||||
$res = $today->endOfDay()->milli(0);
|
||||
// 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()));
|
||||
}
|
||||
|
||||
return $res;
|
||||
}
|
||||
|
||||
@@ -270,6 +271,7 @@ class Navigation
|
||||
if ($currentEnd->lt($end)) {
|
||||
throw new FireflyException(sprintf('[c] endOfPeriod(%s, %s) failed, because it resulted in %s.', $end->toW3cString(), $repeatFreq, $currentEnd->toW3cString()));
|
||||
}
|
||||
|
||||
return $end->endOfMonth();
|
||||
}
|
||||
|
||||
|
||||
@@ -35,7 +35,6 @@ use Illuminate\Support\Facades\Log;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
use Psr\Container\NotFoundExceptionInterface;
|
||||
use Spatie\Period\Boundaries;
|
||||
use Spatie\Period\Exceptions\InvalidPeriod;
|
||||
use Spatie\Period\Period;
|
||||
use Spatie\Period\Precision;
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ return [
|
||||
// see cer.php for exchange rates feature flag.
|
||||
],
|
||||
'version' => 'develop/2025-11-26',
|
||||
'build_time' => 1764136346,
|
||||
'build_time' => 1764178914,
|
||||
'api_version' => '2.1.0', // field is no longer used.
|
||||
'db_version' => 28, // field is no longer used.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user