diff --git a/app/Http/Resources/ContainerBaseResource.php b/app/Http/Resources/ContainerBaseResource.php index 47ef6762..d06627a8 100644 --- a/app/Http/Resources/ContainerBaseResource.php +++ b/app/Http/Resources/ContainerBaseResource.php @@ -50,6 +50,7 @@ class ContainerBaseResource extends JsonResource $item['include_order_in_packages'] = false; $item['include_transport_in_packages'] = false; $item['include_container_in_packages'] = false; + $item['include_packing_list_reference_in_packages'] = false; } return $this->whenLoaded('packingLists', PackingListBaseResource::collection($sortedPackingLists)); } diff --git a/app/Http/Resources/OrderPackagesBaseResource.php b/app/Http/Resources/OrderPackagesBaseResource.php index 35c01024..24be5cbb 100644 --- a/app/Http/Resources/OrderPackagesBaseResource.php +++ b/app/Http/Resources/OrderPackagesBaseResource.php @@ -32,6 +32,7 @@ class OrderPackagesBaseResource extends JsonResource $item['include_order_in_packages'] = true; $item['include_transport_in_packages'] = true; $item['include_container_in_packages'] = false; + $item['include_packing_list_reference_in_packages'] = true; } $in_transit_packages = $this->inTransitPackages()->get(); @@ -43,6 +44,7 @@ class OrderPackagesBaseResource extends JsonResource $item['include_order_in_packages'] = true; $item['include_transport_in_packages'] = false; $item['include_container_in_packages'] = true; + $item['include_packing_list_reference_in_packages'] = true; } $destination_warehouse_packages = $this->destinationWarehousePackages()->get(); @@ -54,6 +56,7 @@ class OrderPackagesBaseResource extends JsonResource $item['include_order_in_packages'] = true; $item['include_transport_in_packages'] = false; $item['include_container_in_packages'] = true; + $item['include_packing_list_reference_in_packages'] = true; } $delivered_packages = $this->deliveredPackages()->get(); @@ -65,6 +68,7 @@ class OrderPackagesBaseResource extends JsonResource $item['include_order_in_packages'] = true; $item['include_transport_in_packages'] = false; $item['include_container_in_packages'] = false; + $item['include_packing_list_reference_in_packages'] = true; } $received_packages = $this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get(); @@ -76,6 +80,7 @@ class OrderPackagesBaseResource extends JsonResource $item['include_order_in_packages'] = true; $item['include_transport_in_packages'] = true; $item['include_container_in_packages'] = false; + $item['include_packing_list_reference_in_packages'] = true; } diff --git a/app/Http/Resources/PackageBaseResource.php b/app/Http/Resources/PackageBaseResource.php index a6535d68..935fbb07 100644 --- a/app/Http/Resources/PackageBaseResource.php +++ b/app/Http/Resources/PackageBaseResource.php @@ -26,7 +26,6 @@ class PackageBaseResource extends JsonResource 'weight' => $this->weight, 'quantity' => $this->quantity, 'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity, - 'reference' => $this->packingList->reference, 'status' => $this->status, // 'container' => new ContainerResource($originalPackingList->containers()->first()), // 'transport' => new TransportResource($originalPackingList->transports()->first()) @@ -45,6 +44,10 @@ class PackageBaseResource extends JsonResource } } + if($this->include_packing_list_reference){ + $data['reference'] = $this->packingList->reference; + } + return $data; } } diff --git a/app/Http/Resources/PackingListBaseResource.php b/app/Http/Resources/PackingListBaseResource.php index 015cc2cf..f6b140ad 100644 --- a/app/Http/Resources/PackingListBaseResource.php +++ b/app/Http/Resources/PackingListBaseResource.php @@ -53,6 +53,9 @@ class PackingListBaseResource extends JsonResource if(isset($this->include_container_in_packages) && $this->include_container_in_packages){ $item['include_container'] = $this->include_container_in_packages; } + if(isset($this->include_packing_list_reference_in_packages) && $this->include_packing_list_reference_in_packages){ + $item['include_packing_list_reference'] = $this->include_packing_list_reference_in_packages; + } } } $data['packages'] = PackageBaseResource::collection($packages);