From 56fb250e6ff8ee39206b508f448a950b17f3f654 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 14 Mar 2022 11:14:14 +0800 Subject: [PATCH] fix delivery list filter --- .../General/Eloquent/Filters/PackingListDeliveryStatus.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php b/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php index 5e811c97..9445e578 100644 --- a/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php +++ b/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php @@ -17,8 +17,8 @@ class PackingListDeliveryStatus implements Filter public static function apply(Builder $builder, $value) { return $value == 1 ? $builder->whereDoesntHave('transports') : ($value == 2 ? $builder->whereHas('transports', function (Builder $query) use ($value) { - $query->whereHas('schedules', function (Builder $query) use ($value) { - $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '>', Carbon::now()); + $query->whereDoesntHave('schedules', function (Builder $query) use ($value) { + $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '=<', Carbon::now()); }); }) : $builder->whereHas('transports', function (Builder $query) use ($value) { $query->whereHas('schedules', function (Builder $query) use ($value) {