kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup. Moving closer to new release.

Browse Source
This commit is contained in:
James Cole
2016-05-20 17:53:03 +02:00
parent 87f9ca3bb2
commit a74a646777
19 changed files with 248 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Support/Navigation.php
View File

@@ -111,9 +111,14 @@ class Navigation
$function = $functionMap[$repeatFreq];
if (isset($modifierMap[$repeatFreq])) {
$currentEnd->$function($modifierMap[$repeatFreq]);
} else {
$currentEnd->$function();
if (in_array($repeatFreq, $subDay)) {
$currentEnd->subDay();
}
return $currentEnd;
}
$currentEnd->$function();
if (in_array($repeatFreq, $subDay)) {
$currentEnd->subDay();
}
@@ -370,11 +375,14 @@ class Navigation
if ($range == '6M') {
if ($start->month >= 7) {
$start->startOfYear()->addMonths(6);
} else {
$start->startOfYear();
return $start;
}
$start->startOfYear();
return $start;
}
throw new FireflyException('updateStartDate cannot handle $range "' . $range . '"');
}