kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-25 21:16:47 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-10-10

Browse Source
This commit is contained in:
JC5
2025-10-10 13:32:57 +02:00
parent a88d0de34d
commit e09b6034f7
6 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -81,12 +81,12 @@ class ReconcileController extends Controller
if (!$start instanceof Carbon && !$end instanceof Carbon) {
throw new FireflyException('Invalid dates submitted.');
}
if(!is_numeric($startBalance)) {
if (!is_numeric($startBalance)) {
$startBalance = '0';
}
if(!is_numeric($endBalance)) {
if (!is_numeric($endBalance)) {
$endBalance = '0';
}
}
if ($end->lt($start)) {
[$start, $end] = [$end, $start];
}

10
app/Support/Navigation.php
View File

@@ -428,11 +428,11 @@ class Navigation
'year' => (string)trans('config.year_js'),
'yearly' => (string)trans('config.year_js'),
'6M' => (string)trans('config.half_year_js'),
'last7' => (string)trans('config.specific_day_js'),
'last30' => (string)trans('config.month_js'),
'last90' => (string)trans('config.month_js'),
'last365' => (string)trans('config.year_js'),
'QTD' => (string)trans('config.month_js'),
'last7' => (string)trans('config.specific_day_js'),
'last30' => (string)trans('config.month_js'),
'last90' => (string)trans('config.month_js'),
'last365' => (string)trans('config.year_js'),
'QTD' => (string)trans('config.month_js'),
];
if (array_key_exists($repeatFrequency, $formatMap)) {