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

Fixed budget charts.

Browse Source
This commit is contained in:
James Cole
2016-04-24 20:41:12 +02:00
parent ed863986a7
commit 53760766a0
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\CacheProperties;
@@ -273,10 +274,20 @@ class BudgetController extends Controller
$currentEnd = Navigation::endOfPeriod($currentStart, $viewRange);
// get all budget limits and their repetitions.
$reps = $repository->getAllBudgetLimitRepetitions($currentStart, $currentEnd);
$reps = $repository->getAllBudgetLimitRepetitions($currentStart, $currentEnd, $budget);
$budgeted = $reps->sum('amount');
$perBudget = $repository->spentPerBudgetPerAccount(new Collection([$budget]), $accounts, $currentStart, $currentEnd);
$spent = $perBudget->sum('spent');
// includes null, so filter!
$perBudget = $perBudget->filter(
function (TransactionJournal $journal) use ($budget) {
if (intval($journal->budget_id) === $budget->id) {
return $journal;
}
}
);
$spent = $perBudget->sum('spent');
$entry = [
'date' => clone $currentStart,