From 0a69faeb3baaa8e243ce961399c3ce72593e899b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 14 Mar 2022 10:58:48 +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 bda5b871..c5efa51a 100644 --- a/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php +++ b/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php @@ -18,11 +18,11 @@ class PackingListDeliveryStatus implements Filter { 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::APPROVED)->where('eta', '>', Carbon::now()); + $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) { - $query->where('status', ApprovalStatus::APPROVED)->where('eta', '=<', Carbon::now()); + $query->where('status', ApprovalStatus::EXPIRED)->where('eta', '=<', Carbon::now()); }); })); }