From 6c3262e176f514a39f44865eff5de4312fbc4b1e Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 1 Jan 2015 21:26:40 +0100 Subject: [PATCH] First attempt to make the year charts and month reports report the same thing [skip ci] --- .../TransactionJournal/TransactionJournal.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php index 749d467643..99741a017f 100644 --- a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php +++ b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php @@ -453,16 +453,15 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData */ public function getSumOfExpensesByMonth(Carbon $date) { - $end = clone $date; - $date->startOfMonth(); - $end->endOfMonth(); + /** @var \FireflyIII\Report\ReportInterface $reportRepository */ + $reportRepository = \App::make('FireflyIII\Report\ReportInterface'); - $sum = \DB::table('transactions')->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->leftJoin( - 'transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id' - )->where('amount', '>', 0)->where('transaction_types.type', '=', 'Withdrawal')->where('transaction_journals.date', '>=', $date->format('Y-m-d'))->where( - 'transaction_journals.date', '<=', $end->format('Y-m-d') - )->sum('transactions.amount'); - $sum = floatval($sum); + $set = $reportRepository->getExpenseGroupedForMonth($date, 200); + $sum = 0; + foreach ($set as $entry) { + $sum += $entry['amount']; + } + return $sum; }