kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

This is a partial fix for issue #151. It does not filter on account selection.

Browse Source
This commit is contained in:
James Cole
2016-02-24 17:37:08 +01:00
parent 8e42e71528
commit ecefcfabc0
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -259,21 +259,24 @@ class BudgetController extends Controller
$currentEnd = clone $currentStart;
$currentEnd->endOfYear();
// save to array:
// basic information:
$year = $currentStart->year;
$entry['name'] = $budget->name;
$entry['name'] = $budget->name ?? (string)trans('firefly.noBudget');
$spent = 0;
$budgeted = 0;
if (isset($set[$id]['entries'][$year])) {
$spent = $set[$id]['entries'][$year] * -1;
}
if (isset($budgetedArray[$id][$year])) {
$budgeted = round($budgetedArray[$id][$year], 2);
// this might be a good moment to collect no budget stuff.
if (is_null($budget->id)) {
// get without budget sum in range:
$spent = $repository->getWithoutBudgetSum($currentStart, $currentEnd) * -1;
} else {
if (isset($set[$id]['entries'][$year])) {
$spent = $set[$id]['entries'][$year] * -1;
}
}
$budgeted = $budgetedArray[$id][$year] ?? '0';
$entry['spent'][$year] = $spent;
$entry['budgeted'][$year] = $budgeted;
$entry['budgeted'][$year] = round($budgeted, 2);
// jump to next year.
$currentStart = clone $currentEnd;