diff --git a/app/Http/Resources/TransportResource.php b/app/Http/Resources/TransportResource.php index 2677782f..960579ad 100644 --- a/app/Http/Resources/TransportResource.php +++ b/app/Http/Resources/TransportResource.php @@ -16,6 +16,7 @@ class TransportResource extends JsonResource */ public function toArray($request) { + $currentSchedule = $this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first(); return [ 'id' => $this->id, 'type' => $this->type, @@ -24,9 +25,10 @@ class TransportResource extends JsonResource '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()), + 'current_schedule' => new ScheduleResource($currentSchedule), 'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get()), - 'dropped_days' => Carbon::now()->diffInDays($this->drop_date, false) + 'dropped_days' => Carbon::now()->diffInDays($this->drop_date, false), + 'schedule_complete' => $currentSchedule->eta >= Carbon::now() ]; } } diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue index 11c9386b..44401377 100644 --- a/resources/assets/vue/components/orders/elements/PackageComponent.vue +++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue @@ -50,7 +50,7 @@
{{status}}
+{{item.container ? item.container.transport.schedule_complete ? 'Custom Clearance' : status : status}}