From b3333cc2d362f05dfa9781338664b8f2b2587eb6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 13 Sep 2015 07:32:39 +0200 Subject: [PATCH] Experimental fix for issue #109. --- app/Http/Controllers/Chart/CategoryController.php | 2 +- app/Repositories/Shared/ComponentRepository.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 840bc68aed..e95d4ccb38 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -65,7 +65,7 @@ class CategoryController extends Controller while ($start <= $end) { $currentEnd = Navigation::endOfPeriod($start, $range); - $spent = $repository->balanceInPeriod($category, $start, $currentEnd); + $spent = $repository->balanceInPeriod($category, $start, $currentEnd, true); $entries->push([clone $start, $spent]); $start = Navigation::addPeriod($start, $range, 0); diff --git a/app/Repositories/Shared/ComponentRepository.php b/app/Repositories/Shared/ComponentRepository.php index 584856fa3d..1d879a6b69 100644 --- a/app/Repositories/Shared/ComponentRepository.php +++ b/app/Repositories/Shared/ComponentRepository.php @@ -40,7 +40,7 @@ class ComponentRepository if ($shared === true) { // shared is true: always ignore transfers between accounts! $sum = $object->transactionjournals()->transactionTypes(['Withdrawal'])->before($end)->after($start) - ->get(['transaction_journals.*'])->sum('amount'); + ->get(['transaction_journals.*'])->sum('actual_amount'); } else { // do something else, SEE budgets. // get all journals in this month where the asset account is NOT shared.