diff --git a/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php b/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php index 4f316148..bda5b871 100644 --- a/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php +++ b/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php @@ -17,12 +17,12 @@ 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->whereDoesntHave('schedules', function (Builder $query) use ($value) { - $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '>', Carbon::now()); + $query->whereHas('schedules', function (Builder $query) use ($value) { + $query->where('status', ApprovalStatus::APPROVED)->where('eta', '>', Carbon::now()); }); }) : $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->where('status', ApprovalStatus::APPROVED)->where('eta', '=<', Carbon::now()); }); })); }