From bb4e2be9eba1356e80094b72a2dddf4fc64b1cda Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 1 Jan 2016 20:04:44 +0100 Subject: [PATCH] Method no longer used. --- app/Helpers/Report/ReportHelper.php | 2 -- app/Helpers/Report/ReportQuery.php | 23 --------------------- app/Helpers/Report/ReportQueryInterface.php | 12 ----------- 3 files changed, 37 deletions(-) diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 46dbebb137..27b94e9cb4 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -365,8 +365,6 @@ class ReportHelper implements ReportHelperInterface if (!is_null($entry->first())) { $spent = $entry->first()->spent; } - //$spent = $this->query->spentInBudget($account, $budget, $start, $end); // I think shared is irrelevant. - $balanceEntry->setSpent($spent); $line->addBalanceEntry($balanceEntry); } diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index bec2475577..638b3d0129 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -18,29 +18,6 @@ use Illuminate\Support\Collection; */ class ReportQuery implements ReportQueryInterface { - /** - * Covers tags - * - * @param Account $account - * @param Budget $budget - * @param Carbon $start - * @param Carbon $end - * - * @return float - */ - public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end) - { - - return Auth::user()->transactionjournals() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->transactionTypes([TransactionType::WITHDRAWAL]) - ->where('transactions.account_id', $account->id) - ->before($end) - ->after($start) - ->where('budget_transaction_journal.budget_id', $budget->id) - ->get(['transaction_journals.*'])->sum('amount'); - } /** * @param Account $account diff --git a/app/Helpers/Report/ReportQueryInterface.php b/app/Helpers/Report/ReportQueryInterface.php index 45d910d46c..182b35d8bd 100644 --- a/app/Helpers/Report/ReportQueryInterface.php +++ b/app/Helpers/Report/ReportQueryInterface.php @@ -39,18 +39,6 @@ interface ReportQueryInterface */ public function expense(Collection $accounts, Carbon $start, Carbon $end); - /** - * Covers tags as well. - * - * @param Account $account - * @param Budget $budget - * @param Carbon $start - * @param Carbon $end - * - * @return float - */ - public function spentInBudget(Account $account, Budget $budget, Carbon $start, Carbon $end); - /** * @param Account $account * @param Carbon $start