From 7a2083557160e4da5ac9c23c5e11cd8d199ecc37 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 23 May 2015 09:09:25 +0200
Subject: [PATCH] Code cleanup [skip ci]

---
 app/Models/LimitRepetition.php               | 21 --------------------
 app/Repositories/Budget/BudgetRepository.php |  6 ++----
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index c4066352d5..d0eca39e37 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -31,27 +31,6 @@ class LimitRepetition extends Model
         return ['created_at', 'updated_at', 'startdate', 'enddate'];
     }
 
-    /**
-     * @return float
-     */
-    public function spentInRepetition()
-    {
-        $sum = DB::table('transactions')
-                 ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                 ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                 ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
-                 ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
-                 ->where('transaction_journals.date', '>=', $this->startdate->format('Y-m-d'))
-                 ->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d'))
-                 ->where('transaction_journals.user_id', Auth::user()->id)
-                 ->whereNull('transactions.deleted_at')
-                 ->where('transactions.amount', '>', 0)
-                 ->where('limit_repetitions.id', '=', $this->id)
-                 ->sum('transactions.amount');
-
-        return floatval($sum);
-    }
-
     /**
      * @param $value
      *
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index 98dd165042..e0a4c62949 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -250,9 +250,8 @@ class BudgetRepository implements BudgetRepositoryInterface
                            )
                            ->after($start)
                            ->before($end)
-                           ->lessThan(0)
                            ->transactionTypes(['Withdrawal'])
-                           ->sum('transactions.amount');
+                            ->get(['transaction_journals.*'])->sum('amount');
 
         return floatval($noBudgetSet) * -1;
     }
@@ -269,13 +268,12 @@ class BudgetRepository implements BudgetRepositoryInterface
     {
         if ($shared === true) {
             // get everything:
-            $sum = floatval($budget->transactionjournals()->before($end)->after($start)->lessThan(0)->get(['transaction_journals.*'])->sum('amount'));
+            $sum = floatval($budget->transactionjournals()->before($end)->after($start)->get(['transaction_journals.*'])->sum('amount'));
         } else {
             // get all journals in this month where the asset account is NOT shared.
             $sum = $budget->transactionjournals()
                           ->before($end)
                           ->after($start)
-                          ->lessThan(0)
                           ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
                           ->leftJoin(
                               'account_meta', function (JoinClause $join) {