cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-22 14:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix delivery list filter

Browse Source
This commit is contained in:
omair saleh
2022-03-14 10:58:48 +08:00
parent bea9507dae
commit 0a69faeb3b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/PackingListDeliveryStatus.php
+2 -2
View File
@@ -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());
});
}));
}