diff --git a/app/Classes/General/Eloquent/Filters/WithPackingLists.php b/app/Classes/General/Eloquent/Filters/WithPackingLists.php new file mode 100644 index 00000000..927aa526 --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/WithPackingLists.php @@ -0,0 +1,20 @@ +with('packingLists'); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/PackingLists/Containers/CreateContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/CreateContainerController.php similarity index 100% rename from app/Http/Controllers/PackingLists/Containers/CreateContainerPackingListController.php rename to app/Http/Controllers/PackingLists/Containers/CreateContainerController.php diff --git a/app/Http/Controllers/PackingLists/Containers/DeleteContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/DeleteContainerController.php similarity index 100% rename from app/Http/Controllers/PackingLists/Containers/DeleteContainerPackingListController.php rename to app/Http/Controllers/PackingLists/Containers/DeleteContainerController.php diff --git a/app/Http/Controllers/PackingLists/Containers/FetchContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/FetchContainerController.php similarity index 100% rename from app/Http/Controllers/PackingLists/Containers/FetchContainerPackingListController.php rename to app/Http/Controllers/PackingLists/Containers/FetchContainerController.php diff --git a/app/Http/Controllers/PackingLists/Containers/ListContainerPackingListsController.php b/app/Http/Controllers/PackingLists/Containers/ListContainersController.php similarity index 91% rename from app/Http/Controllers/PackingLists/Containers/ListContainerPackingListsController.php rename to app/Http/Controllers/PackingLists/Containers/ListContainersController.php index 61084f53..8cff9f2e 100644 --- a/app/Http/Controllers/PackingLists/Containers/ListContainerPackingListsController.php +++ b/app/Http/Controllers/PackingLists/Containers/ListContainersController.php @@ -10,7 +10,7 @@ class ListContainersController { /** * @param Request $request - * @param ListContainerLogic $logic + * @param ListContainersLogic $logic * @return JsonResponse */ public function list(Request $request, ListContainersLogic $logic): JsonResponse { diff --git a/app/Http/Controllers/PackingLists/Containers/UpdateContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/UpdateContainerController.php similarity index 100% rename from app/Http/Controllers/PackingLists/Containers/UpdateContainerPackingListController.php rename to app/Http/Controllers/PackingLists/Containers/UpdateContainerController.php diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php index f1d3671f..774ada84 100644 --- a/app/Http/Resources/ContainerResource.php +++ b/app/Http/Resources/ContainerResource.php @@ -21,6 +21,10 @@ class ContainerResource extends JsonResource 'container_number' => $this->container_number, 'seal_reference' => $this->seal_reference, 'transport' => new TransportResource($this->transports()->first()), + 'packing_lists' => PackingListResource::collection($this->whenLoaded('packingLists', function(){ + return $this->packingLists()->whereHas('packages')->get(); + })), + 'status' => $this->status ]; } } diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php index e75ce164..4024833d 100644 --- a/app/Http/Resources/PackingListResource.php +++ b/app/Http/Resources/PackingListResource.php @@ -21,6 +21,7 @@ class PackingListResource extends JsonResource 'status' => $this->status, 'transport' => new TransportResource($this->transports()->first()), 'packages' => PackageResource::collection($this->packages), + 'order' => New OrderResource($this->owner) ]; } } diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue index 2a4f7525..78fd231a 100644 --- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue +++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue @@ -5,23 +5,28 @@
- - - - - - - - +
-
Shipping ID: {{item.country.id}}
-

status: in transit

+
{{item.container_reference}}
+

{{item.container_number}} / {{item.seal_reference}}

+
+
+

ETD

+

{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}

+
+
+

ETA

+

{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}

+
+
+

Status

+

{{item.status === 3 ? 'Un-stuffed' : 'In Progress'}}

-
- -
@@ -30,40 +35,30 @@
-
+
-
-
-
Package ID
+
+
+
Order Number
+
Customer Marking
+
Quantity
+
CBM
Delivery Address
-
Delivery Estimation
-
-
-
6288153-MY3143485
-
Home
-
20/04/2002
-
-
-
-
-
-
-
6288153-MY3143485
-
Home
-
20/04/2002
-
-
-
-
-
-
-
6288153-MY3143485
-
Home
-
20/04/2002
+
+
+
+
+
{{packingList.order.reference}}
+
{{packingList.order.company_module.marking}}
+
{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}
+
{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}
+
{{packingList.order.address.street_one+' '+(packingList.order.address.street_two ? packingList.order.address.street_two : '')+', '+ packingList.order.address.district.name+', '+packingList.order.address.post_code+' '+packingList.order.address.state.name+', '+packingList.order.address.country.name}}
+
+
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue index c9fcdfdb..17e29d63 100644 --- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue +++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue @@ -59,7 +59,7 @@

Marking

-

{{item.order.company_module.marking}}

+

{{item.order.company_module.marking}}

@@ -67,7 +67,7 @@

Order Number

-

{{item.order.reference}}

+

{{item.order.reference}}

diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php new file mode 100644 index 00000000..24fed85e --- /dev/null +++ b/resources/views/pages/containers.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.base_portal') +@section('inner_content') +
+
+
Search
+
+
+
Filter
+
+
+ + + + +@endsection \ No newline at end of file diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 744454ef..e0881b5f 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -52,12 +52,12 @@
Arrived Parcels
-
+
+ style=" fill:#000000;">
Containers
 diff --git a/routes/web.php b/routes/web.php index dc47f4a0..e638b4d5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -65,6 +65,10 @@ Route::get('/warehouse-list', function () { return view('pages.warehouse_list'); })->name('warehouse.list'); +Route::get('/containers', function () { + return view('pages.containers'); +})->name('containers'); + Route::get('/customer/{marking}', function ($marking) { $connection = CompanyConnection::where('invitee_reference', $marking)->first(); $id = $connection->invitee->company->id; @@ -73,15 +77,12 @@ Route::get('/customer/{marking}', function ($marking) { Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download'); -Route::get('/test', function(){ - $addresses = \App\Models\Address::all(); - foreach ($addresses as $address){ - $address->street_one = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_one, $address->district, $address->postcode); - $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode); - $address->save(); - } -})->name('test'); +//Route::get('/test', function(){ +// $addresses = \App\Models\Address::all(); +// foreach ($addresses as $address){ +// $address->street_one = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_one, $address->district, $address->postcode); +// $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode); +// $address->save(); +// } +//})->name('test'); -Route::get('/containers', function () { - return view('pages.templates.containers'); -})->name('containers'); \ No newline at end of file