mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-23 14:26:58 +00:00
Fix #1451
This commit is contained in:
@@ -243,6 +243,17 @@ class BudgetController extends Controller
|
|||||||
$days = 0;
|
$days = 0;
|
||||||
$daysInMonth = 0;
|
$daysInMonth = 0;
|
||||||
|
|
||||||
|
// make date if present:
|
||||||
|
if (null !== $moment || '' !== (string)$moment) {
|
||||||
|
try {
|
||||||
|
$start = new Carbon($moment);
|
||||||
|
$end = app('navigation')->endOfPeriod($start, $range);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
// start and end are already defined.
|
||||||
|
Log::debug('start and end are already defined.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// if today is between start and end, use the diff in days between end and today (days left)
|
// if today is between start and end, use the diff in days between end and today (days left)
|
||||||
// otherwise, use diff between start and end.
|
// otherwise, use diff between start and end.
|
||||||
$today = new Carbon;
|
$today = new Carbon;
|
||||||
@@ -257,16 +268,7 @@ class BudgetController extends Controller
|
|||||||
$days = $days === 0 ? 1 : $days;
|
$days = $days === 0 ? 1 : $days;
|
||||||
$daysInMonth = $daysInMonth === 0 ? 1 : $daysInMonth;
|
$daysInMonth = $daysInMonth === 0 ? 1 : $daysInMonth;
|
||||||
|
|
||||||
// make date if present:
|
|
||||||
if (null !== $moment || '' !== (string)$moment) {
|
|
||||||
try {
|
|
||||||
$start = new Carbon($moment);
|
|
||||||
$end = app('navigation')->endOfPeriod($start, $range);
|
|
||||||
} catch (Exception $e) {
|
|
||||||
// start and end are already defined.
|
|
||||||
Log::debug('start and end are already defined.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$next = clone $end;
|
$next = clone $end;
|
||||||
$next->addDay();
|
$next->addDay();
|
||||||
$prev = clone $start;
|
$prev = clone $start;
|
||||||
|
Reference in New Issue
Block a user