kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 02:38:09 +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

31
app/lib/FireflyIII/Database/RepeatedExpense.php
View File

@@ -116,6 +116,26 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface
// }
for ($i = 0; $i < $parts; $i++) {
/*
* If it's not the first repetition, jump the start date a [period]
* and jump the target date a [period]
*/
if($i > 0) {
$currentStart = clone $currentTarget;
$currentStart->addDay();
$currentTarget = \DateKit::addPeriod($currentStart, $piggyBank->reminder,0);
}
/*
* If it's the first one, and has reminders, jump to the end of the [period]
*/
if($i == 0 && !is_null($piggyBank->reminder)) {
$currentTarget = \DateKit::endOfX($currentStart, $piggyBank->reminder);
}
if($currentStart > $repetition->targetdate) {
break;
}
/*
* Jump one month ahead after the first instance:
*/
@@ -148,6 +168,17 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface
$part->setCurrentamount($repetition->currentamount);
$part->setStartdate($currentStart);
$part->setTargetdate($currentTarget);
if (!is_null($piggyBank->reminder)) {
// might be a reminder for this range?
$reminder = $piggyBank->reminders()
->where('startdate',$currentStart->format('Y-m-d'))
->where('enddate',$currentTarget->format('Y-m-d'))
->first();
if($reminder) {
$part->setReminder($reminder);
}
}
// if (!is_null($piggyBank->reminder)) {
// $currentStart = \DateKit::addPeriod($currentStart, $piggyBank->reminder, 0);