kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 14:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Expand repeated expenses.

Browse Source
This commit is contained in:
James Cole
2014-11-24 17:01:37 +01:00
parent bfda4bc199
commit b051278d2e
6 changed files with 161 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/FireflyIII/Shared/Toolkit/Reminders.php
View File

@@ -85,6 +85,8 @@ class Reminders
}
}
);
$today = Carbon::now();
//$today = new Carbon('15-12-2014');
/** @var \Piggybank $piggybank */
foreach ($set as $piggybank) {
@@ -95,8 +97,8 @@ class Reminders
*/
/** @var \PiggybankRepetition $repetition */
$repetition = $piggybank->currentRelevantRep();
$start = \DateKit::startOfPeriod(Carbon::now(), $piggybank->reminder);
if ($repetition->targetdate && $repetition->targetdate <= Carbon::now()) {
$start = \DateKit::startOfPeriod($today, $piggybank->reminder);
if ($repetition->targetdate && $repetition->targetdate <= $today) {
// break when no longer relevant:
continue;
}