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

fix unclaimed packing lists

Browse Source
This commit is contained in:
omair saleh
2022-02-23 13:49:48 +08:00
parent 1dc23b088e
commit c932f2b86f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/PackageResource.php
+1 -1
View File
@@ -18,7 +18,7 @@ class PackageResource extends JsonResource
{
$originalPackingList = $this->packingList->owner instanceof PackingList ? $this->packingList->owner->owner : $this->packingList->owner;
dd($originalPackingList);
return [
'id' => $this->id,
'type' => $this->type,
app/Http/Resources/TransportResource.php
+8 -8
View File
@@ -17,14 +17,14 @@ class TransportResource extends JsonResource
{
return [
'id' => $this->id,
// 'type' => $this->type,
// 'courier' => $this->courier,
// 'tracking_number' => $this->tracking_number,
// 'dispatch_date' => $this->dispatch_date ? $this->dispatch_date->format('d-m-Y') : $this->dispatch_date,
// 'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
// 'status' => $this->status,
// 'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
// 'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
'type' => $this->type,
'courier' => $this->courier,
'tracking_number' => $this->tracking_number,
'dispatch_date' => $this->dispatch_date ? $this->dispatch_date->format('d-m-Y') : $this->dispatch_date,
'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
'status' => $this->status,
'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
];
}
}