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

Final fix for #170. Now to make a new release!

Browse Source
This commit is contained in:
James Cole
2016-02-05 07:21:51 +01:00
parent 6f9675b6d6
commit 5a23b95352
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Support/Navigation.php
View File

@@ -232,7 +232,7 @@ class Navigation
return $date; return $date;
} }
if ($repeatFreq === 'custom') { if ($repeatFreq === 'custom') {
return $theDate; // the date is already at the start. return $date; // the date is already at the start.
} }
@@ -283,6 +283,18 @@ class Navigation
return $date; return $date;
} }
// a custom range requires the session start
// and session end to calculate the difference in days.
// this is then subtracted from $theDate (* $subtract).
if($repeatFreq === 'custom') {
/** @var Carbon $tStart */
$tStart = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $tEnd */
$tEnd = session('end', Carbon::now()->endOfMonth());
$diffInDays = $tStart->diffInDays($tEnd);
$date->subDays($diffInDays * $subtract);
return $date;
}
throw new FireflyException('Cannot do subtractPeriod for $repeat_freq "' . $repeatFreq . '"'); throw new FireflyException('Cannot do subtractPeriod for $repeat_freq "' . $repeatFreq . '"');
} }