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 @@