From 5fbea55c660b1539265fe899c1ab3a8818a62465 Mon Sep 17 00:00:00 2001 From: wdog Date: Thu, 7 Dec 2023 16:08:46 +0100 Subject: [PATCH] simplified scopeBetweenDates --- app/Models/Reservation.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/Models/Reservation.php b/app/Models/Reservation.php index 800b2a4..6d1ba2a 100644 --- a/app/Models/Reservation.php +++ b/app/Models/Reservation.php @@ -39,14 +39,10 @@ public function scopeActiveBetween($query, $from, $to) public function scopeBetweenDates($query, $from, $to) { - $query->where(function ($query) use ($to, $from) { - $query - ->whereBetween('start_date', [$from, $to]) - ->orWhereBetween('end_date', [$from, $to]) - ->orWhere(function ($query) use ($to, $from) { - $query - ->where('start_date', '<', $from) - ->where('end_date', '>', $to); + $query->where(function ($query) use ($from, $to) { + $query->where(function ($query) use ($from, $to) { + $query->where('start_date', '<', $to) + ->where('end_date', '>', $from); }); }); }