From 3c20386875deb82621fa77622e5becbc57046d84 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 19 Aug 2021 01:31:27 +0800
Subject: [PATCH 01/98] feat: API to request change order address

---
 .../DataTransferObjects/AddressObject.php     | 12 +++-
 .../Addresses/Services/CreatesAddress.php     |  1 +
 .../RequestChangeOrderAddressLogic.php        | 49 ++++++++++++++
 .../RequestChangeOrderAddressProcessor.php    | 66 +++++++++++++++++++
 .../Standards/Rules/CanChangeOrderAddress.php | 39 +++++++++++
 .../RequestChangeOrderAddressController.php   | 20 ++++++
 app/Http/Resources/OrderResource.php          |  1 +
 app/Models/Order.php                          | 11 ++++
 8 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/Modules/Orders/ControllersLogic/RequestChangeOrderAddressLogic.php
 create mode 100644 app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
 create mode 100644 app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php
 create mode 100644 app/Http/Controllers/Orders/RequestChangeOrderAddressController.php

diff --git a/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php b/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
index 76c66b52..b4453c3a 100644
--- a/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
+++ b/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Addresses\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 class AddressObject implements DataTransferObject
 {
@@ -38,7 +39,7 @@ class AddressObject implements DataTransferObject
      * @param int $postCode
      * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -47,6 +48,7 @@ class AddressObject implements DataTransferObject
         $this->districtId = $districtId;
         $this->postCode = $postCode;
         $this->reference = $reference;
+        $this->status = $status;
     }
 
     /**
@@ -105,5 +107,13 @@ class AddressObject implements DataTransferObject
         return $this->reference;
     }
 
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/Services/CreatesAddress.php b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
index b6662a98..b9f2716c 100644
--- a/app/Classes/Modules/Addresses/Services/CreatesAddress.php
+++ b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
@@ -28,6 +28,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
         $model->state_id = $object->getStateId();
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
+        $model->status = $object->getStatus();
 
         return $this->handler($addressable->addresses(), $model);
 
diff --git a/app/Classes/Modules/Orders/ControllersLogic/RequestChangeOrderAddressLogic.php b/app/Classes/Modules/Orders/ControllersLogic/RequestChangeOrderAddressLogic.php
new file mode 100644
index 00000000..b0c24f0b
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/RequestChangeOrderAddressLogic.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Processors\RequestChangeOrderAddressProcessor;
+use App\Http\Resources\OrderResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+class RequestChangeOrderAddressLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Request To Change Order Address',
+            'message' => 'You have successfully request to change order address'
+        ];
+    }
+
+    /** @var RequestChangeOrderAddressProcessor */
+    private $requestChangeOrderAddressProcessor;
+
+    /**
+     * RequestChangeOrderAddressLogic constructor.
+     * @param RequestChangeOrderAddressProcessor $requestChangeOrderAddressProcessor
+     */
+
+    public function __construct(RequestChangeOrderAddressProcessor $requestChangeOrderAddressProcessor)
+    {
+        $this->requestChangeOrderAddressProcessor = $requestChangeOrderAddressProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+
+    public function logic(Request $request): JsonResponse
+    {
+        $order = $this->requestChangeOrderAddressProcessor->execute($request);
+
+        return $this->resourceResponse(new OrderResource($order));
+    }
+}
diff --git a/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
new file mode 100644
index 00000000..7f01726b
--- /dev/null
+++ b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use App\Classes\Modules\Orders\Standards\Rules\CanChangeOrderAddress;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Addresses\Services\DeletesAddress;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use Illuminate\Http\Request;
+
+class RequestChangeOrderAddressProcessor
+{
+    /** @var CanChangeOrderAddress */
+    private $canChangeOrderAddress;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var DeletesAddress */
+    private $deletesAddress;
+
+    /**
+     * ChangeOrderAddressProcessor constructor.
+     * @param FetchesOrder $fetchesOrder
+     * @param CreatesAddress $createsAddress
+     * @param FetchesAddress $fetchesAddress
+     * @param DeletesAddress $deletesAddress
+     */
+    public function __construct(CanChangeOrderAddress $canChangeOrderAddress, FetchesOrder $fetchesOrder, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress, DeletesAddress $deletesAddress)
+    {
+
+        $this->canChangeOrderAddress = $canChangeOrderAddress;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->createsAddress = $createsAddress;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->deletesAddress = $deletesAddress;
+    }
+
+
+    public function execute(Request $request)
+    {
+
+        $this->canChangeOrderAddress->passes();
+
+        $order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
+        foreach ($order->addressesPendingVerification as $address) {
+            $this->deletesAddress->execute($address);
+        }
+
+        $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->reference, ApprovalStatus::PENDING_VERIFICATION);
+        $this->createsAddress->execute($order, $addressObject);
+
+        return $order;
+    }
+}
diff --git a/app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php b/app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php
new file mode 100644
index 00000000..1030168b
--- /dev/null
+++ b/app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php
@@ -0,0 +1,39 @@
+<?php
+
+
+namespace App\Classes\Modules\Orders\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+
+class CanChangeOrderAddress extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Http/Controllers/Orders/RequestChangeOrderAddressController.php b/app/Http/Controllers/Orders/RequestChangeOrderAddressController.php
new file mode 100644
index 00000000..3fb8881f
--- /dev/null
+++ b/app/Http/Controllers/Orders/RequestChangeOrderAddressController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\RequestChangeOrderAddressLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RequestChangeOrderAddressController
+{
+    /**
+     * @param Request $request
+     * @param ChangeOrderAddressLogic $logic
+     * @return JsonResponse
+     */
+    public function request(Request $request, RequestChangeOrderAddressLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 1a31578f..1653de70 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -24,6 +24,7 @@ class OrderResource extends JsonResource
             'company_module' => new CompanyModuleResource($this->companyModule),
             'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
             'address' => new AddressResource($this->addresses()->first()),
+            'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             'created_at' => $this->created_at->format('d-m-Y')
         ];
     }
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 58f64dc8..050ff390 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Addressable;
 use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Scopes\CustomerOrdersScope;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -57,4 +58,14 @@ class Order extends AbstractModel implements Addressable
 //            static::addGlobalScope(new CustomerOrdersScope);
 //        }
     }
+
+    public function addressesPendingVerification()
+    {
+        return $this->addresses()->where('status','=',ApprovalStatus::PENDING_VERIFICATION);
+    }
+
+    public function addressesApproved()
+    {
+        return $this->addresses()->where('status','=',ApprovalStatus::APPROVED);
+    }
 }

From 5a043e89a027fa7b1c36f57c6778eb0762bee475 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 19 Aug 2021 01:33:16 +0800
Subject: [PATCH 02/98] feat: API to approve order address change.

---
 .../ApproveChangeOrderAddressLogic.php        | 43 +++++++++++++++
 .../ApproveChangeOrderAddressProcessor.php    | 53 +++++++++++++++++++
 .../Orders/Services/UpdatesOrdersAddress.php  | 20 +++++++
 .../Rules/CanApproveChangeOrderAddress.php    | 39 ++++++++++++++
 .../ApproveChangeOrderAddressController.php   | 20 +++++++
 5 files changed, 175 insertions(+)
 create mode 100644 app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
 create mode 100644 app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
 create mode 100644 app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
 create mode 100644 app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php
 create mode 100644 app/Http/Controllers/Orders/ApproveChangeOrderAddressController.php

diff --git a/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php b/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
new file mode 100644
index 00000000..ff78145e
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Processors\ApproveChangeOrderAddressProcessor;
+use App\Http\Resources\OrderResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+class ApproveChangeOrderAddressLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Change Order Address Approval',
+            'message' => 'You have successfully change the order address'
+        ];
+    }
+
+    /** @var ApproveChangeOrderAddressProcessor */
+    private $approveChangeOrderAddressProcessor;
+
+    /**
+     * ApproveChangeOrderAddressLogic constructor.
+     * @param ApproveChangeOrderAddressProcessor $approveChangeOrderAddressProcessor
+     */
+
+    public function __construct(ApproveChangeOrderAddressProcessor $approveChangeOrderAddressProcessor)
+    {
+        $this->approveChangeOrderAddressProcessor = $approveChangeOrderAddressProcessor;
+    }
+
+    public function logic(Request $request): JsonResponse
+    {
+        $order = $this->approveChangeOrderAddressProcessor->execute($request);
+
+        return $this->resourceResponse(new OrderResource($order));
+    }
+}
diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
new file mode 100644
index 00000000..423d8ce5
--- /dev/null
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Addresses\Services\DeletesAddress;
+use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use Illuminate\Http\Request;
+
+class ApproveChangeOrderAddressProcessor
+{
+    /** @var CanApproveChangeOrderAddress */
+    private $canApproveChangeOrderAddress;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesOrdersAddress */
+    private $updatesOrdersAddress;
+
+    /** @var DeletesAddress */
+    private $deletesAddress;
+
+    /**
+     * CreateOrderProcessor constructor.
+     * @param CanApproveChangeOrderAddress $canApproveChangeOrderAddress
+     * @param FetchesOrder $fetchesOrder
+     * @param DeletesAddress $deletesAddress
+     * @param UpdatesOrdersAddress $updatesOrdersAddress
+     */
+    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesOrder $fetchesOrder, DeletesAddress $deletesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
+    {
+        $this->canApproveChangeOrderAddress = $canApproveChangeOrderAddress;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->deletesAddress = $deletesAddress;
+        $this->updatesOrdersAddress = $updatesOrdersAddress;
+    }
+
+
+    public function execute(Request $request)
+    {
+        $this->canApproveChangeOrderAddress->passes();
+
+        $order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
+        $this->deletesAddress->execute($order->addressesApproved->first());
+        $this->updatesOrdersAddress->execute($order->addressesPendingVerification->first(), ApprovalStatus::APPROVED);
+
+        return $order;
+    }
+}
diff --git a/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php b/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
new file mode 100644
index 00000000..3ad6295a
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Address;
+
+class UpdatesOrdersAddress extends AbstractUpdateRecord
+{
+    /**
+     * @param Address $address
+     * @param int $type
+     * @return void
+     */
+    public function execute(Address $address, int $type)
+    {
+        $address->status = $type;
+        return $this->handler($address);
+    }
+}
diff --git a/app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php b/app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php
new file mode 100644
index 00000000..24ce6418
--- /dev/null
+++ b/app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php
@@ -0,0 +1,39 @@
+<?php
+
+
+namespace App\Classes\Modules\Orders\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+
+class CanApproveChangeOrderAddress extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Http/Controllers/Orders/ApproveChangeOrderAddressController.php b/app/Http/Controllers/Orders/ApproveChangeOrderAddressController.php
new file mode 100644
index 00000000..9443ad7b
--- /dev/null
+++ b/app/Http/Controllers/Orders/ApproveChangeOrderAddressController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\ApproveChangeOrderAddressLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApproveChangeOrderAddressController
+{
+    /**
+     * @param Request $request
+     * @param ApproveChangeOrderAddressLogic $logic
+     * @return JsonResponse
+     */
+    public function approve(Request $request, ApproveChangeOrderAddressLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}

From 6fb5d666312900ef06f26e81f7915adaee7fa059 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 19 Aug 2021 01:33:50 +0800
Subject: [PATCH 03/98] feat: add route for request and approve address change.

---
 routes/order.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routes/order.php b/routes/order.php
index 4f31ecff..27cb66ef 100644
--- a/routes/order.php
+++ b/routes/order.php
@@ -9,4 +9,6 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f
     Route::put('/confirm/{id}', 'ConfirmOrderController@confirm')->name('confirm');
     Route::put('/cancel/{id}', 'CancelOrderController@cancel')->name('cancel');
     Route::put('/restore/{id}', 'RestoreOrderController@restore')->name('restore');
+    Route::post('/address/change/request', 'RequestChangeOrderAddressController@request')->name('address.change.request');
+    Route::post('/address/change/approve', 'ApproveChangeOrderAddressController@approve')->name('address.change.approve');
 });

From e0405bca1ec0deeb1c95d7c9b61e541e6fe38e80 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 19 Aug 2021 01:35:23 +0800
Subject: [PATCH 04/98] swagger: add show order, request address change, and
 approve address change api endpoint.

---
 resources/views/swagger/json.blade.php | 142 +++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

diff --git a/resources/views/swagger/json.blade.php b/resources/views/swagger/json.blade.php
index 1e09fa9c..00cfe1a3 100644
--- a/resources/views/swagger/json.blade.php
+++ b/resources/views/swagger/json.blade.php
@@ -2430,6 +2430,148 @@
         }
       }
     },
+    "/order/show/{id}": {
+      "get": {
+        "tags": [
+          "Order"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "operationId": "showOrder",
+        "summary": "Show order",
+        "description": "",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Order Reference Id",
+            "required": true,
+            "type": "integer"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "headers": {
+              "X-Expires-After": {
+                "type": "string",
+                "format": "date-time",
+                "description": "date in UTC when token expires"
+              },
+              "X-Rate-Limit": {
+                "type": "integer",
+                "format": "int32",
+                "description": "calls per hour allowed by the user"
+              }
+            },
+            "schema": {
+              "type": "string"
+            }
+          },
+          "422": {
+            "description": "Invalid input supplied"
+          }
+        }
+      }
+    },
+    "/order/address/change/request": {
+      "post": {
+        "tags": [
+          "Order"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "operationId": "requestChangeOrderAddress",
+        "summary": "Request Change Order Address",
+        "description": "",
+        "parameters": [
+          {
+            "name": "order_id",
+            "in": "query",
+            "description": "Order ID",
+            "required": true,
+            "type": "integer"
+          },
+          {
+            "name": "address_id",
+            "in": "query",
+            "description": "New Order Address ID",
+            "required": true,
+            "type": "integer"
+          },
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "headers": {
+              "X-Expires-After": {
+                "type": "string",
+                "format": "date-time",
+                "description": "date in UTC when token expires"
+              },
+              "X-Rate-Limit": {
+                "type": "integer",
+                "format": "int32",
+                "description": "calls per hour allowed by the user"
+              }
+            },
+            "schema": {
+              "type": "string"
+            }
+          },
+          "422": {
+            "description": "Invalid input supplied"
+          }
+        }
+      }
+    },
+    "/order/address/change/approve": {
+      "post": {
+        "tags": [
+          "Order"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "operationId": "approveChangeOrderAddress",
+        "summary": "Approve Change Order Address",
+        "description": "",
+        "parameters": [
+          {
+            "name": "order_id",
+            "in": "query",
+            "description": "Order ID",
+            "required": true,
+            "type": "integer"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "headers": {
+              "X-Expires-After": {
+                "type": "string",
+                "format": "date-time",
+                "description": "date in UTC when token expires"
+              },
+              "X-Rate-Limit": {
+                "type": "integer",
+                "format": "int32",
+                "description": "calls per hour allowed by the user"
+              }
+            },
+            "schema": {
+              "type": "string"
+            }
+          },
+          "422": {
+            "description": "Invalid input supplied"
+          }
+        }
+      }
+    },
     "/address/create": {
       "post": {
         "tags": [

From 7008a01b117cb1549ac4cfb455ff4db1d54cebeb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 2 Sep 2021 12:27:40 +0800
Subject: [PATCH 05/98] fix reschedule containers etd bug

---
 .../FetchContainersStatusUpdateFromVTPortalProcessor.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index a50bbfdf..208c8b31 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -107,9 +107,11 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                     if($delayDate){
                         $delayDate = Carbon::parse($delayDate);
                         $transport = $container->transports()->first();
+
                         $schedule = $transport->schedules()->where('eta', '=', $delayDate)->first();
                         $etd = $delayDate->subDays(5);
-                        if(!$schedule){
+
+                        if($schedule){
                             $etd = $schedule->etd;
                             $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
                         }

From 842fc52b4e4505aa9f89d3c929bd05819bef5fe9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 2 Sep 2021 16:51:10 +0800
Subject: [PATCH 06/98] fix warehouse list bugs

---
 .../CreateAddressFromOldAddressProcessor.php  |  5 +-
 ...ehouseReceiveListFromVTPortalProcessor.php | 18 +++++--
 app/Models/OldOrders.php                      |  2 +-
 database/seeders/DeleteOldOrdersSeeder.php    | 54 +++++++++++++++++++
 4 files changed, 72 insertions(+), 7 deletions(-)
 create mode 100644 database/seeders/DeleteOldOrdersSeeder.php

diff --git a/app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php b/app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php
index 7cd04d1f..3e209927 100644
--- a/app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php
+++ b/app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php
@@ -7,6 +7,7 @@ use App\Classes\Modules\Addresses\Services\CleansOldAddress;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Models\OldAddress;
+use App\Models\Order;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateAddressFromOldAddressProcessor
@@ -44,8 +45,8 @@ class CreateAddressFromOldAddressProcessor
         }
 
 
-        if($address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()){
-           return $address;
+        if(!$addressable instanceof Order && $address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()) {
+            return $address;
         }
 
         return $this->createsAddress->execute($addressable, $object);
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 862fdb60..476b1426 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -125,6 +125,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
             }
 
             $end = $end ? $end : Carbon::now();
+
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
             $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
@@ -132,6 +133,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
             foreach ($response->Rows as $parcel){
+
                 $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
 
                 if(!array_key_exists(1, $marking)){
@@ -144,6 +146,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                     continue;
                 }
 
+
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
                 } catch (ResourceNotFoundException $exception) {
@@ -154,13 +157,16 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                         continue;
                     }
 
-                    $customerMarking = str_replace(' ', '', str_replace('/', '', str_replace('CIEF/', '', $oldOrder->company->marking)));
+
+                    $customerMarking = str_replace('/', '', str_replace(' ', '', explode('CIEF/', $oldOrder->company->marking)[1]));
 
                     $companyModule = CompanyModule::whereHas('inviters', function($query) use ($customerMarking) {
                         return $query->where('invitee_reference', '=', $customerMarking);
                     })->first();
 
-                    if(!$companyModule) {
+
+                    if(!$companyModule){
+                        log::error('unknown customer: '.$customerMarking);
                         continue;
                     }
 
@@ -180,6 +186,10 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
 
                     $order = $this->createOrderProcessor->execute($companyModule->company, $originWarehouse, $address, $orderNumber);
+
+                    $order->created_at = Carbon::parse($parcel[1]);
+                    $order->save();
+
                 }
 
                 $packingListReference = $parcel[17];
@@ -217,13 +227,13 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             }
 
-            return [];
+
         } catch (\Exception $exception){
             Log::error($exception->getMessage());
         }
 
         DB::commit();
-
+        return [];
 
     }
 
diff --git a/app/Models/OldOrders.php b/app/Models/OldOrders.php
index 81041fab..c6901929 100644
--- a/app/Models/OldOrders.php
+++ b/app/Models/OldOrders.php
@@ -17,7 +17,7 @@ class OldOrders extends Model
      */
     public function address(): hasOne
     {
-        return $this->hasOne(OldAddress::class,  'reference_id', 'address_id')->where('type', '=', 1);
+        return $this->hasOne(OldAddress::class,  'id', 'address_id')->where('type', '=', 1);
     }
 
     /**
diff --git a/database/seeders/DeleteOldOrdersSeeder.php b/database/seeders/DeleteOldOrdersSeeder.php
new file mode 100644
index 00000000..74afabf6
--- /dev/null
+++ b/database/seeders/DeleteOldOrdersSeeder.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
+use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
+use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
+use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
+use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
+use App\Classes\Modules\PackingLists\Processors\FetchContainersStatusUpdateFromVTPortalProcessor;
+use App\Models\Address;
+use App\Models\Container;
+use App\Models\ContainerPackingList;
+use App\Models\OldOrders;
+use App\Models\Order;
+use App\Models\Package;
+use App\Models\PackingList;
+use App\Models\Schedule;
+use App\Models\Step;
+use App\Models\Transport;
+use Illuminate\Database\Seeder;
+
+class DeleteOldOrdersSeeder extends Seeder
+{
+
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        Container::truncate();
+        ContainerPackingList::truncate();
+        Transport::truncate();
+        Schedule::truncate();
+        PackingList::truncate();
+        Package::truncate();
+        Step::truncate();
+
+        foreach (Order::all() as $order){
+            $oldOrder = OldOrders::where('marking', '=', $order->reference)->first();
+            if($oldOrder){
+                $order->addresses()->forceDelete();
+                $order->packingLists()->forceDelete();
+                $order->OrderRoles()->forceDelete();
+                $order->orderSteps()->forceDelete();
+                $order->forceDelete();
+            }
+        }
+    }
+
+}

From 050dc8ac7ba2dba80b267f7ca6e0780ffd813b8e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 2 Sep 2021 22:20:01 +0800
Subject: [PATCH 07/98] frontend suggested changes

---
 ...inersStatusUpdateFromVTPortalProcessor.php | 16 ++---
 app/Http/Resources/ContainerResource.php      |  2 +-
 app/Http/Resources/TransportResource.php      |  2 +-
 database/seeders/OrdersTableSeeder.php        |  1 -
 .../elements/CustomerProfileComponent.vue     | 66 +++++++++++--------
 .../orders/elements/PackageComponent.vue      | 50 +++++++++++---
 .../orders/elements/ParcelComponent.vue       | 10 ++-
 .../WarehouseListSectionComponent.vue         | 12 ++++
 .../views/pages/warehouse_list.blade.php      |  4 ++
 routes/web.php                                |  4 ++
 10 files changed, 118 insertions(+), 49 deletions(-)
 create mode 100644 resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
 create mode 100644 resources/views/pages/warehouse_list.blade.php

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index 208c8b31..cddc41ea 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -89,6 +89,8 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
 
                     $eta = Carbon::parse($eta);
 
+                    $etd = Carbon::parse($eta)->subDays(5);
+
                     $delayDate = $containerDetails[6];
 
                     $containerStatus = $containerDetails[9];
@@ -98,25 +100,23 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                     $transport = $container->transports()->first();
 
                     if(!$transport){
-                        $transportObject = new TransportObject(TransportType::SEA, null, null,  $eta, null, ApprovalStatus::APPROVED);
+                        $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
                         /** @var Transport $transport */
                         $transport = $this->createsTransport->execute($transportObject, $container);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($eta->subDays(5), $eta, ApprovalStatus::APPROVED));
+                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                     }
 
                     if($delayDate){
+
                         $delayDate = Carbon::parse($delayDate);
                         $transport = $container->transports()->first();
 
-                        $schedule = $transport->schedules()->where('eta', '=', $delayDate)->first();
-                        $etd = $delayDate->subDays(5);
-
-                        if($schedule){
-                            $etd = $schedule->etd;
+                        if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
+                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
                             $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
                         }
 
-                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
                     }
 
                     if($containerStatus === 'Unstuffing'){
diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 59c60916..f1d3671f 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -20,7 +20,7 @@ class ContainerResource extends JsonResource
             'container_type' => $this->container_type,
             'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
-            'transport' => TransportResource::collection($this->transports),
+            'transport' => new TransportResource($this->transports()->first()),
         ];
     }
 }
diff --git a/app/Http/Resources/TransportResource.php b/app/Http/Resources/TransportResource.php
index 6656721a..b931964d 100644
--- a/app/Http/Resources/TransportResource.php
+++ b/app/Http/Resources/TransportResource.php
@@ -24,7 +24,7 @@ class TransportResource extends JsonResource
             '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::APPROVED)->get())
+            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
         ];
     }
 }
diff --git a/database/seeders/OrdersTableSeeder.php b/database/seeders/OrdersTableSeeder.php
index 60caa71c..0e881591 100644
--- a/database/seeders/OrdersTableSeeder.php
+++ b/database/seeders/OrdersTableSeeder.php
@@ -21,7 +21,6 @@ class OrdersTableSeeder extends Seeder
      */
     public function run()
     {
-
         FetchWarehouseReceiveListFromVTPortalJob::withChain([
             new FetchLoadedContainersFromVTPortalJob,
             new FetchPackingListFromVTPortalJob,
diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index 5584ec86..59d0dd1e 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -30,25 +30,29 @@
                 </div>
             </div>
         </div>
-        <div class="col-auto">
+        <div class="col-6">
             <div class="row">
                 <div class="col-auto" v-if="item.employee">
-                    <div class="row align-items-center">
+                    <div class="row align-items-center m-b-5">
                         <div class="col">
                             <h6 class="no-margin fs-12">Account Owner</h6>
                             <h6 class="no-margin">{{item.employee.name}}</h6>
                         </div>
                     </div>
+                    <div class="row align-items-center">
+                        <div class="col">
+                            <h6 class="no-margin fs-12">Account Owner</h6>
+                            <h6 class="no-margin">{{item.employee.email}}</h6>
+                        </div>
+                    </div>
                 </div>
                 <div class="col-auto" v-if="item.contact">
-                    <div class="row align-items-center">
+                    <div class="row align-items-center m-b-5">
                         <div class="col">
                             <h6 class="no-margin fs-12">Contact Number</h6>
                             <h6 class="no-margin">{{item.contact.phone}}</h6>
                         </div>
                     </div>
-                </div>
-                <div class="col-auto" v-if="item.contact">
                     <div class="row align-items-center">
                         <div class="col">
                             <h6 class="no-margin fs-12">WeChat ID</h6>
@@ -57,35 +61,39 @@
                     </div>
                 </div>
                 <div class="col-auto">
-                    <div class="row" v-if="item.identification">
-                        <div class="col">
-                            <div class="row align-items-center">
+                    <div class="row">
+                        <div class="col-auto">
+                            <div class="row" v-if="item.identification">
                                 <div class="col">
-                                    <h6 class="no-margin fs-12">{{ item.type === 0 ? 'Identification Card' : 'SSM Registration' }}</h6>
-                                    <h6 class="no-margin"> {{item.identification.reference}}</h6>
-                                </div>
-                                <div class="col-auto p-l-0" v-for="file in item.identification.files" v-bind:key="file.id"  >
-                                    <document-file-viewer-component :file="file">
-                                        <template slot="button">
-                                            <div class="icon-thumbnail fs-14 text-white icon-25 bg-primary btn-rounded m-l-5">
-                                                <i class="fa fa-file-image-o fs-14"></i>
-                                            </div>
-                                        </template>
-                                    </document-file-viewer-component>
+                                    <div class="row align-items-center">
+                                        <div class="col">
+                                            <h6 class="no-margin fs-12">{{ item.type === 0 ? 'Identification Card' : 'SSM Registration' }}</h6>
+                                            <h6 class="no-margin"> {{item.identification.reference}}</h6>
+                                        </div>
+                                        <div class="col-auto p-l-0" v-for="file in item.identification.files" v-bind:key="file.id"  >
+                                            <document-file-viewer-component :file="file">
+                                                <template slot="button">
+                                                    <div class="icon-thumbnail fs-14 text-white icon-25 bg-primary btn-rounded m-l-5">
+                                                        <i class="fa fa-file-image-o fs-14"></i>
+                                                    </div>
+                                                </template>
+                                            </document-file-viewer-component>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="row parentContainer" v-if="!item.identification">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col no-padding">
-                                    <button class="btn btn-sm btn-success btn-block b-rad-none requestModal" data-type="identificationVerificationModal">Upload Identification</button>
+                            <div class="row parentContainer" v-if="!item.identification">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col no-padding">
+                                            <button class="btn btn-sm btn-success btn-block b-rad-none requestModal" data-type="identificationVerificationModal">Upload Identification</button>
+                                        </div>
+                                    </div>
+                                    <modal-component type="identificationVerificationModal">
+                                        <identification-verification-form-component section="orderListSection" :data="item"></identification-verification-form-component>
+                                    </modal-component>
                                 </div>
                             </div>
-                            <modal-component type="identificationVerificationModal">
-                                <identification-verification-form-component section="orderListSection" :data="item"></identification-verification-form-component>
-                            </modal-component>
                         </div>
                     </div>
                 </div>
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index f9a1da89..f1465b7c 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -66,15 +66,29 @@
                                 </div>
                             </div>
                             <div class="row p-t-10 p-b-10">
-                                <div class="col-auto p-r-0">
-                                    <div class="row justify-content-center">
-                                        <div class="col-auto">
-                                            <i class="fa fa-check fs-15 p-t-15" :class="{'text-primary': status !== 'Ready To Ship', 'muted': status === 'Ready To Ship'}"></i>
+                                <div class="col-auto p-r-0 p-t-10">
+                                    <div class="row" v-for="schedule in item.container.transport.schedule_history" :key="schedule.id">
+                                        <div class="col">
+                                            <div class="row justify-content-center">
+                                                <div class="col-auto">
+                                                    <i class="fa fa-times fs-15 text-danger"></i>
+                                                </div>
+                                            </div>
+                                            <div class="row justify-content-center">
+                                                <div class="col-auto">
+                                                    <div class="b-l b-dashed b-danger" style="height: 35px;"></div>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="row justify-content-center">
                                         <div class="col-auto">
-                                            <div class="b-l b-dashed " style="height: 40px;" :class="{'b-primary': status === 'Preparing Delivery' || status === 'Delivered', 'b-grey': status !== 'Preparing Delivery' || status !== 'Delivered'}"></div>
+                                            <i class="fa fa-check fs-15" :class="{'text-primary': status !== 'Ready To Ship', 'muted': status === 'Ready To Ship'}"></i>
+                                        </div>
+                                    </div>
+                                    <div class="row justify-content-center">
+                                        <div class="col-auto">
+                                            <div class="b-l b-dashed " style="height: 35px;" :class="{'b-primary': status === 'Preparing Delivery' || status === 'Delivered', 'b-grey': status !== 'Preparing Delivery' || status !== 'Delivered'}"></div>
                                         </div>
                                     </div>
                                     <div class="row justify-content-center">
@@ -84,11 +98,31 @@
                                     </div>
                                 </div>
                                 <div class="col p-l-0">
+                                    <div class="row m-b-15" v-for="schedule in item.container.transport.schedule_history" :key="schedule.id">
+                                        <div class="col">
+                                            <div class="row no-margin">
+                                                <div class="col-auto">
+                                                    <small class="fs-10 all-caps muted">Etd</small>
+                                                    <h6 class="no-margin small">{{schedule.etd}}</h6>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <small class="fs-10 all-caps muted">Eta</small>
+                                                    <h6 class="no-margin small">{{schedule.eta}}</h6>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="row m-b-15">
                                         <div class="col">
-                                            <div class="col-auto">
-                                                <small class="fs-10 all-caps muted">Shipping Date</small>
-                                                <h6 class="no-margin small">{{item.container ? item.container.transport[0].current_schedule.etd : 'n/a'}}</h6>
+                                            <div class="row no-margin">
+                                                <div class="col-auto" v-if="!item.container.transport.schedule_history.length">
+                                                    <small class="fs-10 all-caps muted">Etd</small>
+                                                    <h6 class="no-margin small">{{item.container ? item.container.transport.current_schedule.etd : 'n/a'}}</h6>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <small class="fs-10 all-caps muted">{{!item.container.transport.schedule_history.length ? 'Eta' : 'Rescheduled Eta' }}</small>
+                                                    <h6 class="no-margin small">{{item.container ? item.container.transport.current_schedule.eta : 'n/a'}}</h6>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 6c037efc..74c2be6d 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -38,7 +38,15 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
-                    <div class="row m-b-5" v-if="item.transport.tracking_number">
+                    <div class="row m-b-5">
+                        <div class="col-auto p-r-5">
+                            <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>
+                        </div>
+                    </div>
+                    <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Description</p>
                         </div>
diff --git a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
new file mode 100644
index 00000000..a56afe24
--- /dev/null
+++ b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="row">
+        <div class="col-5">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
+                <template slot="list" slot-scope="{data}">
+
+                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
new file mode 100644
index 00000000..b12f825a
--- /dev/null
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -0,0 +1,4 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+   <warehouse-list-section-component></warehouse-list-section-component>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 0281ac90..b1370bfe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -61,6 +61,10 @@ Route::get('/address', function () {
     return view('pages.addresses.index');
 })->name('address');
 
+Route::get('/warehouse-list', function () {
+    return view('pages.warehouse_list');
+})->name('warehouse.list');
+
 Route::get('/customer/{marking}', function ($marking) {
     $connection = CompanyConnection::where('invitee_reference', $marking)->first();
     $id = $connection->invitee->company->id;

From 8e05c287b88d3937112801fffb1eaff2df1359ab Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 2 Sep 2021 22:25:03 +0800
Subject: [PATCH 08/98] frontend suggested changes

---
 resources/views/partials/menu.blade.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 90d7d4d2..73f727b9 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -41,6 +41,17 @@
                                 <a href="{{route('orders')}}"><h6 class="no-margin light fs-18 all-caps">Orders</h6></a>
                             </div>
                         </div>
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
+                            <div class="col-auto p-r-0">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                     width="25" height="25"
+                                     viewBox="0 0 172 172"
+                                     style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M8.6,23.65c-2.37676,0 -4.3,1.92324 -4.3,4.3c0,2.37676 1.92324,4.3 4.3,4.3c2.37676,0 4.3,-1.92324 4.3,-4.3c4.77031,0 8.6,3.82969 8.6,8.6v85.10137c0,8.28926 6.76074,15.05 15.05,15.05h0.50391c0.99941,2.98145 3.72051,5.19863 7.02109,5.19863h4.43438c-0.74746,1.26816 -1.20938,2.72949 -1.20938,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20938,-4.3h66.91875c-0.74746,1.26816 -1.20937,2.72949 -1.20937,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20937,-4.3h4.43437c3.36777,0 6.13926,-2.30117 7.08828,-5.375h0.43672v-2.15c0,-3.90527 -3.04863,-7.12188 -6.87832,-7.45781c0.26035,-0.69707 0.42832,-1.43613 0.42832,-2.21719v-40.85c0,-1.67129 -0.73066,-3.14941 -1.78887,-4.3c1.0582,-1.15059 1.78887,-2.62871 1.78887,-4.3v-43c0,-3.53574 -2.91426,-6.45 -6.45,-6.45h-94.6c-3.53574,0 -6.45,2.91426 -6.45,6.45v43c0,1.67129 0.73066,3.14941 1.78887,4.3c-1.0582,1.15059 -1.78887,2.62871 -1.78887,4.3v40.85c0,0.78105 0.16797,1.52012 0.42832,2.21719c-3.15781,0.27715 -5.75293,2.51953 -6.57598,5.48418h-0.30234c-5.96289,0 -10.75,-4.78711 -10.75,-10.75v-85.10137c0,-7.09668 -5.80332,-12.9 -12.9,-12.9zM49.45,30.1h94.6c1.21777,0 2.15,0.93223 2.15,2.15v43c0,1.21777 -0.93223,2.15 -2.15,2.15c-1.17578,0.0168 -2.11641,0.97422 -2.11641,2.15c0,1.17578 0.94062,2.1332 2.11641,2.15c1.21777,0 2.15,0.93223 2.15,2.15v40.85c0,1.21777 -0.93223,2.15 -2.15,2.15h-94.6c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-40.85c0,-1.21777 0.93223,-2.15 2.15,-2.15c1.17578,-0.0168 2.11641,-0.97422 2.11641,-2.15c0,-1.17578 -0.94063,-2.1332 -2.11641,-2.15c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-43c0,-1.21777 0.93223,-2.15 2.15,-2.15zM88.15,38.7c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM58.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM66.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM75.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM101.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM118.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM126.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM88.15,90.3c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM44.075,131.15h105.35c1.80566,0 3.225,1.41934 3.225,3.225c0,1.80566 -1.41934,3.225 -3.225,3.225h-105.35c-1.80566,0 -3.225,-1.41934 -3.225,-3.225c0,-1.80566 1.41934,-3.225 3.225,-3.225zM55.9,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM137.6,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3z"></path></g></g></svg>
+                            </div>
+                            <div class="col">
+                                <a href="{{route('warehouse.list')}}"><h6 class="no-margin light fs-18 all-caps">Arrived Parcels</h6></a>
+                            </div>
+                        </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide">
                             <div class="col-auto p-r-0">
                                 <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"

From 51f1b3adcbd2fe592458a61468de321b1bbe9cd2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 2 Sep 2021 22:32:01 +0800
Subject: [PATCH 09/98] change scheduled jobs into a chain

---
 app/Console/Kernel.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index bec96f83..5dd79445 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -29,11 +29,14 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-         $schedule->job(FetchWarehouseReceiveListFromVTPortalJob::class)->dailyAt('21:00');
-         $schedule->job(FetchLoadedContainersFromVTPortalJob::class)->dailyAt('21:15');
-         $schedule->job(FetchPackingListFromVTPortalJob::class)->dailyAt('21:30');
-         $schedule->job(FetchContainersStatusUpdateFromVTPortalJob::class)->dailyAt('21:45');
-         $schedule->job(FetchDeliveryListFromVTPortalJob::class)->dailyAt('22:00');
+        $schedule->call(function(){
+            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+                new FetchLoadedContainersFromVTPortalJob,
+                new FetchPackingListFromVTPortalJob,
+                new FetchContainersStatusUpdateFromVTPortalJob,
+                new FetchDeliveryListFromVTPortalJob
+            ])->dispatch();
+        })->dailyAt('21:00');
     }
 
     /**

From 1edcb296f3947da811c257408158695e5238ad6a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 2 Sep 2021 22:39:37 +0800
Subject: [PATCH 10/98] sort orders by latest

---
 .../vue/components/orders/sections/OrderSectionComponent.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
index 18df2ac5..840e5ecf 100644
--- a/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
@@ -170,7 +170,7 @@
                                 <div class="col">
                                     <div class="row">
                                         <div class="col">
-                                            <list-component v-show="!$store.getters.isShowing('createOrderForm')" section="activeOrderListSection" :endpoint="route('api.order.list')" :options="item ? {per_page: 12, status_in: [2], company_module_id: item.company_module.id} : {per_page: 30, status_in: [2]}" :columns=3>
+                                            <list-component v-show="!$store.getters.isShowing('createOrderForm')" section="activeOrderListSection" :endpoint="route('api.order.list')" :options="item ? {per_page: 12, order_by: {column: 'created_at', DESC: false}, status_in: [2], company_module_id: item.company_module.id} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2]}" :columns=3>
                                                 <template slot="list" slot-scope="{data}">
                                                     <order-component :data="data"></order-component>
                                                 </template>

From 3ee8afc4a4a8768261354a7f33fad8efd539a6bc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 3 Sep 2021 13:07:31 +0800
Subject: [PATCH 11/98] add new schedule for fetching from vt at 11:30 am

---
 app/Console/Kernel.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 5dd79445..795f9ab6 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -29,6 +29,16 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
+
+        $schedule->call(function(){
+            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+                new FetchLoadedContainersFromVTPortalJob,
+                new FetchPackingListFromVTPortalJob,
+                new FetchContainersStatusUpdateFromVTPortalJob,
+                new FetchDeliveryListFromVTPortalJob
+            ])->dispatch();
+        })->dailyAt('11:30');
+
         $schedule->call(function(){
             FetchWarehouseReceiveListFromVTPortalJob::withChain([
                 new FetchLoadedContainersFromVTPortalJob,
@@ -37,6 +47,8 @@ class Kernel extends ConsoleKernel
                 new FetchDeliveryListFromVTPortalJob
             ])->dispatch();
         })->dailyAt('21:00');
+
+
     }
 
     /**

From b049c95ca25ea69398aaec7abe061b8d867b30ad Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 3 Sep 2021 17:25:17 +0800
Subject: [PATCH 12/98] change schedule for vt portal fetch

---
 app/Console/Kernel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 795f9ab6..83b805ad 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -37,7 +37,7 @@ class Kernel extends ConsoleKernel
                 new FetchContainersStatusUpdateFromVTPortalJob,
                 new FetchDeliveryListFromVTPortalJob
             ])->dispatch();
-        })->dailyAt('11:30');
+        })->dailyAt('15:00');
 
         $schedule->call(function(){
             FetchWarehouseReceiveListFromVTPortalJob::withChain([

From 51d999e3c8a9f471feeccba90029cb5eef7a5e9e Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 4 Sep 2021 16:22:09 +0800
Subject: [PATCH 13/98] add container page ui

---
 .../elements/ContainerComponent.vue           | 85 +++++++++++++++++++
 .../pages/templates/containers.blade.php      | 17 ++++
 resources/views/partials/menu.blade.php       | 11 +++
 routes/web.php                                |  6 +-
 4 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/components/containers/elements/ContainerComponent.vue
 create mode 100644 resources/views/pages/templates/containers.blade.php

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
new file mode 100644
index 00000000..2a4f7525
--- /dev/null
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -0,0 +1,85 @@
+<template>
+    <div class="row m-b-15">
+        <div class="col b-a b-grey rounded">
+            <div class="row">
+                <div class="col padding-15">
+                    <div class="row align-items-center">
+                        <div class="col-auto p-r-0">
+                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="40" height="40" viewBox="0 0 172 172" style=" fill:#000000;">
+                                <g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal">
+                                    <path d="M0,172v-172h172v172z" fill="none"></path>
+                                    <g fill="#000000">
+                                        <path d="M12.9,34.4v103.2h9.07031c1.96524,0 3.70371,-1.35215 4.17402,-3.25859h-0.0084l0.26875,-1.04141h119.19063l0.26875,1.04141h-0.0084c0.47031,1.90645 2.20879,3.25859 4.17402,3.25859h9.07031v-103.2h-9.20469c-1.83926,0 -3.49375,1.19258 -4.07324,2.94785l-0.45352,1.35215h-118.73711l-0.45352,-1.35215v-0.0084c-0.57949,-1.74688 -2.24238,-2.93945 -4.07324,-2.93945zM17.2,38.7h4.90469l1.43613,4.3h124.91836l1.43613,-4.3h4.90469v94.6h-4.77031l-1.075,-4.3h-125.90938l-1.075,4.3h-4.77031zM34.4,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path>
+                                    </g>
+                                </g>
+                            </svg>
+                        </div>
+                        <div class="col">
+                            <h5 class="no-margin">Shipping ID: {{item.country.id}}</h5>
+                            <p class="no-margin muted">status: in transit</p>
+                        </div>
+                        <div class="col-auto">
+                            <div class="btn btn-default no-border">
+                                <i class="fa fa-bell"></i>
+                            </div>
+                            <div class="btn btn-default no-border" @click="expanded = !expanded">
+                                <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-show="expanded">
+                <div class="col p-b-10">
+                    <div class="row">
+                        <div class="col p-b-0 p-l-15 p-r-15 p-t-15 no-margin">
+                            <div class="row align-items-center muted">
+                                <div class="col">Package ID</div>
+                                <div class="col">Delivery Address</div>
+                                <div class="col">Delivery Estimation</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-l-15 p-r-15 p-t-10 p-b-10">
+                            <div class="row align-items-center">
+                                <div class="col">6288153-MY3143485</div>
+                                <div class="col">Home</div>
+                                <div class="col">20/04/2002</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-l-15 p-r-15 p-t-10 p-b-10">
+                            <div class="row align-items-center">
+                                <div class="col">6288153-MY3143485</div>
+                                <div class="col">Home</div>
+                                <div class="col">20/04/2002</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-l-15 p-r-15 p-t-10 p-b-10">
+                            <div class="row align-items-center">
+                                <div class="col">6288153-MY3143485</div>
+                                <div class="col">Home</div>
+                                <div class="col">20/04/2002</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/pages/templates/containers.blade.php b/resources/views/pages/templates/containers.blade.php
new file mode 100644
index 00000000..995e7b93
--- /dev/null
+++ b/resources/views/pages/templates/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.address.district.list')">
+    <template slot="list" slot-scope="{data}">
+        <container-component :data="data"></container-component>
+    </template>
+</list-component>
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 90d7d4d2..abd5c4bb 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -41,6 +41,17 @@
                                 <a href="{{route('orders')}}"><h6 class="no-margin light fs-18 all-caps">Orders</h6></a>
                             </div>
                         </div>
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
+                            <div class="col-auto p-r-0">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                     width="25" height="25"
+                                     viewBox="0 0 172 172"
+                                     style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M21.5,21.5v47.3h47.3v-47.3zM103.2,21.5v47.3h47.3v-47.3zM83.85,23.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,23.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,25.8h38.7v38.7h-38.7zM107.5,25.8h38.7v38.7h-38.7zM32.25,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM131.15,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,40.85v8.6h8.6v-8.6zM122.55,40.85v8.6h8.6v-8.6zM77.4,43c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,43c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,49.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM131.15,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,68.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM45.15,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM70.95,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM45.15,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM38.7,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM21.5,103.2v47.3h47.3v-47.3zM25.8,107.5h38.7v38.7h-38.7zM77.4,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,122.55v8.6h8.6v-8.6zM83.85,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,129c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,129c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                            </div>
+                            <div class="col">
+                                <a href="{{route('containers')}}"><h6 class="no-margin light fs-18 all-caps">Containers</h6></a>
+                            </div>
+                        </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide">
                             <div class="col-auto p-r-0">
                                 <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
diff --git a/routes/web.php b/routes/web.php
index 0281ac90..b1f53d94 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -76,4 +76,8 @@ Route::get('/test', function(){
         $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode);
         $address->save();
     }
-})->name('test');
\ No newline at end of file
+})->name('test');
+
+Route::get('/containers', function () {
+    return view('pages.templates.containers');
+})->name('containers');
\ No newline at end of file

From 7d67e13b9edb994877ccb44064318d31f75ac235 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 5 Sep 2021 20:12:52 +0800
Subject: [PATCH 14/98] change schedule for vt portal fetch

---
 app/Console/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 83b805ad..623233c2 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -31,7 +31,7 @@ class Kernel extends ConsoleKernel
     {
 
         $schedule->call(function(){
-            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
                 new FetchLoadedContainersFromVTPortalJob,
                 new FetchPackingListFromVTPortalJob,
                 new FetchContainersStatusUpdateFromVTPortalJob,
@@ -40,7 +40,7 @@ class Kernel extends ConsoleKernel
         })->dailyAt('15:00');
 
         $schedule->call(function(){
-            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
                 new FetchLoadedContainersFromVTPortalJob,
                 new FetchPackingListFromVTPortalJob,
                 new FetchContainersStatusUpdateFromVTPortalJob,

From 6009e82994294cece4b1b1cdf911c2fea247cc37 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 6 Sep 2021 12:48:57 +0800
Subject: [PATCH 15/98] add marking to arrived parcel components

---
 .../vue/components/orders/elements/ParcelComponent.vue    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 74c2be6d..f306502d 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -38,6 +38,14 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
+                    <div class="row m-b-5" v-if="$store.getter.isAdmin">
+                        <div class="col-auto p-r-5">
+                            <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>
+                        </div>
+                    </div>
                     <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>

From 91c8424dc5bc9aaf04ccb34f91828d325722173f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 6 Sep 2021 12:52:11 +0800
Subject: [PATCH 16/98] add marking to arrived parcel components

---
 .../Eloquent/Filters/OrderByArrivalDate.php   | 20 +++++++++++++++++++
 ...hLoadedContainersFromVTPortalProcessor.php |  7 ++++---
 ...ehouseReceiveListFromVTPortalProcessor.php |  4 +++-
 .../orders/elements/ParcelComponent.vue       |  2 +-
 .../WarehouseListSectionComponent.vue         | 12 -----------
 .../views/pages/warehouse_list.blade.php      | 10 +++++++++-
 6 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
 delete mode 100644 resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php b/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
new file mode 100644
index 00000000..aae9336c
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OrderByArrivalDate implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('transports');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 2776124d..ed41ed08 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -124,11 +124,12 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-        DB::beginTransaction();
+//        DB::beginTransaction();
         try {
+            $start = Carbon::parse('01-06-2021');
             $start = $start ? $start : Carbon::now()->subMonth();
 
-            $startLimit = Carbon::parse('11-08-2021');
+            $startLimit = Carbon::parse('01-06-2021');
 
             if($start->isBefore($startLimit)){
                 $start = $startLimit;
@@ -221,7 +222,7 @@ class FetchLoadedContainersFromVTPortalProcessor
         }
 
 
-        DB::commit();
+//        DB::commit();
         return [];
 
     }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 476b1426..bc6042b6 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -116,9 +116,11 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
+            $start = Carbon::parse('01-06-2021');
+
             $start = $start ? $start : Carbon::now()->subMonth();
 
-            $startLimit = Carbon::parse('11-08-2021');
+            $startLimit = Carbon::parse('01-06-2021');
 
             if($start->isBefore($startLimit)){
                 $start = $startLimit;
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index f306502d..7f50b346 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -38,7 +38,7 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
-                    <div class="row m-b-5" v-if="$store.getter.isAdmin">
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Marking</p>
                         </div>
diff --git a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
deleted file mode 100644
index a56afe24..00000000
--- a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col-5">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
-                <template slot="list" slot-scope="{data}">
-
-                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
-                </template>
-            </list-component>
-        </div>
-    </div>
-</template>
\ No newline at end of file
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index b12f825a..3b58deab 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,4 +1,12 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-   <warehouse-list-section-component></warehouse-list-section-component>
+    <div class="row">
+        <div class="col-5">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by_arrival_date: true, order_by: {column: 'created_at', DESC: false}}">
+                <template slot="list" slot-scope="{data}">
+                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
 @endsection
\ No newline at end of file

From 50cbafce254f4a9ff7b7cbd3c229936947a0e84e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 6 Sep 2021 12:52:27 +0800
Subject: [PATCH 17/98] add marking to arrived parcel components

---
 .../assets/vue/components/orders/elements/ParcelComponent.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 7f50b346..822534b2 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -46,7 +46,7 @@
                             <p class="no-margin bold text-info fs-12">{{item.order.company_module.marking}}</p>
                         </div>
                     </div>
-                    <div class="row m-b-5">
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>
                         </div>

From 1933030e9aa06adf4bef6011faddadbecc9d44c9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 6 Sep 2021 12:59:11 +0800
Subject: [PATCH 18/98] Revert "add marking to arrived parcel components"

This reverts commit 50cbafce254f4a9ff7b7cbd3c229936947a0e84e.
---
 .../assets/vue/components/orders/elements/ParcelComponent.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 822534b2..7f50b346 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -46,7 +46,7 @@
                             <p class="no-margin bold text-info fs-12">{{item.order.company_module.marking}}</p>
                         </div>
                     </div>
-                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                    <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>
                         </div>

From a2f4e1f3fd7ae9307c1b6f37830901f9e5b9271b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 6 Sep 2021 13:00:31 +0800
Subject: [PATCH 19/98] Revert "add marking to arrived parcel components"

This reverts commit 91c8424dc5bc9aaf04ccb34f91828d325722173f.
---
 .../Eloquent/Filters/OrderByArrivalDate.php   | 20 -------------------
 ...hLoadedContainersFromVTPortalProcessor.php |  7 +++----
 ...ehouseReceiveListFromVTPortalProcessor.php |  4 +---
 .../orders/elements/ParcelComponent.vue       |  2 +-
 .../WarehouseListSectionComponent.vue         | 12 +++++++++++
 .../views/pages/warehouse_list.blade.php      | 10 +---------
 6 files changed, 18 insertions(+), 37 deletions(-)
 delete mode 100644 app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
 create mode 100644 resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php b/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
deleted file mode 100644
index aae9336c..00000000
--- a/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class OrderByArrivalDate implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->with('transports');
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index ed41ed08..2776124d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -124,12 +124,11 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-//        DB::beginTransaction();
+        DB::beginTransaction();
         try {
-            $start = Carbon::parse('01-06-2021');
             $start = $start ? $start : Carbon::now()->subMonth();
 
-            $startLimit = Carbon::parse('01-06-2021');
+            $startLimit = Carbon::parse('11-08-2021');
 
             if($start->isBefore($startLimit)){
                 $start = $startLimit;
@@ -222,7 +221,7 @@ class FetchLoadedContainersFromVTPortalProcessor
         }
 
 
-//        DB::commit();
+        DB::commit();
         return [];
 
     }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index bc6042b6..476b1426 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -116,11 +116,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
-            $start = Carbon::parse('01-06-2021');
-
             $start = $start ? $start : Carbon::now()->subMonth();
 
-            $startLimit = Carbon::parse('01-06-2021');
+            $startLimit = Carbon::parse('11-08-2021');
 
             if($start->isBefore($startLimit)){
                 $start = $startLimit;
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 7f50b346..f306502d 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -38,7 +38,7 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
-                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                    <div class="row m-b-5" v-if="$store.getter.isAdmin">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Marking</p>
                         </div>
diff --git a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
new file mode 100644
index 00000000..a56afe24
--- /dev/null
+++ b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="row">
+        <div class="col-5">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
+                <template slot="list" slot-scope="{data}">
+
+                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 3b58deab..b12f825a 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,12 +1,4 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row">
-        <div class="col-5">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by_arrival_date: true, order_by: {column: 'created_at', DESC: false}}">
-                <template slot="list" slot-scope="{data}">
-                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
-                </template>
-            </list-component>
-        </div>
-    </div>
+   <warehouse-list-section-component></warehouse-list-section-component>
 @endsection
\ No newline at end of file

From 7f8a4af3fe0e3523a4b2e490c852ef07996ea44d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 6 Sep 2021 13:03:45 +0800
Subject: [PATCH 20/98] add marking to arrived parcel components

---
 .../components/orders/elements/ParcelComponent.vue   |  4 ++--
 .../sections/WarehouseListSectionComponent.vue       | 12 ------------
 resources/views/pages/warehouse_list.blade.php       | 10 +++++++++-
 3 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index f306502d..822534b2 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -38,7 +38,7 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
-                    <div class="row m-b-5" v-if="$store.getter.isAdmin">
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Marking</p>
                         </div>
@@ -46,7 +46,7 @@
                             <p class="no-margin bold text-info fs-12">{{item.order.company_module.marking}}</p>
                         </div>
                     </div>
-                    <div class="row m-b-5">
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>
                         </div>
diff --git a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
deleted file mode 100644
index a56afe24..00000000
--- a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col-5">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
-                <template slot="list" slot-scope="{data}">
-
-                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
-                </template>
-            </list-component>
-        </div>
-    </div>
-</template>
\ No newline at end of file
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index b12f825a..96456aaf 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,4 +1,12 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-   <warehouse-list-section-component></warehouse-list-section-component>
+    <div class="row">
+        <div class="col-5">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
+                <template slot="list" slot-scope="{data}">
+                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
 @endsection
\ No newline at end of file

From 102905df066e4f3913704fa415bf5a5a43a58a1b Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Mon, 6 Sep 2021 14:52:56 +0800
Subject: [PATCH 21/98] Container, Transport, Schedule Api Debug

---
 .../Containers/CreateContainerLogic.php       | 20 +++++++++++++++----
 .../Packages/CreatePackageLogic.php           |  2 +-
 .../ControllersLogic/CreateScheduleLogic.php  |  2 +-
 .../Validators/ScheduleValidation.php         |  2 --
 .../ControllersLogic/CreateTransportLogic.php | 14 ++++++-------
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
index cff8cbb6..40376b12 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
@@ -4,10 +4,12 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainer;
 use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanCreateContainer;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+
 use App\Http\Resources\ContainerResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -32,13 +34,17 @@ class CreateContainerLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
+     /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
     /** @var CreatesPackingList */
     private $createsContainer;
 
-    public function __construct(CanCreateContainer $canCreateContainer, FetchesPackingList $fetchesPackingList, CreatesContainer $createsContainer)
+    public function __construct(CanCreateContainer $canCreateContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreatesContainer $createsContainer)
     {
         $this->canCreateContainer = $canCreateContainer;
         $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsContainer = $createsContainer;
     }
 
@@ -51,15 +57,21 @@ class CreateContainerLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
+        $object = new ContainerObject(
+            $request->input('container_reference'), 
+            $request->input('container_number'), 
+            $request->input('seal_reference'),
+            $request->input('container_type'),
+            $request->input('status')
+        );
 
-        $object = new ContainerObject($request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
+        $company = $this->fetchesCompanyModule->execute(['id' => 2]);
 
         $this->canCreateContainer->passes($object);
 
-        $query = $this->createsContainer->execute($object);
+        $query = $this->createsContainer->execute($object, $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]));
 
         return $this->resourceResponse(new ContainerResource($query));
-
     }
 
 }
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
index c9eebc15..03d67fce 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
@@ -61,7 +61,7 @@ class CreatePackageLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-
+        
         $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
 
         $object = new PackageObject(
diff --git a/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php b/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
index 5bf9c7e9..aecff745 100644
--- a/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
+++ b/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
@@ -56,7 +56,7 @@ class CreateScheduleLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $object = new ScheduleObject($request->input('etd'), $request->input('eta'), $request->input('transport_id'), ApprovalStatus::PENDING_SUBMISSION);
+        $object = new ScheduleObject($request->input('etd'), $request->input('eta'), ApprovalStatus::PENDING_SUBMISSION);
 
         $this->canCreateSchedule->passes($object);
 
diff --git a/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php b/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
index 7d14a3f1..485dc833 100644
--- a/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
+++ b/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
@@ -16,7 +16,6 @@ class ScheduleValidation extends AbstractValidation
      */
     protected function data($object): array {
         return [
-            'transport_id' =>  $object->getTransportId(),
             'etd' => $object->getETD(),
             'eta' => $object->getETA(),
             'status' => $object->getStatus(),
@@ -28,7 +27,6 @@ class ScheduleValidation extends AbstractValidation
      */
     protected function rules(): array {
         return [
-            'transport_id' => 'required',
             'etd' => 'required',
             'eta' => 'required',
         ];
diff --git a/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
index af438830..4e6c6c64 100644
--- a/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
+++ b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
@@ -7,7 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\Modules\Transports\Standards\Rules\CanCreateTransport;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Http\Resources\TransportResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -29,8 +29,8 @@ class CreateTransportLogic extends AbstractControllerLogic
     /** @var CanCreateTransport */
     private $canCreateTransport;
 
-    /** @var FetchesContainer */
-    private $fetchesContainer;
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
 
     /** @var CreatesTransport */
     private $createsTransport;
@@ -38,13 +38,13 @@ class CreateTransportLogic extends AbstractControllerLogic
     /**
      * CreateTransportLogic constructor.
      * @param CanCreateTransport $canCreateTransport
-     * @param FetchesContainer $fetchesContainer
+     * @param FetchesPackingList $fetchesPackingList
      * @param CreatesTransport $createsTransport
      */
-    public function __construct(CanCreateTransport $canCreateTransport, FetchesContainer $fetchesContainer, CreatesTransport $createsTransport)
+    public function __construct(CanCreateTransport $canCreateTransport, FetchesPackingList $fetchesPackingList, CreatesTransport $createsTransport)
     {
         $this->canCreateTransport = $canCreateTransport;
-        $this->fetchesContainer = $fetchesContainer;
+        $this->fetchesPackingList = $fetchesPackingList;
         $this->createsTransport = $createsTransport;
     }
 
@@ -62,7 +62,7 @@ class CreateTransportLogic extends AbstractControllerLogic
 
         $this->canCreateTransport->passes($object);
 
-        $query = $this->createsTransport->execute($this->fetchesContainer->execute(['id' => $request->input('container_id')]), $object);
+        $query = $this->createsTransport->execute($object, $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]));
 
         return $this->resourceResponse(new TransportResource($query));
 

From c96a2b71d1c644869c39c3ea6a5504e5b56701a2 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Mon, 6 Sep 2021 15:22:28 +0800
Subject: [PATCH 22/98] update api

---
 .../Containers/UpdateContainerLogic.php       | 10 +++-
 .../DataTransferObjects/ContainerObject.php   | 12 ++--
 .../Services/Containers/CreatesContainer.php  |  2 +-
 .../Services/Containers/UpdatesContainer.php  |  2 +-
 .../ControllersLogic/CreateTransportLogic.php |  9 ++-
 .../ControllersLogic/UpdateTransportLogic.php |  9 ++-
 database/seeders/CompaniesTableSeeder.php     | 60 +++++++++----------
 7 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
index 3d1516f0..72537db2 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
@@ -58,8 +58,14 @@ class UpdateContainerLogic extends AbstractControllerLogic
     {
 
         $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-
-        $object = new ContainerObject( $container->packing_list_id , $request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
+        
+        $object = new ContainerObject( 
+            $request->input('container_reference'), 
+            $container->container_number, 
+            $request->input('container_type'), 
+            $request->input('seal_reference'),
+            $container->status, 
+        );
 
         $this->canUpdateContainer->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
index 92b0effa..3924102c 100644
--- a/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
@@ -14,7 +14,7 @@ class ContainerObject implements DataTransferObject
     private $containerNumber;
 
     /** @var string */
-    private $sealNumber;
+    private $sealReference;
 
     /** @var int  */
     private $containerType;
@@ -26,15 +26,15 @@ class ContainerObject implements DataTransferObject
      * ContainerObject constructor.
      * @param string $reference
      * @param string $containerNumber
-     * @param string $sealNumber
+     * @param string $sealReference
      * @param int $containerType
      * @param int $status
      */
-    public function __construct(string $reference, string $containerNumber, string $sealNumber, int $containerType, int $status)
+    public function __construct(string $reference, string $containerNumber, string $sealReference, int $containerType, int $status)
     {
         $this->reference = $reference;
         $this->containerNumber = $containerNumber;
-        $this->sealNumber = $sealNumber;
+        $this->sealReference = $sealReference;
         $this->containerType = $containerType;
         $this->status = $status;
     }
@@ -58,9 +58,9 @@ class ContainerObject implements DataTransferObject
     /**
      * @return string
      */
-    public function getSealNumber(): string
+    public function getSealReference(): string
     {
-        return $this->sealNumber;
+        return $this->sealReference;
     }
 
     /**
diff --git a/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php b/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
index d8d733b2..eb8ff4e0 100644
--- a/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
+++ b/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
@@ -22,7 +22,7 @@ class CreatesContainer extends AbstractUpdateRelationshipRecord
         $model->reference = $object->getReference();
         $model->container_number = $object->getContainerNumber();
         $model->container_type = $object->getContainerType();
-        $model->seal_reference = $object->getSealNumber();
+        $model->seal_reference = $object->getSealReference();
         $model->status = $object->getStatus();
 
         return $this->handler($owner->containers(), $model);
diff --git a/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php b/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php
index c3f6f1a4..d10102e1 100644
--- a/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php
+++ b/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php
@@ -17,7 +17,7 @@ class UpdatesContainer extends AbstractUpdateRecord
      */
     public function execute(Container $model, ContainerObject $object) {
 
-        $model->container_reference = $object->getContainerReference();
+        $model->reference = $object->getReference();
         $model->container_type = $object->getContainerType();
         $model->seal_reference = $object->getSealReference();
 
diff --git a/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
index 4e6c6c64..edd5690f 100644
--- a/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
+++ b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
@@ -58,7 +58,14 @@ class CreateTransportLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
-        $object = new TransportObject($request->input('type'), $request->input('courier'), $request->input('tracking_number'), null, null, ApprovalStatus::PENDING_SUBMISSION);
+        $object = new TransportObject(
+            $request->input('type'), 
+            $request->input('courier'), 
+            $request->input('tracking_number'), 
+            null, 
+            null, 
+            pprovalStatus::PENDING_SUBMISSION
+        );
 
         $this->canCreateTransport->passes($object);
 
diff --git a/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
index cab03419..6f6cfd4c 100644
--- a/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
+++ b/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
@@ -58,7 +58,14 @@ class UpdateTransportLogic extends AbstractControllerLogic
     {
         $query = $this->fetchesTransport->execute(['id' => $request->route('id')]);
 
-        $object = new TransportObject($request->input('type'), $request->input('courier'), $request->input('tracking_number'), $request->input('dispatch_date'), $request->input('drop_date'), $request->input('status'));
+        $object = new TransportObject(
+            $request->input('type'), 
+            $request->input('courier'), 
+            $request->input('tracking_number'), 
+            $request->input('dispatch_date'), 
+            $request->input('drop_date'), 
+            $request->input('status')
+        );
 
         $this->canUpdateTransport->passes($object);
 
diff --git a/database/seeders/CompaniesTableSeeder.php b/database/seeders/CompaniesTableSeeder.php
index 01bb3801..c2ffdeb4 100644
--- a/database/seeders/CompaniesTableSeeder.php
+++ b/database/seeders/CompaniesTableSeeder.php
@@ -172,49 +172,49 @@ class CompaniesTableSeeder extends Seeder
 
         }
 
-        if(true){
-            $companies = OldCompany::all();
+        // if(true){
+        //     $companies = OldCompany::all();
 
-            foreach($companies as $company){
+        //     foreach($companies as $company){
 
-                $marking = explode("CIEF/", $company->marking);
+        //         $marking = explode("CIEF/", $company->marking);
 
-                if(count($marking) < 2){
-                    continue;
-                }
+        //         if(count($marking) < 2){
+        //             continue;
+        //         }
 
-                $marking = str_replace(' ', '', str_replace('/', '', $marking[1]));
+        //         $marking = str_replace(' ', '', str_replace('/', '', $marking[1]));
 
 
-                /** @var Company $newCompany */
-                $newCompany = $this->createCompanyProcessor->execute($company->name, CompanyType::COMPANY_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
+        //         /** @var Company $newCompany */
+        //         $newCompany = $this->createCompanyProcessor->execute($company->name, CompanyType::COMPANY_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
 
-                $this->updatesCompanyStatus->execute($newCompany, ApprovalStatus::APPROVED);
+        //         $this->updatesCompanyStatus->execute($newCompany, ApprovalStatus::APPROVED);
 
-                /** @var CompanyModule $companyModule */
-                $companyModule = $this->createCompanyModuleProcessor->execute($newCompany, BusinessType::IMPORTER);
+        //         /** @var CompanyModule $companyModule */
+        //         $companyModule = $this->createCompanyModuleProcessor->execute($newCompany, BusinessType::IMPORTER);
 
-                $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', $marking);
+        //         $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', $marking);
 
-                $connection = $this->createsCompanyConnection->execute($connectionObject);
-                $this->approvesCompanyConnection->execute($connection);
+        //         $connection = $this->createsCompanyConnection->execute($connectionObject);
+        //         $this->approvesCompanyConnection->execute($connection);
 
-                $i = 0;
-                foreach($company->addresses as $address){
-                    $this->createAddressFromOldAddressProcessor->execute($address, $companyModule);
-                    $contact = preg_replace("/[^0-9.]/", "", $address->contact);
-                    if($contact){
-                        $i++;
-                        if($i === 1) {
-                            $contactObject = new ContactObject('', $contact, $company->email, '',);
-                            $this->createContactProcessor->execute($contactObject, $newCompany);
-                        }
-                    }
+        //         $i = 0;
+        //         foreach($company->addresses as $address){
+        //             $this->createAddressFromOldAddressProcessor->execute($address, $companyModule);
+        //             $contact = preg_replace("/[^0-9.]/", "", $address->contact);
+        //             if($contact){
+        //                 $i++;
+        //                 if($i === 1) {
+        //                     $contactObject = new ContactObject('', $contact, $company->email, '',);
+        //                     $this->createContactProcessor->execute($contactObject, $newCompany);
+        //                 }
+        //             }
 
 
-                }
-            }
-        }
+        //         }
+        //     }
+        // }
 
 
     }

From cdaa39582468f292ba7b790f26b0e05c083e72ab Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Tue, 7 Sep 2021 09:51:04 +0800
Subject: [PATCH 23/98] Updates on Packing List & Package

---
 .../CreatePackingListLogic.php                | 19 ++++--
 .../Packages/CreatePackageLogic.php           |  5 +-
 .../Packages/FetchPackageLogic.php            |  4 +-
 .../Packages/ListPackagesLogic.php            |  4 +-
 .../Packages/UpdatePackageLogic.php           | 14 ++---
 .../UpdatePackingListLogic.php                |  2 +-
 .../Services/Packages/UpdatesPackage.php      |  1 -
 .../Packages/CreatePackageController.php      |  2 +-
 .../Packages/DeletePackageController.php      |  2 +-
 .../Packages/FetchPackageController.php       |  2 +-
 .../Packages/ListPackagesController.php       |  2 +-
 .../Packages/UpdatePackageController.php      |  2 +-
 resources/views/swagger/json.blade.php        | 60 ++++++++++---------
 13 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
index a06a6842..afd8f3d7 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
@@ -13,6 +14,9 @@ use App\Classes\Modules\PackingLists\Services\CreatesPackingListPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingListPackage;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+
 use App\Http\Resources\PackingListResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -34,13 +38,18 @@ class CreatePackingListLogic extends AbstractControllerLogic
     /** @var CreatePackingListProcessor */
     private $createPackingListProcessor;
 
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
     /**
      * CreatePackingListLogic constructor.
      * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param FetchesOrder $fetchesOrder
      */
-    public function __construct(CreatePackingListProcessor $createPackingListProcessor)
+    public function __construct(CreatePackingListProcessor $createPackingListProcessor, FetchesOrder $fetchesOrder)
     {
         $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->fetchesOrder = $fetchesOrder;
     }
 
     /**
@@ -50,11 +59,13 @@ class CreatePackingListLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
-        $object = new PackingListObject($request->input('reference_number'), ApprovalStatus::PENDING_SUBMISSION);
+        $order = $this->fetchesOrder->execute(['reference' => $request->input('reference_number')]);
 
-        $query = $this->createPackingListProcessor->execute($object);
+        $packingListObject = new PackingListObject($request->input('reference_number'), $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::PENDING_SUBMISSION);
 
-        return $this->resourceResponse(new PackingListResource($query));
+        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+        return $this->resourceResponse(new PackingListResource($packingList));
 
     }
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
index c9eebc15..28e43d02 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
@@ -12,6 +12,7 @@ use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Http\Resources\PackageResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\ValueObjects\Constants\PackageType;
 
 class CreatePackageLogic extends AbstractControllerLogic
 {
@@ -65,19 +66,19 @@ class CreatePackageLogic extends AbstractControllerLogic
         $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
 
         $object = new PackageObject(
-            null,
             $request->input('type'),
             $request->input('description'),
             $request->input('width'),
             $request->input('height'),
             $request->input('length'),
             $request->input('weight'),
+            0,
             $request->input('quantity'),
             ApprovalStatus::PENDING_VERIFICATION);
 
         $this->canCreatePackage->passes($object);
 
-        $query = $this->createsPackage->execute($object);
+        $query = $this->createsPackage->execute($object, $order->packingLists()->first());
 
         return $this->resourceResponse(new PackageResource($query));
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php
index d2e8be81..0dcb6b07 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php
@@ -4,8 +4,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Packages\Services\FetchesPackage;
-use App\Classes\Modules\Packages\Standards\Rules\CanFetchPackage;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanFetchPackage;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
index 48aee051..80d73e5b 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
@@ -4,8 +4,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Packages\Services\ListsPackages;
-use App\Classes\Modules\Packages\Standards\Rules\CanListPackages;
+use App\Classes\Modules\PackingLists\Services\Packages\ListsPackages;
+use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanListPackages;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php
index b96e6933..6b25e3a5 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php
@@ -4,10 +4,10 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Packages\Services\UpdatesPackage;
-use App\Classes\Modules\Packages\Services\FetchesPackage;
-use App\Classes\Modules\Packages\Standards\Rules\CanUpdatePackage;
-use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\Packages\UpdatesPackage;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanUpdatePackage;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -60,8 +60,6 @@ class UpdatePackageLogic extends AbstractControllerLogic
         $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
 
         $object = new PackageObject(
-            $package->order_id,
-            null,
             $request->input('type'),
             $request->input('description'),
             $request->input('width'),
@@ -69,7 +67,9 @@ class UpdatePackageLogic extends AbstractControllerLogic
             $request->input('length'),
             $request->input('weight'),
             $request->input('quantity'),
-            $request->input('status'));
+            $request->input('status'),
+            $package->reference
+        );
 
         $this->canUpdatePackage->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php
index 926b9873..7f5232dc 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php
@@ -57,7 +57,7 @@ class UpdatePackingListLogic extends AbstractControllerLogic
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $object = new PackingListObject($packingList->reference, $request->input('status'));
+        $object = new PackingListObject($packingList->reference, $packingList->claimant_id, $packingList->type, $request->input('status'));
 
         $this->canUpdatePackingList->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php b/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php
index 9cb265fd..b1903eb5 100644
--- a/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php
+++ b/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php
@@ -10,7 +10,6 @@ class UpdatesPackage extends AbstractUpdateRecord
 {
     public function execute(Package $model, PackageObject $object) {
 
-        $model->claimant_id = $object->getClaimantId();
         $model->type = $object->getType();
         $model->description = $object->getDescription();
         $model->width = $object->getWidth();
diff --git a/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php b/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php
index a3f1ddbb..a540ca51 100644
--- a/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\CreatePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php b/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php
index 455e550d..4e9235c9 100644
--- a/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\DeletePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\DeletePackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php b/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php
index 6ad30c56..0bb60451 100644
--- a/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\FetchPackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\FetchPackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php b/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php
index fe834b6b..75bed1d5 100644
--- a/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php
+++ b/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\ListPackagesLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\ListPackagesLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php b/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php
index cfc2e248..bc334d11 100644
--- a/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\UpdatePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\UpdatePackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/resources/views/swagger/json.blade.php b/resources/views/swagger/json.blade.php
index 1e09fa9c..1f64c81e 100644
--- a/resources/views/swagger/json.blade.php
+++ b/resources/views/swagger/json.blade.php
@@ -28,13 +28,17 @@
       "name": "Order",
       "description": "Endpoints related to order module."
     },
+    {
+      "name": "Packing",
+      "description": "Endpoints related to packing module."
+    },
     {
       "name": "Package",
       "description": "Endpoints related to package module."
     },
     {
-      "name": "Packing",
-      "description": "Endpoints related to packing module."
+      "name": "Container",
+      "description": "Endpoints related to container module."
     },
     {
       "name": "Transport",
@@ -71,9 +75,9 @@
         "description": "",
         "parameters": [
           {
-            "name": "package_id",
+            "name": "reference_number",
             "in": "query",
-            "description": "Package Id",
+            "description": "Reference No",
             "required": true,
             "type": "integer"
           }
@@ -221,7 +225,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -296,7 +300,7 @@
     "/packing_list/container/create": {
       "post": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -362,7 +366,7 @@
     "/packing_list/container/list": {
       "get": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -410,7 +414,7 @@
     "/packing_list/container/{id}/show": {
       "get": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -455,7 +459,7 @@
     "/packing_list/container/update/{id}": {
       "put": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -528,7 +532,7 @@
     "/packing_list/container/delete/{id}": {
       "delete": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -826,7 +830,7 @@
         }
       }
     },
-    "/package/create": {
+    "/packing_list/package/create": {
       "post": {
         "tags": [
           "Package"
@@ -893,7 +897,7 @@
             "description": "Quantity",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -920,7 +924,7 @@
         }
       }
     },
-    "/package/list": {
+    "/packing_list/package/list": {
       "get": {
         "tags": [
           "Package"
@@ -968,7 +972,7 @@
         }
       }
     },
-    "/package/{id}/show": {
+    "/packing_list/package/{id}/show": {
       "get": {
         "tags": [
           "Package"
@@ -1013,7 +1017,7 @@
         }
       }
     },
-    "/package/update/{id}": {
+    "/packing_list/package/update/{id}": {
       "put": {
         "tags": [
           "Package"
@@ -1087,7 +1091,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -1114,7 +1118,7 @@
         }
       }
     },
-    "/package/delete/{id}": {
+    "/packing_list/package/delete/{id}": {
       "delete": {
         "tags": [
           "Package"
@@ -1159,7 +1163,7 @@
         }
       }
     },
-    "/package/item/create": {
+    "/packing_list/package/item/create": {
       "post": {
         "tags": [
           "Package"
@@ -1219,7 +1223,7 @@
             "description": "Total",
             "required": true,
             "type": "number"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -1246,7 +1250,7 @@
         }
       }
     },
-    "/package/item/list": {
+    "/packing_list/package/item/list": {
       "get": {
         "tags": [
           "Package"
@@ -1294,7 +1298,7 @@
         }
       }
     },
-    "/package/item/{id}/show": {
+    "/packing_list/package/item/{id}/show": {
       "get": {
         "tags": [
           "Package"
@@ -1339,7 +1343,7 @@
         }
       }
     },
-    "/package/item/update/{id}": {
+    "/packing_list/package/item/update/{id}": {
       "put": {
         "tags": [
           "Package"
@@ -1406,7 +1410,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -1433,7 +1437,7 @@
         }
       }
     },
-    "/package/item/delete/{id}": {
+    "/packing_list/package/item/delete/{id}": {
       "delete": {
         "tags": [
           "Package"
@@ -1490,7 +1494,7 @@
         "summary": "Create transport",
         "description": "",
         "parameters": [
-         {
+          {
             "name": "container_id",
             "in": "query",
             "description": "Container Id",
@@ -1697,7 +1701,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -2294,9 +2298,9 @@
         "description": "",
         "parameters": [
           {
-            "name": "company_module_id",
+            "name": "company_id",
             "in": "query",
-            "description": "Company Module ID",
+            "description": "Company ID",
             "required": true,
             "type": "integer"
           },

From d23b59b8e906ee31228d2cb2b7a8b624202b4a0c Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 8 Sep 2021 16:44:24 +0800
Subject: [PATCH 24/98] payment and billing ui

---
 .../elements/PaymentsBillingComponents.vue    | 131 ++++++++++++++++++
 .../pages/templates/paymentsBilling.blade.php | 128 +++++++++++++++++
 resources/views/partials/menu.blade.php       |   2 +-
 routes/web.php                                |   6 +-
 4 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue
 create mode 100644 resources/views/pages/templates/paymentsBilling.blade.php

diff --git a/resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue b/resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue
new file mode 100644
index 00000000..86535a80
--- /dev/null
+++ b/resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue
@@ -0,0 +1,131 @@
+<template>
+    <div class="row m-b-15 m-l-5 m-r-10">
+        <div class="col bg-master-lightest rounded" :class="{'b-gray': !selected, 'b-primary': selected, 'bg-primary-lighter': selected}">
+            <div class="row">
+                <div class="col padding-20">
+                    <div class="row align-items-center">
+                        <div class="col-auto pointer align-items-center" @click="selected = !selected">
+                            <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                        </div>
+                        <div class="col">
+                            <h5 class="no-margin">{{item.country.id}}05052021</h5>
+                        </div>
+                        <div class="col">
+                            <h5 class="no-margin">Invoice Date Invoice Date</h5>
+                        </div>
+                        <div class="col">
+                            <h5 class="no-margin">Status</h5>
+                        </div>
+                        <div class="col">
+                            <h5 class="no-margin">Amount</h5>
+                        </div>
+                        <div class="col-auto">
+                            <div class="btn bg-grey no-border" @click="expanded = !expanded">
+                                <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row b-t b-grey p-t-10" v-show="expanded">
+                <div class="col p-b-10">
+                    <div class="row">
+                        <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
+                            <div class="row align-items-center">
+                                <div class="col-auto invisible">
+                                    <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0">Carrier Tracking Number</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">#1zbr06tw403742920</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0">Due Date</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">11.04.2021</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">Outstanding</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">RM0.00</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
+                            <div class="row align-items-center">
+                                <div class="col-auto invisible">
+                                    <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0 normal-text">This package was delivered by</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">#1zbr06tw403742920</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="m-b-0">Date Paid</h5>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h5 class="semi-bold m-t-0 m-b-0 large-text">21.01.2021</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="btn btn-outline-complete btn-lg">
+                                        Invoice Detail
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false,
+                selected: false,
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/views/pages/templates/paymentsBilling.blade.php b/resources/views/pages/templates/paymentsBilling.blade.php
new file mode 100644
index 00000000..f8a7719d
--- /dev/null
+++ b/resources/views/pages/templates/paymentsBilling.blade.php
@@ -0,0 +1,128 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row">
+    <div class="col">
+        <div class="row">
+            <div class="col-12 col-sm-12 col-md-9">
+                <div class="row m-b-15 m-l-5 m-r-10">
+                    <div class="col b-a b-grey rounded bg-master-light">
+                        <div class="row">
+                            <div class="col padding-20">
+                                <div class="row align-items-center justify-conten-center">
+                                    <div class="col-auto pointer">
+                                        <i class="fa fs-30 fa-fw fa-square-o"></i>
+                                    </div>
+                                    <div class="col">
+                                        <h5 class="no-margin font-heading">Invoice No</h5>
+                                    </div>
+                                    <div class="col">
+                                        <h5 class="no-margin">Invoice Date</h5>
+                                    </div>
+                                    <div class="col">
+                                        <h5 class="no-margin">Status</h5>
+                                    </div>
+                                    <div class="col">
+                                        <h5 class="no-margin">Amount</h5>
+                                    </div>
+                                    <div class="col-auto invisible">
+                                        <div class="btn btn-default no-border">
+                                            <i class="fa fa-angle-up"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <list-component section="containerListSection" :endpoint="route('api.address.district.list')">
+                    <template slot="list" slot-scope="{data}">
+                        <payments-billing-components :data="data"></payments-billing-components>
+                    </template>
+                </list-component>
+            </div>
+            <div class="col-12 col-sm-12 col-md-3">
+                <div class="row align-items-center">
+                    <div class="col b-a b-grey rounded padding-25">
+                        <div class="row">
+                            <div class="col">
+                                <h6 class="semi-bold muted">Payment Summary</h6>
+                            </div>
+                        </div>
+                        <div class="row align-items-center justify-content-center">
+                            <div class="col-auto">
+                                <div class="padding-5">
+                                    <i class="fa fa-angle-up"></i>
+                                </div>
+                            </div>
+                            <div class="col p-l-0">
+                                <h6 class="semi-bold text-primary">2 Invoice Selected</h6>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col-auto">
+                                        <h6 class="no-margin">x1</h6>
+                                    </div>
+                                    <div class="col">
+                                        <h6 class="no-margin">lorem ipsum</h6>
+                                    </div>
+                                    <div class="col-auto">
+                                        <h6 class="no-margin">52x62x635 CM</h6>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-auto">
+                                        <h6 class="no-margin">x1</h6>
+                                    </div>
+                                    <div class="col">
+                                        <h6 class="no-margin">lorem ipsum</h6>
+                                    </div>
+                                    <div class="col-auto">
+                                        <h6 class="no-margin">52x62x635 CM</h6>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <hr>
+                        <div class="row">
+                            <div class="col">
+                                <h6 class="normal m-t-5 m-b-5">Shipping Fee</h6>
+                            </div>
+                            <div class="col-auto">
+                                <h6 class="normal m-t-5 m-b-5">RM 212.15</h6>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <h6 class="normal m-t-5 m-b-5">Serrvice Fee</h6>
+                            </div>
+                            <div class="col-auto">
+                                <h6 class="normal m-t-5 m-b-5">RM 41.25</h6>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <h6 class="normal m-t-5 m-b-5">Discount</h6>
+                            </div>
+                            <div class="col-auto">
+                                <h6 class="normal m-t-5 m-b-5">RM 0.00</h6>
+                            </div>
+                        </div>
+                        <hr>
+                        <div class="row">
+                            <div class="col">
+                                <h6 class="normal">Total Payments</h6>
+                            </div>
+                            <div class="col-auto">
+                                <h6 class="text-primary bold">RM 3300.00</h6>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 73f727b9..4a122b0a 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -82,7 +82,7 @@
                                      style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M32.25,19.35v133.3h47.59814c-0.1763,-0.87075 -0.29814,-1.75695 -0.29814,-2.6707v-1.6293h-43v-124.7h68.8v30.1h30.1v23.90195c1.39535,-0.15265 2.82295,-0.25195 4.3,-0.25195v-26.69023l-31.35977,-31.35977zM109.65,26.69023l22.75977,22.75977h-22.75977zM47.3,27.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,36.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,45.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,53.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,62.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,62.35v4.12783c-8.0754,0.7482 -12.97978,5.32437 -12.97978,12.23232c0,5.8351 3.65238,9.8429 10.32168,11.54785l2.65811,0.68867v13.63906c-4.45695,-0.50955 -7.32693,-2.99253 -7.62578,-6.55078h-6.34082c0.02365,5.66095 3.61012,9.82731 9.57422,11.48066c1.849,-2.9928 4.77992,-5.51263 8.49082,-7.34443v-10.44766c5.08475,1.01695 7.44522,3.07924 7.44522,6.52139c0,0.5074 -0.05237,0.98248 -0.14697,1.43613c2.021,-0.4214 4.16791,-0.65746 6.39961,-0.73486c0.04515,-0.46225 0.12598,-0.90404 0.12598,-1.38994c0,-6.192 -3.53195,-9.98705 -11.03975,-11.8124l-2.78408,-0.62988v-12.8916c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.25264c-0.1806,-6.67145 -5.26693,-11.39735 -13.01338,-12.08535v-4.12783zM47.3,70.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,72.19297v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM47.3,79.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,83.85c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v11.17412v2.6959c-0.57832,-0.43562 -1.18402,-0.84736 -1.83506,-1.21357c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v10.52324v0.65088v10.75v10.75c0,3.61346 2.669,6.48532 6.18125,8.34805c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c1.57399,-0.83477 2.96028,-1.883 4.03125,-3.09902c1.07097,1.21602 2.45726,2.26425 4.03125,3.09902c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c3.51225,-1.86273 6.18125,-4.73459 6.18125,-8.34805v-11.40088v-10.09912v-0.42412v-10.86338v-10.86338v-10.52324h-0.0126c0.00075,-0.04429 0.0126,-0.08569 0.0126,-0.13018c0,-3.70452 -2.61519,-6.73345 -6.13506,-8.71338c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162zM47.3,88.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,88.15c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,1.63884 -1.23776,3.44594 -3.94307,4.96768c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,96.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,103.1748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,105.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM105.35,109.65c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,0.00549 0.00003,0.01131 0,0.0168c-0.00826,1.63447 -1.24682,3.43424 -3.94307,4.95088c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,113.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,114.14736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM47.3,122.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,124.6748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.22676v0.42412c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM124.7,124.89736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.15781v0.42412c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,131.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.04443v0.5375c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM124.7,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v2.93105v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375v-0.11338zM47.3,139.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776zM124.7,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776z"></path></g></g></svg>
                             </div>
                             <div class="col">
-                                <h6 class="no-margin light fs-18 all-caps">Payments & Billing</h6>
+                                <a href="{{route('payments-and-billing')}}"><h6 class="no-margin light fs-18 all-caps">Payments & Billing</h6></a>
                             </div>
                         </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide">
diff --git a/routes/web.php b/routes/web.php
index b1370bfe..f2180626 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -80,4 +80,8 @@ Route::get('/test', function(){
         $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode);
         $address->save();
     }
-})->name('test');
\ No newline at end of file
+})->name('test');
+
+Route::get('/payments-and-billing', function () {
+    return view('pages.templates.paymentsBilling');
+})->name('payments-and-billing');
\ No newline at end of file

From f6115c40123a736a67c67cb9021fe9c5a8be2118 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 8 Sep 2021 16:56:54 +0800
Subject: [PATCH 25/98] hide container in menu

---
 resources/views/partials/menu.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 61420e0b..744454ef 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -52,7 +52,7 @@
                                 <a href="{{route('warehouse.list')}}"><h6 class="no-margin light fs-18 all-caps">Arrived Parcels</h6></a>
                             </div>
                         </div>
-                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide" v-if="$store.getters.isAdmin">
                             <div class="col-auto p-r-0">
                                 <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                                      width="25" height="25"

From 77e3641be9d6966299d2d0812baf5c0f535120e0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 8 Sep 2021 19:06:58 +0800
Subject: [PATCH 26/98] add delivery address to warehouse list

---
 .../orders/elements/ParcelComponent.vue       | 30 ++++++++++++-------
 .../views/pages/warehouse_list.blade.php      |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 822534b2..c9fcdfdb 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -38,6 +38,22 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
+                    <div class="row m-b-5">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Description</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12">{{item.description}}</p>
+                        </div>
+                    </div>
+                    <div class="row" v-if="item.transport.tracking_number">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Tracking Number:</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12">{{item.transport.tracking_number}}</p>
+                        </div>
+                    </div>
                     <div class="row m-b-5" v-if="$store.getters.isAdmin">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Marking</p>
@@ -54,20 +70,12 @@
                             <p class="no-margin bold text-info fs-12">{{item.order.reference}}</p>
                         </div>
                     </div>
-                    <div class="row m-b-5">
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
                         <div class="col-auto p-r-5">
-                            <p class="no-margin all-caps fs-10 light">Description</p>
+                            <p class="no-margin all-caps fs-10 light">Delivery Address</p>
                         </div>
                         <div class="col p-l-5">
-                            <p class="no-margin bold text-info fs-12">{{item.description}}</p>
-                        </div>
-                    </div>
-                    <div class="row" v-if="item.transport.tracking_number">
-                        <div class="col-auto p-r-5">
-                            <p class="no-margin all-caps fs-10 light">Tracking Number:</p>
-                        </div>
-                        <div class="col p-l-5">
-                            <p class="no-margin bold text-info fs-12">{{item.transport.tracking_number}}</p>
+                            <p class="no-margin bold text-info fs-12">{{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}</p>
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 96456aaf..257bf7b8 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.base_portal')
 @section('inner_content')
     <div class="row">
-        <div class="col-5">
+        <div class="col-7">
             <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
                 <template slot="list" slot-scope="{data}">
                     <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>

From 600a1547141e17061c5f567ae8a6c31d238b34e5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 8 Sep 2021 23:06:25 +0800
Subject: [PATCH 27/98] List containers

---
 .../Eloquent/Filters/WithPackingLists.php     | 20 +++++
 ...ller.php => CreateContainerController.php} |  0
 ...ller.php => DeleteContainerController.php} |  0
 ...oller.php => FetchContainerController.php} |  0
 ...oller.php => ListContainersController.php} |  2 +-
 ...ller.php => UpdateContainerController.php} |  0
 app/Http/Resources/ContainerResource.php      |  4 +
 app/Http/Resources/PackingListResource.php    |  1 +
 .../elements/ContainerComponent.vue           | 77 +++++++++----------
 .../orders/elements/ParcelComponent.vue       |  4 +-
 resources/views/pages/containers.blade.php    | 17 ++++
 resources/views/partials/menu.blade.php       |  4 +-
 routes/web.php                                | 23 +++---
 13 files changed, 95 insertions(+), 57 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/WithPackingLists.php
 rename app/Http/Controllers/PackingLists/Containers/{CreateContainerPackingListController.php => CreateContainerController.php} (100%)
 rename app/Http/Controllers/PackingLists/Containers/{DeleteContainerPackingListController.php => DeleteContainerController.php} (100%)
 rename app/Http/Controllers/PackingLists/Containers/{FetchContainerPackingListController.php => FetchContainerController.php} (100%)
 rename app/Http/Controllers/PackingLists/Containers/{ListContainerPackingListsController.php => ListContainersController.php} (91%)
 rename app/Http/Controllers/PackingLists/Containers/{UpdateContainerPackingListController.php => UpdateContainerController.php} (100%)
 create mode 100644 resources/views/pages/containers.blade.php

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 @@
+<?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');
+    }
+}
\ 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 @@
                 <div class="col padding-15">
                     <div class="row align-items-center">
                         <div class="col-auto p-r-0">
-                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="40" height="40" viewBox="0 0 172 172" style=" fill:#000000;">
-                                <g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal">
-                                    <path d="M0,172v-172h172v172z" fill="none"></path>
-                                    <g fill="#000000">
-                                        <path d="M12.9,34.4v103.2h9.07031c1.96524,0 3.70371,-1.35215 4.17402,-3.25859h-0.0084l0.26875,-1.04141h119.19063l0.26875,1.04141h-0.0084c0.47031,1.90645 2.20879,3.25859 4.17402,3.25859h9.07031v-103.2h-9.20469c-1.83926,0 -3.49375,1.19258 -4.07324,2.94785l-0.45352,1.35215h-118.73711l-0.45352,-1.35215v-0.0084c-0.57949,-1.74688 -2.24238,-2.93945 -4.07324,-2.93945zM17.2,38.7h4.90469l1.43613,4.3h124.91836l1.43613,-4.3h4.90469v94.6h-4.77031l-1.075,-4.3h-125.90938l-1.075,4.3h-4.77031zM34.4,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,58.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,66.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path>
-                                    </g>
-                                </g>
-                            </svg>
+                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                 width="40" height="40"
+                                 viewBox="0 0 172 172"
+                                 style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M85.96641,12.86641c-1.18418,0.0252 -2.1332,0.99941 -2.11641,2.18359v10.75h-23.65v15.05h-25.8v38.24649l-22.38184,5.42539l11.71582,25.7748l6.12246,32.63633c-1.00781,0.41992 -1.96524,0.89023 -2.87227,1.34375c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-0.90703,-0.45352 -1.86445,-0.92383 -2.87227,-1.34375l6.12246,-32.63633l11.71582,-25.7748l-22.38184,-5.42539v-38.24649h-25.8v-15.05h-23.65v-10.75c0.0084,-0.57949 -0.21836,-1.14219 -0.62988,-1.55371c-0.41152,-0.41152 -0.97422,-0.63828 -1.55371,-0.62988zM64.5,30.1h21.13887c0.23516,0.04199 0.47031,0.04199 0.69707,0h21.16406v10.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h25.8v32.90508l-47.3,-11.47227l-47.3,11.47227v-32.90508h25.8c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,71.01719l67.91816,16.46094l-9.78418,21.5252l-6.17285,32.92188c-0.11758,-0.0084 -0.23516,-0.0252 -0.36113,-0.0252c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-0.12598,0 -0.24355,0.0168 -0.36113,0.0252l-6.17285,-32.92187l-9.78418,-21.5252zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.54961,90.90469c-0.32754,0.0084 -0.66348,0.05039 -0.99102,0.13438l-4.3,1.075c-1.90645,0.47031 -3.25859,2.20879 -3.25859,4.16562v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031l4.3,-1.075v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531c0,-2.40195 -2.04922,-4.3 -4.35039,-4.3zM120.45039,90.90469c-2.30117,0 -4.35039,1.89805 -4.35039,4.3v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531l4.3,1.075v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67187,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031c0,-1.95684 -1.35215,-3.69531 -3.25859,-4.16562l-4.3,-1.075c-0.32754,-0.08398 -0.66348,-0.12598 -0.99101,-0.13438zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,118.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,135.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM12.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM159.1,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
                         </div>
                         <div class="col">
-                            <h5 class="no-margin">Shipping ID: {{item.country.id}}</h5>
-                            <p class="no-margin muted">status: in transit</p>
+                            <h6 class="no-margin bold">{{item.container_reference}}</h6>
+                            <p class="no-margin">{{item.container_number}} / {{item.seal_reference}}</p>
+                        </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">ETD</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}</p>
+                        </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">ETA</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Status</p>
+                            <p class="no-margin bold" :class="{'text-success': item.status === 3, 'text-complete': item.status !== 3}">{{item.status === 3 ? 'Un-stuffed' : 'In Progress'}}</p>
                         </div>
                         <div class="col-auto">
-                            <div class="btn btn-default no-border">
-                                <i class="fa fa-bell"></i>
-                            </div>
                             <div class="btn btn-default no-border" @click="expanded = !expanded">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
@@ -30,40 +35,30 @@
                 </div>
             </div>
             <div class="row" v-show="expanded">
-                <div class="col p-b-10">
+                <div class="col bg-master-lightest">
                     <div class="row">
-                        <div class="col p-b-0 p-l-15 p-r-15 p-t-15 no-margin">
-                            <div class="row align-items-center muted">
-                                <div class="col">Package ID</div>
+                        <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">Order Number</div>
+                                <div class="col-2">Customer Marking</div>
+                                <div class="col-1 text-center">Quantity</div>
+                                <div class="col-1">CBM</div>
                                 <div class="col">Delivery Address</div>
-                                <div class="col">Delivery Estimation</div>
                             </div>
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col p-l-15 p-r-15 p-t-10 p-b-10">
-                            <div class="row align-items-center">
-                                <div class="col">6288153-MY3143485</div>
-                                <div class="col">Home</div>
-                                <div class="col">20/04/2002</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col p-l-15 p-r-15 p-t-10 p-b-10">
-                            <div class="row align-items-center">
-                                <div class="col">6288153-MY3143485</div>
-                                <div class="col">Home</div>
-                                <div class="col">20/04/2002</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col p-l-15 p-r-15 p-t-10 p-b-10">
-                            <div class="row align-items-center">
-                                <div class="col">6288153-MY3143485</div>
-                                <div class="col">Home</div>
-                                <div class="col">20/04/2002</div>
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="packingList in item.packing_lists">
+                                        <div class="col-2"><a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
+                                        <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a></div>
+                                        <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
+                                        <div class="col-1">{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
+                                        <div class="col">{{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}}</div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
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 @@
                             <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">
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')
+<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
\ 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 @@
                                 <a href="{{route('warehouse.list')}}"><h6 class="no-margin light fs-18 all-caps">Arrived Parcels</h6></a>
                             </div>
                         </div>
-                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide" v-if="$store.getters.isAdmin">
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
                             <div class="col-auto p-r-0">
                                 <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                                      width="25" height="25"
                                      viewBox="0 0 172 172"
-                                     style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M21.5,21.5v47.3h47.3v-47.3zM103.2,21.5v47.3h47.3v-47.3zM83.85,23.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,23.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,25.8h38.7v38.7h-38.7zM107.5,25.8h38.7v38.7h-38.7zM32.25,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM131.15,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,38.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,40.85v8.6h8.6v-8.6zM122.55,40.85v8.6h8.6v-8.6zM77.4,43c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,43c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,47.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,49.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM113.95,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM131.15,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM139.75,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,62.35c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,68.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM45.15,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM70.95,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,81.7c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM45.15,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,88.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM38.7,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM96.75,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM21.5,103.2v47.3h47.3v-47.3zM25.8,107.5h38.7v38.7h-38.7zM77.4,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,107.5c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,111.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,113.95c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,120.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,122.55v8.6h8.6v-8.6zM83.85,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM122.55,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,129c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,129c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,133.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM32.25,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM40.85,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM49.45,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM58.05,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM148.35,139.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM141.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                     style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M85.96641,12.86641c-1.18418,0.0252 -2.1332,0.99941 -2.11641,2.18359v10.75h-23.65v15.05h-25.8v38.24649l-22.38184,5.42539l11.71582,25.7748l6.12246,32.63633c-1.00781,0.41992 -1.96524,0.89023 -2.87227,1.34375c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-0.90703,-0.45352 -1.86445,-0.92383 -2.87227,-1.34375l6.12246,-32.63633l11.71582,-25.7748l-22.38184,-5.42539v-38.24649h-25.8v-15.05h-23.65v-10.75c0.0084,-0.57949 -0.21836,-1.14219 -0.62988,-1.55371c-0.41152,-0.41152 -0.97422,-0.63828 -1.55371,-0.62988zM64.5,30.1h21.13887c0.23516,0.04199 0.47031,0.04199 0.69707,0h21.16406v10.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h25.8v32.90508l-47.3,-11.47227l-47.3,11.47227v-32.90508h25.8c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,71.01719l67.91816,16.46094l-9.78418,21.5252l-6.17285,32.92188c-0.11758,-0.0084 -0.23516,-0.0252 -0.36113,-0.0252c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-0.12598,0 -0.24355,0.0168 -0.36113,0.0252l-6.17285,-32.92187l-9.78418,-21.5252zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.54961,90.90469c-0.32754,0.0084 -0.66348,0.05039 -0.99102,0.13438l-4.3,1.075c-1.90645,0.47031 -3.25859,2.20879 -3.25859,4.16562v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031l4.3,-1.075v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531c0,-2.40195 -2.04922,-4.3 -4.35039,-4.3zM120.45039,90.90469c-2.30117,0 -4.35039,1.89805 -4.35039,4.3v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531l4.3,1.075v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67187,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031c0,-1.95684 -1.35215,-3.69531 -3.25859,-4.16562l-4.3,-1.075c-0.32754,-0.08398 -0.66348,-0.12598 -0.99101,-0.13438zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,118.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,135.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM12.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM159.1,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
                             </div>
                             <div class="col">
                                 <a href="{{route('containers')}}"><h6 class="no-margin light fs-18 all-caps">Containers</h6></a>
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

From b24fbc36f9b57549c4d8779fffe733a1beec5a4e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 8 Sep 2021 23:19:04 +0800
Subject: [PATCH 28/98] refresh orders button

---
 resources/views/pages/orders/index.blade.php |  6 ++++++
 routes/web.php                               | 20 ++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/resources/views/pages/orders/index.blade.php b/resources/views/pages/orders/index.blade.php
index 60788960..b770a4db 100644
--- a/resources/views/pages/orders/index.blade.php
+++ b/resources/views/pages/orders/index.blade.php
@@ -1,4 +1,10 @@
 @extends('layouts.base_portal')
 @section('inner_content')
+    <div class="row m-b-20">
+        <div class="col"></div>
+        <div class="col-auto p-r-0">
+            <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
+        </div>
+    </div>
     <order-section-component></order-section-component>
 @endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index e638b4d5..2ebbe797 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,10 +1,11 @@
 <?php
 
-use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
+use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
+use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
+use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
+use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Models\CompanyConnection;
-use App\Models\OldCompany;
-use App\Models\Order;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -75,6 +76,17 @@ Route::get('/customer/{marking}', function ($marking) {
     return view('pages.customers.profile', ['id' => $id]);
 })->name('customer.profile');
 
+Route::get('/orders/refresh', function(){
+    FetchWarehouseReceiveListFromVTPortalJob::withChain([
+        new FetchLoadedContainersFromVTPortalJob,
+        new FetchPackingListFromVTPortalJob,
+        new FetchContainersStatusUpdateFromVTPortalJob,
+        new FetchDeliveryListFromVTPortalJob
+    ])->dispatch();
+
+    return redirect('orders');
+})->name('orders.refresh');
+
 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
 
 //Route::get('/test', function(){

From a5313615146ba2ed5d84212290032d92ca280517 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 8 Sep 2021 23:23:11 +0800
Subject: [PATCH 29/98] refresh orders button

---
 resources/views/pages/warehouse_list.blade.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 257bf7b8..3cbe9b7a 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,5 +1,11 @@
 @extends('layouts.base_portal')
 @section('inner_content')
+    <div class="row m-b-20">
+        <div class="col"></div>
+        <div class="col-auto p-r-0">
+            <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
+        </div>
+    </div>
     <div class="row">
         <div class="col-7">
             <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">

From a4b2e02ec304348f512e9722638e7b493d0d53eb Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 9 Sep 2021 01:49:44 +0800
Subject: [PATCH 30/98] wip-feat: request change order shipping address ui.

---
 app/Http/Resources/OrderResource.php          |  1 +
 .../elements/ChangeAddressComponent.vue       | 22 ++++++
 .../forms/ChangeOrderAddressFormComponent.vue | 74 +++++++++++++++++++
 .../sections/OrderProfileSectionComponent.vue |  3 +-
 4 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
 create mode 100644 resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue

diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 183536e3..91e1c4b5 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -28,6 +28,7 @@ class OrderResource extends JsonResource
             'company_module' => new CompanyModuleResource($this->companyModule),
             'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
             'address' => new AddressResource($this->addresses()->first()),
+            'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             $this->mergeWhen($this->relationLoaded('parcels'), [
                 'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
                     return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('containers', function($query) {
diff --git a/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue b/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
new file mode 100644
index 00000000..e8c2636d
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
@@ -0,0 +1,22 @@
+<template>
+    <i class="fa fa-edit pointer requestModal"  data-type="addressesList" v-tooltip:right="data.address_change_request.reference">
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="addressesList" size="large">
+            <change-order-address-form-component :data="data" :section="section" class="text-center"></change-order-address-form-component>
+        </modal-component>
+    </i>
+</template>
+<script>
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                section:"changeAddressSection"
+            }
+        },
+    }
+</script>
diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
new file mode 100644
index 00000000..8e6c3d7b
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
@@ -0,0 +1,74 @@
+<template>
+    <div class="row justify-content-center">
+        <div class="col col-md-10">
+            <div class="row m-b-20">
+                <div class="col">
+                    <div class="row m-b-20 text-info">
+                        <div class="col text-center">
+                            <h3>Please select the address where you want to receive this order</h3>
+                        </div>
+                    </div>
+                    <div class="row justify-content-center">
+                        <div class="col col-md-10">
+                            <list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: data.company_module.id}">
+                                <template slot="list" slot-scope="{data}">
+                                    <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
+                                </template>
+                            </list-component>
+                            <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                                <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.address_id, 'b-grey': parameters.address_id}" @click="parameters.address_id = null">
+                                    <div class="row align-items-center">
+                                        <div class="col-auto p-r-0">
+                                            <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.address_id, 'fa-check-circle': !parameters.address_id, 'text-primary': !parameters.address_id}"></i>
+                                        </div>
+                                        <div class="col-auto semi-bold">New Address</div>
+                                    </div>
+                                    <div class="row" v-show="!parameters.address_id">
+                                        <div class="col">
+                                            <address-form-component :id="data.company_module.id" section="addressList" @input="parameters.address_id = $event"></address-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row justify-content-center animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                <div class="col col-md-8 no-padding">
+                    <div class="row">
+                        <div class="col p-l-5">
+                            <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="changeAddress()" >Update</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                parameters : {
+                    address_id: '',
+                    order_id: this.data.id,
+                }
+            }
+        },
+        methods:{
+            changeAddress(){
+                this.submit((this.route('api.order.address.change.request')), 'post', 'orderListSection', true, true);
+            },
+        },
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 84525c41..ad49af1c 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -23,7 +23,8 @@
                             </div>
                             <div class="row m-b-10">
                                 <div class="col-auto">
-                                    <h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i></h6>
+                                    <h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i>
+                                    <change-address-component :data="order"></change-address-component></h6>
                                 </div>
                                 <div class="col-auto">
                                     <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.id === 3 ? 'Guang Zhou' : 'Yiwu'}}</h6>

From 8dab2a09ff5ec575cf6483460c3a2181c81f3cdd Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 04:05:51 +0800
Subject: [PATCH 31/98] hold and release goods for delivery

---
 .../UpdatePackingListStatusLogic.php          | 62 +++++++++++++++++++
 ...inersStatusUpdateFromVTPortalProcessor.php |  9 ++-
 ...FetchDeliveryListFromVTPortalProcessor.php |  3 -
 ...hLoadedContainersFromVTPortalProcessor.php |  5 +-
 .../FetchPackingListFromVTPortalProcessor.php |  2 +-
 .../Services/UpdatesPackingListStatus.php     | 24 +++++++
 .../UpdatePackingListStatusController.php     | 20 ++++++
 .../elements/ContainerComponent.vue           | 11 ++++
 routes/packing_list.php                       |  1 +
 routes/web.php                                |  4 +-
 10 files changed, 133 insertions(+), 8 deletions(-)
 create mode 100644 app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
 create mode 100644 app/Classes/Modules/PackingLists/Services/UpdatesPackingListStatus.php
 create mode 100644 app/Http/Controllers/PackingLists/UpdatePackingListStatusController.php

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
new file mode 100644
index 00000000..67a1733c
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingListStatus;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanUpdatePackingList;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Http\Resources\PackingListResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdatePackingListStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated PackingList Status',
+            'message' => 'You have successfully updated the PackingList status'
+        ];
+    }
+
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var UpdatesPackingListStatus */
+    private $updatesPackingListStatus;
+
+    /**
+     * UpdatePackingListStatusLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param UpdatesPackingListStatus $updatesPackingListStatus
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesPackingListStatus $updatesPackingListStatus)
+    {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->updatesPackingListStatus = $updatesPackingListStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+
+        $query = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+
+        return $this->resourceResponse(new PackingListResource($query));
+    }
+
+}
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index cddc41ea..06d1add0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -65,7 +65,6 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
 
     /**
      * @return array
-     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function execute(){
 
@@ -122,9 +121,15 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                     if($containerStatus === 'Unstuffing'){
                         $container->update(['status' => ApprovalStatus::COMPLETED]);
                         $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
-                        $container->packingLists()->update(['status' => ApprovalStatus::APPROVED]);
+
                         /** @var PackingList $packingList */
                         foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
                             $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
                             foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
                                 $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index 6714472b..c987cb29 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -3,8 +3,6 @@
 namespace App\Classes\Modules\PackingLists\Processors;
 
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
@@ -12,7 +10,6 @@ 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\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\PackingList;
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 2776124d..4ed1ff00 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -199,7 +199,10 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                         $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
 
-                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION, $contractReference);
+                        $connection = $order->companyModule->connections()->first();
+                        $marking = $connection->invitee_reference;
+
+                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, (int) filter_var($marking, FILTER_SANITIZE_NUMBER_INT) <= 1000 ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::SUSPENDED, $contractReference);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 715c61ba..ed03c5d1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,7 +46,7 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('status', '=', ApprovalStatus::PENDING_VERIFICATION)->get();
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->get();
 
         foreach($packingLists as $packingList){
 
diff --git a/app/Classes/Modules/PackingLists/Services/UpdatesPackingListStatus.php b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListStatus.php
new file mode 100644
index 00000000..e25b550f
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListStatus.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PackingList;
+
+class UpdatesPackingListStatus extends AbstractUpdateRecord
+{
+
+    /**
+     * @param PackingList $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $model, int $status) {
+
+        $model->status = $status;
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Http/Controllers/PackingLists/UpdatePackingListStatusController.php b/app/Http/Controllers/PackingLists/UpdatePackingListStatusController.php
new file mode 100644
index 00000000..5d653449
--- /dev/null
+++ b/app/Http/Controllers/PackingLists/UpdatePackingListStatusController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\UpdatePackingListStatusLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdatePackingListStatusController
+{
+    /**
+     * @param Request $request
+     * @param UpdatePackingListStatusLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdatePackingListStatusLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index 78fd231a..d66b5517 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -43,6 +43,7 @@
                                 <div class="col-2">Customer Marking</div>
                                 <div class="col-1 text-center">Quantity</div>
                                 <div class="col-1">CBM</div>
+                                <div class="col-1 text-center">status</div>
                                 <div class="col">Delivery Address</div>
                             </div>
                         </div>
@@ -56,7 +57,12 @@
                                         <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a></div>
                                         <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
                                         <div class="col-1">{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
+                                        <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
                                         <div class="col">{{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}}</div>
+                                        <div class="col-auto" v-if="!packingList.transport">
+                                            <div class="btn btn-xs btn-success pointer" v-if="packingList.status === 5" @click="submit(route('api.packing_list.status.update', packingList.id, item.status === 1 ? 1 : 2), 'put', 'containerListSection', true, true)"><i class="fa fa-check m-r-5"></i>Release</div>
+                                            <div class="btn btn-xs btn-danger pointer" v-if="packingList.status !== 5" @click="submit(route('api.packing_list.status.update', packingList.id, 5), 'put', 'containerListSection', true, true)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -75,6 +81,11 @@
                 expanded: false
             }
         },
+        methods: {
+            successHandler(){
+                this.$store.dispatch('reloadList', {'name': 'containerListSection'});
+            }
+        },
         mixins: [componentHandler]
     }
 </script>
\ No newline at end of file
diff --git a/routes/packing_list.php b/routes/packing_list.php
index 06b11950..ea64c7e1 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -7,6 +7,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
     Route::get('/list', 'ListPackingListsController@list')->name('list');
     Route::post('/create', 'CreatePackingListController@create')->name('create');
     Route::put('/update/{id}', 'UpdatePackingListController@update')->name('update');
+    Route::put('/status/{id}/update/{status}', 'UpdatePackingListStatusController@update')->name('status.update');
     Route::delete('/delete/{id}', 'DeletePackingListController@delete')->name('delete');
 
     Route::group(['namespace' => 'Containers', 'prefix' => 'container', 'as' => 'container.'], function () {
diff --git a/routes/web.php b/routes/web.php
index 2ebbe797..7548a1dd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -77,6 +77,7 @@ Route::get('/customer/{marking}', function ($marking) {
 })->name('customer.profile');
 
 Route::get('/orders/refresh', function(){
+
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
         new FetchLoadedContainersFromVTPortalJob,
         new FetchPackingListFromVTPortalJob,
@@ -84,7 +85,8 @@ Route::get('/orders/refresh', function(){
         new FetchDeliveryListFromVTPortalJob
     ])->dispatch();
 
-    return redirect('orders');
+    return redirect()->back();
+
 })->name('orders.refresh');
 
 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');

From e9b8815f0848a001fa23a41f39d21da4d5a1bf16 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 04:10:20 +0800
Subject: [PATCH 32/98] hold and release goods for delivery

---
 .../FetchContainersStatusUpdateFromVTPortalProcessor.php      | 2 +-
 .../Processors/FetchDeliveryListFromVTPortalProcessor.php     | 2 +-
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php | 4 ++--
 .../Processors/FetchPackingListFromVTPortalProcessor.php      | 2 +-
 .../FetchWarehouseReceiveListFromVTPortalProcessor.php        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index 06d1add0..e156f678 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -76,7 +76,7 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                 try {
                     $filter = '["RefNo:=%js%\"'.$container->reference.'\"\u0000"]';
 
-                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
 
                     $containerDetails = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index c987cb29..24fd8e0f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -62,7 +62,7 @@ class FetchDeliveryListFromVTPortalProcessor
                 try {
                     $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
 
                     $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 4ed1ff00..63bb338b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -137,14 +137,14 @@ class FetchLoadedContainersFromVTPortalProcessor
             $end = $end ? $end : Carbon::now();
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
 
             foreach ($containers->Rows as $container){
 
                 $filter = '["ContainerID:=%js%'.$container[11].'"]';
-                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
 
                 $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index ed03c5d1..f6f802a4 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -55,7 +55,7 @@ class FetchPackingListFromVTPortalProcessor
 
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 476b1426..1f0808c3 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -128,7 +128,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 

From fab262a959a4a794d3c73731dcfb15cdc36696ff Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 04:15:40 +0800
Subject: [PATCH 33/98] hold and release goods for delivery

---
 resources/views/pages/containers.blade.php     | 2 +-
 resources/views/pages/warehouse_list.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
index 24fed85e..6c2eb286 100644
--- a/resources/views/pages/containers.blade.php
+++ b/resources/views/pages/containers.blade.php
@@ -9,7 +9,7 @@
     </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}}">
+<list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'with_packing_lists': true, order_by: {column: 'created_at', DESC: true}}">
     <template slot="list" slot-scope="{data}">
         <container-component :data="data"></container-component>
     </template>
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 3cbe9b7a..4a05c94c 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -8,7 +8,7 @@
     </div>
     <div class="row">
         <div class="col-7">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: true}}">
                 <template slot="list" slot-scope="{data}">
                     <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
                 </template>

From e426550c73ae425991795ec2a086d55aa6bd828e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 04:18:49 +0800
Subject: [PATCH 34/98] hold and release goods for delivery

---
 .../FetchContainersStatusUpdateFromVTPortalProcessor.php      | 2 +-
 .../Processors/FetchDeliveryListFromVTPortalProcessor.php     | 2 +-
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php | 4 ++--
 .../Processors/FetchPackingListFromVTPortalProcessor.php      | 2 +-
 .../FetchWarehouseReceiveListFromVTPortalProcessor.php        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index e156f678..0a0c0158 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -76,7 +76,7 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                 try {
                     $filter = '["RefNo:=%js%\"'.$container->reference.'\"\u0000"]';
 
-                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
+                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                     $containerDetails = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index 24fd8e0f..14a13064 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -62,7 +62,7 @@ class FetchDeliveryListFromVTPortalProcessor
                 try {
                     $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
+                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                     $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 63bb338b..3f33767f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -137,14 +137,14 @@ class FetchLoadedContainersFromVTPortalProcessor
             $end = $end ? $end : Carbon::now();
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
+            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
 
             foreach ($containers->Rows as $container){
 
                 $filter = '["ContainerID:=%js%'.$container[11].'"]';
-                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
+                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index f6f802a4..a87fabed 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -55,7 +55,7 @@ class FetchPackingListFromVTPortalProcessor
 
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 1f0808c3..8d7e43d4 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -128,7 +128,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn asc","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 

From 502b702a0a31afcd03290c10e1ede1d08a954906 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 04:26:18 +0800
Subject: [PATCH 35/98] hold and release goods for delivery

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 +-
 .../FetchWarehouseReceiveListFromVTPortalProcessor.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 3f33767f..4069a40d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -137,7 +137,7 @@ class FetchLoadedContainersFromVTPortalProcessor
             $end = $end ? $end : Carbon::now();
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 8d7e43d4..c247c6dc 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -128,7 +128,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"EtaPort asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 

From aa26fb97a0a51d2e9b7bbcce0a00f389ff58e181 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 04:31:32 +0800
Subject: [PATCH 36/98] hold and release goods for delivery

---
 .../FetchWarehouseReceiveListFromVTPortalProcessor.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index c247c6dc..b9043479 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -128,7 +128,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"EtaPort asc","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 

From f21eb73f4af0e7907d7946922b6b618fc58fdf47 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 05:09:10 +0800
Subject: [PATCH 37/98] hold and release goods for delivery

---
 routes/web.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 7548a1dd..64dd013d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -89,6 +89,14 @@ Route::get('/orders/refresh', function(){
 
 })->name('orders.refresh');
 
+Route::get('/containers/refresh', function(){
+
+    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
+
+    return redirect()->back();
+
+})->name('containers.refresh');
+
 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
 
 //Route::get('/test', function(){

From ee30ebb05d29463e1b01ee961810e85fc3270b2b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 05:35:02 +0800
Subject: [PATCH 38/98] hold and release goods for delivery

---
 routes/web.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 64dd013d..ed24a13f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -97,6 +97,14 @@ Route::get('/containers/refresh', function(){
 
 })->name('containers.refresh');
 
+Route::get('/deliveries/refresh', function(){
+
+    FetchDeliveryListFromVTPortalJob::dispatch();
+
+    return redirect()->back();
+
+})->name('deliveries.refresh');
+
 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
 
 //Route::get('/test', function(){

From ac3e6fba206ffbd8c66554aabbd03b9f6118003d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 05:47:51 +0800
Subject: [PATCH 39/98] hold and release goods for delivery

---
 .../Processors/FetchPackingListFromVTPortalProcessor.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index a87fabed..c22056cd 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,7 +46,9 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->get();
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->doesntHave('containers', function($query){
+            return $query->where('status', '=', ApprovalStatus::COMPLETED);
+        })->get();
 
         foreach($packingLists as $packingList){
 

From b4215a5bde9356aff95b02e85b511d759cdca67a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 06:22:06 +0800
Subject: [PATCH 40/98] hold and release goods for delivery

---
 .../Processors/FetchPackingListFromVTPortalProcessor.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index c22056cd..ecc9c9f0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,8 +46,8 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->doesntHave('containers', function($query){
-            return $query->where('status', '=', ApprovalStatus::COMPLETED);
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
+            $query->where('status', '=', ApprovalStatus::COMPLETED);
         })->get();
 
         foreach($packingLists as $packingList){

From d6915bc22fd9e9c07830f7a84d10b5dc46df61c2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 06:43:35 +0800
Subject: [PATCH 41/98] hold and release goods for delivery

---
 resources/views/layouts/base_portal.blade.php  | 6 ++++++
 resources/views/pages/orders/index.blade.php   | 6 ------
 resources/views/pages/warehouse_list.blade.php | 6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index 452d1560..87144464 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -19,6 +19,12 @@
                                     @include('partials.header')
                                     <div class="row no-margin p-b-50">
                                         <div class="col p-t-15 p-b-25">
+                                            <div class="row m-b-20" v-if="$store.getters.isAdmin">
+                                                <div class="col"></div>
+                                                <div class="col-auto p-r-0">
+                                                    <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
+                                                </div>
+                                            </div>
                                             @yield('inner_content')
                                         </div>
                                     </div>
diff --git a/resources/views/pages/orders/index.blade.php b/resources/views/pages/orders/index.blade.php
index b770a4db..60788960 100644
--- a/resources/views/pages/orders/index.blade.php
+++ b/resources/views/pages/orders/index.blade.php
@@ -1,10 +1,4 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row m-b-20">
-        <div class="col"></div>
-        <div class="col-auto p-r-0">
-            <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
-        </div>
-    </div>
     <order-section-component></order-section-component>
 @endsection
\ No newline at end of file
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 4a05c94c..a57fc834 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,11 +1,5 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row m-b-20">
-        <div class="col"></div>
-        <div class="col-auto p-r-0">
-            <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
-        </div>
-    </div>
     <div class="row">
         <div class="col-7">
             <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: true}}">

From ea08d1d9985d2ba571ea3c3f82aaa4511f636fce Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 13:13:59 +0800
Subject: [PATCH 42/98] show company create date

---
 app/Http/Resources/CompanyResource.php                       | 1 +
 .../vue/components/companies/elements/CompanyComponent.vue   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index f338d095..9933f49d 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -35,6 +35,7 @@ class CompanyResource extends JsonResource
             'company_module' => new CompanyModuleResource($companyModule),
             'last_order' => new OrderResource($companyModule ? $companyModule->orders()->orderBy('id', 'DESC')->first(): null),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
+            'created_at' => $this->created_at
 
         ];
 
diff --git a/resources/assets/vue/components/companies/elements/CompanyComponent.vue b/resources/assets/vue/components/companies/elements/CompanyComponent.vue
index c0c63716..487190d1 100644
--- a/resources/assets/vue/components/companies/elements/CompanyComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CompanyComponent.vue
@@ -10,8 +10,9 @@
             <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
             <div class="font-heading all-caps fs-11">CIEF/{{this.item.company_module.marking}}</div>
         </div>
-        <div class="col-auto text-center">
-
+        <div class="col-auto">
+            <div class="font-heading all-caps fs-11">Registration Date</div>
+            <div class="font-heading all-caps fs-11">{{this.created_at}}</div>
         </div>
         <div class="col-auto text-center">
             <div class="font-heading all-caps fs-11 p-l-15 p-r-15 p-t-5 p-b-5 bg-master-lighter btn-rounded"><i class="fa fa-circle m-r-10" :class="{'text-danger': item.status !==2,  'text-success': item.status ==2}"></i>{{this.item.status === 2 ? 'Active':'Inactive'}}</div>

From d77c0b1c06d045f6ce72897de8b57bcc2ae26cec Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 13:17:32 +0800
Subject: [PATCH 43/98] show company create date

---
 app/Http/Resources/CompanyResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 9933f49d..702319aa 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -35,7 +35,7 @@ class CompanyResource extends JsonResource
             'company_module' => new CompanyModuleResource($companyModule),
             'last_order' => new OrderResource($companyModule ? $companyModule->orders()->orderBy('id', 'DESC')->first(): null),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
-            'created_at' => $this->created_at
+            'created_at' => $this->created_at->format('d-m-Y')
 
         ];
 

From 9970277411dc4fdb925080af59733e4f2bac18f9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 13:18:29 +0800
Subject: [PATCH 44/98] show company create date

---
 .../vue/components/companies/elements/CompanyComponent.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/companies/elements/CompanyComponent.vue b/resources/assets/vue/components/companies/elements/CompanyComponent.vue
index 487190d1..88c0480c 100644
--- a/resources/assets/vue/components/companies/elements/CompanyComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CompanyComponent.vue
@@ -11,8 +11,8 @@
             <div class="font-heading all-caps fs-11">CIEF/{{this.item.company_module.marking}}</div>
         </div>
         <div class="col-auto">
-            <div class="font-heading all-caps fs-11">Registration Date</div>
-            <div class="font-heading all-caps fs-11">{{this.created_at}}</div>
+            <div class="font-heading all-caps fs-11">Date</div>
+            <div class="font-heading all-caps fs-11">{{this.item.created_at}}</div>
         </div>
         <div class="col-auto text-center">
             <div class="font-heading all-caps fs-11 p-l-15 p-r-15 p-t-5 p-b-5 bg-master-lighter btn-rounded"><i class="fa fa-circle m-r-10" :class="{'text-danger': item.status !==2,  'text-success': item.status ==2}"></i>{{this.item.status === 2 ? 'Active':'Inactive'}}</div>

From 3d46895328397e1d7bd09e943f6d87504804fa75 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 13:25:14 +0800
Subject: [PATCH 45/98] fix cbm calculation bug

---
 app/Http/Resources/PackageResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Resources/PackageResource.php b/app/Http/Resources/PackageResource.php
index 7a3209d1..d69ae652 100644
--- a/app/Http/Resources/PackageResource.php
+++ b/app/Http/Resources/PackageResource.php
@@ -23,7 +23,7 @@ class PackageResource extends JsonResource
             'length' => floatval($this->length),
             'weight' => $this->weight,
             'quantity' => $this->quantity,
-            'cbm' => (($this->width / 100) * ($this->width / 100) * ($this->width / 100)) * $this->quantity,
+            'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
             'status' => $this->status,
             'order' => new OrderResource($this->packingList->owner),
             'container' => new ContainerResource($this->packingList->containers()->first()),

From ade8b0fe4f533fdbdbaa84923b88ec083cebdb37 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 13:26:05 +0800
Subject: [PATCH 46/98] fix cbm calculation bug

---
 .../assets/vue/components/orders/elements/PackageComponent.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index f1465b7c..2dcb4a29 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -27,7 +27,7 @@
                                             <p class="no-margin all-caps fs-10 light">Width</p>
                                         </div>
                                         <div class="col-auto b-r b-grey p-t-10 p-b-10">
-                                            <p class="no-margin text-info bold">{{item.quantity}} <sup>CM</sup></p>
+                                            <p class="no-margin text-info bold">{{item.height}} <sup>CM</sup></p>
                                             <p class="no-margin all-caps fs-10 light">Height</p>
                                         </div>
                                         <div class="col-auto b-r b-grey p-t-10 p-b-10">

From 54211a5b72e3bbde7fe2cf41a5652c953dfc9b46 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Thu, 9 Sep 2021 13:48:57 +0800
Subject: [PATCH 47/98] =?UTF-8?q?feat=EF=BC=9A=20add=20approve=20change=20?=
 =?UTF-8?q?prder=20address=20component=20-=20admin=20access=20only.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApproveChangeAddressComponent.vue         | 22 +++++++++
 .../elements/ChangeAddressComponent.vue       |  2 +-
 .../ApproveChangeAddressFormComponent.vue     | 49 +++++++++++++++++++
 .../sections/OrderProfileSectionComponent.vue |  4 +-
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 resources/assets/vue/components/orders/elements/ApproveChangeAddressComponent.vue
 create mode 100644 resources/assets/vue/components/orders/forms/ApproveChangeAddressFormComponent.vue

diff --git a/resources/assets/vue/components/orders/elements/ApproveChangeAddressComponent.vue b/resources/assets/vue/components/orders/elements/ApproveChangeAddressComponent.vue
new file mode 100644
index 00000000..d4217fd5
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/ApproveChangeAddressComponent.vue
@@ -0,0 +1,22 @@
+<template>
+    <i v-show="data.address_change_request&&$store.getters.isAdmin" class="fa fa-exclamation pointer requestModal"  data-type="approveChangeAddress">
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveChangeAddress" size="large">
+            <approve-change-address-form-component :data="data" :section="section" class="text-center"></approve-change-address-form-component>
+        </modal-component>
+    </i>
+</template>
+<script>
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                section:"changeAddressSection"
+            }
+        },
+    }
+</script>
diff --git a/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue b/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
index e8c2636d..dc82ede2 100644
--- a/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <i class="fa fa-edit pointer requestModal"  data-type="addressesList" v-tooltip:right="data.address_change_request.reference">
+    <i class="fa fa-edit pointer requestModal"  data-type="addressesList">
         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="addressesList" size="large">
             <change-order-address-form-component :data="data" :section="section" class="text-center"></change-order-address-form-component>
         </modal-component>
diff --git a/resources/assets/vue/components/orders/forms/ApproveChangeAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ApproveChangeAddressFormComponent.vue
new file mode 100644
index 00000000..ce9f4769
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/ApproveChangeAddressFormComponent.vue
@@ -0,0 +1,49 @@
+<template>
+    <div class="row justify-content-center">
+        <div class="col col-md-10">
+            <div class="row m-b-20">
+                <div class="col">
+                    <div class="row m-b-20 text-info">
+                        <div class="col text-center">
+                            <h3>Approve</h3>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row justify-content-center animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                <div class="col col-md-8 no-padding">
+                    <div class="row">
+                        <div class="col p-l-5">
+                            <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="approveChangeAddress()" >Approve</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                parameters : {
+                    order_id: this.data.id,
+                }
+            }
+        },
+        methods:{
+            approveChangeAddress(){
+                this.submit((this.route('api.order.address.change.approve')), 'post', 'orderListSection', true, true);
+            },
+        },
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index ad49af1c..4e52c1e3 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -24,7 +24,9 @@
                             <div class="row m-b-10">
                                 <div class="col-auto">
                                     <h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i>
-                                    <change-address-component :data="order"></change-address-component></h6>
+                                    <change-address-component :data="order"></change-address-component>
+                                    <approve-change-address-component :data="order"></approve-change-address-component>
+                                    </h6>
                                 </div>
                                 <div class="col-auto">
                                     <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.id === 3 ? 'Guang Zhou' : 'Yiwu'}}</h6>

From 512cca3445dd3eea0296a1a83ee429a351314642 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 15:31:39 +0800
Subject: [PATCH 48/98] fix redirect bug

---
 routes/web.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index ed24a13f..2eb2bcbb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -85,7 +85,7 @@ Route::get('/orders/refresh', function(){
         new FetchDeliveryListFromVTPortalJob
     ])->dispatch();
 
-    return redirect()->back();
+    return redirect('orders');
 
 })->name('orders.refresh');
 
@@ -93,7 +93,7 @@ Route::get('/containers/refresh', function(){
 
     FetchContainersStatusUpdateFromVTPortalJob::dispatch();
 
-    return redirect()->back();
+    return redirect('orders');
 
 })->name('containers.refresh');
 
@@ -101,7 +101,7 @@ Route::get('/deliveries/refresh', function(){
 
     FetchDeliveryListFromVTPortalJob::dispatch();
 
-    return redirect()->back();
+    return redirect('orders');
 
 })->name('deliveries.refresh');
 

From 1939f64cdfeb6a556824be3664d9fe299187dae6 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 22:57:02 +0800
Subject: [PATCH 49/98] change order address

---
 .../General/Eloquent/Filters/WithOwner.php    |  20 +++
 .../ApproveChangeOrderAddressLogic.php        |   5 +-
 .../ApproveChangeOrderAddressProcessor.php    |  42 +++---
 .../Orders/Services/UpdatesOrdersAddress.php  |   3 +-
 app/Http/Resources/AddressResource.php        |   3 +-
 app/Http/Resources/OrderResource.php          |   2 +-
 resources/assets/sass/modules/_modals.scss    |   2 +-
 .../forms/DeleteAddressFormComponent.vue      |  33 -----
 .../elements/AddressComponent.vue             |   0
 .../elements/AddressVerificationComponent.vue | 135 ++++++++++++++++++
 .../elements/SelectAddressComponent.vue       |   4 +-
 .../addresses/forms/AddressFormComponent.vue  |   4 +-
 .../forms/NewEditAddressFormComponent.vue     |   0
 .../forms/SetDefaultAddressFormComponent.vue  |   0
 .../sections/AddressListComponent.vue         |   0
 .../elements/ChangeAddressComponent.vue       |  22 ---
 .../forms/ChangeOrderAddressFormComponent.vue |  32 +++--
 .../sections/OrderProfileSectionComponent.vue |  63 ++++++--
 .../views/pages/admin/dashboard.blade.php     |  14 ++
 routes/order.php                              |   2 +-
 20 files changed, 280 insertions(+), 106 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/WithOwner.php
 delete mode 100644 resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue
 rename resources/assets/vue/components/{address => addresses}/elements/AddressComponent.vue (100%)
 create mode 100644 resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
 rename resources/assets/vue/components/{address => addresses}/forms/NewEditAddressFormComponent.vue (100%)
 rename resources/assets/vue/components/{address => addresses}/forms/SetDefaultAddressFormComponent.vue (100%)
 rename resources/assets/vue/components/{address => addresses}/sections/AddressListComponent.vue (100%)
 delete mode 100644 resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/WithOwner.php b/app/Classes/General/Eloquent/Filters/WithOwner.php
new file mode 100644
index 00000000..7d31691e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithOwner.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithOwner implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('owner');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php b/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
index ff78145e..0b469fd1 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Orders\Processors\ApproveChangeOrderAddressProcessor;
+use App\Http\Resources\AddressResource;
 use App\Http\Resources\OrderResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
@@ -36,8 +37,8 @@ class ApproveChangeOrderAddressLogic extends AbstractControllerLogic
 
     public function logic(Request $request): JsonResponse
     {
-        $order = $this->approveChangeOrderAddressProcessor->execute($request);
+        $address = $this->approveChangeOrderAddressProcessor->execute($request);
 
-        return $this->resourceResponse(new OrderResource($order));
+        return $this->resourceResponse(new AddressResource($address));
     }
 }
diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
index 423d8ce5..fbd84f90 100644
--- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -2,9 +2,8 @@
 
 namespace App\Classes\Modules\Orders\Processors;
 
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Addresses\Services\DeletesAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
@@ -15,39 +14,48 @@ class ApproveChangeOrderAddressProcessor
     /** @var CanApproveChangeOrderAddress */
     private $canApproveChangeOrderAddress;
 
-    /** @var FetchesOrder */
-    private $fetchesOrder;
+    /** @var FetchesAddress */
+    private $fetchesAddress;
 
     /** @var UpdatesOrdersAddress */
     private $updatesOrdersAddress;
 
-    /** @var DeletesAddress */
-    private $deletesAddress;
-
     /**
-     * CreateOrderProcessor constructor.
+     * ApproveChangeOrderAddressProcessor constructor.
      * @param CanApproveChangeOrderAddress $canApproveChangeOrderAddress
-     * @param FetchesOrder $fetchesOrder
-     * @param DeletesAddress $deletesAddress
+     * @param FetchesAddress $fetchesAddress
      * @param UpdatesOrdersAddress $updatesOrdersAddress
      */
-    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesOrder $fetchesOrder, DeletesAddress $deletesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
+    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
     {
         $this->canApproveChangeOrderAddress = $canApproveChangeOrderAddress;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->deletesAddress = $deletesAddress;
+        $this->fetchesAddress = $fetchesAddress;
         $this->updatesOrdersAddress = $updatesOrdersAddress;
     }
 
 
+    /**
+     * @param Request $request
+     * @return mixed
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
     public function execute(Request $request)
     {
+
+        $status = (int) $request->route('status');
+
         $this->canApproveChangeOrderAddress->passes();
 
-        $order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
-        $this->deletesAddress->execute($order->addressesApproved->first());
-        $this->updatesOrdersAddress->execute($order->addressesPendingVerification->first(), ApprovalStatus::APPROVED);
+        $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-        return $order;
+        if($status === ApprovalStatus::APPROVED){
+            $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
+        }
+
+        $this->updatesOrdersAddress->execute($address, $status);
+
+        return $address;
     }
 }
diff --git a/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php b/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
index 3ad6295a..352ce64d 100644
--- a/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
+++ b/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
@@ -10,7 +10,8 @@ class UpdatesOrdersAddress extends AbstractUpdateRecord
     /**
      * @param Address $address
      * @param int $type
-     * @return void
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function execute(Address $address, int $type)
     {
diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index 3b4c465b..b6903599 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -23,7 +23,8 @@ class AddressResource extends JsonResource
             'state' => $this->state,
             'post_code' => $this->postcode,
             'country' => $this->country,
-            'default' => (int) $this->default
+            'default' => (int) $this->default,
+            'owner' => new OrderResource($this->whenLoaded('owner'))
         ];
     }
 }
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 91e1c4b5..390ca1ef 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -27,7 +27,7 @@ class OrderResource extends JsonResource
             'status' => (int) $this->status,
             'company_module' => new CompanyModuleResource($this->companyModule),
             'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
-            'address' => new AddressResource($this->addresses()->first()),
+            'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
             'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             $this->mergeWhen($this->relationLoaded('parcels'), [
                 'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
diff --git a/resources/assets/sass/modules/_modals.scss b/resources/assets/sass/modules/_modals.scss
index 73272c57..1bafb1cd 100644
--- a/resources/assets/sass/modules/_modals.scss
+++ b/resources/assets/sass/modules/_modals.scss
@@ -269,7 +269,7 @@ body.modal-open {
 			box-shadow: none;
 		}
 		.modal-dialog {
-		    width: 600px;
+		    width: 1140px;
 		}
 		.modal-sm {
 		    width: 300px;
diff --git a/resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue b/resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue
deleted file mode 100644
index 9fbc94a1..00000000
--- a/resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col">
-            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
-            <div class="row justify-content-center" v-show="!isLoading">
-                <div class="col">
-                    <div class="row m-b-20">
-                        <div class="col">
-                            <h3 class="all-caps">Are you Sure?</h3>
-                            <div class="fs-11">Are you sure you want to delete this address?</div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col p-r-5">
-                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
-                        </div>
-                        <div class="col p-l-5">
-                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.address.delete', item.id), 'delete', section, true, true)">Delete</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
-    export default {
-        mixins: [componentHandler, ModalFormHandler]
-
-    }
-</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/address/elements/AddressComponent.vue b/resources/assets/vue/components/addresses/elements/AddressComponent.vue
similarity index 100%
rename from resources/assets/vue/components/address/elements/AddressComponent.vue
rename to resources/assets/vue/components/addresses/elements/AddressComponent.vue
diff --git a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
new file mode 100644
index 00000000..5c5e1cbe
--- /dev/null
+++ b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
@@ -0,0 +1,135 @@
+<template>
+    <div class="row m-b-10 bg-master-lightest">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-show="!isLoading">
+                <div class="col">
+                    <div class="row align-items-center">
+                        <div class="col p-t-10 p-b-10">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="text-primary no-margin"><a :href="route('order.show', item.owner.reference)">{{item.owner.reference}}</a></h5>
+                                </div>
+                            </div>
+                            <div class="row align-items-center">
+                                <div class="col">
+                                    <h6 class="no-margin"><a :href="route('customer.profile', item.owner.company_module.marking)">{{item.owner.company_module.marking}}</a></h6>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row b-t b-grey">
+                        <div class="col p-t-10">
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">Original Address</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">New Address</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 bold">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-20 parentContainer">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col no-padding">
+                                            <button class="btn btn-md btn-block btn-outline-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectAddress">
+                                                Reject
+                                            </button>
+                                        </div>
+                                        <modal-component small type="rejectAddress">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Reject Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to reject order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveAddress(6)">Reject</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                        <div class="col no-padding ml-auto">
+                                            <button class="btn btn-md btn-block btn-outline-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveAddress">
+                                                Approve
+                                            </button>
+                                        </div>
+                                        <modal-component small type="approveAddress">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Approve Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to approve this order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveAddress(2)">Approve</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import staticFormHandler from '../../../general/mixins/staticFormHandler'
+    export default {
+        methods: {
+            approveAddress(status){
+                this.isLoading = true;
+                this.submit((this.route('api.order.address.status.update', this.item.id, status)), 'put', 'addressVerificationSection', true, true);
+            },
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue b/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue
index 587f2394..d3e8daf2 100644
--- a/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue
+++ b/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue
@@ -5,10 +5,10 @@
                 <div class="col-auto p-r-0">
                     <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': value !== item.id, 'fa-check-circle': value === item.id, 'text-primary': value === item.id}"></i>
                 </div>
-                <div class="col-2">
+                <div class="col-3">
                     <h6 class="no-margin bold fs-12">{{item.reference}}</h6>
                 </div>
-                <div class="col">
+                <div class="col text-left">
                     <h6 class="no-margin fs-12">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
                 </div>
                 <div class="col-auto">
diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 3999ce1d..450fe5aa 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -20,13 +20,13 @@
                         </div>
                     </div>
                     <div class="row m-b-15">
-                        <div class="col-12 col-md pl-md-2 pb-3 pb-md-0 ">
+                        <div class="col-12 col-md p-r-5 pb-3 pb-md-0 ">
                             <validation-wrapper-component selecatable :validator="$v.parameters.district_id">
                                 <label>District</label>
                                 <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-12 col-md pl-md-2">
+                        <div class="col-12 col-md p-l-5">
                             <validation-wrapper-component :validator="$v.parameters.post_code">
                                 <label>Post Code</label>
                                 <input class="form-control" name="post_code" v-model="parameters.post_code">
diff --git a/resources/assets/vue/components/address/forms/NewEditAddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/NewEditAddressFormComponent.vue
similarity index 100%
rename from resources/assets/vue/components/address/forms/NewEditAddressFormComponent.vue
rename to resources/assets/vue/components/addresses/forms/NewEditAddressFormComponent.vue
diff --git a/resources/assets/vue/components/address/forms/SetDefaultAddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
similarity index 100%
rename from resources/assets/vue/components/address/forms/SetDefaultAddressFormComponent.vue
rename to resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
diff --git a/resources/assets/vue/components/address/sections/AddressListComponent.vue b/resources/assets/vue/components/addresses/sections/AddressListComponent.vue
similarity index 100%
rename from resources/assets/vue/components/address/sections/AddressListComponent.vue
rename to resources/assets/vue/components/addresses/sections/AddressListComponent.vue
diff --git a/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue b/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
deleted file mode 100644
index dc82ede2..00000000
--- a/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-    <i class="fa fa-edit pointer requestModal"  data-type="addressesList">
-        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="addressesList" size="large">
-            <change-order-address-form-component :data="data" :section="section" class="text-center"></change-order-address-form-component>
-        </modal-component>
-    </i>
-</template>
-<script>
-    export default {
-        props: {
-            data: {
-                type: Object,
-                required: true,
-            }
-        },
-        data() {
-            return {
-                section:"changeAddressSection"
-            }
-        },
-    }
-</script>
diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
index 8e6c3d7b..b138b680 100644
--- a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
@@ -1,15 +1,16 @@
 <template>
-    <div class="row justify-content-center">
-        <div class="col col-md-10">
-            <div class="row m-b-20">
+    <div class="row">
+        <div class="col">
+            <div class="row">
                 <div class="col">
                     <div class="row m-b-20 text-info">
-                        <div class="col text-center">
-                            <h3>Please select the address where you want to receive this order</h3>
+                        <div class="col">
+                            <h3 class="text-left">Delivery Address Update</h3>
+                            <h6 class="text-left">Please select the address where you want to receive this order</h6>
                         </div>
                     </div>
-                    <div class="row justify-content-center">
-                        <div class="col col-md-10">
+                    <div class="row justify-content-center no-margin">
+                        <div class="col">
                             <list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: data.company_module.id}">
                                 <template slot="list" slot-scope="{data}">
                                     <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
@@ -34,11 +35,20 @@
                     </div>
                 </div>
             </div>
-            <div class="row justify-content-center animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
-                <div class="col col-md-8 no-padding">
+            <div class="row animate__animated animate__fadeInUpBig animate__delay-1 animate__fast no-margin">
+                <div class="col no-padding">
                     <div class="row">
-                        <div class="col p-l-5">
-                            <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="changeAddress()" >Update</button>
+                        <div class="col"></div>
+                        <div class="col-7">
+                            <h6 class="text-right fs-12 text-danger m-b-15 text-right">**You delivery address change request will be approved after being reviewed, once it's approved your order delivery address will be updated.</h6>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col text-left">
+                            <button type="button" class="btn btn-md btn-default b-rad-none pointer" data-dismiss="modal" >Cancel</button>
+                        </div>
+                        <div class="col-auto">
+                            <button type="button" class="btn btn-md btn-block btn-primary b-rad-none" @click="changeAddress()" v-if="parameters.address_id">Update Delivery Address</button>
                         </div>
                     </div>
                 </div>
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 4e52c1e3..22215504 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -16,32 +16,71 @@
                             </div>
                         </div>
                         <div class="col">
-                            <div class="row m-b-10">
+                            <div class="row m-b-20">
                                 <div class="col">
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
                             </div>
-                            <div class="row m-b-10">
+                            <div class="row m-b-20">
                                 <div class="col-auto">
-                                    <h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i>
-                                    <change-address-component :data="order"></change-address-component>
-                                    <approve-change-address-component :data="order"></approve-change-address-component>
-                                    </h6>
+                                    <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
                                 </div>
                                 <div class="col-auto">
                                     <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.id === 3 ? 'Guang Zhou' : 'Yiwu'}}</h6>
                                 </div>
-                                <div class="col-auto">
-                                    <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
-                                </div>
-                            </div>
-                            <div class="row m-b-10" v-if="$store.getters.isAdmin">
-                                <div class="col" >
+                                <div class="col" v-if="$store.getters.isAdmin">
                                     <a :href="route('customer.profile', order.company_module.marking)">
                                         <h6 class="no-margin"><b>Customer Marking:</b> {{order.company_module.marking}}</h6>
                                     </a>
                                 </div>
                             </div>
+                            <div class="row m-b-10 align-items-center parentContainer" >
+                                <div class="col-auto">
+                                    <h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i></h6>
+                                </div>
+                                <div class="col">
+                                    <div class="row" v-if="!order.address_change_request">
+                                        <div class="col">
+                                            <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal"  data-type="updateDeliveryAddress">Change Delivery Address</div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="updateDeliveryAddress" size="large">
+                                                <change-order-address-form-component :data="order" :section="section" class="text-center"></change-order-address-form-component>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                    <div class="row parentContainer" v-if="order.address_change_request">
+                                        <div class="col-auto p-r-0">
+                                            <div class="p-t-10 p-b-10 p-l-15 p-r-15 b-a b-danger fs-10 text-danger requestModal"  data-type="updateDeliveryAddress"><i class="fa fa-exclamation-circle m-r-10"></i>Your Delivery address change request is being reviewed</div>
+                                        </div>
+                                        <div class="col-auto bg-danger-light pointer requestModal" data-type="cancelAddressChangeRequest">
+                                            <i class="fa fa-times text-white lh-38"></i>
+                                        </div>
+                                        <modal-component small type="cancelAddressChangeRequest">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Cancel Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to cancel your order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.order.address.status.update', order.address_change_request.id, 6), 'put', section, true, true)">Confirm</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="row align-items-center">
                                 <div class="col-10">
                                     <h6 class="text-info"><span class="text-danger bold">Gentle reminder:</span> You need to send the QR code to your supplier to print and stick on your packages, this QR code is required for us to identify your packages when they arrives at our warehouse!</h6>
diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php
index 431120dc..132ee160 100644
--- a/resources/views/pages/admin/dashboard.blade.php
+++ b/resources/views/pages/admin/dashboard.blade.php
@@ -30,5 +30,19 @@
                 </list-component>
             </div>
         </div>
+        <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>Address Change Verification</h6>
+            </div>
+        </div>
+        <div class="row no-margin">
+            <div class="col">
+                <list-component key="2" section="addressVerificationSection" :options="{'per_page': 5, 'status': 1, 'with_owner': true}"  :endpoint="route('api.address.list')">
+                    <template slot="list" slot-scope="{data}">
+                        <address-verification-component section="addressVerificationSection" :data="data"></address-verification-component>
+                    </template>
+                </list-component>
+            </div>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/routes/order.php b/routes/order.php
index 27cb66ef..6a0c04d3 100644
--- a/routes/order.php
+++ b/routes/order.php
@@ -10,5 +10,5 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f
     Route::put('/cancel/{id}', 'CancelOrderController@cancel')->name('cancel');
     Route::put('/restore/{id}', 'RestoreOrderController@restore')->name('restore');
     Route::post('/address/change/request', 'RequestChangeOrderAddressController@request')->name('address.change.request');
-    Route::post('/address/change/approve', 'ApproveChangeOrderAddressController@approve')->name('address.change.approve');
+    Route::put('/address/{id}/status/{status}', 'ApproveChangeOrderAddressController@approve')->name('address.status.update');
 });

From b57f56dd8f0cb595ed1830269b21e7d8a841bf75 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 9 Sep 2021 23:07:48 +0800
Subject: [PATCH 50/98] change order address

---
 .../forms/NewEditAddressFormComponent.vue     | 145 ------------------
 .../views/pages/admin/dashboard.blade.php     |   2 +-
 2 files changed, 1 insertion(+), 146 deletions(-)
 delete mode 100644 resources/assets/vue/components/addresses/forms/NewEditAddressFormComponent.vue

diff --git a/resources/assets/vue/components/addresses/forms/NewEditAddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/NewEditAddressFormComponent.vue
deleted file mode 100644
index 8f2fad2b..00000000
--- a/resources/assets/vue/components/addresses/forms/NewEditAddressFormComponent.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-    <div class="row p-t-25 text-left">
-        <div class="col">
-            <div class="shadow p-3 bg-white rounded">
-                <div class="d-flex flex-row align-items-center">
-                    <input v-show="!isEdit" type="radio" name="answer" id="answer-2"
-                        v-model="computeAddressId"
-                        :value='-1'
-                        :checked="new_address == true"
-                    >
-                    <label for="answer-2" data-question-number="2" class="mb-0 pl-2 pl-md-2 bold">{{isEdit?'Edit ':'Add New '}}Address</label>
-                </div>
-                <div class="col-0" v-if="computeAddressId==-1">
-                    <div class="d-flex flex-column flex-sm-row">
-                        <div class="col px-0 pr-sm-2">
-                            <validation-wrapper-component selecatable :validator="$v.parameters.district_id">
-                            <label class="text-primary fs-12">District</label>
-                            <div class="controls">
-                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                        <div class="col px-0 pl-sm-2">
-                            <validation-wrapper-component :validator="$v.parameters.post_code">
-                            <label class="text-primary fs-12">Post Code</label>
-                            <div class="controls">
-                                <input type="text" class="form-control fs-12" v-model="parameters.post_code">
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-
-                    <div class="d-flex flex-column flex-sm-row">
-                        <div class="col px-0 pr-sm-2">
-                            <validation-wrapper-component :validator="$v.parameters.street_one">
-                            <label class="text-primary fs-12">Street one</label>
-                            <div class="controls">
-                                <input type="text" class="form-control fs-12"
-                                v-model="parameters.street_one"
-                                >
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                        <div class="col px-0 pl-sm-2">
-                            <validation-wrapper-component :validator="$v.parameters.street_two">
-                            <label class="text-primary fs-12">Street two</label>
-                            <div class="controls">
-                                <input type="text" class="form-control fs-12"
-                                v-model="parameters.street_two"
-                                >
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-
-                    <div class="row  m-t-25">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col text-right">
-                                    <button type="button" class="btn btn-sm btn-primary b-rad-none" @click="submitForm()">{{isEdit?'Update':'Create'}}</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { required ,requiredIf } from "vuelidate/lib/validators";
-    export default {
-        props: {
-            section: {
-                default: 'addressForm'
-            },
-            isEdit:{
-                default: false
-            },
-            populateWith: {
-               type: Object,
-               default: () => ({ empty: true })
-             },
-            address_id: null
-        },
-        watch: {
-        },
-        data() {
-			return {
-                parameters : {
-                    company_module_id:this.$store.getters.getCompanyModuleId,
-                    street_one: '',
-                    street_two: '',
-                    district_id: '',
-                    post_code: '',
-				},
-                new_address:false
-
-            }
-		},
-
-        computed: {
-            computeAddressId:{
-                get() {
-                    if (!this.populateWith.empty) {
-                    this.parameters = this.populateWith;
-                    this.parameters.district_id = this.populateWith.district.id;
-                    this.parameters.id = this.populateWith.id;
-                    }
-                    return this.address_id;
-                },
-                set(val) {
-                    this.$emit('input', val);
-                }
-
-            },
-
-        },
-
-        validations: {
-            parameters: {
-                street_one: { required:requiredIf(function () { return this.computeAddressId === -1 }) },
-                street_two: {},
-                district_id: { required },
-                post_code: { required },
-            }
-        },
-        methods:{
-            submitForm(){
-                if(!this.validate()){
-                    return;
-                }
-                this.isLoading = true;
-                this.isEdit?this.submit(route('api.address.update', this.parameters.id), 'put', this.section, true, true):this.submit((this.route('api.address.create')), 'post', 'addressList', true, true);
-            },
-            successHandler(response){
-                this.$emit('input', response.payload.data.id);
-                this.resetForm();
-                this.closeModal();
-                this.isLoading = false;
-                this.updateList();
-            }
-        }
-    }
-</script>
diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php
index 132ee160..0fe49ba7 100644
--- a/resources/views/pages/admin/dashboard.blade.php
+++ b/resources/views/pages/admin/dashboard.blade.php
@@ -1,5 +1,5 @@
 <div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
-    <div class="col-6">
+    <div class="col-8">
         <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>Customers List</h6>

From 06ac4c4e62a552b4db346d015618b3bef1e7b803 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 13:12:02 +0800
Subject: [PATCH 51/98] merge marking and order number in the container list

---
 .../components/containers/elements/ContainerComponent.vue   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index d66b5517..be480278 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -39,8 +39,7 @@
                     <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">Order Number</div>
-                                <div class="col-2">Customer Marking</div>
+                                <div class="col-2">Marking</div>
                                 <div class="col-1 text-center">Quantity</div>
                                 <div class="col-1">CBM</div>
                                 <div class="col-1 text-center">status</div>
@@ -53,8 +52,7 @@
                             <div class="row">
                                 <div class="col">
                                     <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="packingList in item.packing_lists">
-                                        <div class="col-2"><a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
-                                        <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a></div>
+                                        <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a>/<a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
                                         <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
                                         <div class="col-1">{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>

From fa5f129af00e47d7f7ed3402c6459196e49f6cd9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 13:38:35 +0800
Subject: [PATCH 52/98] add container ref in the package component

---
 .../vue/components/orders/elements/PackageComponent.vue       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index 2dcb4a29..35d9e52f 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -52,6 +52,10 @@
                                             <small class="fs-10 all-caps muted">Status</small>
                                             <p class="no-margin bold">{{status}}</p>
                                         </div>
+                                        <div class="col-auto" v-if="$store.getters.isAdmin">
+                                            <small class="fs-10 all-caps muted">Container</small>
+                                            <p class="no-margin bold">{{item.container.container_reference}}</p>
+                                        </div>
                                     </div>
                                     <div class="row">
                                         <div class="col-auto">

From c652d8df1adc77375f361d94987840f93365b85a Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 10 Sep 2021 15:58:28 +0800
Subject: [PATCH 53/98] shipping queue ui

---
 .../elements/shippingQueueComponents.vue      |  94 ++++++++++++++
 .../pages/templates/shippingQueue.blade.php   | 120 ++++++++++++++++++
 resources/views/partials/menu.blade.php       |  11 ++
 routes/web.php                                |   6 +-
 4 files changed, 230 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/components/shippingQueue/elements/shippingQueueComponents.vue
 create mode 100644 resources/views/pages/templates/shippingQueue.blade.php

diff --git a/resources/assets/vue/components/shippingQueue/elements/shippingQueueComponents.vue b/resources/assets/vue/components/shippingQueue/elements/shippingQueueComponents.vue
new file mode 100644
index 00000000..41c20a1c
--- /dev/null
+++ b/resources/assets/vue/components/shippingQueue/elements/shippingQueueComponents.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="row padding-15">
+        <div class="col rounded p-l-20 p-r-20">
+            <div class="row bg-master-light rounded align-items-center padding-20">
+                <div class="col">
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 font-weight-normal">Package ID:</h5>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0">9956665659-MY5568978458</h5>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 font-weight-normal">Package Size:</h5>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0">52x65x35 CM / 10KG</h5>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 font-weight-normal">Delivery Address</h5>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0">Home</h5>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0 font-weight-normal">Delivery Estimation</h5>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="m-b-0 m-t-0">05/05/2022</h5>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <h5 class="m-b-0 m-t-0">Shipping Cost</h5>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <h3 class="m-b-0 m-t-0">RM2800</h3>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto pointer">
+                    <div class="btn btn-lg btn-default btn-rounded"><i class="fa fa-check lightest lh-50"></i></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false,
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/views/pages/templates/shippingQueue.blade.php b/resources/views/pages/templates/shippingQueue.blade.php
new file mode 100644
index 00000000..455d5bb2
--- /dev/null
+++ b/resources/views/pages/templates/shippingQueue.blade.php
@@ -0,0 +1,120 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row">
+    <div class="col-12 col-sm-12 col-md-8">
+        <div class="row h-100 padding-15">
+            <div class="col rounded bg-master-lighter">
+                <div class="row align-items-center h-100 padding-20">
+                    <div class="col">
+                        <h2><span class="normal">Shipping ID:</span> 05052021-25-0100</h2>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-12 col-sm-12 col-md-4">
+        <div class="row h-100 padding-15">
+            <div class="col rounded bg-master-lighter padding-20">
+                <h6 class="normal">Discount Code</h6>
+                <div class="row">
+                    <div class="col bg-master-lightest rounded m-l-20 m-r-20 padding-15">
+                        <div class="row align-items-center">
+                            <div class="col">
+                                <h6>Free 10</h6>
+                            </div>
+                            <div class="col-auto">
+                                <div class="btn rounded bg-master-light">Removed</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-12 col-sm-12 col-md-8">
+        <list-component section="containerListSection" :endpoint="route('api.address.district.list')">
+            <template slot="list" slot-scope="{data}">
+                <shipping-queue-components :data="data"></shipping-queue-components>
+            </template>
+        </list-component>
+    </div>
+    <div class="col-12 col-sm-12 col-md-4">
+        <div class="row padding-15">
+            <div class="col rounded p-l-20 p-r-20">
+                <div class="row">
+                    <div class="col bg-master-light rounded padding-30">
+                        <div class="row">
+                            <div class="col">
+                                <h3 class="normal">Shipping cost estimation</h3>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col m-t-10 m-b-10">
+                                <div class="row">
+                                    <div class="col">
+                                        <h5 class="m-t-0 m-b-5">Shipping Cost: RM8400</h5>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <h5 class="m-t-0 m-b-5">SST(6%): RM600</h5>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <h5 class="m-t-0 m-b-5">Discount: RM100</h5>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <h5 class="no-margin">Total Cost: </h5>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <h4 class="no-margin normal">RM7300</h4>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col p-t-20 p-b-20">
+                        <div class="row align-items-center">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <p class="no-margin normal-text">Group my products with same destination</p>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <p class="no-margin normal-text">You will get grouped package at once if possible</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-auto">
+                                <div class="btn bg-master-light"><i class="fa fa-check lightest"></i></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col">
+                        <div class="btn w-100 bg-master text-white p-t-15 p-b-15 large-text">
+                            Checkout
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 73f727b9..467daf85 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -96,6 +96,17 @@
                                 <h6 class="no-margin light fs-18 all-caps">Tracking</h6>
                             </div>
                         </div>
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide">
+                            <div class="col-auto p-r-0">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                     width="25" height="25"
+                                     viewBox="0 0 172 172"
+                                     style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M27.95,19.35c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM27.95,23.65c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM43,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,34.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,40.85c-9.47344,0 -17.2,7.72656 -17.2,17.2c0,2.72949 1.0666,5.74453 2.52793,9.07031c1.46973,3.33418 3.38457,6.88672 5.29102,10.17891c3.80449,6.56758 7.60898,12.06855 7.60898,12.06855l1.77207,2.56992l1.77207,-2.56992c0,0 3.80449,-5.50097 7.60898,-12.06855c1.90645,-3.29219 3.82129,-6.84473 5.29102,-10.17891c1.46133,-3.32578 2.52793,-6.34082 2.52793,-9.07031c0,-9.47344 -7.72656,-17.2 -17.2,-17.2zM146.2,43c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,45.15c7.14707,0 12.9,5.75293 12.9,12.9c0,1.42774 -0.81465,4.24961 -2.1752,7.34863c-1.35215,3.09063 -3.1998,6.53398 -5.05586,9.74219c-2.83027,4.87109 -4.47637,7.21426 -5.66895,8.97793c-1.19258,-1.76367 -2.83867,-4.10684 -5.66895,-8.97793c-1.85605,-3.2082 -3.70371,-6.65156 -5.05586,-9.74219c-1.36055,-3.09902 -2.1752,-5.9209 -2.1752,-7.34863c0,-7.14707 5.75293,-12.9 12.9,-12.9zM146.2,49.45c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM86,53.75c-2.37676,0 -4.3,1.92324 -4.3,4.3c0,2.37676 1.92324,4.3 4.3,4.3c2.37676,0 4.3,-1.92324 4.3,-4.3c0,-2.37676 -1.92324,-4.3 -4.3,-4.3zM146.2,53.75c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM146.2,68.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM43,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,103.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,109.65c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM25.8,113.95c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM25.8,129c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,139.75c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM135.45,144.05c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM25.8,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM43,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                            </div>
+                            <div class="col">
+                                <a href="{{route('shipping-queue')}}"><h6 class="no-margin light fs-18 all-caps">Shipping Queue</h6></a>
+                            </div>
+                        </div>
                         <div class="row p-t-15 p-b-15 justify-content-center d-md-none">
                             <div class="col">
                                 <logout-component></logout-component>
diff --git a/routes/web.php b/routes/web.php
index b1370bfe..17b46032 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -80,4 +80,8 @@ Route::get('/test', function(){
         $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode);
         $address->save();
     }
-})->name('test');
\ No newline at end of file
+})->name('test');
+
+Route::get('/shipping-queue', function () {
+    return view('pages.templates.shippingQueue');
+})->name('shipping-queue');
\ No newline at end of file

From 688832445a4bbc808a622e2f638907da17acc482 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 10 Sep 2021 16:41:30 +0800
Subject: [PATCH 54/98] add the route for shipping queue

---
 routes/web.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 2eb2bcbb..56faa99a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -97,6 +97,10 @@ Route::get('/containers/refresh', function(){
 
 })->name('containers.refresh');
 
+Route::get('/shipping-queue', function () {
+    return view('pages.templates.shippingQueue');
+})->name('shipping-queue');
+
 Route::get('/deliveries/refresh', function(){
 
     FetchDeliveryListFromVTPortalJob::dispatch();

From f0c5ea8617bb94c2075fc26886f18b2e0ae027b4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 18:18:48 +0800
Subject: [PATCH 55/98] fix address resource owner bug

---
 app/Http/Resources/AddressResource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index b6903599..e6753cf2 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Models\Order;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class AddressResource extends JsonResource
@@ -24,7 +25,7 @@ class AddressResource extends JsonResource
             'post_code' => $this->postcode,
             'country' => $this->country,
             'default' => (int) $this->default,
-            'owner' => new OrderResource($this->whenLoaded('owner'))
+            'owner' => $this->when($this->owner instanceof Order, new OrderResource($this->whenLoaded('owner')))
         ];
     }
 }

From 47f00e135b034971f08e655ede8f76282277d356 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 18:26:28 +0800
Subject: [PATCH 56/98] fix order resource loop

---
 app/Http/Resources/AddressResource.php        |   1 -
 .../elements/AddressVerificationComponent.vue | 228 +++++++++---------
 2 files changed, 114 insertions(+), 115 deletions(-)

diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index e6753cf2..4c6b8a39 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -25,7 +25,6 @@ class AddressResource extends JsonResource
             'post_code' => $this->postcode,
             'country' => $this->country,
             'default' => (int) $this->default,
-            'owner' => $this->when($this->owner instanceof Order, new OrderResource($this->whenLoaded('owner')))
         ];
     }
 }
diff --git a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
index 5c5e1cbe..ab58d626 100644
--- a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
+++ b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
@@ -2,120 +2,120 @@
     <div class="row m-b-10 bg-master-lightest">
         <div class="col">
             <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
-            <div class="row" v-show="!isLoading">
-                <div class="col">
-                    <div class="row align-items-center">
-                        <div class="col p-t-10 p-b-10">
-                            <div class="row">
-                                <div class="col">
-                                    <h5 class="text-primary no-margin"><a :href="route('order.show', item.owner.reference)">{{item.owner.reference}}</a></h5>
-                                </div>
-                            </div>
-                            <div class="row align-items-center">
-                                <div class="col">
-                                    <h6 class="no-margin"><a :href="route('customer.profile', item.owner.company_module.marking)">{{item.owner.company_module.marking}}</a></h6>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row b-t b-grey">
-                        <div class="col p-t-10">
-                            <div class="row m-b-15">
-                                <div class="col">
-                                    <div class="row m-b-5">
-                                        <div class="col">
-                                            <div class="fs-8 all-caps muted">Original Address</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row m-b-15">
-                                <div class="col">
-                                    <div class="row m-b-5">
-                                        <div class="col">
-                                            <div class="fs-8 all-caps muted">New Address</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <div class="fs-11 bold">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row m-t-20 parentContainer">
-                                <div class="col">
-                                    <div class="row">
-                                        <div class="col no-padding">
-                                            <button class="btn btn-md btn-block btn-outline-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectAddress">
-                                                Reject
-                                            </button>
-                                        </div>
-                                        <modal-component small type="rejectAddress">
-                                            <div class="row">
-                                                <div class="col text-center">
-                                                    <div class="row">
-                                                        <div class="col text-center">
-                                                            <div class="row m-b-20">
-                                                                <div class="col">
-                                                                    <h5 class="all-caps">Reject Address Change Request</h5>
-                                                                    <div class="fs-11">Are you sure you want to reject order delivery address change request?</div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="row">
-                                                                <div class="col p-r-5">
-                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
-                                                                </div>
-                                                                <div class="col p-l-5">
-                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveAddress(6)">Reject</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </modal-component>
-                                        <div class="col no-padding ml-auto">
-                                            <button class="btn btn-md btn-block btn-outline-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveAddress">
-                                                Approve
-                                            </button>
-                                        </div>
-                                        <modal-component small type="approveAddress">
-                                            <div class="row">
-                                                <div class="col text-center">
-                                                    <div class="row">
-                                                        <div class="col text-center">
-                                                            <div class="row m-b-20">
-                                                                <div class="col">
-                                                                    <h5 class="all-caps">Approve Address Change Request</h5>
-                                                                    <div class="fs-11">Are you sure you want to approve this order delivery address change request?</div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="row">
-                                                                <div class="col p-r-5">
-                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
-                                                                </div>
-                                                                <div class="col p-l-5">
-                                                                    <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveAddress(2)">Approve</div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </modal-component>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <!--<div class="row" v-show="!isLoading">-->
+                <!--<div class="col">-->
+                    <!--<div class="row align-items-center">-->
+                        <!--<div class="col p-t-10 p-b-10">-->
+                            <!--<div class="row">-->
+                                <!--<div class="col">-->
+                                    <!--<h5 class="text-primary no-margin"><a :href="route('order.show', item.owner.reference)">{{item.owner.reference}}</a></h5>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="row align-items-center">-->
+                                <!--<div class="col">-->
+                                    <!--<h6 class="no-margin"><a :href="route('customer.profile', item.owner.company_module.marking)">{{item.owner.company_module.marking}}</a></h6>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--<div class="row b-t b-grey">-->
+                        <!--<div class="col p-t-10">-->
+                            <!--<div class="row m-b-15">-->
+                                <!--<div class="col">-->
+                                    <!--<div class="row m-b-5">-->
+                                        <!--<div class="col">-->
+                                            <!--<div class="fs-8 all-caps muted">Original Address</div>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="row">-->
+                                        <!--<div class="col">-->
+                                            <!--<div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="row m-b-15">-->
+                                <!--<div class="col">-->
+                                    <!--<div class="row m-b-5">-->
+                                        <!--<div class="col">-->
+                                            <!--<div class="fs-8 all-caps muted">New Address</div>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="row">-->
+                                        <!--<div class="col">-->
+                                            <!--<div class="fs-11 bold">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</div>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="row m-t-20 parentContainer">-->
+                                <!--<div class="col">-->
+                                    <!--<div class="row">-->
+                                        <!--<div class="col no-padding">-->
+                                            <!--<button class="btn btn-md btn-block btn-outline-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectAddress">-->
+                                                <!--Reject-->
+                                            <!--</button>-->
+                                        <!--</div>-->
+                                        <!--<modal-component small type="rejectAddress">-->
+                                            <!--<div class="row">-->
+                                                <!--<div class="col text-center">-->
+                                                    <!--<div class="row">-->
+                                                        <!--<div class="col text-center">-->
+                                                            <!--<div class="row m-b-20">-->
+                                                                <!--<div class="col">-->
+                                                                    <!--<h5 class="all-caps">Reject Address Change Request</h5>-->
+                                                                    <!--<div class="fs-11">Are you sure you want to reject order delivery address change request?</div>-->
+                                                                <!--</div>-->
+                                                            <!--</div>-->
+                                                            <!--<div class="row">-->
+                                                                <!--<div class="col p-r-5">-->
+                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>-->
+                                                                <!--</div>-->
+                                                                <!--<div class="col p-l-5">-->
+                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveAddress(6)">Reject</div>-->
+                                                                <!--</div>-->
+                                                            <!--</div>-->
+                                                        <!--</div>-->
+                                                    <!--</div>-->
+                                                <!--</div>-->
+                                            <!--</div>-->
+                                        <!--</modal-component>-->
+                                        <!--<div class="col no-padding ml-auto">-->
+                                            <!--<button class="btn btn-md btn-block btn-outline-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveAddress">-->
+                                                <!--Approve-->
+                                            <!--</button>-->
+                                        <!--</div>-->
+                                        <!--<modal-component small type="approveAddress">-->
+                                            <!--<div class="row">-->
+                                                <!--<div class="col text-center">-->
+                                                    <!--<div class="row">-->
+                                                        <!--<div class="col text-center">-->
+                                                            <!--<div class="row m-b-20">-->
+                                                                <!--<div class="col">-->
+                                                                    <!--<h5 class="all-caps">Approve Address Change Request</h5>-->
+                                                                    <!--<div class="fs-11">Are you sure you want to approve this order delivery address change request?</div>-->
+                                                                <!--</div>-->
+                                                            <!--</div>-->
+                                                            <!--<div class="row">-->
+                                                                <!--<div class="col p-r-5">-->
+                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>-->
+                                                                <!--</div>-->
+                                                                <!--<div class="col p-l-5">-->
+                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveAddress(2)">Approve</div>-->
+                                                                <!--</div>-->
+                                                            <!--</div>-->
+                                                        <!--</div>-->
+                                                    <!--</div>-->
+                                                <!--</div>-->
+                                            <!--</div>-->
+                                        <!--</modal-component>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
         </div>
     </div>
 </template>

From b9794c8ff3ab16a784ab09dbd78ba19552ab0a7b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 23:07:24 +0800
Subject: [PATCH 57/98] round up cbm

---
 .../vue/components/containers/elements/ContainerComponent.vue   | 2 +-
 .../assets/vue/components/orders/elements/OrderComponent.vue    | 2 +-
 .../assets/vue/components/orders/elements/PackageComponent.vue  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index be480278..4ed82551 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -54,7 +54,7 @@
                                     <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="packingList in item.packing_lists">
                                         <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a>/<a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
                                         <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
-                                        <div class="col-1">{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
+                                        <div class="col-1">{{(Math.ceil((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
                                         <div class="col">{{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}}</div>
                                         <div class="col-auto" v-if="!packingList.transport">
diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index 907f3d73..c3104ca9 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -67,7 +67,7 @@
                         </div>
                         <div class="col-auto text-right">
                             <small class="fs-10 all-caps muted">Total CBM</small>
-                            <h6 class="no-margin semi-bold">{{(Math.round((item.origin_warehouse_packages.reduce((total, obj) => obj.cbm + total, 0) + item.in_transit_packages.reduce((total, obj) => obj.cbm + total, 0) + item.delivered_packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</h6>
+                            <h6 class="no-margin semi-bold">{{(Math.ceil((item.origin_warehouse_packages.reduce((total, obj) => obj.cbm + total, 0) + item.in_transit_packages.reduce((total, obj) => obj.cbm + total, 0) + item.delivered_packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</h6>
                         </div>
                     </div>
                 </div>
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index 35d9e52f..7fc433ce 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -36,7 +36,7 @@
                                         </div>
                                         <div class="col text-right p-t-10 p-b-10">
                                             <p class="no-margin all-caps fs-10 lh-15 light">Total CBM</p>
-                                            <h5 class="no-margin text-primary bold">{{parseFloat((item.cbm * 100) / 100).toFixed(3)}}</h5>
+                                            <h5 class="no-margin text-primary bold">{{(Math.ceil(parseFloat((item.cbm * 1000))) / 1000).toFixed(3)}}</h5>
                                         </div>
                                     </div>
                                 </div>

From bcffe4ef3eaa6ac74998afcff5ab8e25928b2ce3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 23:10:26 +0800
Subject: [PATCH 58/98] remove packing list database transactions

---
 .../Processors/FetchPackingListFromVTPortalProcessor.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index ecc9c9f0..65339691 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -53,7 +53,6 @@ class FetchPackingListFromVTPortalProcessor
         foreach($packingLists as $packingList){
 
             try {
-                DB::beginTransaction();
 
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
@@ -72,7 +71,6 @@ class FetchPackingListFromVTPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
-                DB::commit();
             } catch (GuzzleException $exception) {
                 continue;
             }

From 69180ef9376eb251f108ce2658370e278ad38a7d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 23:20:19 +0800
Subject: [PATCH 59/98] update delivery list for on hold goods

---
 .../Processors/FetchDeliveryListFromVTPortalProcessor.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index 14a13064..c8ec591d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -55,7 +55,7 @@ class FetchDeliveryListFromVTPortalProcessor
     public function execute(){
 
         try {
-            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('status', '=', ApprovalStatus::APPROVED)->get();
+            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->get();
 
             /** @var PackingList $packingList */
             foreach($packingLists as $packingList){
@@ -71,6 +71,11 @@ class FetchDeliveryListFromVTPortalProcessor
                             continue;
                         }
 
+                        if($packingList->status === ApprovalStatus::SUSPENDED){
+                            $packingList->status = ApprovalStatus::APPROVED;
+                            $packingList->save();
+                        }
+
                         $deliveryDate = Carbon::parse($shippingPackingList[9] ? $shippingPackingList[9]:$shippingPackingList[10]);
                         $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
                         /** @var Transport $transport */

From 00c9fbfdca15313d4b689806f7e0e9df51b5d507 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 23:48:35 +0800
Subject: [PATCH 60/98] add db transactions back to packing lists

---
 .../Processors/FetchPackingListFromVTPortalProcessor.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 65339691..ecc9c9f0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -53,6 +53,7 @@ class FetchPackingListFromVTPortalProcessor
         foreach($packingLists as $packingList){
 
             try {
+                DB::beginTransaction();
 
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
@@ -71,6 +72,7 @@ class FetchPackingListFromVTPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
+                DB::commit();
             } catch (GuzzleException $exception) {
                 continue;
             }

From a5c652ef91f3c97d707a282ba1579da405513e53 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 23:55:20 +0800
Subject: [PATCH 61/98] fix address resource loop

---
 app/Http/Resources/AddressResource.php        |  11 +
 app/Http/Resources/OrderResource.php          | 115 ++++-----
 .../elements/AddressVerificationComponent.vue | 228 +++++++++---------
 3 files changed, 185 insertions(+), 169 deletions(-)

diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index 4c6b8a39..6f6a6237 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\Order;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -15,6 +16,7 @@ class AddressResource extends JsonResource
      */
     public function toArray($request)
     {
+
         return [
             'id' => $this->id,
             'reference' => $this->reference,
@@ -25,6 +27,15 @@ class AddressResource extends JsonResource
             'post_code' => $this->postcode,
             'country' => $this->country,
             'default' => (int) $this->default,
+            'status' => (int) $this->status,
+            $this->mergeWhen($this->relationLoaded('owner'), [
+                'owner' => $this->when($this->owner instanceof Order, [
+                    'reference' => $this->owner->reference,
+                    'company_module' => new CompanyModuleResource($this->owner->companyModule),
+                    'address' => new AddressResource($this->owner->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first())
+                ])
+            ])
+
         ];
     }
 }
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 390ca1ef..e3a66981 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -19,66 +19,71 @@ class OrderResource extends JsonResource
      */
     public function toArray($request)
     {
-        return [
-            'id' => $this->id,
-            'reference' => $this->reference,
-            'reference_contract' => (int) $this->type,
-            'type' => (int) $this->type,
-            'status' => (int) $this->status,
-            'company_module' => new CompanyModuleResource($this->companyModule),
-            'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
-            'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
-            'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
-            $this->mergeWhen($this->relationLoaded('parcels'), [
-                'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
-                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('containers', function($query) {
-                        return $query->whereHas('transports', function($query){
-                            return $query->whereHas('schedules', function($query){
+        try {
+            return [
+                'id' => $this->id,
+                'reference' => $this->reference,
+                'reference_contract' => (int) $this->type,
+                'type' => (int) $this->type,
+                'status' => (int) $this->status,
+                'company_module' => new CompanyModuleResource($this->companyModule),
+                'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
+                'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
+                'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
+                $this->mergeWhen($this->relationLoaded('parcels'), [
+                    'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                        return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('containers', function($query) {
+                            return $query->whereHas('transports', function($query){
+                                return $query->whereHas('schedules', function($query){
+                                    return $query->where('etd', '<', Carbon::now());
+                                });
+                            });
+                        });
+                    })->get()),
+                    'in_transit_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                        return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
+                            return $query->whereHas('transports', function($query){
+                                return $query->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
+                                    return $query->where('etd', '<', Carbon::now());
+                                });
+                            });
+                        });
+                    })->get()),
+                    'destination_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                        return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
+                            return $query->whereHas('transports', function($query){
+                                return $query->where('type', '=', TransportType::SEA)->where('status', '=', ApprovalStatus::COMPLETED)->whereHas('schedules', function($query){
+                                    return $query->where('etd', '<', Carbon::now());
+                                });
+                            });
+                        })->whereDoesntHave('transports', function($query){
+                            return $query->where('type', '=', TransportType::LAND)->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
                                 return $query->where('etd', '<', Carbon::now());
                             });
                         });
-                    });
-                })->get()),
-                'in_transit_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
-                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
-                        return $query->whereHas('transports', function($query){
-                            return $query->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
+                    })->get()),
+                    'delivered_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                        return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
+                            return $query->whereHas('transports', function($query){
+                                return $query->where('type', '=', TransportType::SEA)->where('status', '=', ApprovalStatus::COMPLETED)->whereHas('schedules', function($query){
+                                    return $query->where('etd', '<', Carbon::now());
+                                });
+                            });
+                        })->whereHas('transports', function($query){
+                            return $query->where('type', '=', TransportType::LAND)->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
                                 return $query->where('etd', '<', Carbon::now());
                             });
                         });
-                    });
-                })->get()),
-                'destination_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
-                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
-                        return $query->whereHas('transports', function($query){
-                            return $query->where('type', '=', TransportType::SEA)->where('status', '=', ApprovalStatus::COMPLETED)->whereHas('schedules', function($query){
-                                return $query->where('etd', '<', Carbon::now());
-                            });
-                        });
-                    })->whereDoesntHave('transports', function($query){
-                        return $query->where('type', '=', TransportType::LAND)->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
-                            return $query->where('etd', '<', Carbon::now());
-                        });
-                    });
-                })->get()),
-                'delivered_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
-                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
-                        return $query->whereHas('transports', function($query){
-                            return $query->where('type', '=', TransportType::SEA)->where('status', '=', ApprovalStatus::COMPLETED)->whereHas('schedules', function($query){
-                                return $query->where('etd', '<', Carbon::now());
-                            });
-                        });
-                    })->whereHas('transports', function($query){
-                        return $query->where('type', '=', TransportType::LAND)->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
-                            return $query->where('etd', '<', Carbon::now());
-                        });
-                    });
-                })->get()),
-                'parcels' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
-                    return $query->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST);
-                })->get()),
-            ]),
-            'created_at' => $this->created_at->format('d-m-Y')
-        ];
+                    })->get()),
+                    'parcels' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                        return $query->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST);
+                    })->get()),
+                ]),
+                'created_at' => $this->created_at->format('d-m-Y')
+            ];
+        } catch (\Exception $exception){
+            $this->id;
+        }
+
     }
 }
diff --git a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
index ab58d626..5c5e1cbe 100644
--- a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
+++ b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
@@ -2,120 +2,120 @@
     <div class="row m-b-10 bg-master-lightest">
         <div class="col">
             <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
-            <!--<div class="row" v-show="!isLoading">-->
-                <!--<div class="col">-->
-                    <!--<div class="row align-items-center">-->
-                        <!--<div class="col p-t-10 p-b-10">-->
-                            <!--<div class="row">-->
-                                <!--<div class="col">-->
-                                    <!--<h5 class="text-primary no-margin"><a :href="route('order.show', item.owner.reference)">{{item.owner.reference}}</a></h5>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div class="row align-items-center">-->
-                                <!--<div class="col">-->
-                                    <!--<h6 class="no-margin"><a :href="route('customer.profile', item.owner.company_module.marking)">{{item.owner.company_module.marking}}</a></h6>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</div>-->
-                    <!--</div>-->
-                    <!--<div class="row b-t b-grey">-->
-                        <!--<div class="col p-t-10">-->
-                            <!--<div class="row m-b-15">-->
-                                <!--<div class="col">-->
-                                    <!--<div class="row m-b-5">-->
-                                        <!--<div class="col">-->
-                                            <!--<div class="fs-8 all-caps muted">Original Address</div>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                    <!--<div class="row">-->
-                                        <!--<div class="col">-->
-                                            <!--<div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div class="row m-b-15">-->
-                                <!--<div class="col">-->
-                                    <!--<div class="row m-b-5">-->
-                                        <!--<div class="col">-->
-                                            <!--<div class="fs-8 all-caps muted">New Address</div>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                    <!--<div class="row">-->
-                                        <!--<div class="col">-->
-                                            <!--<div class="fs-11 bold">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</div>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div class="row m-t-20 parentContainer">-->
-                                <!--<div class="col">-->
-                                    <!--<div class="row">-->
-                                        <!--<div class="col no-padding">-->
-                                            <!--<button class="btn btn-md btn-block btn-outline-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectAddress">-->
-                                                <!--Reject-->
-                                            <!--</button>-->
-                                        <!--</div>-->
-                                        <!--<modal-component small type="rejectAddress">-->
-                                            <!--<div class="row">-->
-                                                <!--<div class="col text-center">-->
-                                                    <!--<div class="row">-->
-                                                        <!--<div class="col text-center">-->
-                                                            <!--<div class="row m-b-20">-->
-                                                                <!--<div class="col">-->
-                                                                    <!--<h5 class="all-caps">Reject Address Change Request</h5>-->
-                                                                    <!--<div class="fs-11">Are you sure you want to reject order delivery address change request?</div>-->
-                                                                <!--</div>-->
-                                                            <!--</div>-->
-                                                            <!--<div class="row">-->
-                                                                <!--<div class="col p-r-5">-->
-                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>-->
-                                                                <!--</div>-->
-                                                                <!--<div class="col p-l-5">-->
-                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveAddress(6)">Reject</div>-->
-                                                                <!--</div>-->
-                                                            <!--</div>-->
-                                                        <!--</div>-->
-                                                    <!--</div>-->
-                                                <!--</div>-->
-                                            <!--</div>-->
-                                        <!--</modal-component>-->
-                                        <!--<div class="col no-padding ml-auto">-->
-                                            <!--<button class="btn btn-md btn-block btn-outline-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveAddress">-->
-                                                <!--Approve-->
-                                            <!--</button>-->
-                                        <!--</div>-->
-                                        <!--<modal-component small type="approveAddress">-->
-                                            <!--<div class="row">-->
-                                                <!--<div class="col text-center">-->
-                                                    <!--<div class="row">-->
-                                                        <!--<div class="col text-center">-->
-                                                            <!--<div class="row m-b-20">-->
-                                                                <!--<div class="col">-->
-                                                                    <!--<h5 class="all-caps">Approve Address Change Request</h5>-->
-                                                                    <!--<div class="fs-11">Are you sure you want to approve this order delivery address change request?</div>-->
-                                                                <!--</div>-->
-                                                            <!--</div>-->
-                                                            <!--<div class="row">-->
-                                                                <!--<div class="col p-r-5">-->
-                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>-->
-                                                                <!--</div>-->
-                                                                <!--<div class="col p-l-5">-->
-                                                                    <!--<div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveAddress(2)">Approve</div>-->
-                                                                <!--</div>-->
-                                                            <!--</div>-->
-                                                        <!--</div>-->
-                                                    <!--</div>-->
-                                                <!--</div>-->
-                                            <!--</div>-->
-                                        <!--</modal-component>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</div>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
+            <div class="row" v-show="!isLoading">
+                <div class="col">
+                    <div class="row align-items-center">
+                        <div class="col p-t-10 p-b-10">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="text-primary no-margin"><a :href="route('order.show', item.owner.reference)">{{item.owner.reference}}</a></h5>
+                                </div>
+                            </div>
+                            <div class="row align-items-center">
+                                <div class="col">
+                                    <h6 class="no-margin"><a :href="route('customer.profile', item.owner.company_module.marking)">{{item.owner.company_module.marking}}</a></h6>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row b-t b-grey">
+                        <div class="col p-t-10">
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">Original Address</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">New Address</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 bold">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-20 parentContainer">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col no-padding">
+                                            <button class="btn btn-md btn-block btn-outline-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectAddress">
+                                                Reject
+                                            </button>
+                                        </div>
+                                        <modal-component small type="rejectAddress">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Reject Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to reject order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveAddress(6)">Reject</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                        <div class="col no-padding ml-auto">
+                                            <button class="btn btn-md btn-block btn-outline-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveAddress">
+                                                Approve
+                                            </button>
+                                        </div>
+                                        <modal-component small type="approveAddress">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Approve Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to approve this order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveAddress(2)">Approve</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>

From 335a9f845ee4ae50e12b285dc68a630cd10235f8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 11 Sep 2021 00:09:02 +0800
Subject: [PATCH 62/98] limit delivery list to first 50

---
 .../Processors/FetchDeliveryListFromVTPortalProcessor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index c8ec591d..7e7f7240 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -55,7 +55,7 @@ class FetchDeliveryListFromVTPortalProcessor
     public function execute(){
 
         try {
-            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->get();
+            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->limit(50)->get();
 
             /** @var PackingList $packingList */
             foreach($packingLists as $packingList){

From e43f7e2880c3c91b9f7f62aaeb93f2894c7972a2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 11 Sep 2021 00:39:39 +0800
Subject: [PATCH 63/98] update packing list to complete after delivery updated

---
 .../Processors/FetchDeliveryListFromVTPortalProcessor.php   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index 7e7f7240..d605ee07 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -71,10 +71,8 @@ class FetchDeliveryListFromVTPortalProcessor
                             continue;
                         }
 
-                        if($packingList->status === ApprovalStatus::SUSPENDED){
-                            $packingList->status = ApprovalStatus::APPROVED;
-                            $packingList->save();
-                        }
+                        $packingList->status = ApprovalStatus::COMPLETED;
+                        $packingList->save();
 
                         $deliveryDate = Carbon::parse($shippingPackingList[9] ? $shippingPackingList[9]:$shippingPackingList[10]);
                         $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);

From 2d1ec679eb4e2b4826b43274204f9dcb4e2a8c82 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 11 Sep 2021 01:14:32 +0800
Subject: [PATCH 64/98] fix delivery list job

---
 ...FetchDeliveryListFromVTPortalProcessor.php | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index d605ee07..fbab0c5b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -55,7 +55,7 @@ class FetchDeliveryListFromVTPortalProcessor
     public function execute(){
 
         try {
-            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->limit(50)->get();
+            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->get();
 
             /** @var PackingList $packingList */
             foreach($packingLists as $packingList){
@@ -66,28 +66,26 @@ class FetchDeliveryListFromVTPortalProcessor
 
                     $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
-                    foreach($shippingPackingLists->Rows as $shippingPackingList){
-                        if(!$shippingPackingList[9] && !$shippingPackingList[10]) {
-                            continue;
-                        }
-
-                        $packingList->status = ApprovalStatus::COMPLETED;
-                        $packingList->save();
-
-                        $deliveryDate = Carbon::parse($shippingPackingList[9] ? $shippingPackingList[9]:$shippingPackingList[10]);
-                        $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
-                        /** @var Transport $transport */
-                        $transport = $this->createsTransport->execute($transportObject, $packingList);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
-
-                        $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
-                        $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                        $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
-                        $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
-
+                    $shippingPackingList = $shippingPackingLists->Rows[0];
 
+                    if(!$shippingPackingList[9] && !$shippingPackingList[10]) {
+                        continue;
                     }
 
+                    $packingList->status = ApprovalStatus::COMPLETED;
+                    $packingList->save();
+
+                    $deliveryDate = Carbon::parse($shippingPackingList[9] ? $shippingPackingList[9]:$shippingPackingList[10]);
+                    $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
+                    /** @var Transport $transport */
+                    $transport = $this->createsTransport->execute($transportObject, $packingList);
+                    $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+
+                    $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                    $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                    $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+
                 } catch (GuzzleException $exception) {
                     continue;
                 }

From 18b19fd90abaf8c181ca4825119bbf86e3e28ef3 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Sat, 11 Sep 2021 17:26:02 +0800
Subject: [PATCH 65/98] Join table from frontend

---
 .../General/Eloquent/AbstractGetRecord.php    | 18 +++++++++--
 .../General/Eloquent/AbstractListRecord.php   | 31 +++++++++++++++++--
 .../orders/elements/ParcelComponent.vue       |  2 +-
 .../views/pages/warehouse_list.blade.php      |  4 +--
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/app/Classes/General/Eloquent/AbstractGetRecord.php b/app/Classes/General/Eloquent/AbstractGetRecord.php
index f927d818..e2972eb0 100644
--- a/app/Classes/General/Eloquent/AbstractGetRecord.php
+++ b/app/Classes/General/Eloquent/AbstractGetRecord.php
@@ -12,6 +12,8 @@ abstract class AbstractGetRecord
     /** @var array  */
     private const DECORATION_FILTERS = ['per_page', 'order_by'];
 
+    private const JOIN_FILTERS = ['joins'];
+
     /** @var Collection */
     private $filters;
 
@@ -20,7 +22,7 @@ abstract class AbstractGetRecord
      * @return Collection
      */
     private function getQueryFilters(){
-        return $this->filters->except(self::DECORATION_FILTERS);
+        return $this->filters->except(array_merge(self::DECORATION_FILTERS, self::JOIN_FILTERS));
     }
 
     /**
@@ -30,6 +32,10 @@ abstract class AbstractGetRecord
         return $this->filters->only(self::DECORATION_FILTERS);
     }
 
+    public function getJoinFilters(){
+        return $this->filters->only(self::JOIN_FILTERS);
+    }
+
     /**
      * @param null|string $json
      * @return array
@@ -43,7 +49,13 @@ abstract class AbstractGetRecord
      */
     private function applyFiltersToQuery(): Builder
     {
-        return (new ApplyFiltersToQuery())->execute($this->getRepository(), $this->getQueryFilters()->toArray());
+        $table = $this->getRepository()->getModel()->getTable();
+        $a = $this->getQueryFilters()->toArray();
+        $r=[];
+
+        array_walk($a, function ($v, $k) use ($table, &$r) { $r[$table.".".$k]=$v; });
+
+        return (new ApplyFiltersToQuery())->execute($this->getRepository(), $r);
     }
 
     /**
@@ -67,4 +79,4 @@ abstract class AbstractGetRecord
      */
     abstract function getResults(Builder $query);
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/General/Eloquent/AbstractListRecord.php b/app/Classes/General/Eloquent/AbstractListRecord.php
index c5d2e6e6..830dad3c 100644
--- a/app/Classes/General/Eloquent/AbstractListRecord.php
+++ b/app/Classes/General/Eloquent/AbstractListRecord.php
@@ -6,6 +6,7 @@ namespace App\Classes\General\Eloquent;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Schema;
 
 abstract class AbstractListRecord extends AbstractGetRecord
 {
@@ -33,14 +34,40 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      */
     public function getResults(Builder $query) {
+
+        $filters = $this->getJoinFilters();
+        $table = $query->getModel()->getTable();
+        $selects = [];
+
+        $selects[] = $table.".*,";
+
+        if($filters->has('joins')){
+
+            foreach($filters->get('joins') as $join){
+                $join_table = $join->table;
+                $columns = Schema::getColumnListing($join_table);
+
+                $r=[];
+                array_walk($columns, function ($v, $k) use ($join_table, &$r) { $r[] = $join_table.".".$v." ".$join_table."_".$v; });
+                $selects[] = implode(",",$r);
+
+                $query = $query->join($join->table, function($q) use($join, $query) {
+                    $q->on($query->getModel()->getTable().'.id', '=', $join->table.'.owner_id');
+                });
+            };
+
+            $query = $query->selectRaw(implode("",$selects));
+        }
+
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
-            $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
+            $orderByTable = (strpos($filters->get('order_by')->column,".")===false) ? $query->getModel()->getTable()."." : "";
+            $query = $query->orderBy($orderByTable.$filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
         return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 17e29d63..44303afb 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -93,4 +93,4 @@
         },
         mixins: [componentHandler]
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index a57fc834..6f6ad64f 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -2,11 +2,11 @@
 @section('inner_content')
     <div class="row">
         <div class="col-7">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: true}}">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'transport_arrangements.drop_date', DESC: true}, joins: [{table: 'transport_arrangements'}]}">
                 <template slot="list" slot-scope="{data}">
                     <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
                 </template>
             </list-component>
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection

From a203c5bf123269f61c62ba85425b2e7ce967ef78 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Sun, 12 Sep 2021 12:46:26 +0800
Subject: [PATCH 66/98] Add timer, moved schedule to commands

---
 ...inersStatusUpdateFromVTPortalProcessor.php | 19 ++++++-
 ...FetchDeliveryListFromVTPortalProcessor.php | 19 ++++++-
 ...hLoadedContainersFromVTPortalProcessor.php | 23 +++++++-
 .../FetchPackingListFromVTPortalProcessor.php | 20 +++++++
 ...ehouseReceiveListFromVTPortalProcessor.php | 23 +++++++-
 app/Console/Commands/CurlVTCommand.php        | 57 +++++++++++++++++++
 app/Console/Kernel.php                        | 31 +++-------
 ...2021_09_12_124121_alter_table_packages.php | 30 ++++++++++
 8 files changed, 194 insertions(+), 28 deletions(-)
 create mode 100644 app/Console/Commands/CurlVTCommand.php
 create mode 100644 database/migrations/2021_09_12_124121_alter_table_packages.php

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index 0a0c0158..1a2ab2f1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -68,6 +68,10 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
      */
     public function execute(){
 
+        $time_start = microtime(true);
+        $task_name = "FetchContainersStatusUpdateFromVTPortalProcessor";
+        self::timer($task_name, $time_start);
+
         try {
             $containers = Container::where('status', '=', ApprovalStatus::PENDING_VERIFICATION)->get();
 
@@ -147,9 +151,22 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
             Log::error($exception);
         }
 
+        $time_end = microtime(true);
+        self::timer($task_name, $time_start, $time_end);
+
         return [];
 
     }
 
-
+    private static function timer($task="", $time_start=0, $time_end=0){
+        if ($time_end > 0) {
+            $execution_time = ($time_end - $time_start)/60;
+            $execution_time = round($execution_time,2);
+            $date = date("Y-m-d H:i a", $time_end);
+            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
+        } else {
+            $date = date("Y-m-d H:i a", $time_start);
+            echo "$task starts at $date". PHP_EOL;
+        }
+    }
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index fbab0c5b..98aadfbd 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -54,6 +54,10 @@ class FetchDeliveryListFromVTPortalProcessor
      */
     public function execute(){
 
+        $time_start = microtime(true);
+        $task_name = "FetchDeliveryListFromVTPortalProcessor";
+        self::timer($task_name, $time_start);
+
         try {
             $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->get();
 
@@ -95,9 +99,22 @@ class FetchDeliveryListFromVTPortalProcessor
             Log::error($exception);
         }
 
+        $time_end = microtime(true);
+        self::timer($task_name, $time_start, $time_end);
+
         return [];
 
     }
 
-
+    private static function timer($task="", $time_start=0, $time_end=0){
+        if ($time_end > 0) {
+            $execution_time = ($time_end - $time_start)/60;
+            $execution_time = round($execution_time,2);
+            $date = date("Y-m-d H:i a", $time_end);
+            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
+        } else {
+            $date = date("Y-m-d H:i a", $time_start);
+            echo "$task starts at $date". PHP_EOL;
+        }
+    }
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 4069a40d..e3313f48 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -124,7 +124,12 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
+        $time_start = microtime(true);
+        $task_name = "FetchLoadedContainersFromVTPortalProcessor";
+        self::timer($task_name, $time_start);
+
         DB::beginTransaction();
+
         try {
             $start = $start ? $start : Carbon::now()->subMonth();
 
@@ -217,17 +222,29 @@ class FetchLoadedContainersFromVTPortalProcessor
                     }
 
                 }
-
             }
         } catch (\Exception $exception){
             Log::error($exception);
         }
 
-
         DB::commit();
+
+        $time_end = microtime(true);
+        self::timer($task_name, $time_start, $time_end);
+
         return [];
 
     }
 
-
+    private static function timer($task="", $time_start=0, $time_end=0){
+        if ($time_end > 0) {
+            $execution_time = ($time_end - $time_start)/60;
+            $execution_time = round($execution_time,2);
+            $date = date("Y-m-d H:i a", $time_end);
+            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
+        } else {
+            $date = date("Y-m-d H:i a", $time_start);
+            echo "$task starts at $date". PHP_EOL;
+        }
+    }
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index ecc9c9f0..d9b61644 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,6 +46,10 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
+        $time_start = microtime(true);
+        $task_name = "FetchPackingListFromVTPortalProcessor";
+        self::timer($task_name, $time_start);
+
         $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
             $query->where('status', '=', ApprovalStatus::COMPLETED);
         })->get();
@@ -79,9 +83,25 @@ class FetchPackingListFromVTPortalProcessor
 
         }
 
+        $time_end = microtime(true);
+        self::timer($task_name, $time_start, $time_end);
+
         return [];
 
     }
 
+    private static function timer($task="", $time_start=0, $time_end=0){
+        if ($time_end > 0) {
+            $execution_time = ($time_end - $time_start)/60;
+            $execution_time = round($execution_time,2);
+            $date = date("Y-m-d H:i a", $time_end);
+            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
+        } else {
+            $date = date("Y-m-d H:i a", $time_start);
+            echo "$task starts at $date". PHP_EOL;
+        }
+    }
 
 }
+
+
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index b9043479..6756dd2e 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -112,6 +112,10 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
+        $time_start = microtime(true);
+        $task_name = "FetchWarehouseReceiveListFromVTPortalProcessor";
+        self::timer($task_name, $time_start);
+
         DB::beginTransaction();
 
         try {
@@ -132,6 +136,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
+            $time_elapsed_secs = microtime(true) - $timer;
+            echo 'Time '.$timer. PHP_EOL;
+
             foreach ($response->Rows as $parcel){
 
                 $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
@@ -233,9 +240,23 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
         }
 
         DB::commit();
+
+        $time_end = microtime(true);
+        self::timer($task_name, $time_start, $time_end);
+
         return [];
 
     }
 
-
+    private static function timer($task="", $time_start=0, $time_end=0){
+        if ($time_end > 0) {
+            $execution_time = ($time_end - $time_start)/60;
+            $execution_time = round($execution_time,2);
+            $date = date("Y-m-d H:i a", $time_end);
+            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
+        } else {
+            $date = date("Y-m-d H:i a", $time_start);
+            echo "$task starts at $date". PHP_EOL;
+        }
+    }
 }
diff --git a/app/Console/Commands/CurlVTCommand.php b/app/Console/Commands/CurlVTCommand.php
new file mode 100644
index 00000000..e779cd5c
--- /dev/null
+++ b/app/Console/Commands/CurlVTCommand.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\State;
+use App\Http\Helpers\General;
+
+use Illuminate\Console\Command;
+use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
+use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
+use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
+use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
+use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
+
+class CurlVTCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+
+    protected $signature = 'command:curlVTCommand';
+    // php artisan queue:work
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            new FetchLoadedContainersFromVTPortalJob,
+            new FetchPackingListFromVTPortalJob,
+            new FetchContainersStatusUpdateFromVTPortalJob,
+            new FetchDeliveryListFromVTPortalJob
+        ])->dispatch();
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 623233c2..b9aad421 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -17,9 +17,7 @@ class Kernel extends ConsoleKernel
      *
      * @var array
      */
-    protected $commands = [
-        //
-    ];
+    protected $commands = [];
 
     /**
      * Define the application's command schedule.
@@ -29,26 +27,15 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
+        $schedule->command('command:curlVTCommand')
+            ->everyMinute()//dailyAt('15:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
-        $schedule->call(function(){
-            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
-                new FetchLoadedContainersFromVTPortalJob,
-                new FetchPackingListFromVTPortalJob,
-                new FetchContainersStatusUpdateFromVTPortalJob,
-                new FetchDeliveryListFromVTPortalJob
-            ])->dispatch();
-        })->dailyAt('15:00');
-
-        $schedule->call(function(){
-            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
-                new FetchLoadedContainersFromVTPortalJob,
-                new FetchPackingListFromVTPortalJob,
-                new FetchContainersStatusUpdateFromVTPortalJob,
-                new FetchDeliveryListFromVTPortalJob
-            ])->dispatch();
-        })->dailyAt('21:00');
-
-
+        $schedule->command('command:curlVTCommand')
+            ->dailyAt('21:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');
     }
 
     /**
diff --git a/database/migrations/2021_09_12_124121_alter_table_packages.php b/database/migrations/2021_09_12_124121_alter_table_packages.php
new file mode 100644
index 00000000..f0c4c311
--- /dev/null
+++ b/database/migrations/2021_09_12_124121_alter_table_packages.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlterTablePackages extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('packages', function (Blueprint $table) {
+            $table->text('description')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

From e80dbf4b49965e25a64d5373d0a94ac38aa0dda7 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Sun, 12 Sep 2021 12:48:28 +0800
Subject: [PATCH 67/98] Add timer, moved schedule to commands

---
 app/Console/Kernel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index b9aad421..2e082565 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -28,7 +28,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('command:curlVTCommand')
-            ->everyMinute()//dailyAt('15:00')
+            ->dailyAt('15:00')
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
 

From 0884bcf47aaa40ef1030c94d518d490902fcd652 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 12 Sep 2021 17:12:59 +0800
Subject: [PATCH 68/98] fix long reload issue for container on packing list
 status update

---
 .../elements/ContainerComponent.vue           | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index 4ed82551..75b5305c 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -51,15 +51,15 @@
                         <div class="col">
                             <div class="row">
                                 <div class="col">
-                                    <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="packingList in item.packing_lists">
+                                    <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="(packingList, index) in item.packing_lists">
                                         <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a>/<a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
                                         <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
                                         <div class="col-1">{{(Math.ceil((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
                                         <div class="col">{{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}}</div>
                                         <div class="col-auto" v-if="!packingList.transport">
-                                            <div class="btn btn-xs btn-success pointer" v-if="packingList.status === 5" @click="submit(route('api.packing_list.status.update', packingList.id, item.status === 1 ? 1 : 2), 'put', 'containerListSection', true, true)"><i class="fa fa-check m-r-5"></i>Release</div>
-                                            <div class="btn btn-xs btn-danger pointer" v-if="packingList.status !== 5" @click="submit(route('api.packing_list.status.update', packingList.id, 5), 'put', 'containerListSection', true, true)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
+                                            <div class="btn btn-xs btn-success pointer" v-if="packingList.status === 5" @click="updateStatus(index, item.status === 1 ? 1 : 2)"><i class="fa fa-check m-r-5"></i>Release</div>
+                                            <div class="btn btn-xs btn-danger pointer" v-if="packingList.status !== 5" @click="updateStatus(index, 5)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
                                         </div>
                                     </div>
                                 </div>
@@ -76,12 +76,22 @@
     export default {
         data(){
             return {
-                expanded: false
+                expanded: false,
+                index: null,
             }
         },
         methods: {
-            successHandler(){
-                this.$store.dispatch('reloadList', {'name': 'containerListSection'});
+            updateStatus(index, status){
+                this.index = index;
+                this.submit(this.route('api.packing_list.status.update', this.item.packing_lists[index].id, status), 'put', 'containerListSection', true, true)
+            },
+            successHandler(response){
+                this.item.packing_lists[this.index] = response.payload.data;
+                this.$forceUpdate();
+                this.index = null;
+            },
+            errorHandler(){
+                this.index = null;
             }
         },
         mixins: [componentHandler]

From a7c6c29c259fbcf3952c62071374e6c4fdda5f3b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 14 Sep 2021 12:15:17 +0800
Subject: [PATCH 69/98] delete packages change migration

---
 ...2021_09_12_124121_alter_table_packages.php | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 database/migrations/2021_09_12_124121_alter_table_packages.php

diff --git a/database/migrations/2021_09_12_124121_alter_table_packages.php b/database/migrations/2021_09_12_124121_alter_table_packages.php
deleted file mode 100644
index f0c4c311..00000000
--- a/database/migrations/2021_09_12_124121_alter_table_packages.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AlterTablePackages extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('packages', function (Blueprint $table) {
-            $table->text('description')->change();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-    }
-}

From 41554be892ddec5da3189d6d1a07f6cfc6e71fc7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 14 Sep 2021 12:32:18 +0800
Subject: [PATCH 70/98] revert changes for join table

---
 .../General/Eloquent/AbstractGetRecord.php    | 18 ++----------
 .../General/Eloquent/AbstractListRecord.php   | 29 +------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/app/Classes/General/Eloquent/AbstractGetRecord.php b/app/Classes/General/Eloquent/AbstractGetRecord.php
index e2972eb0..f927d818 100644
--- a/app/Classes/General/Eloquent/AbstractGetRecord.php
+++ b/app/Classes/General/Eloquent/AbstractGetRecord.php
@@ -12,8 +12,6 @@ abstract class AbstractGetRecord
     /** @var array  */
     private const DECORATION_FILTERS = ['per_page', 'order_by'];
 
-    private const JOIN_FILTERS = ['joins'];
-
     /** @var Collection */
     private $filters;
 
@@ -22,7 +20,7 @@ abstract class AbstractGetRecord
      * @return Collection
      */
     private function getQueryFilters(){
-        return $this->filters->except(array_merge(self::DECORATION_FILTERS, self::JOIN_FILTERS));
+        return $this->filters->except(self::DECORATION_FILTERS);
     }
 
     /**
@@ -32,10 +30,6 @@ abstract class AbstractGetRecord
         return $this->filters->only(self::DECORATION_FILTERS);
     }
 
-    public function getJoinFilters(){
-        return $this->filters->only(self::JOIN_FILTERS);
-    }
-
     /**
      * @param null|string $json
      * @return array
@@ -49,13 +43,7 @@ abstract class AbstractGetRecord
      */
     private function applyFiltersToQuery(): Builder
     {
-        $table = $this->getRepository()->getModel()->getTable();
-        $a = $this->getQueryFilters()->toArray();
-        $r=[];
-
-        array_walk($a, function ($v, $k) use ($table, &$r) { $r[$table.".".$k]=$v; });
-
-        return (new ApplyFiltersToQuery())->execute($this->getRepository(), $r);
+        return (new ApplyFiltersToQuery())->execute($this->getRepository(), $this->getQueryFilters()->toArray());
     }
 
     /**
@@ -79,4 +67,4 @@ abstract class AbstractGetRecord
      */
     abstract function getResults(Builder $query);
 
-}
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/AbstractListRecord.php b/app/Classes/General/Eloquent/AbstractListRecord.php
index 830dad3c..01e66c29 100644
--- a/app/Classes/General/Eloquent/AbstractListRecord.php
+++ b/app/Classes/General/Eloquent/AbstractListRecord.php
@@ -6,7 +6,6 @@ namespace App\Classes\General\Eloquent;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\QueryException;
-use Illuminate\Support\Facades\Schema;
 
 abstract class AbstractListRecord extends AbstractGetRecord
 {
@@ -34,36 +33,10 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      */
     public function getResults(Builder $query) {
-
-        $filters = $this->getJoinFilters();
-        $table = $query->getModel()->getTable();
-        $selects = [];
-
-        $selects[] = $table.".*,";
-
-        if($filters->has('joins')){
-
-            foreach($filters->get('joins') as $join){
-                $join_table = $join->table;
-                $columns = Schema::getColumnListing($join_table);
-
-                $r=[];
-                array_walk($columns, function ($v, $k) use ($join_table, &$r) { $r[] = $join_table.".".$v." ".$join_table."_".$v; });
-                $selects[] = implode(",",$r);
-
-                $query = $query->join($join->table, function($q) use($join, $query) {
-                    $q->on($query->getModel()->getTable().'.id', '=', $join->table.'.owner_id');
-                });
-            };
-
-            $query = $query->selectRaw(implode("",$selects));
-        }
-
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
-            $orderByTable = (strpos($filters->get('order_by')->column,".")===false) ? $query->getModel()->getTable()."." : "";
-            $query = $query->orderBy($orderByTable.$filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
+            $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
         return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();

From 3e23fa680954e6422ef7568f0f4a45ae02880846 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 14 Sep 2021 12:40:37 +0800
Subject: [PATCH 71/98] revert changes for join table

---
 resources/views/pages/warehouse_list.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 6f6ad64f..a57fc834 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -2,11 +2,11 @@
 @section('inner_content')
     <div class="row">
         <div class="col-7">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'transport_arrangements.drop_date', DESC: true}, joins: [{table: 'transport_arrangements'}]}">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: true}}">
                 <template slot="list" slot-scope="{data}">
                     <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
                 </template>
             </list-component>
         </div>
     </div>
-@endsection
+@endsection
\ No newline at end of file

From a3ecda8f8e6fefe5a70f9eb88e146b3bf15bc984 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 14 Sep 2021 17:26:33 +0800
Subject: [PATCH 72/98] round up cbm in container component

---
 .../vue/components/containers/elements/ContainerComponent.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index 75b5305c..e8af2c65 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -54,7 +54,7 @@
                                     <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="(packingList, index) in item.packing_lists">
                                         <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a>/<a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
                                         <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
-                                        <div class="col-1">{{(Math.ceil((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
+                                        <div class="col-1">{{ (Math.ceil((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 1000) / 1000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
                                         <div class="col">{{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}}</div>
                                         <div class="col-auto" v-if="!packingList.transport">

From 1f05c4b56f415b46c499827c738dd5887b979dee Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 15 Sep 2021 18:17:03 +0800
Subject: [PATCH 73/98] remove timer from vt fetch jobs

---
 ...inersStatusUpdateFromVTPortalProcessor.php | 19 +--------------
 ...FetchDeliveryListFromVTPortalProcessor.php | 19 +--------------
 ...hLoadedContainersFromVTPortalProcessor.php | 23 +++----------------
 .../FetchPackingListFromVTPortalProcessor.php | 20 ----------------
 ...ehouseReceiveListFromVTPortalProcessor.php | 23 +------------------
 5 files changed, 6 insertions(+), 98 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index 1a2ab2f1..0a0c0158 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -68,10 +68,6 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
      */
     public function execute(){
 
-        $time_start = microtime(true);
-        $task_name = "FetchContainersStatusUpdateFromVTPortalProcessor";
-        self::timer($task_name, $time_start);
-
         try {
             $containers = Container::where('status', '=', ApprovalStatus::PENDING_VERIFICATION)->get();
 
@@ -151,22 +147,9 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
             Log::error($exception);
         }
 
-        $time_end = microtime(true);
-        self::timer($task_name, $time_start, $time_end);
-
         return [];
 
     }
 
-    private static function timer($task="", $time_start=0, $time_end=0){
-        if ($time_end > 0) {
-            $execution_time = ($time_end - $time_start)/60;
-            $execution_time = round($execution_time,2);
-            $date = date("Y-m-d H:i a", $time_end);
-            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
-        } else {
-            $date = date("Y-m-d H:i a", $time_start);
-            echo "$task starts at $date". PHP_EOL;
-        }
-    }
+
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index 98aadfbd..fbab0c5b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -54,10 +54,6 @@ class FetchDeliveryListFromVTPortalProcessor
      */
     public function execute(){
 
-        $time_start = microtime(true);
-        $task_name = "FetchDeliveryListFromVTPortalProcessor";
-        self::timer($task_name, $time_start);
-
         try {
             $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->get();
 
@@ -99,22 +95,9 @@ class FetchDeliveryListFromVTPortalProcessor
             Log::error($exception);
         }
 
-        $time_end = microtime(true);
-        self::timer($task_name, $time_start, $time_end);
-
         return [];
 
     }
 
-    private static function timer($task="", $time_start=0, $time_end=0){
-        if ($time_end > 0) {
-            $execution_time = ($time_end - $time_start)/60;
-            $execution_time = round($execution_time,2);
-            $date = date("Y-m-d H:i a", $time_end);
-            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
-        } else {
-            $date = date("Y-m-d H:i a", $time_start);
-            echo "$task starts at $date". PHP_EOL;
-        }
-    }
+
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index e3313f48..4069a40d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -124,12 +124,7 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-        $time_start = microtime(true);
-        $task_name = "FetchLoadedContainersFromVTPortalProcessor";
-        self::timer($task_name, $time_start);
-
         DB::beginTransaction();
-
         try {
             $start = $start ? $start : Carbon::now()->subMonth();
 
@@ -222,29 +217,17 @@ class FetchLoadedContainersFromVTPortalProcessor
                     }
 
                 }
+
             }
         } catch (\Exception $exception){
             Log::error($exception);
         }
 
+
         DB::commit();
-
-        $time_end = microtime(true);
-        self::timer($task_name, $time_start, $time_end);
-
         return [];
 
     }
 
-    private static function timer($task="", $time_start=0, $time_end=0){
-        if ($time_end > 0) {
-            $execution_time = ($time_end - $time_start)/60;
-            $execution_time = round($execution_time,2);
-            $date = date("Y-m-d H:i a", $time_end);
-            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
-        } else {
-            $date = date("Y-m-d H:i a", $time_start);
-            echo "$task starts at $date". PHP_EOL;
-        }
-    }
+
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index d9b61644..ecc9c9f0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,10 +46,6 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $time_start = microtime(true);
-        $task_name = "FetchPackingListFromVTPortalProcessor";
-        self::timer($task_name, $time_start);
-
         $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
             $query->where('status', '=', ApprovalStatus::COMPLETED);
         })->get();
@@ -83,25 +79,9 @@ class FetchPackingListFromVTPortalProcessor
 
         }
 
-        $time_end = microtime(true);
-        self::timer($task_name, $time_start, $time_end);
-
         return [];
 
     }
 
-    private static function timer($task="", $time_start=0, $time_end=0){
-        if ($time_end > 0) {
-            $execution_time = ($time_end - $time_start)/60;
-            $execution_time = round($execution_time,2);
-            $date = date("Y-m-d H:i a", $time_end);
-            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
-        } else {
-            $date = date("Y-m-d H:i a", $time_start);
-            echo "$task starts at $date". PHP_EOL;
-        }
-    }
 
 }
-
-
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 6756dd2e..b9043479 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -112,10 +112,6 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-        $time_start = microtime(true);
-        $task_name = "FetchWarehouseReceiveListFromVTPortalProcessor";
-        self::timer($task_name, $time_start);
-
         DB::beginTransaction();
 
         try {
@@ -136,9 +132,6 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
-            $time_elapsed_secs = microtime(true) - $timer;
-            echo 'Time '.$timer. PHP_EOL;
-
             foreach ($response->Rows as $parcel){
 
                 $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
@@ -240,23 +233,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
         }
 
         DB::commit();
-
-        $time_end = microtime(true);
-        self::timer($task_name, $time_start, $time_end);
-
         return [];
 
     }
 
-    private static function timer($task="", $time_start=0, $time_end=0){
-        if ($time_end > 0) {
-            $execution_time = ($time_end - $time_start)/60;
-            $execution_time = round($execution_time,2);
-            $date = date("Y-m-d H:i a", $time_end);
-            echo "$task ends at $date (took $execution_time minutes)". PHP_EOL;
-        } else {
-            $date = date("Y-m-d H:i a", $time_start);
-            echo "$task starts at $date". PHP_EOL;
-        }
-    }
+
 }

From 2be9a3dcfed75204e5f6f09be3e10060ff8314e3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 15 Sep 2021 18:26:54 +0800
Subject: [PATCH 74/98] remove logger from logout logic

---
 .../Modules/Accounts/ControllersLogic/LogoutUserLogic.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php
index bfa1f20a..aea1f932 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php
@@ -37,7 +37,6 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     protected function logic(Request $request): JsonResponse {
 
-        logger("logout");
         $this->invalidatesAuthenticationToken->execute();
 
         return $this->response();

From 4626eb937ed77044757c90cd9bfb8624e19ccc68 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 15 Sep 2021 18:29:34 +0800
Subject: [PATCH 75/98] change container list to 5 per page

---
 resources/views/pages/containers.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
index 6c2eb286..642d8c33 100644
--- a/resources/views/pages/containers.blade.php
+++ b/resources/views/pages/containers.blade.php
@@ -9,7 +9,7 @@
     </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: true}}">
+<list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, order_by: {column: 'created_at', DESC: true}}">
     <template slot="list" slot-scope="{data}">
         <container-component :data="data"></container-component>
     </template>

From b5076a6f9dc88a44009554349164728d33afc074 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Thu, 16 Sep 2021 20:47:33 +0800
Subject: [PATCH 76/98] Excel library, controllers

---
 .gitignore                                    |   3 +-
 .../Processors/FetchPackingListProcessor.php  |  63 ++++
 .../CustomcClearanceLogic.php                 |  38 ++
 .../ControllersLogic/ExportExcelLogic.php     |  51 +++
 .../CustomcClearanceReportController.php      |  17 +
 composer.json                                 |   1 +
 config/app.php                                |   4 +-
 config/excel.php                              | 328 ++++++++++++++++++
 resources/views/layouts/base_portal.blade.php |  13 +-
 routes/web.php                                |   2 +
 10 files changed, 517 insertions(+), 3 deletions(-)
 create mode 100644 app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php
 create mode 100644 app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php
 create mode 100644 app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php
 create mode 100644 app/Http/Controllers/Reports/CustomcClearanceReportController.php
 create mode 100644 config/excel.php

diff --git a/.gitignore b/.gitignore
index 95d268cf..9b34cbea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ db/*
 docker-compose.yml
 package-lock.json
 public/*
-/public/*
\ No newline at end of file
+/public/*
+storage/framework/laravel-excel/*
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php
new file mode 100644
index 00000000..b128aeed
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class FetchPackingListProcessor
+{
+
+    /** @var ListsPackingLists */
+    private $listsPackingLists;
+
+    /**
+     * FetchPackingListFromVTPortalProcessor constructor.
+     * @param ListsPackingLists $listsPackingLists
+     */
+    public function __construct(ListsPackingLists $listsPackingLists)
+    {
+        $this->listsPackingLists = $listsPackingLists;
+    }
+
+    /**
+     * @return array
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(){
+
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)
+            ->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])
+            ->whereDoesntHave('containers', function($query){
+                $query->where('status', '=', ApprovalStatus::COMPLETED);
+            })->orderBy('created_at','desc')->limit(5)->get();
+
+        $packingListsArray=[];
+        foreach($packingLists as $packingList){
+
+            $address = $packingList->owner->addresses()->first();
+            $packingList->fulladdress = $address->street_one.', '.$address->street_two.', '.$address->district->name.', '.$address->post_code.' '.$address->state->name.', '.$address->country->name;
+
+            $container = $packingList->containers()->first();
+            $packingList->container_reference = $container->reference;
+            $packingList->container_number = $container->container_number;
+
+            $packingListsArray[]=$packingList;
+
+        }
+
+        return $packingListsArray;
+
+    }
+
+
+}
diff --git a/app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php b/app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php
new file mode 100644
index 00000000..5557c185
--- /dev/null
+++ b/app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Reports\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Models\User;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Reports\ControllersLogic\ExportExcelLogic;
+use App\Classes\Modules\PackingLists\Processors\FetchPackingListProcessor;
+
+class CustomcClearanceLogic extends AbstractControllerLogic
+{
+    private $excelExportLogic;
+    private $listsPackingListProcessor;
+
+    public function __construct(FetchPackingListProcessor $listsPackingListProcessor){
+        $this->listsPackingListProcessor = $listsPackingListProcessor;
+    }
+
+    protected function notification():array {
+        return [];
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $packingLists = $this->listsPackingListProcessor->execute();
+        $excelExportLogic = new ExportExcelLogic(collect($packingLists));
+        $this->excelExportLogic = $excelExportLogic;
+
+        return response()->json(['success' => true]);
+    }
+
+    public function getExcelCollection(){
+        return $this->excelExportLogic;
+    }
+}
diff --git a/app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php b/app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php
new file mode 100644
index 00000000..ede392b4
--- /dev/null
+++ b/app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Reports\ControllersLogic;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+
+class ExportExcelLogic implements FromCollection, ShouldAutoSize, WithEvents, WithHeadings, WithColumnFormatting, WithMapping
+{
+    private $data;
+
+    public function __construct($data)
+    {
+        $this->data=$data;
+    }
+    public function collection()
+    {
+        return $this->data;
+    }
+    public function map($order): array
+    {
+        return [
+            (string)$order->reference,
+            (string)$order->container_number,
+            (string)$order->fulladdress,
+            (string)$order->created_at,
+            "ssxxx"
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A'=>'@',
+            'B' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+
+        ];
+    }
+
+    public function headings(): array
+    {
+        return ["Reference", "Container", "Address", "Created", "Status"];
+    }
+
+}
diff --git a/app/Http/Controllers/Reports/CustomcClearanceReportController.php b/app/Http/Controllers/Reports/CustomcClearanceReportController.php
new file mode 100644
index 00000000..e7d24ff0
--- /dev/null
+++ b/app/Http/Controllers/Reports/CustomcClearanceReportController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Controllers\Reports;
+
+use App\Classes\Modules\Reports\ControllersLogic\CustomcClearanceLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+
+class CustomcClearanceReportController
+{
+    public function download(Request $request, CustomcClearanceLogic $customClearancelogic) {
+        $filename = date("Y-m-d H:i:s")." - Custom cleared report ";
+        $customClearancelogic->logic($request);
+        return Excel::download( $customClearancelogic->getExcelCollection(), $filename.'.xlsx');
+    }
+}
diff --git a/composer.json b/composer.json
index 824d2d3f..56ab4aac 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
         "intervention/image": "^2.5",
         "laravel/framework": "^8.40",
         "laravel/tinker": "^2.5",
+        "maatwebsite/excel": "^3.1",
         "rinvex/countries": "^6.1",
         "spatie/laravel-activitylog": "^3.14",
         "spatie/laravel-permission": "^4.2",
diff --git a/config/app.php b/config/app.php
index bad26462..df3e7a90 100644
--- a/config/app.php
+++ b/config/app.php
@@ -178,7 +178,8 @@ return [
         // Third Parties
         Spatie\Permission\PermissionServiceProvider::class,
         Barryvdh\DomPDF\ServiceProvider::class,
-        Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class
+        Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class,
+        Maatwebsite\Excel\ExcelServiceProvider::class,
     ],
 
     /*
@@ -233,6 +234,7 @@ return [
         'View' => Illuminate\Support\Facades\View::class,
         'PDF' => Barryvdh\DomPDF\Facade::class,
         'MPDF' => Meneses\LaravelMpdf\Facades\LaravelMpdf::class,
+        'Excel' => Maatwebsite\Excel\Facades\Excel::class,
     ],
 
 ];
diff --git a/config/excel.php b/config/excel.php
new file mode 100644
index 00000000..c3199b92
--- /dev/null
+++ b/config/excel.php
@@ -0,0 +1,328 @@
+<?php
+
+use Maatwebsite\Excel\Excel;
+
+return [
+    'exports' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Chunk size
+        |--------------------------------------------------------------------------
+        |
+        | When using FromQuery, the query is automatically chunked.
+        | Here you can specify how big the chunk should be.
+        |
+        */
+        'chunk_size'             => 1000,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Pre-calculate formulas during export
+        |--------------------------------------------------------------------------
+        */
+        'pre_calculate_formulas' => false,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Enable strict null comparison
+        |--------------------------------------------------------------------------
+        |
+        | When enabling strict null comparison empty cells ('') will
+        | be added to the sheet.
+        */
+        'strict_null_comparison' => false,
+
+        /*
+        |--------------------------------------------------------------------------
+        | CSV Settings
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. delimiter, enclosure and line ending for CSV exports.
+        |
+        */
+        'csv'                    => [
+            'delimiter'              => ',',
+            'enclosure'              => '"',
+            'line_ending'            => PHP_EOL,
+            'use_bom'                => false,
+            'include_separator_line' => false,
+            'excel_compatibility'    => false,
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Worksheet properties
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. default title, creator, subject,...
+        |
+        */
+        'properties'             => [
+            'creator'        => '',
+            'lastModifiedBy' => '',
+            'title'          => '',
+            'description'    => '',
+            'subject'        => '',
+            'keywords'       => '',
+            'category'       => '',
+            'manager'        => '',
+            'company'        => '',
+        ],
+    ],
+
+    'imports'            => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Read Only
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with imports, you might only be interested in the
+        | data that the sheet exists. By default we ignore all styles,
+        | however if you want to do some logic based on style data
+        | you can enable it by setting read_only to false.
+        |
+        */
+        'read_only' => true,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Ignore Empty
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with imports, you might be interested in ignoring
+        | rows that have null values or empty strings. By default rows
+        | containing empty strings or empty values are not ignored but can be
+        | ignored by enabling the setting ignore_empty to true.
+        |
+        */
+        'ignore_empty' => false,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Heading Row Formatter
+        |--------------------------------------------------------------------------
+        |
+        | Configure the heading row formatter.
+        | Available options: none|slug|custom
+        |
+        */
+        'heading_row' => [
+            'formatter' => 'slug',
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | CSV Settings
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. delimiter, enclosure and line ending for CSV imports.
+        |
+        */
+        'csv'         => [
+            'delimiter'        => ',',
+            'enclosure'        => '"',
+            'escape_character' => '\\',
+            'contiguous'       => false,
+            'input_encoding'   => 'UTF-8',
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Worksheet properties
+        |--------------------------------------------------------------------------
+        |
+        | Configure e.g. default title, creator, subject,...
+        |
+        */
+        'properties'  => [
+            'creator'        => '',
+            'lastModifiedBy' => '',
+            'title'          => '',
+            'description'    => '',
+            'subject'        => '',
+            'keywords'       => '',
+            'category'       => '',
+            'manager'        => '',
+            'company'        => '',
+        ],
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Extension detector
+    |--------------------------------------------------------------------------
+    |
+    | Configure here which writer/reader type should be used when the package
+    | needs to guess the correct type based on the extension alone.
+    |
+    */
+    'extension_detector' => [
+        'xlsx'     => Excel::XLSX,
+        'xlsm'     => Excel::XLSX,
+        'xltx'     => Excel::XLSX,
+        'xltm'     => Excel::XLSX,
+        'xls'      => Excel::XLS,
+        'xlt'      => Excel::XLS,
+        'ods'      => Excel::ODS,
+        'ots'      => Excel::ODS,
+        'slk'      => Excel::SLK,
+        'xml'      => Excel::XML,
+        'gnumeric' => Excel::GNUMERIC,
+        'htm'      => Excel::HTML,
+        'html'     => Excel::HTML,
+        'csv'      => Excel::CSV,
+        'tsv'      => Excel::TSV,
+
+        /*
+        |--------------------------------------------------------------------------
+        | PDF Extension
+        |--------------------------------------------------------------------------
+        |
+        | Configure here which Pdf driver should be used by default.
+        | Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF
+        |
+        */
+        'pdf'      => Excel::DOMPDF,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Value Binder
+    |--------------------------------------------------------------------------
+    |
+    | PhpSpreadsheet offers a way to hook into the process of a value being
+    | written to a cell. In there some assumptions are made on how the
+    | value should be formatted. If you want to change those defaults,
+    | you can implement your own default value binder.
+    |
+    | Possible value binders:
+    |
+    | [x] Maatwebsite\Excel\DefaultValueBinder::class
+    | [x] PhpOffice\PhpSpreadsheet\Cell\StringValueBinder::class
+    | [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class
+    |
+    */
+    'value_binder' => [
+        'default' => Maatwebsite\Excel\DefaultValueBinder::class,
+    ],
+
+    'cache' => [
+        /*
+        |--------------------------------------------------------------------------
+        | Default cell caching driver
+        |--------------------------------------------------------------------------
+        |
+        | By default PhpSpreadsheet keeps all cell values in memory, however when
+        | dealing with large files, this might result into memory issues. If you
+        | want to mitigate that, you can configure a cell caching driver here.
+        | When using the illuminate driver, it will store each value in a the
+        | cache store. This can slow down the process, because it needs to
+        | store each value. You can use the "batch" store if you want to
+        | only persist to the store when the memory limit is reached.
+        |
+        | Drivers: memory|illuminate|batch
+        |
+        */
+        'driver'     => 'memory',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Batch memory caching
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with the "batch" caching driver, it will only
+        | persist to the store when the memory limit is reached.
+        | Here you can tweak the memory limit to your liking.
+        |
+        */
+        'batch'     => [
+            'memory_limit' => 60000,
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Illuminate cache
+        |--------------------------------------------------------------------------
+        |
+        | When using the "illuminate" caching driver, it will automatically use
+        | your default cache store. However if you prefer to have the cell
+        | cache on a separate store, you can configure the store name here.
+        | You can use any store defined in your cache config. When leaving
+        | at "null" it will use the default store.
+        |
+        */
+        'illuminate' => [
+            'store' => null,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Transaction Handler
+    |--------------------------------------------------------------------------
+    |
+    | By default the import is wrapped in a transaction. This is useful
+    | for when an import may fail and you want to retry it. With the
+    | transactions, the previous import gets rolled-back.
+    |
+    | You can disable the transaction handler by setting this to null.
+    | Or you can choose a custom made transaction handler here.
+    |
+    | Supported handlers: null|db
+    |
+    */
+    'transactions' => [
+        'handler' => 'db',
+    ],
+
+    'temporary_files' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Local Temporary Path
+        |--------------------------------------------------------------------------
+        |
+        | When exporting and importing files, we use a temporary file, before
+        | storing reading or downloading. Here you can customize that path.
+        |
+        */
+        'local_path'          => storage_path('framework/laravel-excel'),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Remote Temporary Disk
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with a multi server setup with queues in which you
+        | cannot rely on having a shared local temporary path, you might
+        | want to store the temporary file on a shared disk. During the
+        | queue executing, we'll retrieve the temporary file from that
+        | location instead. When left to null, it will always use
+        | the local path. This setting only has effect when using
+        | in conjunction with queued imports and exports.
+        |
+        */
+        'remote_disk'         => null,
+        'remote_prefix'       => null,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Force Resync
+        |--------------------------------------------------------------------------
+        |
+        | When dealing with a multi server setup as above, it's possible
+        | for the clean up that occurs after entire queue has been run to only
+        | cleanup the server that the last AfterImportJob runs on. The rest of the server
+        | would still have the local temporary file stored on it. In this case your
+        | local storage limits can be exceeded and future imports won't be processed.
+        | To mitigate this you can set this config value to be true, so that after every
+        | queued chunk is processed the local temporary file is deleted on the server that
+        | processed it.
+        |
+        */
+        'force_resync_remote' => null,
+    ],
+];
diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index 87144464..c12f1e3e 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -22,6 +22,17 @@
                                             <div class="row m-b-20" v-if="$store.getters.isAdmin">
                                                 <div class="col"></div>
                                                 <div class="col-auto p-r-0">
+
+<div class="btn-group">
+    <a class="btn btn-sm btn-warning all-caps b-rad-none pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    Report&nbsp;<i class="fa fa-download m-r-10"></i>
+</a>
+    <div class="dropdown-menu">
+        <a class="dropdown-item" href="{{route('report.customclearance')}}">Origin custom cleared</a>
+    </div>
+</div>
+                                                </div>
+                                                <div class="col-auto p-r-0">
                                                     <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
                                                 </div>
                                             </div>
@@ -108,4 +119,4 @@
         </div>
     </div>
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 2eb2bcbb..ca3457bc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -107,6 +107,8 @@ Route::get('/deliveries/refresh', function(){
 
 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
 
+Route::get('/report/customclearance', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
+
 //Route::get('/test', function(){
 //    $addresses = \App\Models\Address::all();
 //    foreach ($addresses as $address){

From b8a145cb5cf49470affa731b02e22ace916742a9 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Fri, 17 Sep 2021 07:12:08 +0800
Subject: [PATCH 77/98] Excel library, controllers

---
 .../Modules/Reports/ControllersLogic/ExportExcelLogic.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php b/app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php
index ede392b4..c1d332a5 100644
--- a/app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php
+++ b/app/Classes/Modules/Reports/ControllersLogic/ExportExcelLogic.php
@@ -8,10 +8,9 @@ use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use Maatwebsite\Excel\Concerns\WithColumnFormatting;
 use Maatwebsite\Excel\Concerns\WithMapping;
 use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithEvents;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 
-class ExportExcelLogic implements FromCollection, ShouldAutoSize, WithEvents, WithHeadings, WithColumnFormatting, WithMapping
+class ExportExcelLogic implements FromCollection, ShouldAutoSize, WithHeadings, WithColumnFormatting, WithMapping
 {
     private $data;
 

From f7c6873316666a25b3ff1d1ca4229e3f34c34cc5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Sep 2021 17:59:37 +0800
Subject: [PATCH 78/98] update vt portal url

---
 app/Classes/Jobs/CurlContainerListJob.php                   | 6 +++---
 .../Modules/Orders/Services/FetchesDataFromVTPortal.php     | 4 ++--
 .../FetchContainersStatusUpdateFromVTPortalProcessor.php    | 2 +-
 .../Processors/FetchDeliveryListFromVTPortalProcessor.php   | 2 +-
 .../FetchLoadedContainersFromVTPortalProcessor.php          | 4 ++--
 .../Processors/FetchPackingListFromVTPortalProcessor.php    | 2 +-
 .../FetchWarehouseReceiveListFromVTPortalProcessor.php      | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Classes/Jobs/CurlContainerListJob.php b/app/Classes/Jobs/CurlContainerListJob.php
index abc93c1a..e65a1a18 100644
--- a/app/Classes/Jobs/CurlContainerListJob.php
+++ b/app/Classes/Jobs/CurlContainerListJob.php
@@ -45,7 +45,7 @@ class CurlContainerListJob implements ShouldQueue
         $last_two_month = Carbon::now()->subMonth(2)->format('Y-m-d');
 
         $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', [\GuzzleHttp\RequestOptions::JSON => json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":' . $this->page . ',"PageSize":10,"PageOffset":0,"SortExpression":"CreatedOn DESC","GroupExpression":"","Filter":["LoadedTime:<=%js%\"' . $last_two_month . 'T00:00:00.000\"\u0000"],"ContextKey":"view1","FilterIsExternal":false,"LookupContextFieldName":null,"LookupContextController":null,"LookupContextView":null,"LookupContext":null,"Inserting":false,"LastCommandName":null,"ExternalFilter":[],"DoesNotRequireData":false,"LastView":"grid1","Tag":null,"RequiresFirstLetters":false,"ViewType":"Grid","SupportsCaching":true,"SystemFilter":null,"RequiresRowCount":true,"QuickFindHint":null,"RequiresPivot":false,"PivotDefinitions":null,"RequiresMetaData":true}}')]);
+        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', [\GuzzleHttp\RequestOptions::JSON => json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":' . $this->page . ',"PageSize":10,"PageOffset":0,"SortExpression":"CreatedOn DESC","GroupExpression":"","Filter":["LoadedTime:<=%js%\"' . $last_two_month . 'T00:00:00.000\"\u0000"],"ContextKey":"view1","FilterIsExternal":false,"LookupContextFieldName":null,"LookupContextController":null,"LookupContextView":null,"LookupContext":null,"Inserting":false,"LastCommandName":null,"ExternalFilter":[],"DoesNotRequireData":false,"LastView":"grid1","Tag":null,"RequiresFirstLetters":false,"ViewType":"Grid","SupportsCaching":true,"SystemFilter":null,"RequiresRowCount":true,"QuickFindHint":null,"RequiresPivot":false,"PivotDefinitions":null,"RequiresMetaData":true}}')]);
 
         $data = json_decode($res->getBody()->getContents());
 
@@ -63,7 +63,7 @@ class CurlContainerListJob implements ShouldQueue
     {
         // get latest cookies
         $client = new \GuzzleHttp\Client(['cookies' => true]);
-        $r = $client->request('GET', 'https://portalvt.azurewebsites.net');
+        $r = $client->request('GET', 'http://portal.vtnation.com.my');
         $call_cookie = $client->getConfig('cookies');
         $call_cookie = $call_cookie->toArray();
         $latest_cookie = [];
@@ -79,7 +79,7 @@ class CurlContainerListJob implements ShouldQueue
             'Cookie' => $latest_cookie,
         ];
         $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
+        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
             "username" => "CIEF",
             "password" => "0122120880",
             "createPersistentCookie" => true,
diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromVTPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromVTPortal.php
index 6d77abce..0a6ed2b9 100644
--- a/app/Classes/Modules/Orders/Services/FetchesDataFromVTPortal.php
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromVTPortal.php
@@ -68,7 +68,7 @@ class FetchesDataFromVTPortal
         $latest_cookie = [];
         $cookieRequest = new \GuzzleHttp\Client(['cookies' => true]);
 
-        $cookieRequest->get('https://portalvt.azurewebsites.net');
+        $cookieRequest->get('http://portal.vtnation.com.my');
         foreach ($cookieRequest->getConfig('cookies')->toArray() as $key => $row) {
             $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
         }
@@ -77,7 +77,7 @@ class FetchesDataFromVTPortal
 
 
         /** @var  $loginRequest */
-        $loginRequest = $this->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/Login', 'POST', [
+        $loginRequest = $this->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', 'POST', [
             "username" => "CIEF",
             "password" => "0122120880",
             "createPersistentCookie" => true,
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index 0a0c0158..955d68d0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -76,7 +76,7 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                 try {
                     $filter = '["RefNo:=%js%\"'.$container->reference.'\"\u0000"]';
 
-                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                     $containerDetails = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index fbab0c5b..3a9ebdea 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -62,7 +62,7 @@ class FetchDeliveryListFromVTPortalProcessor
                 try {
                     $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                     $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 4069a40d..23dc50ad 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -137,14 +137,14 @@ class FetchLoadedContainersFromVTPortalProcessor
             $end = $end ? $end : Carbon::now();
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
+            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
 
             foreach ($containers->Rows as $container){
 
                 $filter = '["ContainerID:=%js%'.$container[11].'"]';
-                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index ecc9c9f0..00c3e112 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -57,7 +57,7 @@ class FetchPackingListFromVTPortalProcessor
 
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index b9043479..d1eb8516 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -128,7 +128,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 

From e84f9d8bef9620d4a829092e79ea775bd34b4d81 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Sat, 18 Sep 2021 13:40:15 +0800
Subject: [PATCH 79/98] assign packing list to container

---
 .../AssignPackingListContainerLogic.php       | 67 +++++++++++++++++++
 .../AssignPackingListContainerController.php  | 20 ++++++
 routes/packing_list.php                       |  2 +
 3 files changed, 89 insertions(+)
 create mode 100644 app/Classes/Modules/PackingLists/ControllersLogic/Containers/AssignPackingListContainerLogic.php
 create mode 100644 app/Http/Controllers/PackingLists/Containers/AssignPackingListContainerController.php

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/AssignPackingListContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/AssignPackingListContainerLogic.php
new file mode 100644
index 00000000..33310711
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/AssignPackingListContainerLogic.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Http\Resources\ContainerResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignPackingListContainerLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Assign Packing List Container',
+            'message' => 'You have successfully assign Packing List to Container'
+        ];
+    }
+
+    /** @var FetchesContainer */
+        private $fetchesContainer;
+
+    /** @var FetchesPackingList */
+        private $fetchesPackingList;
+
+    /**
+     * DeleteContainerControllersLogic constructor.
+     * @param FetchesContainer $fetchesContainer
+     * @param FetchesPackingList $fetchesPackingList
+     */
+    public function __construct(FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList)
+    {
+        $this->fetchesContainer = $fetchesContainer;
+        $this->fetchesPackingList = $fetchesPackingList;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+            $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
+            $packing_list = $request->input('packing_list_id');
+
+            foreach ($packing_list as $key => $row) {
+                $packing_list_item = $this->fetchesPackingList->execute(['id' => $row]);
+                $container->packingLists()->attach($packing_list_item);
+            }
+
+            return $this->resourceResponse(new ContainerResource($container));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Http/Controllers/PackingLists/Containers/AssignPackingListContainerController.php b/app/Http/Controllers/PackingLists/Containers/AssignPackingListContainerController.php
new file mode 100644
index 00000000..7cda1111
--- /dev/null
+++ b/app/Http/Controllers/PackingLists/Containers/AssignPackingListContainerController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists\Containers;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\Containers\AssignPackingListContainerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignPackingListContainerController
+{
+    /**
+     * @param Request $request
+     * @param AssignPackingListContainerLogic $logic
+     * @return JsonResponse
+     */
+    public function assign(Request $request, AssignPackingListContainerLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/routes/packing_list.php b/routes/packing_list.php
index ea64c7e1..a636f853 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -16,6 +16,8 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
         Route::post('/create', 'CreateContainerController@create')->name('create');
         Route::put('/update/{id}', 'UpdateContainerController@update')->name('update');
         Route::delete('/delete/{id}', 'DeleteContainerController@delete')->name('delete');
+
+        Route::put('/assign-packing_list/{id}', 'AssignPackingListContainerController@assign')->name('assign.packing_list');
     });
 
     Route::group(['namespace' => 'Packages', 'as' => 'package.', 'prefix' => 'package'], function () {

From ad2d54cf0efaf022e0e37765bbca1725b1b0ceea Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Mon, 20 Sep 2021 15:34:28 +0800
Subject: [PATCH 80/98] package switch packing list

---
 .../SwitchPackagePackingListLogic.php         | 68 +++++++++++++++++++
 .../Packages/SwitchesPackagePackingList.php   | 25 +++++++
 .../SwitchPackagePackingListController.php    | 20 ++++++
 routes/packing_list.php                       |  1 +
 4 files changed, 114 insertions(+)
 create mode 100644 app/Classes/Modules/PackingLists/ControllersLogic/Packages/SwitchPackagePackingListLogic.php
 create mode 100644 app/Classes/Modules/PackingLists/Services/Packages/SwitchesPackagePackingList.php
 create mode 100644 app/Http/Controllers/PackingLists/Packages/SwitchPackagePackingListController.php

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/SwitchPackagePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/SwitchPackagePackingListLogic.php
new file mode 100644
index 00000000..cdbc7917
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/SwitchPackagePackingListLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\Packages\SwitchesPackagePackingList;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Http\Resources\PackageResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class SwitchPackagePackingListLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Switched Package Packing List',
+            'message' => 'You have successfully switched the Package Packing List'
+        ];
+    }
+
+    /** @var SwitchesPackagePackingList */
+    private $switchesPackagePackingList;
+
+    /** @var FetchesPackage */
+    private $fetchesPackage;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /**
+     * UpdatePackageLogic constructor.
+     * @param SwitchesPackagePackingList $switchesPackagePackingList
+     * @param FetchesPackage $fetchesPackage
+     * @param FetchesPackingList $fetchesPackingList
+     */
+    public function __construct(SwitchesPackagePackingList $switchesPackagePackingList, FetchesPackage $fetchesPackage, FetchesPackingList $fetchesPackingList)
+    {
+        $this->switchesPackagePackingList = $switchesPackagePackingList;
+        $this->fetchesPackage = $fetchesPackage;
+        $this->fetchesPackingList = $fetchesPackingList;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
+
+        $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
+
+        $query = $this->switchesPackagePackingList->execute($package, $packing_list);
+
+        return $this->resourceResponse(new PackageResource($query));
+    }
+
+}
diff --git a/app/Classes/Modules/PackingLists/Services/Packages/SwitchesPackagePackingList.php b/app/Classes/Modules/PackingLists/Services/Packages/SwitchesPackagePackingList.php
new file mode 100644
index 00000000..9abedc0b
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Services/Packages/SwitchesPackagePackingList.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Services\Packages;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Package;
+use App\Models\PackingList;
+
+class SwitchesPackagePackingList extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Package $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Package $model, PackingList $packing_list) {
+
+        $model->packing_list_id = $packing_list->id;
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Http/Controllers/PackingLists/Packages/SwitchPackagePackingListController.php b/app/Http/Controllers/PackingLists/Packages/SwitchPackagePackingListController.php
new file mode 100644
index 00000000..42c85cff
--- /dev/null
+++ b/app/Http/Controllers/PackingLists/Packages/SwitchPackagePackingListController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists\Packages;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\SwitchPackagePackingListLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class SwitchPackagePackingListController
+{
+    /**
+     * @param Request $request
+     * @param SwitchPackagePackingListLogic $logic
+     * @return JsonResponse
+     */
+    public function switch(Request $request, SwitchPackagePackingListLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/routes/packing_list.php b/routes/packing_list.php
index ea64c7e1..231d8b99 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -24,6 +24,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
         Route::post('/create', 'CreatePackageController@create')->name('create');
         Route::put('/update/{id}', 'UpdatePackageController@update')->name('update');
         Route::delete('/delete/{id}', 'DeletePackageController@delete')->name('delete');
+        Route::put('/switch-packing-list/{id}', 'SwitchPackagePackingListController@switch')->name('switch.packing_list');
 
         Route::group(['namespace' => 'PackageItems', 'prefix' => 'item', 'as' => 'item.'], function () {
             Route::get('/{id}/show', 'FetchPackageItemController@fetch')->name('show');

From fbfe68c1c27ef1183f65f6002a7ef9bcf595e9f9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 21 Sep 2021 02:19:41 +0800
Subject: [PATCH 81/98] exchange user table seeder

---
 app/Models/Exchange/Company.php               | 36 ++++++++++
 app/Models/Exchange/Employee.php              | 37 ++++++++++
 app/Models/Exchange/User.php                  | 19 +++++
 config/database.php                           | 20 +++++-
 .../seeders/CompanyEmployeesTableSeeder.php   | 72 +++++++++++++++++++
 5 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 app/Models/Exchange/Company.php
 create mode 100644 app/Models/Exchange/Employee.php
 create mode 100644 app/Models/Exchange/User.php
 create mode 100644 database/seeders/CompanyEmployeesTableSeeder.php

diff --git a/app/Models/Exchange/Company.php b/app/Models/Exchange/Company.php
new file mode 100644
index 00000000..fc85080c
--- /dev/null
+++ b/app/Models/Exchange/Company.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models\Exchange;
+use App\Models\AbstractModel;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+/**
+ * Class Company
+ * @package App\Models
+ *
+ * @property \App\Models\Country country_id
+ * @property \App\Models\State state_id
+ * @property \App\Models\District district_id
+ * @property string postcode
+ * @property string street_one
+ * @property string street_two
+ * @property integer billing_type
+ */
+class Company extends AbstractModel
+{
+    protected $connection = 'exchange_db';
+
+    protected $table = 'companies';
+
+    /**
+     * @return belongsToMany
+     */
+    public function employees(): belongsToMany
+    {
+        return $this->belongsToMany(User::class, (new Employee())->getTable(), 'company_id','user_id');
+    }
+
+}
+
+
+
diff --git a/app/Models/Exchange/Employee.php b/app/Models/Exchange/Employee.php
new file mode 100644
index 00000000..b310f078
--- /dev/null
+++ b/app/Models/Exchange/Employee.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Models\Exchange;
+
+use App\Models\AbstractModel;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+/**
+ * Class CompanyEmployee
+ * @package App\Models
+ *
+ * @property \App\Models\Company company_id
+ * @property \App\Models\User user_id
+ */
+class Employee extends AbstractModel
+{
+    protected $connection = 'exchange_db';
+
+    protected $table = 'employees';
+
+    /**
+     * @return HasMany
+     */
+    public function company(): HasMany
+    {
+        return $this->HasMany(Company::class, 'company_id', 'id');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     **/
+    public function user(): HasOne
+    {
+        return $this->hasOne(User::class, 'user_id', 'id');
+    }
+}
diff --git a/app/Models/Exchange/User.php b/app/Models/Exchange/User.php
new file mode 100644
index 00000000..cc102ba2
--- /dev/null
+++ b/app/Models/Exchange/User.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models\Exchange;
+
+use App\Models\AbstractModel;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class User extends AbstractModel {
+
+    protected $connection = 'exchange_db';
+
+    /**
+     * @return belongsToMany
+     */
+    public function company(): belongsToMany
+    {
+        return $this->belongsToMany(Company::class, (new Employee())->getTable(), 'user_id', 'company_id');
+    }
+}
diff --git a/config/database.php b/config/database.php
index 4e8bc250..8b5c199f 100644
--- a/config/database.php
+++ b/config/database.php
@@ -82,7 +82,25 @@ return [
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
-
+        'exchange_db' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE_EXCHANGE', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET_IZYIM', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
         'pgsql' => [
             'driver' => 'pgsql',
             'url' => env('DATABASE_URL'),
diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php
new file mode 100644
index 00000000..d0ce9739
--- /dev/null
+++ b/database/seeders/CompanyEmployeesTableSeeder.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Models\CompanyConnection;
+use App\Models\Exchange\Company as ExchangeCompany;
+use App\Models\User;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
+
+class CompanyEmployeesTableSeeder extends Seeder
+{
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /**
+     * CompanyEmployeesTableSeeder constructor.
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     */
+    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor)
+    {
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+    }
+
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function run()
+    {
+        DB::beginTransaction();
+        foreach(ExchangeCompany::all() as $company) {
+
+            if($connection = CompanyConnection::where('invitee_reference', $company->reference)->first()){
+
+                $companyModule = $connection->invitee;
+
+                if($companyModule->employees()->exists()) {
+                    continue;
+                }
+
+                $exchangeUser = $company->employees()->first();
+
+                $user = new User();
+                $user->name = $exchangeUser->name;
+                $user->email = $exchangeUser->email;
+                $user->password = $exchangeUser->password;
+                $user->type = $exchangeUser->type;
+                $user->status = $exchangeUser->status;
+
+                $user->save();
+
+                $Object = new EmploymentObject($companyModule, $user);
+
+                $this->assignEmployeeProcessor->execute($Object);
+            }
+
+        }
+        DB::commit();
+
+
+    }
+
+}

From c7b4b759821cf60d3439da4863e25b0c7f86ec8d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 21 Sep 2021 02:31:04 +0800
Subject: [PATCH 82/98] exchange user table seeder

---
 database/seeders/CompanyEmployeesTableSeeder.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php
index d0ce9739..95c4a367 100644
--- a/database/seeders/CompanyEmployeesTableSeeder.php
+++ b/database/seeders/CompanyEmployeesTableSeeder.php
@@ -49,6 +49,10 @@ class CompanyEmployeesTableSeeder extends Seeder
 
                 $exchangeUser = $company->employees()->first();
 
+                if(User::where('email', '=', $exchangeUser->email)->get()){
+                    continue;
+                }
+
                 $user = new User();
                 $user->name = $exchangeUser->name;
                 $user->email = $exchangeUser->email;

From 1c5d8147908a09988aa3dbe6e951cd8d2c796ed5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 21 Sep 2021 02:39:58 +0800
Subject: [PATCH 83/98] show claimed accounts in company profile

---
 .../companies/elements/CustomerProfileComponent.vue        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index 59d0dd1e..6f1095fa 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -107,6 +107,13 @@
                     </div>
                 </div>
             </div>
+            <div class="row justify-content-end m-t-5 m-b-5">
+                <div class="col-auto text-right">
+                    <div class="font-heading fs-10 all-caps p-t-5 p-b-5 p-l-10 p-r-15 b-rad-sm bg-master-lighter" v-if="item.employee">
+                        <i class="fa fa-circle text-success m-r-5"></i>Claimed
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>

From 5b105caf0b113381799a79561fe79bbdf6f34d57 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 21 Sep 2021 02:50:48 +0800
Subject: [PATCH 84/98] show claimed accounts in company profile

---
 database/seeders/CompanyEmployeesTableSeeder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php
index 95c4a367..89af1cf2 100644
--- a/database/seeders/CompanyEmployeesTableSeeder.php
+++ b/database/seeders/CompanyEmployeesTableSeeder.php
@@ -49,7 +49,8 @@ class CompanyEmployeesTableSeeder extends Seeder
 
                 $exchangeUser = $company->employees()->first();
 
-                if(User::where('email', '=', $exchangeUser->email)->get()){
+                dd(User::where('email', '=', $exchangeUser->email)->count());
+                if(User::where('email', '=', $exchangeUser->email)->count()){
                     continue;
                 }
 

From fd8d9bd0dbef804e0c5203d1b5627b50ac096db9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 21 Sep 2021 02:51:50 +0800
Subject: [PATCH 85/98] show claimed accounts in company profile

---
 database/seeders/CompanyEmployeesTableSeeder.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php
index 89af1cf2..40473ed1 100644
--- a/database/seeders/CompanyEmployeesTableSeeder.php
+++ b/database/seeders/CompanyEmployeesTableSeeder.php
@@ -49,7 +49,6 @@ class CompanyEmployeesTableSeeder extends Seeder
 
                 $exchangeUser = $company->employees()->first();
 
-                dd(User::where('email', '=', $exchangeUser->email)->count());
                 if(User::where('email', '=', $exchangeUser->email)->count()){
                     continue;
                 }

From bf07a928731617f85d941cda6f2d4263141bd9cd Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 21 Sep 2021 22:37:08 +0800
Subject: [PATCH 86/98] container profile page ui

---
 .../Containers/FetchContainerLogic.php        |   2 +-
 .../elements/ContainerComponent.vue           |   3 +
 .../ContainerProfileSectionComponent.vue      | 255 ++++++++++++++++++
 .../pages/templates/warehouseFlow.blade.php   |   4 +
 routes/web.php                                |   6 +
 5 files changed, 269 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/components/containers/elements/ContainerProfileSectionComponent.vue
 create mode 100644 resources/views/pages/templates/warehouseFlow.blade.php

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
index 8969126c..c8c8548d 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
@@ -53,7 +53,7 @@ class FetchContainerLogic extends AbstractControllerLogic
 
             $this->canFetchContainer->passes();
 
-            $query = $this->fetchesContainer->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
 
             return $this->resourceResponse(new ContainerResource($query));
 
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index e8af2c65..e0f8d191 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -30,6 +30,9 @@
                             <div class="btn btn-default no-border" @click="expanded = !expanded">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
+                             <a class="btn btn-default no-border" :href="route('container.show', item.container_reference)">
+                                <i class="fa fa-angle-right fa-fw"></i>
+                            </a>
                         </div>
                     </div>
                 </div>
diff --git a/resources/assets/vue/components/containers/elements/ContainerProfileSectionComponent.vue b/resources/assets/vue/components/containers/elements/ContainerProfileSectionComponent.vue
new file mode 100644
index 00000000..b63f317c
--- /dev/null
+++ b/resources/assets/vue/components/containers/elements/ContainerProfileSectionComponent.vue
@@ -0,0 +1,255 @@
+<template>
+<div class="row">
+    <div class="col">
+        <div class="row align-items-center">
+            <div class="col bg-master-light rounded padding-20 m-l-10 m-r-10">
+                <div class="row d-flex justify-content-between align-items-center">
+                    <div class="col-auto">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="bold m-b-0">{{container.container_reference}}</h5>
+                                <p>{{container.container_number}}</p>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <p class="m-t-0">Container Type: {{container.container_type}}</p>
+                            </div>
+                        </div>
+                    </div>
+                     <div class="col-auto">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-b-0 large-text normal l-20">ETD</h5>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-t-0 large-text">{{container.transport.current_schedule.etd}}</h5>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-auto">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-b-0 large-text normal l-20">ETA</h5>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-t-0 large-text">{{container.transport.current_schedule.eta}}</h5>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-auto">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-b-0 large-text normal l-20">Loading Place</h5>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-t-0 large-text">SHANGHAI, CHINA</h5>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-auto">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-b-0 large-text normal l-20">Destination port</h5>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-t-0 large-text">PORT KLANG NORTH PORT, MALAYSIA</h5>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-auto p-r-50">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-b-0 large-text normal l-20">Status</h5>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-t-0 large-text">{{container.status}}</h5>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row m-t-20">
+            <div class="col bg-master-light rounded m-l-10 m-r-10">
+                <div class="row align-items-center p-t-10 p-b-10 padding-10">
+                    <div class="col-auto">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="bold m-b-0">Package List</h5>
+                                <p>(Total 77 Package in this container)</p>
+                            </div>
+                        </div>
+                    </div>
+                     <div class="col-auto">
+                        <p class="m-b-0">{{ containerFilledPercentage }}%</p>
+                    </div>
+                        <div class="batteryContainer">
+                            <div class="batteryOuter">
+                                <div id="batteryLevel" :style="{ width: svgLenght + 'px' }"></div>
+                            </div>
+                            <div class="batteryBump"></div>
+                        </div>
+                    <div class="col">
+                        <div class="btn btn-default">
+                            Add Package
+                        </div>
+                        <div class="btn btn-default">
+                            Export List
+                        </div>
+                        <div class="btn btn-default">
+                            Print Custom
+                        </div>
+                    </div>
+                    <div class="col-auto p-r-30">
+                        <h5 class="m-b-0 large-text normal l-20">Custom Declaration Status</h5>
+                        <h5 class="m-t-0 text-right">__</h5>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col padding-20 p-l-40 p-r-50">
+                        <div class="row" v-for="packingList in container.packing_lists">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row b-a b-grey bg-master-lightest rounded align-items-center m-b-15 p-t-10 p-b-10" v-for="package_item in packingList.packages">
+                                            <div class="col">{{package_item.description}}</div>
+                                            <div class="col">Quantity: {{package_item.quantity}}</div>
+                                            <div class="col">cbm:{{ package_item.cbm }}</div>
+                                            <div class="col">Remark</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row m-t-10">
+            <div class="col">
+                <div class="row">
+                    <div class="col" style="height: 300px;">
+                        <div class="row h-100">
+                            <div class="col">
+                                <h5 class="m-b-5 large-text bold l-20">Timeline:</h5>
+                                <div class="row h-100 p-l-10 p-r-10">
+                                    <div class="col rounded bg-master-lighter padding-15">
+                                        Timeline
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col">
+                        <div class="row">
+                            <div class="col">
+                                <h5 class="m-b-5 large-text bold l-20">Comments:</h5>
+                                <div class="row p-l-10 p-r-10">
+                                    <div class="col rounded bg-master-lighter padding-15">
+                                        Comments
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row m-t-15">
+                            <div class="col">
+                                <div class="row p-l-10 p-r-10">
+                                    <div class="col">
+                                        <h5 class="m-b-5 large-text bold l-20">Related documents:</h5>
+                                    </div>
+                                    <div class="co-auto">
+                                        <div class="btn justify-content bg-master-light">
+                                            <i class="fa fa-upload m-r-10" ></i>Upload Documents    
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row p-l-10 p-r-10">
+                                    <div class="col rounded bg-master-lighter padding-15">
+                                        documents
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</template>
+<script>
+    export default {
+        props: {
+            id: {
+                type: Number,
+                required: true,
+            }  
+        },
+        data(){
+            return {
+                section: 'containerPofileSection',
+                isLoading: true,
+                container: null,
+                expanded: false,
+                totalCBM: 6,
+                CBMcapacity: 30,
+                svgLenght: 0,
+                svgLenghtSquare: 0,
+                confirmLanding: false,
+            }
+        },
+        computed: {
+            pendingQueue () {   
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            containerFilledPercentage() {
+                this.svgLenght = this.totalCBM / this.CBMcapacity * 25;
+                this.svgLenghtSquare = this.totalCBM / this.CBMcapacity * 100 -2;
+                return this.totalCBM / this.CBMcapacity * 100;
+            }
+            // totalCbm () {
+            //     let totalCbm = 0;
+                
+            //     return this.container.packing_lists.map(function(packing_list){
+            //         totalCbm += packing_list.packages.reduce((total, obj) => obj.quantity + total, 0);
+            //     })
+            // }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchCompany();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchCompany(){
+                this.isLoading = true;
+                this.submit(route('api.packing_list.container.show', this.id), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.isLoading = false;
+                this.container = response.payload.data;
+            },
+            confirmStatus(){
+                this.confirmLanding = true;
+                console.log(this.confirmLanding);
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/pages/templates/warehouseFlow.blade.php b/resources/views/pages/templates/warehouseFlow.blade.php
new file mode 100644
index 00000000..6800fcd6
--- /dev/null
+++ b/resources/views/pages/templates/warehouseFlow.blade.php
@@ -0,0 +1,4 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <container-profile-section-component :id="{{$id}}"></container-profile-section-component>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 2eb2bcbb..ad4295ae 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,7 @@ use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Models\CompanyConnection;
+use App\Models\Container;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -70,6 +71,11 @@ Route::get('/containers', function () {
     return view('pages.containers');
 })->name('containers');
 
+Route::get('/container/show/{reference}', function ($reference) {
+    $container = Container::where('reference', $reference)->first();
+    return view('pages.templates.warehouseFlow', ['id' => $container->id]);
+})->name('container.show');
+
 Route::get('/customer/{marking}', function ($marking) {
     $connection = CompanyConnection::where('invitee_reference', $marking)->first();
     $id = $connection->invitee->company->id;

From 65493e6c901ac62bfdf3dde5f93df02b6ac903d9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 22 Sep 2021 14:14:47 +0800
Subject: [PATCH 87/98] invitation link registration

---
 .../CreateInvitedCustomerLogic.php            | 105 ++++++++++++++++++
 .../CreateInvitedCustomerController.php       |  20 ++++
 app/Http/Resources/CompanyResource.php        |   2 +
 .../forms/InviteRegistrationFormComponent.vue | 101 +++++++++++++++++
 .../RegistrationCheckEmailFormComponent.vue   |   1 -
 .../forms/RegistrationFormComponent.vue       |   1 -
 .../elements/CustomerProfileComponent.vue     |  10 ++
 .../inviteRegistrationFormValidation.js       |  27 +++++
 resources/assets/vue/general/mixins/guards.js |   5 +-
 .../assets/vue/general/mixins/stepNavi.js     |  22 ----
 .../pages/accounts/claim_business.blade.php   |  23 ++++
 routes/account.php                            |   1 +
 routes/web.php                                |  13 ++-
 13 files changed, 300 insertions(+), 31 deletions(-)
 create mode 100644 app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php
 create mode 100644 app/Http/Controllers/Accounts/CreateInvitedCustomerController.php
 create mode 100644 resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue
 create mode 100644 resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js
 delete mode 100644 resources/assets/vue/general/mixins/stepNavi.js
 create mode 100644 resources/views/pages/accounts/claim_business.blade.php

diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php
new file mode 100644
index 00000000..ebd4587e
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Company;
+use App\Models\CompanyModule;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+
+class CreateInvitedCustomerLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created User',
+            'message' => 'You have successfully created a new User'
+        ];
+    }
+
+    /** @var CreateUserProcessor */
+    private $createUserProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
+
+
+    /**
+     * CreateInvitedCustomerLogic constructor.
+     * @param CreateUserProcessor $createUserProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param FetchesCompany $fetchesCompany
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param AuthenticationProcessor $authenticationProcessor
+     */
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateContactProcessor $createContactProcessor, FetchesCompany $fetchesCompany, AssignEmployeeProcessor $assignEmployeeProcessor, AuthenticationProcessor $authenticationProcessor)
+    {
+        $this->createUserProcessor = $createUserProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->authenticationProcessor = $authenticationProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        /** @var Company $company */
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $company->companyModules()->first();
+
+        if($companyModule->employees()->exists()){
+            throw new AccessForbiddenException('This company\'s account has been claimed by another user already!');
+        }
+
+        /** @var User $user */
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+
+        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
+
+        $this->createContactProcessor->execute($contactObject, $company);
+
+        $Object = new EmploymentObject($companyModule, $user);
+
+        $this->assignEmployeeProcessor->execute($Object);
+
+        return $this->response($this->authenticationProcessor->execute($request));
+    }
+}
diff --git a/app/Http/Controllers/Accounts/CreateInvitedCustomerController.php b/app/Http/Controllers/Accounts/CreateInvitedCustomerController.php
new file mode 100644
index 00000000..dce70e1e
--- /dev/null
+++ b/app/Http/Controllers/Accounts/CreateInvitedCustomerController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\CreateInvitedCustomerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateInvitedCustomerController
+{
+    /**
+     * @param Request $request
+     * @param CreateInvitedCustomerLogic $createCustomerLogic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateInvitedCustomerLogic $createCustomerLogic): JsonResponse
+    {
+        return $createCustomerLogic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 702319aa..cae286b9 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -11,6 +11,7 @@ use App\Models\CompanyModule;
 use App\Models\Currency;
 use App\Models\SegmentConstant;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Crypt;
 
 class CompanyResource extends JsonResource
 {
@@ -25,6 +26,7 @@ class CompanyResource extends JsonResource
         $companyModule = $this->companyModules()->where('type', '=', BusinessType::IMPORTER)->first();
         return [
             'id' => $this->id,
+            'hash_id' => Crypt::encryptString($this->id),
             'name' => $this->name,
             'reference' => $this->reference,
             'type' => (int) $this->type,
diff --git a/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue
new file mode 100644
index 00000000..9b8af5ea
--- /dev/null
+++ b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row text-left" @keyup.enter="submitForm">
+                <div class="col">
+                    <error-message-component class="m-b-20" :error="error"></error-message-component>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row" >
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="bold fs-11 all-caps muted">Personal Information</p>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15">
+                                        <div class="col p-r-5">
+                                            <validation-wrapper-component :validator="$v.parameters.name">
+                                                <label>Full Name</label>
+                                                <input class="form-control" v-model="parameters.name">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col p-l-5">
+                                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                                <label>Phone</label>
+                                                <input class="form-control" v-model="parameters.phone">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.email">
+                                                <label>Email</label>
+                                                <input class="form-control" v-model="parameters.email">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15">
+                                        <div class="col p-r-5">
+                                            <validation-wrapper-component :validator="$v.parameters.password">
+                                                <label>Password</label>
+                                                <input class="form-control" type="password" v-model="parameters.password">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col p-l-5">
+                                            <validation-wrapper-component :validator="$v.parameters.password_confirmation">
+                                                <label>Password Confirmation</label>
+                                                <input class="form-control" type="password" v-model="parameters.password_confirmation">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-auto">
+                                            <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: false})">
+                                                <div class="row align-items-center">
+                                                    <div class="col-auto p-r-10">
+                                                        <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
+                                                    </div>
+                                                    <div class="col p-l-5">I already have an account</div>
+                                                </div>
+                                            </button>
+                                        </div>
+                                        <div class="col text-right">
+                                            <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none p-r-30" @click="submit(route('api.account.registration.invite.register'), 'post', section, false, false)"><i class="fa fa-check fs-18 m-r-10"></i>Complete Registration</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</template>
+<script>
+    import inviteRegistrationFormValidation from '../../../general/mixins/accounts/validation/inviteRegistrationFormValidation';
+    export default {
+        props: {
+            id: {
+                required: true,
+                type: Number
+            }
+        },
+        data() {
+            return {
+                error: '',
+                parameters : {
+                    company_id: this.id,
+                    name: '',
+                    email: '',
+                    phone: '',
+                    password: '',
+                    password_confirmation: '',
+                }
+            }
+        },
+        mixins: [inviteRegistrationFormValidation]
+    }
+</script>
diff --git a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
index e96c3f46..04a74241 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
@@ -38,7 +38,6 @@
 </template>
 <script>
     import registrationCheckEmailValidation from '../../../general/mixins/accounts/validation/registrationCheckEmailValidation';
-    import stepNavi from '../../../general/mixins/stepNavi';
     export default {
         data() {
             return {
diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
index a2d41045..52535ad1 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
@@ -257,7 +257,6 @@
 </template>
 <script>
     import registrationFormValidation from '../../../general/mixins/accounts/validation/registrationFormValidation';
-    import stepNavi from '../../../general/mixins/stepNavi';
     export default {
         data() {
             return {
diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index 6f1095fa..b0e28553 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -112,6 +112,10 @@
                     <div class="font-heading fs-10 all-caps p-t-5 p-b-5 p-l-10 p-r-15 b-rad-sm bg-master-lighter" v-if="item.employee">
                         <i class="fa fa-circle text-success m-r-5"></i>Claimed
                     </div>
+                    <div class="font-heading fs-10 all-caps p-t-5 p-b-5 p-l-10 p-r-15 b-rad-sm bg-master-lighter pointer" v-if="!item.employee" @click="copyUrl">
+                        Invitation Link <i class="fa fa-clipboard text-complete m-l-5"></i>
+                    </div>
+                    <textarea style="position: absolute; left: -99999px;" ref="invitationLink">{{ route('company.claim', item.hash_id) }}</textarea>
                 </div>
             </div>
         </div>
@@ -121,6 +125,12 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
+        methods: {
+            copyUrl() {
+                this.$refs.invitationLink.select();
+                document.execCommand('copy');
+            }
+        },
         mixins: [componentHandler]
     }
 </script>
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js
new file mode 100644
index 00000000..7879ff6d
--- /dev/null
+++ b/resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js
@@ -0,0 +1,27 @@
+import { required, email, numeric, sameAs, requiredUnless, requiredIf } from "vuelidate/lib/validators";
+import authenticationHandler from '../authenticationHandler'
+export default {
+    validations: {
+        parameters: {
+            name: {
+                required: required
+            },
+            email: {
+                required: required,
+                email
+            },
+            phone: {
+                required: required,
+                numeric
+            },
+            password: {
+                required: required,
+            },
+            password_confirmation: {
+                required: required,
+                sameAs: sameAs('password')
+            }
+        }
+    },
+    mixins: [authenticationHandler]
+}
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/guards.js b/resources/assets/vue/general/mixins/guards.js
index 18681e5d..ffa96e7d 100644
--- a/resources/assets/vue/general/mixins/guards.js
+++ b/resources/assets/vue/general/mixins/guards.js
@@ -5,7 +5,10 @@ export default {
             (this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = this.route('dashboard') : '';
         },
         isProtectedRoute(){
-            const unprotectedRoutes = [this.route('login'), this.route('account.email.verification')];
+            const unprotectedRoutes = [this.route('login'), this.route('account.email.verification'), this.route('company.claim')];
+            if(window.location.href.indexOf(this.route('company.claim')) === 0) {
+                return false;
+            }
             return !unprotectedRoutes.includes(window.location.href);
         },
         isWithTokenRoute(){
diff --git a/resources/assets/vue/general/mixins/stepNavi.js b/resources/assets/vue/general/mixins/stepNavi.js
deleted file mode 100644
index a3c05a0d..00000000
--- a/resources/assets/vue/general/mixins/stepNavi.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export default {
-    methods: {
-        changeStep(direction) {
-            this.status.direction = direction;
-
-            if (direction === 'next') {
-
-                if (this.validate()) {
-                    //this.step += 1;
-                    this.status.email = this.parameters.email;
-                    this.$emit('updateStatus', this.status);
-                }
-                return;
-            }
-            this.$emit('updateStatus', this.status);
-            this.$v.$reset();
-        },
-    },
-    beforeDestroy: function (event) {
-    },
-
-}
\ No newline at end of file
diff --git a/resources/views/pages/accounts/claim_business.blade.php b/resources/views/pages/accounts/claim_business.blade.php
new file mode 100644
index 00000000..645b8e5f
--- /dev/null
+++ b/resources/views/pages/accounts/claim_business.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.base_login')
+
+@section('inner_content')
+    <div class="row h-100 no-margin align-items-center justify-content-center">
+        <div class="col col-md-10">
+            <div class="row m-b-50">
+                <div class="col-8 col-md-6">
+                    <img class="w-100" src="{{asset('images/cief-izyim-logo.png')}}" alt="">
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
+                    <div class="row justify-content-center" v-show="!$store.getters.isLoading('loginSection')">
+                        <div class="col">
+                            <invite-registration-form-component section="loginSection" :id={{ $id }}></invite-registration-form-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/routes/account.php b/routes/account.php
index 7a9e08df..ff6a9960 100644
--- a/routes/account.php
+++ b/routes/account.php
@@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Route;
 Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account.'], function () {
 
     Route::post('/registration', 'CreateCustomerController@create')->name('registration.register');
+    Route::post('/invite/registration', 'CreateInvitedCustomerController@create')->name('registration.invite.register');
 
     Route::group(['prefix' => 'authentication', 'as' => 'authentication.'], function () {
         Route::group(['prefix' => 'login', 'as' => 'authenticate.'], function () {
diff --git a/routes/web.php b/routes/web.php
index 2eb2bcbb..0e1b6593 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,7 @@ use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Models\CompanyConnection;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -21,9 +22,9 @@ use Illuminate\Support\Facades\Route;
 
 require __DIR__ . '/template.php';
 
-Route::get('/', function () {
-    return view('welcome');
-});
+Route::get('', function () {
+    return view('pages.accounts.login');
+})->name('login');
 
 Route::group(['prefix' => 'swagger'], function () {
     Route::get('/', function () {
@@ -34,9 +35,9 @@ Route::group(['prefix' => 'swagger'], function () {
     });
 });
 
-Route::get('', function () {
-    return view('pages.accounts.login');//temporary showing welcome page.
-})->name('login');
+Route::get('/business/claim/{hash}', function ($hash) {
+    return view('pages.accounts.claim_business', ['id' => Crypt::decryptString($hash)]);
+})->name('company.claim');
 
 Route::get('/account/email/verification/{token}', function ($token) {
     return view('pages.accounts.email_verified', ['token' => $token]);

From a8e26c4dd6bd2f81ce29b63c5f7368d1c4a53100 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 22 Sep 2021 14:20:50 +0800
Subject: [PATCH 88/98] invitation link registration

---
 .../components/companies/elements/CustomerProfileComponent.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index b0e28553..b68875d3 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -41,7 +41,7 @@
                     </div>
                     <div class="row align-items-center">
                         <div class="col">
-                            <h6 class="no-margin fs-12">Account Owner</h6>
+                            <h6 class="no-margin fs-12">Email Address</h6>
                             <h6 class="no-margin">{{item.employee.email}}</h6>
                         </div>
                     </div>

From 8039446db56715f6686b29b352081d5784801e6d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 22 Sep 2021 14:57:29 +0800
Subject: [PATCH 89/98] tooltip for copying invitation link

---
 .../companies/elements/CustomerProfileComponent.vue   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index b68875d3..af3e0e7c 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -112,7 +112,7 @@
                     <div class="font-heading fs-10 all-caps p-t-5 p-b-5 p-l-10 p-r-15 b-rad-sm bg-master-lighter" v-if="item.employee">
                         <i class="fa fa-circle text-success m-r-5"></i>Claimed
                     </div>
-                    <div class="font-heading fs-10 all-caps p-t-5 p-b-5 p-l-10 p-r-15 b-rad-sm bg-master-lighter pointer" v-if="!item.employee" @click="copyUrl">
+                    <div class="font-heading fs-10 all-caps p-t-5 p-b-5 p-l-10 p-r-15 b-rad-sm bg-master-lighter pointer" ref="copyButton" v-if="!item.employee" @click="copyUrl">
                         Invitation Link <i class="fa fa-clipboard text-complete m-l-5"></i>
                     </div>
                     <textarea style="position: absolute; left: -99999px;" ref="invitationLink">{{ route('company.claim', item.hash_id) }}</textarea>
@@ -126,9 +126,16 @@
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
         methods: {
-            copyUrl() {
+            copyUrl(event) {
                 this.$refs.invitationLink.select();
                 document.execCommand('copy');
+
+                $(this.$refs.copyButton).tooltip({
+                    title: 'Url Copied To Clipboard!',
+                    placement: 'left',
+                    delay: 1000
+                });
+                $(this.$refs.copyButton).tooltip('show');
             }
         },
         mixins: [componentHandler]

From 9719f1da778adbf217dc1d8cf0c854d882c4125f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 23 Sep 2021 18:34:53 +0800
Subject: [PATCH 90/98] show container total cbm

---
 app/Http/Resources/ContainerResource.php                      | 3 ++-
 .../vue/components/containers/elements/ContainerComponent.vue | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 774ada84..bc6337cc 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\ContainerTypes;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ContainerResource extends JsonResource
@@ -17,7 +18,7 @@ class ContainerResource extends JsonResource
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,
-            'container_type' => $this->container_type,
+            'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type],
             'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
             'transport' => new TransportResource($this->transports()->first()),
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index e8af2c65..d02e69a6 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -22,6 +22,10 @@
                             <p class="no-margin fs-10 all-caps">ETA</p>
                             <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
                         </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">Loaded CBM</p>
+                            <p class="no-margin">{{ (Math.ceil((item.packing_lists.reduce((total, obj) => total + obj.packages.reduce((total, obj) => obj.cbm + total, 0), 0)) * 1000) / 1000).toFixed(3) }}</p>
+                        </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Status</p>
                             <p class="no-margin bold" :class="{'text-success': item.status === 3, 'text-complete': item.status !== 3}">{{item.status === 3 ? 'Un-stuffed' : 'In Progress'}}</p>

From 09f598ffe53104c3e715dde6dc39d441620e1327 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 23 Sep 2021 18:35:58 +0800
Subject: [PATCH 91/98] show container total cbm

---
 .../vue/components/containers/elements/ContainerComponent.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index d02e69a6..6ab36156 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -22,7 +22,7 @@
                             <p class="no-margin fs-10 all-caps">ETA</p>
                             <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
                         </div>
-                        <div class="col-2">
+                        <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">Loaded CBM</p>
                             <p class="no-margin">{{ (Math.ceil((item.packing_lists.reduce((total, obj) => total + obj.packages.reduce((total, obj) => obj.cbm + total, 0), 0)) * 1000) / 1000).toFixed(3) }}</p>
                         </div>

From ed637739cc06d8591e058ec7cd27f3a997ac89b1 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Mon, 27 Sep 2021 09:48:00 +0800
Subject: [PATCH 92/98] Inbound custom cleared

---
 .../Processors/CreateOrderRolesProcessor.php  |   1 +
 .../Containers/InboundCustomClearedLogic.php  |  66 +++++++++++
 .../FetchInboundCustomClearedProcessor.php    | 105 ++++++++++++++++++
 .../InboundCustomClearedController.php        |  20 ++++
 resources/views/swagger/json.blade.php        |  50 ++++++++-
 routes/packing_list.php                       |   2 +
 6 files changed, 243 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/Modules/PackingLists/ControllersLogic/Containers/InboundCustomClearedLogic.php
 create mode 100644 app/Classes/Modules/PackingLists/Processors/FetchInboundCustomClearedProcessor.php
 create mode 100644 app/Http/Controllers/PackingLists/Containers/InboundCustomClearedController.php

diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
index 0d4b1860..24495752 100644
--- a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
@@ -79,6 +79,7 @@ class CreateOrderRolesProcessor
         $roleObject = new OrderRoleObject($order, $destinationWarehouse, OrderRoleTypes::DESTINATION_WAREHOUSE);
         $this->createsOrderRole->execute($roleObject);
 
+
         $roleObject = new OrderRoleObject($order, $freightForwarder, OrderRoleTypes::LAST_MILE_DELIVERY_DRIVER);
         $this->createsOrderRole->execute($roleObject);
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/InboundCustomClearedLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/InboundCustomClearedLogic.php
new file mode 100644
index 00000000..1df92ffa
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/InboundCustomClearedLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\Containers\ListsContainers;
+use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanListContainers;
+use App\Classes\Modules\PackingLists\Processors\FetchInboundCustomClearedProcessor;
+
+use App\Http\Resources\ContainerResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class InboundCustomClearedLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Containers',
+            'message' => 'You have successfully retrieved a list of Containers'
+        ];
+    }
+
+    /** @var CanListContainers */
+    private $canListContainers;
+
+    /** @var ListsContainers */
+    private $listsContainers;
+
+    private $fetchInboundCustomCleared;
+
+    /**
+     * ListContainersLogic constructor.
+     * @param CanListContainers $canListContainers
+     * @param ListsContainers $listsContainers
+     */
+    public function __construct(CanListContainers $canListContainers, ListsContainers $listsContainers, FetchInboundCustomClearedProcessor $fetchInboundCustomCleared)
+    {
+        $this->canListContainers = $canListContainers;
+        $this->listsContainers = $listsContainers;
+        $this->fetchInboundCustomCleared = $fetchInboundCustomCleared;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        //$this->canListOrders->passes();
+
+        //$query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true]));
+
+        $d = $this->fetchInboundCustomCleared->execute();
+
+        return  response()->json($d);
+
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchInboundCustomClearedProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchInboundCustomClearedProcessor.php
new file mode 100644
index 00000000..b4ea6395
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchInboundCustomClearedProcessor.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+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 App\Models\Container;
+use Carbon\Carbon;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\Log;
+
+class FetchInboundCustomClearedProcessor
+{
+
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /**
+     * FetchDeliveryListFromVTPortalProcessor constructor.
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param UpdatesContractObligation $updatesContractObligations
+     */
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, UpdatesContractObligation $updatesContractObligations)
+    {
+        $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->updatesContractObligations = $updatesContractObligations;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function execute(){
+
+           $packingLists = PackingList::query()->with(['steps' => function ($query) {
+            $query->where('steps.status', '<>', 3);
+        }])->first();
+        dd($packingLists);
+            /*
+            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)
+            ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::SUSPENDED])->get();
+
+            foreach($packingLists as $packingList){
+                try {
+                    $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
+
+                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
+
+                    $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
+
+                    $shippingPackingList = $shippingPackingLists->Rows[0];
+
+                    if(!$shippingPackingList[9] && !$shippingPackingList[10]) {
+                        continue;
+                    }
+
+                    $packingList->status = ApprovalStatus::COMPLETED;
+                    $packingList->save();
+
+                    $deliveryDate = Carbon::parse($shippingPackingList[9] ? $shippingPackingList[9]:$shippingPackingList[10]);
+                    $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
+                    $transport = $this->createsTransport->execute($transportObject, $packingList);
+                    $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+
+                    $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                    $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                    $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+
+                } catch (GuzzleException $exception) {
+                    continue;
+                }
+
+            }*/
+
+
+        return [];
+
+    }
+
+
+}
diff --git a/app/Http/Controllers/PackingLists/Containers/InboundCustomClearedController.php b/app/Http/Controllers/PackingLists/Containers/InboundCustomClearedController.php
new file mode 100644
index 00000000..303ea5dc
--- /dev/null
+++ b/app/Http/Controllers/PackingLists/Containers/InboundCustomClearedController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists\Containers;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\Containers\InboundCustomClearedLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class InboundCustomClearedController
+{
+    /**
+     * @param Request $request
+     * @param InboundCustomClearedLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, InboundCustomClearedLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/resources/views/swagger/json.blade.php b/resources/views/swagger/json.blade.php
index 4fa056ef..cd4df686 100644
--- a/resources/views/swagger/json.blade.php
+++ b/resources/views/swagger/json.blade.php
@@ -107,6 +107,54 @@
         }
       }
     },
+    "/packing_list/container/inbound-custom-cleared": {
+      "get": {
+        "tags": [
+          "Packing"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "operationId": "listPackingIn",
+        "summary": "List packing",
+        "description": "",
+        "parameters": [
+          {
+            "name": "filter",
+            "in": "query",
+            "description": "Filters",
+            "required": false,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "headers": {
+              "X-Expires-After": {
+                "type": "string",
+                "format": "date-time",
+                "description": "date in UTC when token expires"
+              },
+              "X-Rate-Limit": {
+                "type": "integer",
+                "format": "int32",
+                "description": "calls per hour allowed by the user"
+              }
+            },
+            "schema": {
+              "type": "string"
+            }
+          },
+          "422": {
+            "description": "Invalid input supplied"
+          }
+        }
+      }
+    },
     "/packing_list/list": {
       "get": {
         "tags": [
@@ -2982,7 +3030,7 @@
         }
       }
     },
-    "/account/registration/registration": {
+    "/account/registration": {
       "post": {
         "tags": [
           "Account",
diff --git a/routes/packing_list.php b/routes/packing_list.php
index ea64c7e1..11fc87ec 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -16,6 +16,8 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
         Route::post('/create', 'CreateContainerController@create')->name('create');
         Route::put('/update/{id}', 'UpdateContainerController@update')->name('update');
         Route::delete('/delete/{id}', 'DeleteContainerController@delete')->name('delete');
+
+        Route::get('/inbound-custom-cleared', 'InboundCustomClearedController@list')->name('list.inbound.custom.cleared');
     });
 
     Route::group(['namespace' => 'Packages', 'as' => 'package.', 'prefix' => 'package'], function () {

From 27684a29408c55c0beca94d0089ff069d33edd26 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Mon, 27 Sep 2021 11:06:38 +0800
Subject: [PATCH 93/98] Changes to inline report

---
 .../Processors/FetchPackingListProcessor.php           |  5 +++--
 .../Reports/ControllersLogic/CustomcClearanceLogic.php |  3 ++-
 .../Reports/CustomcClearanceReportController.php       |  3 ++-
 .../containers/elements/ContainerComponent.vue         | 10 +++++++++-
 resources/views/layouts/base_portal.blade.php          |  9 +--------
 routes/web.php                                         |  2 ++
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php
index b128aeed..508e2293 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListProcessor.php
@@ -33,14 +33,15 @@ class FetchPackingListProcessor
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(){
+    public function execute($params){
 
         $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)
             ->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])
             ->whereDoesntHave('containers', function($query){
                 $query->where('status', '=', ApprovalStatus::COMPLETED);
-            })->orderBy('created_at','desc')->limit(5)->get();
+            })->orderBy('created_at','desc')->where('owner_id',$params['orderId'])->get();
 
+            //dd($packingLists);
         $packingListsArray=[];
         foreach($packingLists as $packingList){
 
diff --git a/app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php b/app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php
index 5557c185..c7fa2c0d 100644
--- a/app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php
+++ b/app/Classes/Modules/Reports/ControllersLogic/CustomcClearanceLogic.php
@@ -25,7 +25,8 @@ class CustomcClearanceLogic extends AbstractControllerLogic
 
     public function logic(Request $request) : JsonResponse
     {
-        $packingLists = $this->listsPackingListProcessor->execute();
+        $params = $request->all();
+        $packingLists = $this->listsPackingListProcessor->execute($params);
         $excelExportLogic = new ExportExcelLogic(collect($packingLists));
         $this->excelExportLogic = $excelExportLogic;
 
diff --git a/app/Http/Controllers/Reports/CustomcClearanceReportController.php b/app/Http/Controllers/Reports/CustomcClearanceReportController.php
index e7d24ff0..061f4a0b 100644
--- a/app/Http/Controllers/Reports/CustomcClearanceReportController.php
+++ b/app/Http/Controllers/Reports/CustomcClearanceReportController.php
@@ -9,7 +9,8 @@ use Maatwebsite\Excel\Facades\Excel;
 
 class CustomcClearanceReportController
 {
-    public function download(Request $request, CustomcClearanceLogic $customClearancelogic) {
+    public function download(int $orderId, Request $request, CustomcClearanceLogic $customClearancelogic) {
+        $request->merge(['orderId' => $orderId]);
         $filename = date("Y-m-d H:i:s")." - Custom cleared report ";
         $customClearancelogic->logic($request);
         return Excel::download( $customClearancelogic->getExcelCollection(), $filename.'.xlsx');
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index e8af2c65..a6e53001 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -61,6 +61,14 @@
                                             <div class="btn btn-xs btn-success pointer" v-if="packingList.status === 5" @click="updateStatus(index, item.status === 1 ? 1 : 2)"><i class="fa fa-check m-r-5"></i>Release</div>
                                             <div class="btn btn-xs btn-danger pointer" v-if="packingList.status !== 5" @click="updateStatus(index, 5)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
                                         </div>
+                                        <div  class="col-auto" v-if="packingList.order == 2">
+                                            <a class="btn btn-xs btn-warning all-caps b-rad-none pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                Report&nbsp;<i class="fa fa-download m-r-10"></i>
+                                            </a>
+                                            <div class="dropdown-menu">
+                                                <a class="dropdown-item" :href="route('report.customclearance',packingList.order.id)">Origin custom cleared</a>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -96,4 +104,4 @@
         },
         mixins: [componentHandler]
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index c12f1e3e..96025829 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -23,14 +23,7 @@
                                                 <div class="col"></div>
                                                 <div class="col-auto p-r-0">
 
-<div class="btn-group">
-    <a class="btn btn-sm btn-warning all-caps b-rad-none pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    Report&nbsp;<i class="fa fa-download m-r-10"></i>
-</a>
-    <div class="dropdown-menu">
-        <a class="dropdown-item" href="{{route('report.customclearance')}}">Origin custom cleared</a>
-    </div>
-</div>
+
                                                 </div>
                                                 <div class="col-auto p-r-0">
                                                     <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
diff --git a/routes/web.php b/routes/web.php
index ca3457bc..f4d71a9c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -109,6 +109,8 @@ Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download
 
 Route::get('/report/customclearance', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
 
+Route::get('/report/customclearance/{orderid}', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
+
 //Route::get('/test', function(){
 //    $addresses = \App\Models\Address::all();
 //    foreach ($addresses as $address){

From aa39adaeb8907fd1be37aef104e10cf4fb7585c9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 27 Sep 2021 16:43:29 +0800
Subject: [PATCH 94/98] clean web routes

---
 routes/web.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 665b7297..9d7fc0a7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -108,15 +108,6 @@ Route::get('/deliveries/refresh', function(){
 
 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('/payments-and-billing', function () {
     return view('pages.templates.paymentsBilling');
 })->name('payments-and-billing');
\ No newline at end of file

From 09a3654e2fd73b83267974e754ecf82f2ab71cc7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 27 Sep 2021 17:05:58 +0800
Subject: [PATCH 95/98] add packing list inbound custom route

---
 routes/packing_list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/packing_list.php b/routes/packing_list.php
index aa25028d..4eb27ddf 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -26,6 +26,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
         Route::post('/create', 'CreatePackageController@create')->name('create');
         Route::put('/update/{id}', 'UpdatePackageController@update')->name('update');
         Route::delete('/delete/{id}', 'DeletePackageController@delete')->name('delete');
+        Route::get('/inbound-custom-cleared', 'InboundCustomClearedController@list')->name('list.inbound.custom.cleared');
         Route::put('/switch-packing-list/{id}', 'SwitchPackagePackingListController@switch')->name('switch.packing_list');
 
         Route::group(['namespace' => 'PackageItems', 'prefix' => 'item', 'as' => 'item.'], function () {

From 2c3ea9e3f1e0892ec039c1c390465135a7e26751 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Sep 2021 13:23:56 +0800
Subject: [PATCH 96/98] order component address tooltip layout fixes

---
 .../orders/elements/OrderComponent.vue        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index c3104ca9..2262d768 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -2,7 +2,7 @@
     <div class="row m-l-0 m-r-0 m-b-30 parentContainer">
         <div class="col bg-white">
             <div class="row align-items-center">
-                <div class="col no-padding">
+                <div class="col-6 no-padding">
                     <div class="row">
                         <div class="col">
                             <a :href="route('order.qr.download', item.id)" target="_blank">
@@ -13,7 +13,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="col">
+                <div class="col-6">
                     <div class="row m-b-5">
                         <div class="col">
                             <small class="fs-10 all-caps muted">Order No.</small>
@@ -28,8 +28,20 @@
                     </div>
                     <div class="row m-b-5">
                         <div class="col">
-                            <small class="fs-10 all-caps muted">Delivery Address</small>
-                            <h6 class="no-margin small">{{item.address.reference}} <i class="fa fa-info-circle m-l-5" v-tooltip:right="item.address.street_one+' '+(item.address.street_two ? item.address.street_two : '')+', '+ item.address.district.name+', '+item.address.post_code+' '+item.address.state.name+', '+item.address.country.name" ></i></h6>
+                            <div class="row">
+                                <div class="col">
+                                    <small class="fs-10 all-caps muted">Delivery Address</small>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-9 p-r-0">
+                                    <h6 class="no-margin small" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{item.address.reference}}</h6>
+                                </div>
+                                <div class="col p-l-0">
+                                    <div class="row"><div class="col"><div class="row"><div class="col"></div></div><div class="row"><div class="col"></div></div></div></div>
+                                    <i class="fa fa-info-circle m-l-5" data-html="true" v-tooltip:right="'<h6 class=\'text-white text-left fs-13 m-t-0 m-b-5 semi-bold\'>'+item.address.reference+'</h6><p class=\'text-white text-left lh-17 no-margin\'>'+item.address.street_one+' '+(item.address.street_two ? item.address.street_two : '')+', '+ item.address.district.name+', '+item.address.post_code+' '+item.address.state.name+', '+item.address.country.name+'</p>'" ></i>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>

From 943f5ce64ee0be41500234f64dccbc30469653e0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Sep 2021 13:24:29 +0800
Subject: [PATCH 97/98] add custom clearance routes

---
 routes/web.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 68121d43..01bc8f9a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -118,6 +118,10 @@ Route::get('/deliveries/refresh', function(){
 
 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
 
+Route::get('/report/customclearance', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
+
+Route::get('/report/customclearance/{orderid}', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
+
 Route::get('/payments-and-billing', function () {
     return view('pages.templates.paymentsBilling');
 })->name('payments-and-billing');

From 8e9db507f6a63c08f26a7f722a70a997fb6a605c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Sep 2021 15:55:24 +0800
Subject: [PATCH 98/98] fix template routes, and hide report button temp

---
 .../containers/elements/ContainerComponent.vue  |  2 +-
 resources/views/partials/menu.blade.php         |  4 ++--
 routes/web.php                                  | 17 ++++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index 694efdac..4b6ba607 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -68,7 +68,7 @@
                                             <div class="btn btn-xs btn-success pointer" v-if="packingList.status === 5" @click="updateStatus(index, item.status === 1 ? 1 : 2)"><i class="fa fa-check m-r-5"></i>Release</div>
                                             <div class="btn btn-xs btn-danger pointer" v-if="packingList.status !== 5" @click="updateStatus(index, 5)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
                                         </div>
-                                        <div  class="col-auto" v-if="packingList.order == 2">
+                                        <div  class="col-auto hide">
                                             <a class="btn btn-xs btn-warning all-caps b-rad-none pointer" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                 Report&nbsp;<i class="fa fa-download m-r-10"></i>
                                             </a>
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 8986d034..0d7693a5 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -93,7 +93,7 @@
                                      style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M32.25,19.35v133.3h47.59814c-0.1763,-0.87075 -0.29814,-1.75695 -0.29814,-2.6707v-1.6293h-43v-124.7h68.8v30.1h30.1v23.90195c1.39535,-0.15265 2.82295,-0.25195 4.3,-0.25195v-26.69023l-31.35977,-31.35977zM109.65,26.69023l22.75977,22.75977h-22.75977zM47.3,27.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,36.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,45.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,53.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,62.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,62.35v4.12783c-8.0754,0.7482 -12.97978,5.32437 -12.97978,12.23232c0,5.8351 3.65238,9.8429 10.32168,11.54785l2.65811,0.68867v13.63906c-4.45695,-0.50955 -7.32693,-2.99253 -7.62578,-6.55078h-6.34082c0.02365,5.66095 3.61012,9.82731 9.57422,11.48066c1.849,-2.9928 4.77992,-5.51263 8.49082,-7.34443v-10.44766c5.08475,1.01695 7.44522,3.07924 7.44522,6.52139c0,0.5074 -0.05237,0.98248 -0.14697,1.43613c2.021,-0.4214 4.16791,-0.65746 6.39961,-0.73486c0.04515,-0.46225 0.12598,-0.90404 0.12598,-1.38994c0,-6.192 -3.53195,-9.98705 -11.03975,-11.8124l-2.78408,-0.62988v-12.8916c3.9474,0.47945 6.64034,3.04917 6.76074,6.34082h6.25264c-0.1806,-6.67145 -5.26693,-11.39735 -13.01338,-12.08535v-4.12783zM47.3,70.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM86.17637,72.19297v12.05596c-4.3086,-0.8686 -6.58018,-2.99112 -6.58018,-6.07207c0,-3.26155 2.75103,-5.77534 6.58018,-5.98389zM47.3,79.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,83.85c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v11.17412v2.6959c-0.57832,-0.43562 -1.18402,-0.84736 -1.83506,-1.21357c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162c-5.07645,0 -9.69507,1.1317 -13.21494,3.11162c-3.51987,1.97993 -6.13506,5.00886 -6.13506,8.71338c0,0.04448 0.01185,0.08589 0.0126,0.13018h-0.0126v10.52324v0.65088v10.75v10.75c0,3.61346 2.669,6.48532 6.18125,8.34805c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c1.57399,-0.83477 2.96028,-1.883 4.03125,-3.09902c1.07097,1.21602 2.45726,2.26425 4.03125,3.09902c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c3.51225,-1.86273 6.18125,-4.73459 6.18125,-8.34805v-11.40088v-10.09912v-0.42412v-10.86338v-10.86338v-10.52324h-0.0126c0.00075,-0.04429 0.0126,-0.08569 0.0126,-0.13018c0,-3.70452 -2.61519,-6.73345 -6.13506,-8.71338c-3.51987,-1.97993 -8.13849,-3.11162 -13.21494,-3.11162zM47.3,88.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM139.75,88.15c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,1.63884 -1.23776,3.44594 -3.94307,4.96768c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,96.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,103.1748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,105.35c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM105.35,109.65c4.42285,0 8.40163,1.03559 11.10693,2.55732c2.70531,1.52174 3.94307,3.32884 3.94307,4.96768c0,0.00549 0.00003,0.01131 0,0.0168c-0.00826,1.63447 -1.24682,3.43424 -3.94307,4.95088c-2.70531,1.52173 -6.68408,2.55732 -11.10693,2.55732c-4.42285,0 -8.40163,-1.03559 -11.10693,-2.55732c-2.70531,-1.52174 -3.94307,-3.32884 -3.94307,-4.96768c0,-1.63884 1.23776,-3.44594 3.94307,-4.96768c2.70531,-1.52173 6.68408,-2.55732 11.10693,-2.55732zM47.3,113.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,114.14736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM47.3,122.55c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,124.6748c0.57832,0.43562 1.18402,0.84736 1.83506,1.21357c3.51987,1.97993 8.13849,3.11162 13.21494,3.11162c5.07645,0 9.69507,-1.1317 13.21494,-3.11162c0.65104,-0.36621 1.25674,-0.77795 1.83506,-1.21357v3.15361v0.22676v0.42412c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM124.7,124.89736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.15781v0.42412c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.65088zM47.3,131.15c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.04443v0.5375c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375zM124.7,135.64736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v2.93105v0.65088c0,1.42339 -1.18021,3.10896 -3.89268,4.54776c-2.71246,1.43879 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776v-0.5375v-0.11338zM47.3,139.75c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.6565,-1.05993 13.16875,-2.92266c0.6667,-0.35359 1.2878,-0.7555 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776zM124.7,146.39736c0.59345,0.42448 1.21455,0.82639 1.88125,1.17998c3.51225,1.86273 8.11018,2.92266 13.16875,2.92266c5.05857,0 9.65642,-1.05958 13.16875,-2.92266c0.66636,-0.35346 1.28807,-0.75577 1.88125,-1.17998v3.58193c0,1.42184 -1.18014,3.10916 -3.89268,4.54776c-2.71253,1.4386 -6.71504,2.42295 -11.15732,2.42295c-4.44228,0 -8.44479,-0.98435 -11.15732,-2.42295c-2.71254,-1.4386 -3.89268,-3.12591 -3.89268,-4.54776z"></path></g></g></svg>
                             </div>
                             <div class="col">
-                                <a href="{{route('payments-and-billing')}}"><h6 class="no-margin light fs-18 all-caps">Payments & Billing</h6></a>
+                                <a href="{{route('template.payments-and-billing')}}"><h6 class="no-margin light fs-18 all-caps">Payments & Billing</h6></a>
                             </div>
                         </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide">
@@ -115,7 +115,7 @@
                                      style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M27.95,19.35c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM27.95,23.65c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM43,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,25.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,34.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,40.85c-9.47344,0 -17.2,7.72656 -17.2,17.2c0,2.72949 1.0666,5.74453 2.52793,9.07031c1.46973,3.33418 3.38457,6.88672 5.29102,10.17891c3.80449,6.56758 7.60898,12.06855 7.60898,12.06855l1.77207,2.56992l1.77207,-2.56992c0,0 3.80449,-5.50097 7.60898,-12.06855c1.90645,-3.29219 3.82129,-6.84473 5.29102,-10.17891c1.46133,-3.32578 2.52793,-6.34082 2.52793,-9.07031c0,-9.47344 -7.72656,-17.2 -17.2,-17.2zM146.2,43c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,45.15c7.14707,0 12.9,5.75293 12.9,12.9c0,1.42774 -0.81465,4.24961 -2.1752,7.34863c-1.35215,3.09063 -3.1998,6.53398 -5.05586,9.74219c-2.83027,4.87109 -4.47637,7.21426 -5.66895,8.97793c-1.19258,-1.76367 -2.83867,-4.10684 -5.66895,-8.97793c-1.85605,-3.2082 -3.70371,-6.65156 -5.05586,-9.74219c-1.36055,-3.09902 -2.1752,-5.9209 -2.1752,-7.34863c0,-7.14707 5.75293,-12.9 12.9,-12.9zM146.2,49.45c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM86,53.75c-2.37676,0 -4.3,1.92324 -4.3,4.3c0,2.37676 1.92324,4.3 4.3,4.3c2.37676,0 4.3,-1.92324 4.3,-4.3c0,-2.37676 -1.92324,-4.3 -4.3,-4.3zM146.2,53.75c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM146.2,68.8c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM43,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM129,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM137.6,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM146.2,86c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,94.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,103.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,109.65c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM25.8,113.95c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM25.8,129c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM25.8,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,139.75c-4.72832,0 -8.6,3.87168 -8.6,8.6c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-4.72832 -3.87168,-8.6 -8.6,-8.6zM135.45,144.05c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM25.8,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM34.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM43,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.6,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM60.2,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM68.8,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM77.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM94.6,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM103.2,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM111.8,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM120.4,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
                             </div>
                             <div class="col">
-                                <a href="{{route('shipping-queue')}}"><h6 class="no-margin light fs-18 all-caps">Shipping Queue</h6></a>
+                                <a href="{{route('template.shipping-queue')}}"><h6 class="no-margin light fs-18 all-caps">Shipping Queue</h6></a>
                             </div>
                         </div>
                         <div class="row p-t-15 p-b-15 justify-content-center d-md-none">
diff --git a/routes/web.php b/routes/web.php
index 01bc8f9a..2e98d3c8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -104,10 +104,6 @@ Route::get('/containers/refresh', function(){
 
 })->name('containers.refresh');
 
-Route::get('/shipping-queue', function () {
-    return view('pages.templates.shippingQueue');
-})->name('shipping-queue');
-
 Route::get('/deliveries/refresh', function(){
 
     FetchDeliveryListFromVTPortalJob::dispatch();
@@ -122,6 +118,13 @@ Route::get('/report/customclearance', 'Reports\CustomcClearanceReportController@
 
 Route::get('/report/customclearance/{orderid}', 'Reports\CustomcClearanceReportController@download')->name('report.customclearance');
 
-Route::get('/payments-and-billing', function () {
-    return view('pages.templates.paymentsBilling');
-})->name('payments-and-billing');
+Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
+    Route::get('/payments-and-billing', function () {
+        return view('pages.templates.paymentsBilling');
+    })->name('payments-and-billing');
+
+    Route::get('/shipping-queue', function () {
+        return view('pages.templates.shippingQueue');
+    })->name('shipping-queue');
+});
+