From cd6d86fb4b462e4430992ce9b5a7027f44fb5e8f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 28 Jan 2022 11:57:27 +0800
Subject: [PATCH] add over weight cbm to yd

---
 app/Http/Resources/ContainerResource.php                        | 2 +-
 .../vue/components/containers/elements/PackingListComponent.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 557ffe74..cf47c90e 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -25,7 +25,7 @@ class ContainerResource extends JsonResource
             'seal_reference' => $this->seal_reference,
             'loading_date' => $this->loading_date ? $this->loading_date->format('d-m-Y') : $this->loading_date,
             'transport' => new TransportResource($this->transports()->first()),
-            'packages_count' => $this->packages->sum('quantity'),
+            'packages_count' => $this->packages()->whereNot('type', 2)->sum('quantity'),
             'total_cbm' => $this->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
             'remarks' => RemarkResource::collection($this->remarks),
             'status' => $this->status,
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index eb0a87f6..ba20a9e4 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="row">
         <div class="col-2"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>/<a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
-        <div class="col-1 text-center">{{item.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
+        <div class="col-1 text-center">{{item.packages.reduce((total, obj) => (obj.type === 2 ? 0 : obj.quantity) + total, 0)}}</div>
         <div class="col-1">{{ (Math.ceil((item.packages.reduce((total, obj) => obj.cbm + total, 0)) * 1000) / 1000).toFixed(3)}}</div>
         <div class="col-1 bold text-center" :class="{'text-danger': item.status === 5, 'text-success': item.status !== 5}">{{item.transport ? 'Delivery' : item.status === 5 ? 'On Hold' : 'Release'}}</div>
         <div class="col-3">{{item.order.address.contact ? item.order.address.contact.reference+' '+item.order.address.contact.phone : ''}}<br>{{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}<br>{{item.order.address.remark ? item.order.address.remark.content: ''}}</div>