kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1451

Browse Source
This commit is contained in:
James Cole
2018-05-30 18:38:39 +02:00
parent 49e302e1bc
commit 68e7d45f63
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/BudgetController.php
View File

@@ -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;