List containers

app/Classes/General/Eloquent/Filters/WithPackingLists.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithPackingLists implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('packingLists');
+    }
+}

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 {

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
         ];
     }
 }

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)
         ];
     }
 }

resources/assets/vue/components/orders/elements/ParcelComponent.vue

@@ -59,7 +59,7 @@
                             <p class="no-margin all-caps fs-10 light">Marking</p>
                         </div>
                         <div class="col p-l-5">
-                            <p class="no-margin bold text-info fs-12">{{item.order.company_module.marking}}</p>
+                            <p class="no-margin bold text-info fs-12"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a></p>
                         </div>
                     </div>
                     <div class="row m-b-5" v-if="$store.getters.isAdmin">
@@ -67,7 +67,7 @@
                             <p class="no-margin all-caps fs-10 light">Order Number</p>
                         </div>
                         <div class="col p-l-5">
-                            <p class="no-margin bold text-info fs-12">{{item.order.reference}}</p>
+                            <p class="no-margin bold text-info fs-12"><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></p>
                         </div>
                     </div>
                     <div class="row m-b-5" v-if="$store.getters.isAdmin">

resources/views/pages/containers.blade.php

@@ -0,0 +1,17 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row m-1 mt-3 mb-3 hide">
+    <div class="col col-10 m-r-5">
+        <div class="row border p-1">Search</div>
+    </div>
+    <div class="col col m-l-5">
+        <div class="row border p-1">Filter</div>
+    </div>
+</div>
+<!-- <list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')"> -->
+<list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'with_packing_lists': true, order_by: {column: 'created_at', DESC: false}}">
+    <template slot="list" slot-scope="{data}">
+        <container-component :data="data"></container-component>
+    </template>
+</list-component>
+@endsection

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');