From f87a4c1e7c5eed9ea616d7cf2aa4158b7898498f Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 26 Sep 2018 20:42:07 +0200 Subject: [PATCH] Fix for #1731 --- app/Repositories/Budget/BudgetRepository.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 483128389e..3787219f0e 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -315,6 +315,7 @@ class BudgetRepository implements BudgetRepositoryInterface $set = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') ->with(['budget']) ->where('budgets.user_id', $this->user->id) + ->whereNull('budgets.deleted_at') ->get(['budget_limits.*']); return $set; @@ -323,6 +324,7 @@ class BudgetRepository implements BudgetRepositoryInterface if (null === $start xor null === $end) { $query = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') ->with(['budget']) + ->whereNull('budgets.deleted_at') ->where('budgets.user_id', $this->user->id); if (null !== $end) { // end date must be before $end. @@ -340,6 +342,7 @@ class BudgetRepository implements BudgetRepositoryInterface $set = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') ->with(['budget']) ->where('budgets.user_id', $this->user->id) + ->whereNull('budgets.deleted_at') ->where( function (Builder $q5) use ($start, $end) { $q5->where(