From 7f7d6cf8934e840ca89ebf255686a74fd83495c3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 25 Apr 2016 21:07:17 +0200 Subject: [PATCH] Expand query [skip ci] --- app/Repositories/Budget/BudgetRepository.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 6f8d56648e..096024ab9e 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -878,6 +878,14 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn $query->where('limit_repetitions.enddate', '>=', $end->format('Y-m-d 00:00:00')); } ); + // start is after start and end is before end + $q->orWhere( + function ($query) use ($start, $end) { + // end after end time, and start is before end time + $query->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')); + $query->where('limit_repetitions.enddate', '<=', $end->format('Y-m-d 00:00:00')); + } + ); } ); if (!is_null($ignore->id)) {