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

fix php error for HasParcelWithTransportBetweenDate

Browse Source
This commit is contained in:
Edmond Lang
2025-09-01 22:00:13 +08:00
parent 6f2b374cbd
commit a8d86eebd6
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/HasParcelWithTransportBetweenDate.php
+14 -5
View File
@@ -10,17 +10,26 @@ class HasParcelWithTransportBetweenDate implements Filter
{
public static function apply(Builder $builder, $value)
{
if (is_string($value)) $value = json_decode($value, true) ?? [];
if (is_string($value)) {
$value = json_decode($value, true) ?? [];
}
$start = Carbon::make(data_get($value, 'start_date'))?->startOfDay();
$end = Carbon::make(data_get($value, 'end_date'))?->endOfDay();
$startDate = Carbon::make(data_get($value, 'start_date'));
$endDate = Carbon::make(data_get($value, 'end_date'));
$start = $startDate ? $startDate->startOfDay() : null;
$end = $endDate ? $endDate->endOfDay() : null;
if (!$start && !$end) return $builder;
if ($start && $end && $start->gt($end)) [$start, $end] = [$end, $start];
return $builder->whereHas('transports', function (Builder $q) use ($start, $end) {
if ($start && $end && $start->isSameDay($end)) return $q->whereDate('drop_date', $start->toDateString());
if ($start && $end) return $q->whereBetween('drop_date', [$start, $end]);
if ($start && $end && $start->isSameDay($end)) {
return $q->whereDate('drop_date', $start->toDateString());
}
if ($start && $end) {
return $q->whereBetween('drop_date', [$start, $end]);
}
return $start
? $q->where('drop_date', '>=', $start)
: $q->where('drop_date', '<=', $end);