From f64616748c72f8cfa4de53e09657cf7abe07349a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 16 May 2015 10:18:32 +0200 Subject: [PATCH] Expenses only [skip ci] --- app/Http/Controllers/Chart/CategoryController.php | 2 ++ app/Repositories/Category/CategoryRepository.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 5aa5ed4592..b51120ebc1 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -122,6 +122,8 @@ class CategoryController extends Controller } /** + * This chart will only show expenses. + * * @param GChart $chart * @param CategoryRepositoryInterface $repository * @param $year diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 55b6f43cb3..918c879fd5 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -177,7 +177,7 @@ class CategoryRepository implements CategoryRepositoryInterface // always ignore transfers between accounts! $sum = floatval( $category->transactionjournals() - ->transactionTypes(['Withdrawal', 'Deposit']) + ->transactionTypes(['Withdrawal']) ->before($end)->after($start)->lessThan(0)->sum('amount') ) * -1; @@ -187,7 +187,7 @@ class CategoryRepository implements CategoryRepositoryInterface $sum = $category->transactionjournals() ->before($end) ->after($start) - ->transactionTypes(['Withdrawal', 'Deposit']) + ->transactionTypes(['Withdrawal']) ->lessThan(0) ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin(