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 for #3875

Browse Source
This commit is contained in:
James Cole
2020-10-01 12:48:27 +02:00
parent 3ce949f0aa
commit b3edbecde2
4 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Budget/IndexController.php
View File

@@ -310,7 +310,6 @@ class IndexController extends Controller
}
$budgets[] = $array;
}
return $budgets;
}
}

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

@@ -115,8 +115,8 @@ class BudgetController extends Controller
while ($end >= $loopStart) {
/** @var Carbon $currentEnd */
$loopEnd = app('navigation')->endOfPeriod($loopStart, $step);
$spent = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection);
$label = trim(app('navigation')->periodShow($loopStart, $step));
$spent = $this->opsRepository->sumExpenses($loopStart, $loopEnd, null, $collection);
$label = trim(app('navigation')->periodShow($loopStart, $step));
foreach ($spent as $row) {
$currencyId = $row['currency_id'];
@@ -404,9 +404,6 @@ class BudgetController extends Controller
/**
* Shows a budget list with spent/left/overspent.
*
* TODO there are cases when this chart hides expenses: when budget has limits
* and limits are found and used, but the expense is in another currency.
*
* @return JsonResponse
*
*/