diff --git a/app/Http/Resources/ContainerBaseResource.php b/app/Http/Resources/ContainerBaseResource.php index 3f203c34..6a719102 100644 --- a/app/Http/Resources/ContainerBaseResource.php +++ b/app/Http/Resources/ContainerBaseResource.php @@ -19,17 +19,17 @@ class ContainerBaseResource extends JsonResource public function toArray($request) { return [ - // 'id' => $this->id, - // 'container_reference' => $this->reference, - // 'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type], - // 'container_number' => $this->container_number, - // 'seal_reference' => $this->seal_reference, - // 'loading_date' => optional($this->loading_date)->format('d-m-Y'), - // 'transport' => new TransportResource($this->transports()->first()), + 'id' => $this->id, + 'container_reference' => $this->reference, + 'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type], + 'container_number' => $this->container_number, + 'seal_reference' => $this->seal_reference, + 'loading_date' => optional($this->loading_date)->format('d-m-Y'), + 'transport' => new TransportResource($this->transports()->first()), // 'packages_count' => $this->packages()->where('packages.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, + 'remarks' => RemarkResource::collection($this->remarks), + 'status' => $this->status, 'packing_lists' => $this->shouldIncludePackingListData($request) ? $this->getSortedPackingLists() : null, ]; } diff --git a/resources/views/pages/download/index.blade.php b/resources/views/pages/download/index.blade.php index 3ae09218..e1fcca1a 100644 --- a/resources/views/pages/download/index.blade.php +++ b/resources/views/pages/download/index.blade.php @@ -128,7 +128,7 @@