update export delivery list - include state and postcode

app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Order Number',
+            'Marking',
+            'Quantity',
+            'Remark',
+            'Contact Person Name',
+            'Contact Number',
+            'Delivery Date',
+            'Delivery Address',
+            'Delivery State',
+            'Delivery Postcode'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
+            $query->where('containers.status', ApprovalStatus::COMPLETED);
+        })->whereDoesntHave('transports');
+    }
+
+    /**
+     * @param PackingList $packingList
+     *
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $order = $packingList->owner;
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $defaultAddress = $order->companyModule->addresses()->defaultAddress()->first();
+        $defaultAddress = $defaultAddress ? $defaultAddress : $order->companyModule->addresses()->first();
+        $address = $defaultAddress->street_one.', '.$defaultAddress->street_two.' '.$defaultAddress->district->name.' '.$defaultAddress->postcode.' '.$defaultAddress->state->name.' '.$defaultAddress->country->name;
+        $contacts = $defaultAddress->contacts->first() ? $defaultAddress->contacts->first(): '';
+        $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
+        $transport = $originalPackingList->containers()->first()->transports()->first();
+
+        return [
+            $order->reference,
+            $marking,
+            $packingList->packages()->sum('quantity'),
+            $defaultAddress->remarks->first() ? $defaultAddress->remarks->first()->content: '',
+            $contacts ? $contacts ->reference : '',
+            $contacts ? $contacts ->phone : '',
+            $transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : '',
+            $address,
+            $defaultAddress->state->name,
+            $defaultAddress->postcode
+        ];
+    }
+}

app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php

@@ -7,6 +7,7 @@ use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use Illuminate\Http\Request;
 
 class ApproveChangeOrderAddressProcessor
@@ -65,7 +66,11 @@ class ApproveChangeOrderAddressProcessor
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
 
             $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-            $appointee === 2  ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address);
+            if($appointee === 2) {
+                foreach($address->owner->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST) as $packingList){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                }
+            }
 
         }
 

app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php

@@ -6,23 +6,9 @@ use App\Classes\Exceptions\InternalServerErrorException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Log;
-
-use Illuminate\Http\Request;
-
 class UpdateDoFromVTPortalProcessor
 {
     /** @var FetchesDataFromVTPortal */
@@ -43,19 +29,20 @@ class UpdateDoFromVTPortalProcessor
     }
 
     /**
-     * @param $address
+     * @param PackingList $packing_list
      * @return array
      * @throws GuzzleException
+     * @throws InternalServerErrorException
      */
-    public function execute($address) {
+    public function execute(PackingList $packing_list) {
 
         if(!app()->environment(['production'])){
             return [];
         }
 
         try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
+            $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            $order = $packing_list->owner;
 
             if ($packing_list) {
                 $contact = $address->contacts()->first();
@@ -67,7 +54,7 @@ class UpdateDoFromVTPortalProcessor
 
                 $status = 'On Hold';
 
-                if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                if (in_array($packing_list->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
                     $status = 'Release';
                 }
 
@@ -77,6 +64,7 @@ class UpdateDoFromVTPortalProcessor
 
                 if ($vt_do) {
                     foreach ($vt_do->Rows as $key => $row) {
+                        if($row[4] !== $packing_list->containers()->first()->reference) continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                         'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                         'POST', 
@@ -141,7 +129,7 @@ class UpdateDoFromVTPortalProcessor
             }
 
         } catch (\Exception $exception){
-            return [];
+            throw new InternalServerErrorException('failed to approve address due to an error related to VT portal: '.$exception->getMessage());
         }
 
     }

app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php

@@ -8,6 +8,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 use Illuminate\Support\Facades\Log;
 
 class UpdateDoFromYDPortalProcessor
@@ -30,36 +31,34 @@ class UpdateDoFromYDPortalProcessor
     }
 
     /**
-     * @param $address
+     * @param PackingList $packingList
      * @return void
      * @throws InternalServerErrorException
      */
-    public function execute($address) {
+    public function execute(PackingList $packingList) {
+        if(!app()->environment(['production'])){
+            return;
+        }
+
         try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_lists = $order->packingLists()
-                ->where('type', PackingListType::SHIPPING_PACKING_LIST)
-                ->where('status', '!=', ApprovalStatus::SUSPENDED)
-                ->orderBy('id', 'desc')->get();
+            $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
 
+            if (!in_array($packingList->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                return;
+            }
 
-            foreach ($packing_lists as $key => $row) {
-                if ($row->status === ApprovalStatus::SUSPENDED) {
-                    continue;
-                }
+            $contact = $address->contacts()->first();
+            $remark = $address->remarks()->first();
 
-                $contact = $address->contacts()->first();
-                $remark = $address->remarks()->first();
+            $phone = $contact ? $contact->phone : null;
+            $reference = $contact ? $contact->reference : null;
+            $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
 
-                $phone = $contact ? $contact->phone : null;
-                $reference = $contact ? $contact->reference : null;
-                $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
-
-                $this->fetchesDataFRomYDPortal->clientRequest(
-                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 
-                'POST', 
+            $this->fetchesDataFRomYDPortal->clientRequest(
+                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
+                'POST',
                 [
-                    'expressno' => $row->reference,
+                    'expressno' => $packingList->reference,
                     'customers_name' => $reference,
                     'cellphone' => $phone,
                     'postcode' => $address->postcode,
@@ -68,8 +67,6 @@ class UpdateDoFromYDPortalProcessor
                 ]);
 
 
-            }
-
         } catch (\Exception $exception){
             throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
         }

app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php

@@ -14,6 +14,7 @@ use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Http\Resources\PackingListResource;
+use App\Models\PackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -70,16 +71,16 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
-        $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        /** @var PackingList $packingList */
+        $packingList = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
 
 
 //        $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
-        $this->updateDoFromVTPortalProcessor->execute($address);
-        $this->updateDoFromYDPortalProcessor->execute($address);
+        $this->updateDoFromVTPortalProcessor->execute($packingList);
+        $this->updateDoFromYDPortalProcessor->execute($packingList);
 
-        return $this->resourceResponse(new PackingListResource($packing_list));
+        return $this->resourceResponse(new PackingListResource($packingList));
     }
 
 }

app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php

@@ -36,6 +36,7 @@ use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 
 class FetchOrderListsFromYdPortalProcessor
 {
@@ -153,7 +154,6 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
-
                 $containerReference = null;
                 $loadingDate = null;
                 $unstuffingDate = null;
@@ -168,6 +168,11 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
+                if(!$rows){
+                    Log::debug($row->expressno);
+                    continue;
+                }
+
                 foreach (array_reverse($rows->data) as $trackingRow) {
                     if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
                         $receiveDate = Carbon::parse($trackingRow->trackingtime);
@@ -217,7 +222,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if ($trackingRow->tracking === '货物已派送完成') {
+                    if (Str::contains($trackingRow->tracking, ['派送中'])) {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
                 }
@@ -310,6 +315,13 @@ class FetchOrderListsFromYdPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
+                if(!count($row->deliverysize)){
+                    $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
                 $weightCbm = (float) $row->weight / 500;
                 $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
 
@@ -395,7 +407,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                if($deliveryDate && !$packingList->transports){
+                if($deliveryDate && !$packingList->transports()->exists()){
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();
 

app/Http/Controllers/Exports/ExportPendingArrangementPackingListController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportPendingArrangementPackingListController
+{
+    /**
+     * ExportPendingArrangementPackingListController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function export(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsPendingArrangementDeliveryList($request);
+        $response = $exportsPendingArrangementDeliveryList->download('pending-arrangement-packing-list.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}

app/Http/Resources/TransportResource.php

@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class TransportResource extends JsonResource
@@ -15,6 +16,7 @@ class TransportResource extends JsonResource
      */
     public function toArray($request)
     {
+        $currentSchedule = $this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first();
         return [
             'id' => $this->id,
             'type' => $this->type,
@@ -23,8 +25,10 @@ class TransportResource extends JsonResource
             'dispatch_date' => $this->dispatch_date ? $this->dispatch_date->format('d-m-Y') : $this->dispatch_date,
             'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
             'status' => $this->status,
-            'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
-            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
+            'current_schedule' => new ScheduleResource($currentSchedule),
+            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get()),
+            'dropped_days' => Carbon::now()->diffInDays($this->drop_date, false),
+            'schedule_complete' => $currentSchedule ? $currentSchedule->eta <= Carbon::now() : false
         ];
     }
 }

resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue

@@ -6,6 +6,37 @@
                     <customer-profile-component :data="company"></customer-profile-component>
                 </div>
             </div>
+            <div class="alert alert-info padding-15" role="alert">
+                <div class="row">
+                    <div class="col"></div>
+                    <div class="col-auto">
+                        <i class="fa fa-times text-info-darker pointer" data-dismiss="alert"></i>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col">
+                        <p>[清明节仓库放假通知 Qing Ming Warehouse Holiday Notice]<br>
+
+                            尊敬的客户们：<br>
+
+                            仓库将为 2022年清明节假期做出如下安排 ：<br>
+
+                            广州仓库 ： 2022 年 4月 4日 - 2022 年 4月 5日 （4月6日复工）<br>
+                            义乌仓库 ： 2022 年 4月 3日 - 2022 年 4月 4日 （4月5日复工）<br>
+
+                            *放假期间没有仓库人员值班， 请大家安排好送货时间， 感谢<br><br>
+
+                            Dear Customers :<br>
+
+                            Our warehouse holiday for Qing Ming is as below :<br>
+
+                            Guangzhou : 4 April 2022 - 5 April 2022 (Resume date : 6 April)<br>
+                            Yiwu : 3 April 2022 - 4 April 2022 (Resume date : 5 April)<br>
+
+                            *Warehouse personnel are on leave during the holiday period, please arrange delivery date in advance, thank you</p>
+                    </div>
+                </div>
+            </div>
             <div class="row" v-show="!$store.getters.isShowing('createOrderForm')">
                 <div class="col">
                     <on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>

resources/assets/vue/components/containers/elements/PackingListComponent.vue

@@ -23,7 +23,8 @@
             </div>
         </div>
         <div class="col">
-            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
+            <p class="no-margin" v-if="item.transport">{{ item.transport.current_schedule.eta }}</p>
+            <p class="no-margin text-danger" v-if="!item.transport">{{ item.packages[0].container.transport ? item.packages[0].container.transport.dropped_days+' Days': 'n/a'}}</p>
         </div>
         <div class="col-auto text-right" v-if="!item.transport">
             <div class="row m-b-5">

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

@@ -50,7 +50,7 @@
                                         </div>
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Status</small>
-                                            <p class="no-margin bold">{{status}}</p>
+                                            <p class="no-margin bold">{{item.container ? item.container.transport.schedule_complete && status === 'Shipping' ? 'Custom Clearance' : status : status}}</p>
                                         </div>
                                         <div class="col-auto" v-if="$store.getters.isAdmin">
                                             <small class="fs-10 all-caps muted">Container</small>

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

@@ -22,17 +22,18 @@
                                     <p class="no-margin all-caps fs-10 light">Arrival Date</p>
                                     <p class="no-margin text-success bold">{{data.transport ? data.transport.drop_date : 'n/a'}}</p>
                                 </div>
-                                <div class="col text-right">
+                                <div class="col text-right" v-if="$store.getters.isSuperAdmin">
                                     <button type="button" class="btn b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="claimPackingList">
+                                        <claim-packinglist-form-component :data="data.id"></claim-packinglist-form-component>
+                                    </modal-component>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="claimPackingList">
-                <claim-packinglist-form-component :data="data.id"></claim-packinglist-form-component>
-            </modal-component>
+
         </div>
     </div>
 </template>

resources/views/pages/admin/dashboard.blade.php

@@ -44,6 +44,20 @@
                 </div>
             </div>
             <div class="col">
+                <div class="row">
+                    <div class="col">
+                        <div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
+                            <div class="col no-padding">
+                                <h6>Unclaimed Packing Lists</h6>
+                            </div>
+                        </div>
+                        <list-component section="unclaimedPackingListSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2037, owner_id: 1, status: 4}">
+                            <template slot="list" slot-scope="{data}">
+                                <unclaimed-packinglist-component :data="data"></unclaimed-packinglist-component>
+                            </template>
+                        </list-component>
+                    </div>
+                </div>
                 <profit-model-report-section-component></profit-model-report-section-component>
             </div>
         </div>

resources/views/pages/delivery_list.blade.php

@@ -75,55 +75,79 @@
             <div class="col bg-master-lightest p-1 p-sm-4">
                 <div class="row tabsContainer tabContent" tab-name="pendingArrangement">
                     <div class="col">
-                        <div class="row align-items-center m-b-5 p-b-10 b-b b-grey muted all-caps fs-10">
-                            <div class="col-2">Marking</div>
-                            <div class="col text-center">Quantity</div>
-                            <div class="col">CBM</div>
-                            <div class="col">Overweight CBM</div>
-                            <div class="col">Total CBM</div>
-                            <div class="col">status</div>
-                            <div class="col">Delivery Date</div>
-                            <div class="col text-right">Action</div>
+                        <div class="row">
+                            <div class="col">
+                                <a href="{{route('packaging_list.pending_arrangement.export')}}" target="_blank">
+                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none">
+                                        <div class="row align-items-center">
+                                            <div class="col-auto p-r-0 p-l-0">
+                                                <i class="fa fa-file-excel-o fs-16"></i>
+                                            </div>
+                                            <div class="col p-r-5">Export To Excel</div>
+                                        </div>
+                                    </button>
+                                </a>
+                                <div class="row align-items-center m-t-10 p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                    <div class="col-2">Marking</div>
+                                    <div class="col-1 text-center">Quantity</div>
+                                    <div class="col-1">CBM</div>
+                                    <div class="col-1">Overweight CBM</div>
+                                    <div class="col-1">Total CBM</div>
+                                    <div class="col-1 text-center">status</div>
+                                    <div class="col-3">Delivery Details</div>
+                                    <div class="col">Delivery Date</div>
+                                </div>
+                            </div>
                         </div>
-                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 1, with_arrival_date: true ,'per_page': 30, order_by: {column: 'arrival_date', DESC: true}}">
+                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 1, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <warehouse-packing-list-component :data="data"></warehouse-packing-list-component>
+                                <packing-list-component :data="data"></packing-list-component>
                             </template>
                         </list-component>
                     </div>
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="pendingDelivery">
                     <div class="col">
-                        <div class="row align-items-center m-b-5 p-b-10 b-b b-grey muted all-caps fs-10">
-                            <div class="col-2">Marking</div>
-                            <div class="col text-center">Quantity</div>
-                            <div class="col">CBM</div>
-                            <div class="col">Overweight CBM</div>
-                            <div class="col">Total CBM</div>
-                            <div class="col">status</div>
-                            <div class="col">Delivery Date</div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row align-items-center p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                    <div class="col-2">Marking</div>
+                                    <div class="col-1 text-center">Quantity</div>
+                                    <div class="col-1">CBM</div>
+                                    <div class="col-1">Overweight CBM</div>
+                                    <div class="col-1">Total CBM</div>
+                                    <div class="col-1 text-center">status</div>
+                                    <div class="col-3">Delivery Details</div>
+                                    <div class="col">Delivery Date</div>
+                                </div>
+                            </div>
                         </div>
-                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 2, with_arrival_date: true ,'per_page': 30, order_by: {column: 'arrival_date', DESC: true}}">
+                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 2, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <warehouse-packing-list-component :data="data"></warehouse-packing-list-component>
+                                <packing-list-component :data="data"></packing-list-component>
                             </template>
                         </list-component>
                     </div>
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="delivered">
                     <div class="col">
-                        <div class="row align-items-center m-b-5 p-b-10 b-b b-grey muted all-caps fs-10">
-                            <div class="col-2">Marking</div>
-                            <div class="col text-center">Quantity</div>
-                            <div class="col">CBM</div>
-                            <div class="col">Overweight CBM</div>
-                            <div class="col">Total CBM</div>
-                            <div class="col">status</div>
-                            <div class="col">Delivery Date</div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row align-items-center p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                    <div class="col-2">Marking</div>
+                                    <div class="col-1 text-center">Quantity</div>
+                                    <div class="col-1">CBM</div>
+                                    <div class="col-1">Overweight CBM</div>
+                                    <div class="col-1">Total CBM</div>
+                                    <div class="col-1 text-center">status</div>
+                                    <div class="col-3">Delivery Details</div>
+                                    <div class="col">Delivery Date</div>
+                                </div>
+                            </div>
                         </div>
-                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 3, with_arrival_date: true ,'per_page': 30, order_by: {column: 'arrival_date', DESC: true}}">
+                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 2, 'packing_list_delivery_status': 3, with_arrival_date: true ,'per_page': 10, order_by: {column: 'arrival_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
-                                <warehouse-packing-list-component :data="data"></warehouse-packing-list-component>
+                                <packing-list-component :data="data"></packing-list-component>
                             </template>
                         </list-component>
                     </div>

routes/web.php

@@ -231,6 +231,7 @@ Route::get('/warehouse/{id}/show', function ($id) {
 })->name('warehouse.show');
 Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
 Route::get('/export/packing-list/{id}', 'Exports\ExportContainerPackingListController@export')->name('container.packaging_list.export');
+Route::get('/export/pending-arrangement-delivery-list', 'Exports\ExportPendingArrangementPackingListController@export')->name('packaging_list.pending_arrangement.export');
 
 Route::get('/settings', function () {
     return view('pages.settings');
@@ -241,7 +242,7 @@ Route::get('/settings', function () {
 
 Route::get('/customer/summary/monthly', function () {
 //    $containers = Container::whereMonth('loading_date', 1)->where('owner_id', 3)->get();
-    $containers = Container::whereIn('reference', ['SM21-166', 'SM21-168', 'SM21-170', 'SM21-171', 'SM21-172', 'SM21-173', 'EPS-3833'])->get();
+    $containers = Container::whereIn('reference', ['EPS-3850', 'EPS-3863', 'WP-1331', 'EPS-3856'])->get();
     foreach ($containers as $container){
         $packingLists = $container->packingLists()->get()->filter(function ($packingList) {
             return $packingList->owner->company_module_id === 248;