From 0224d1d59bf416eab2403cbf4036e9c4591925fa Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Apr 2015 21:01:08 +0200 Subject: [PATCH] Accidentally commented out date limits in query. --- app/Http/Controllers/JsonController.php | 4 ++-- app/Repositories/Bill/BillRepository.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index e8229bfa84..e248d9aeec 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -50,8 +50,8 @@ class JsonController extends Controller $box = Input::get('box'); $in = Auth::user()->transactionjournals() ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - //->before($end) - // ->after($start) + ->before($end) + ->after($start) ->transactionTypes(['Withdrawal']) ->where('transactions.amount', '>', 0) ->first([DB::Raw('SUM(transactions.amount) as `totalAmount`')]); diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 9b7ae4e492..c6b7bacb05 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -4,6 +4,8 @@ namespace FireflyIII\Repositories\Bill; use Auth; use Carbon\Carbon; +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; use FireflyIII\Models\Bill; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal;