diff --git a/app/Http/Resources/ScheduleResource.php b/app/Http/Resources/ScheduleResource.php index 64532420..d22386b4 100644 --- a/app/Http/Resources/ScheduleResource.php +++ b/app/Http/Resources/ScheduleResource.php @@ -3,6 +3,7 @@ namespace App\Http\Resources; use Illuminate\Http\Resources\Json\JsonResource; +use Carbon\Carbon; class ScheduleResource extends JsonResource { @@ -18,6 +19,10 @@ class ScheduleResource extends JsonResource 'id' => $this->id, 'etd' => $this->etd ? $this->etd->format('d-m-Y') : 'n/a', 'eta' => $this->eta ? $this->eta->format('d-m-Y') : 'n/a', + 'billing_days_left' => [ + 'value' => (Carbon::parse($this->eta)->subDays(7)->gt(Carbon::now())) ? '+' : '-' , + 'duration' => Carbon::parse($this->eta)->subDays(7)->diffInDays(Carbon::now()), + ], 'status' => $this->status, ]; } diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue index f894385c..07f43f1a 100644 --- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue +++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue @@ -22,10 +22,18 @@
ETD
{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}
-ETA
{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}
Days Ago
++ {{item.transport ? item.transport.current_schedule.billing_days_left.value : 'n/a'}} + {{item.transport ? item.transport.current_schedule.billing_days_left.duration: ''}} + {{item.transport ? 'days' : ''}} +
+Packages
{{ item.packing_lists.reduce((total, obj) => total + obj.packages.reduce((total, obj) => obj.quantity + total, 0), 0) }}