diff --git a/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php b/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php index 3f4b454c..3cc41510 100644 --- a/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php +++ b/app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php @@ -16,7 +16,9 @@ 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) { + return $value == 1 ? $builder->whereHas('containers', function ($query){ + $query->where('containers.status', ApprovalStatus::COMPLETED); + })->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()); });