kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 07:38:29 +00:00
Code Issues Projects Releases Wiki Activity

Some expansion on the index of repeated expenses, and the first reference to the show page.

Browse Source
This commit is contained in:
James Cole
2014-11-23 06:29:29 +01:00
parent 7336367eff
commit 4456ef2326
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/RepeatedExpenseController.php
View File

@@ -46,29 +46,35 @@ class RepeatedExpenseController extends BaseController
throw new FireflyException('Cannot handle "' . $piggyBank->reminder . '" reminders for repeated expenses');
break;
case 'month':
$piggyBank->parts = $piggyBank->currentRep->startdate->diffInMonths($piggyBank->currentRep->targetdate);
$start = clone $piggyBank->currentRep->startdate;
$start->startOfMonth();
$end = clone $piggyBank->currentRep->targetdate;
$end->endOfMonth();
$piggyBank->parts = $start->diffInMonths($end);
unset($start, $end);
break;
}
} else {
$piggyBank->parts = 1;
}
// number of bars:
$piggyBank->barCount = floor(12 / $piggyBank->parts);
$piggyBank->barCount = floor(12 / $piggyBank->parts) == 0 ? 1 : floor(12 / $piggyBank->parts);
$amountPerBar = floatval($piggyBank->targetamount) / $piggyBank->parts;
$currentAmount = floatval($amountPerBar);
$bars = [];
$currentDate = clone $piggyBank->currentRep->startdate;
for ($i = 0; $i < $piggyBank->parts; $i++) {
// niet elke keer een andere dinges pakken? om target te redden?
if (!is_null($piggyBank->reminder)) {
$currentDate = \DateKit::addPeriod($currentDate, $piggyBank->reminder, 0);
}
$bars[] = [
'amount' => $currentAmount,
'date' => $currentDate
];
if (!is_null($piggyBank->reminder)) {
$currentDate = \DateKit::addPeriod($currentDate, $piggyBank->reminder, 0);
}
$currentAmount += $amountPerBar;
}