From 61a75a4ee12afd55325dd1a434ebcc53832f4958 Mon Sep 17 00:00:00 2001
From: Haziq Danial <haziqdanial031@gmail.com>
Date: Tue, 28 Sep 2021 18:51:43 +0800
Subject: [PATCH 001/223] update order reference id

---
 .../ControllersLogic/UpdateOrderLogic.php     | 46 +++++++++++++++++++
 .../Orders/Services/UpdateOrderReference.php  | 17 +++++++
 .../Orders/UpdateOrderController.php          | 15 ++++++
 routes/order.php                              |  1 +
 4 files changed, 79 insertions(+)
 create mode 100644 app/Classes/Modules/Orders/ControllersLogic/UpdateOrderLogic.php
 create mode 100644 app/Classes/Modules/Orders/Services/UpdateOrderReference.php
 create mode 100644 app/Http/Controllers/Orders/UpdateOrderController.php

diff --git a/app/Classes/Modules/Orders/ControllersLogic/UpdateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/UpdateOrderLogic.php
new file mode 100644
index 00000000..06c00de3
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/UpdateOrderLogic.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\Exceptions\ErrorException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Orders\Services\UpdateOrderReference;
+use App\Http\Resources\OrderResource;
+use App\Models\Company;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateOrderLogic extends AbstractControllerLogic
+{
+
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Update Order',
+            'message' => 'You have successfully update the order'
+        ];
+    }
+
+    private $updateOrderReference;
+    private $fetchesOrder;
+
+    public function __construct(UpdateOrderReference $updateOrderReference, FetchesOrder $fetchesOrder)
+    {
+        $this->updateOrderReference = $updateOrderReference;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    protected function logic(Request $request): JsonResponse
+    {
+        $reference_id = $request->input('reference_id');
+
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
+
+        $order = $this->updateOrderReference->execute($order, $reference_id);
+
+        return $this->resourceResponse(new OrderResource($order));
+
+    }
+}
diff --git a/app/Classes/Modules/Orders/Services/UpdateOrderReference.php b/app/Classes/Modules/Orders/Services/UpdateOrderReference.php
new file mode 100644
index 00000000..0768c4c9
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/UpdateOrderReference.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Order;
+use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+
+class UpdateOrderReference extends AbstractUpdateRecord
+{
+    public function execute(Order $model, string $reference)
+    {
+        $model->reference = $reference;
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Http/Controllers/Orders/UpdateOrderController.php b/app/Http/Controllers/Orders/UpdateOrderController.php
new file mode 100644
index 00000000..c8321284
--- /dev/null
+++ b/app/Http/Controllers/Orders/UpdateOrderController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\UpdateOrderLogic;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class UpdateOrderController
+{
+    public function update(Request $request, UpdateOrderLogic $logic)
+    {
+        return $logic->execute($request);
+    }
+}
diff --git a/routes/order.php b/routes/order.php
index 6a0c04d3..eda518af 100644
--- a/routes/order.php
+++ b/routes/order.php
@@ -10,5 +10,6 @@ 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('/update/{id}','UpdateOrderController@update')->name('reference.update');
     Route::put('/address/{id}/status/{status}', 'ApproveChangeOrderAddressController@approve')->name('address.status.update');
 });

From 8c23d178e8da4fa1262351b137d742e06aa5a57a Mon Sep 17 00:00:00 2001
From: Obenny <sangaiprojects@gmail.com>
Date: Sun, 17 Oct 2021 21:33:40 +0800
Subject: [PATCH 002/223] copied migrations, model, controllers, routes

---
 .../AssignAnnouncementToSegmentLogic.php      | 61 ++++++++++++++
 .../CreateAnnouncementLogic.php               | 82 ++++++++++++++++++
 .../DeleteAnnouncementLogic.php               | 71 ++++++++++++++++
 .../ListAnnouncementsLogic.php                | 60 ++++++++++++++
 .../RemoveSegmentFromAnnouncementLogic.php    | 68 +++++++++++++++
 .../UpdateAnnouncementLogic.php               | 83 +++++++++++++++++++
 .../AnnouncementObject.php                    | 70 ++++++++++++++++
 .../AssignAnnouncementToSegmentProcessor.php  | 56 +++++++++++++
 .../Services/AssignsAnnouncementToSegment.php | 33 ++++++++
 .../Services/CreatesAnnouncement.php          | 26 ++++++
 .../Services/DeletesAnnouncement.php          | 19 +++++
 .../Services/FetchesAnnouncement.php          | 34 ++++++++
 .../Services/ListsAnnouncements.php           | 32 +++++++
 .../RemovesAnnouncementFromSegment.php        | 33 ++++++++
 .../Services/UpdatesAnnouncement.php          | 27 ++++++
 .../Standards/Rules/CanAssignSegment.php      | 40 +++++++++
 .../Standards/Rules/CanCreateAnnouncement.php | 50 +++++++++++
 .../Standards/Rules/CanDeleteAnnouncement.php | 40 +++++++++
 .../Standards/Rules/CanListAnnouncements.php  | 36 ++++++++
 .../Standards/Rules/CanUpdateAnnouncement.php | 54 ++++++++++++
 .../Validators/AnnouncementValidation.php     | 44 ++++++++++
 routes/announcement.php                       | 15 ++++
 22 files changed, 1034 insertions(+)
 create mode 100644 app/Classes/Modules/Announcements/ControllersLogic/AssignAnnouncementToSegmentLogic.php
 create mode 100644 app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php
 create mode 100644 app/Classes/Modules/Announcements/ControllersLogic/DeleteAnnouncementLogic.php
 create mode 100644 app/Classes/Modules/Announcements/ControllersLogic/ListAnnouncementsLogic.php
 create mode 100644 app/Classes/Modules/Announcements/ControllersLogic/RemoveSegmentFromAnnouncementLogic.php
 create mode 100644 app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php
 create mode 100644 app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
 create mode 100644 app/Classes/Modules/Announcements/Processors/AssignAnnouncementToSegmentProcessor.php
 create mode 100644 app/Classes/Modules/Announcements/Services/AssignsAnnouncementToSegment.php
 create mode 100644 app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php
 create mode 100644 app/Classes/Modules/Announcements/Services/DeletesAnnouncement.php
 create mode 100644 app/Classes/Modules/Announcements/Services/FetchesAnnouncement.php
 create mode 100644 app/Classes/Modules/Announcements/Services/ListsAnnouncements.php
 create mode 100644 app/Classes/Modules/Announcements/Services/RemovesAnnouncementFromSegment.php
 create mode 100644 app/Classes/Modules/Announcements/Services/UpdatesAnnouncement.php
 create mode 100644 app/Classes/Modules/Announcements/Standards/Rules/CanAssignSegment.php
 create mode 100644 app/Classes/Modules/Announcements/Standards/Rules/CanCreateAnnouncement.php
 create mode 100644 app/Classes/Modules/Announcements/Standards/Rules/CanDeleteAnnouncement.php
 create mode 100644 app/Classes/Modules/Announcements/Standards/Rules/CanListAnnouncements.php
 create mode 100644 app/Classes/Modules/Announcements/Standards/Rules/CanUpdateAnnouncement.php
 create mode 100644 app/Classes/Modules/Announcements/Standards/Validators/AnnouncementValidation.php
 create mode 100644 routes/announcement.php

diff --git a/app/Classes/Modules/Announcements/ControllersLogic/AssignAnnouncementToSegmentLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/AssignAnnouncementToSegmentLogic.php
new file mode 100644
index 00000000..18552989
--- /dev/null
+++ b/app/Classes/Modules/Announcements/ControllersLogic/AssignAnnouncementToSegmentLogic.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
+use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
+
+use App\Http\Resources\AnnouncementResource;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignAnnouncementToSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Assign Announcement To Segment',
+            'message' => 'You have successfully assigned Announcement to segment'
+        ];
+    }
+
+    /** @var FetchesAnnouncement */
+    private $fetchesAnnouncement;
+
+    /** @var AssignAnnouncementToSegmentProcessor */
+    private $assignAnnouncementToSegmentProcessor;
+
+    /**
+     * AssignAnnouncementToSegmentLogic constructor.
+     * @param FetchesAnnouncement $fetchesAnnouncement
+     * @param AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
+     */
+    public function __construct(FetchesAnnouncement $fetchesAnnouncement, AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor)
+    {
+        $this->fetchesAnnouncement = $fetchesAnnouncement;
+        $this->assignAnnouncementToSegmentProcessor = $assignAnnouncementToSegmentProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $announcement = $this->fetchesAnnouncement->execute(['id' => $request->route('id')]);
+
+        $this->assignAnnouncementToSegmentProcessor->execute($announcement, $request->input('segment_id'));
+
+        return $this->resourceResponse(new AnnouncementResource($announcement));
+    }
+}
diff --git a/app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php
new file mode 100644
index 00000000..9c740601
--- /dev/null
+++ b/app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+use App\Classes\Modules\Announcements\Standards\Rules\CanCreateAnnouncement;
+use App\Classes\Modules\Announcements\Services\CreatesAnnouncement;
+use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
+
+use App\Http\Resources\AnnouncementResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateAnnouncementLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created Annoucement',
+            'message' => 'You have successfully created a new Annoucements'
+        ];
+    }
+
+    /** @var CanCreateAnnouncement */
+    private $canCreateAnnouncement;
+
+    /** @var CreatesAnnoucement */
+    private $createsAnnoucement;
+
+    /** @var AssignAnnouncementToSegmentProcessor */
+    private $assignAnnouncementToSegmentProcessor;
+
+
+    /**
+     * CreateAnnouncementLogic constructor.
+     * @param CanCreateAnnoucement $canCreateAnnoucement
+     * @param CreatesAnnoucement $createsAnnoucement
+     * @param AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
+     */
+    public function __construct(
+        CanCreateAnnouncement $canCreateAnnouncement,
+        CreatesAnnouncement $createsAnnoucement,
+        AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
+    ) {
+        $this->canCreateAnnouncement = $canCreateAnnouncement;
+        $this->createsAnnoucement = $createsAnnoucement;
+        $this->assignAnnouncementToSegmentProcessor = $assignAnnouncementToSegmentProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $annoucement_object = new AnnouncementObject(
+            $request->input('title'),
+            $request->input('description'),
+            $request->input('starting_on'),
+            $request->input('ending_on')
+        );
+
+        $this->canCreateAnnouncement->passes($annoucement_object);
+
+        $announcement = $this->createsAnnoucement->execute($annoucement_object);
+
+        $this->assignAnnouncementToSegmentProcessor->execute($announcement);
+
+        return $this->resourceResponse(new AnnouncementResource($announcement));
+    }
+}
diff --git a/app/Classes/Modules/Announcements/ControllersLogic/DeleteAnnouncementLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/DeleteAnnouncementLogic.php
new file mode 100644
index 00000000..55dc710c
--- /dev/null
+++ b/app/Classes/Modules/Announcements/ControllersLogic/DeleteAnnouncementLogic.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\Standards\Rules\CanDeleteAnnouncement;
+use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
+use App\Classes\Modules\Announcements\Services\DeletesAnnouncement;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteAnnouncementLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Delete Announcement',
+            'message' => 'You have successfully deleted the Announcement'
+        ];
+    }
+
+    /** @var CanDeleteAnnouncement */
+    private $canDeleteAnnouncement;
+
+    /** @var FetchesAnnouncement */
+    private $fetchesAnnouncement;
+
+    /** @var DeletesAnnouncement */
+    private $deletesAnnouncement;
+
+    /**
+     * DeleteAnnouncementLogic constructor.
+     * @param CanDeleteAnnouncement $canDeleteAnnouncement
+     * @param FetchesAnnouncement $fetchesAnnouncement
+     * @param DeletesAnnouncement $deletesAnnouncement
+     */
+    public function __construct(
+        CanDeleteAnnouncement $canDeleteAnnoucement,
+        FetchesAnnouncement $fetchesAnnoucement,
+        DeletesAnnouncement $deletesAnnoucement
+    ) {
+        $this->canDeleteAnnoucement = $canDeleteAnnoucement;
+        $this->fetchesAnnoucement = $fetchesAnnoucement;
+        $this->deletesAnnoucement = $deletesAnnoucement;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+
+        $this->canDeleteAnnoucement->passes();
+
+        $annoucement = $this->fetchesAnnoucement->execute(['id' => $request->route('id')]);
+
+        $this->deletesAnnoucement->execute($annoucement);
+
+        return $this->response([]);
+    }
+}
diff --git a/app/Classes/Modules/Announcements/ControllersLogic/ListAnnouncementsLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/ListAnnouncementsLogic.php
new file mode 100644
index 00000000..0055ebeb
--- /dev/null
+++ b/app/Classes/Modules/Announcements/ControllersLogic/ListAnnouncementsLogic.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Announcements\Services\ListsAnnouncements;
+use App\Classes\Modules\Announcements\Standards\Rules\CanListAnnouncements;
+use App\Http\Resources\AnnouncementResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListAnnouncementsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Retrieve Announcements',
+            'message' => 'You have successfully retrieved a list of Announcements'
+        ];
+    }
+
+    /** @var CanListAnnouncements */
+    private $canListAnnouncements;
+
+    /** @var ListsAnnouncements */
+    private $listsAnnouncements;
+
+    /**
+     * ListAnnouncementsLogic constructor.
+     * @param CanListAnnouncements $canListAnnouncements
+     * @param ListsAnnouncements $listsAnnouncements
+     */
+    public function __construct(CanListAnnouncements $canListAnnouncements, ListsAnnouncements $listsAnnouncements)
+    {
+        $this->canListAnnouncements = $canListAnnouncements;
+        $this->listsAnnouncements = $listsAnnouncements;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+
+        $this->canListAnnouncements->passes();
+
+        $annoucements = $this->listsAnnouncements->execute($this->listsAnnouncements->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(AnnouncementResource::collection($annoucements));
+    }
+}
diff --git a/app/Classes/Modules/Announcements/ControllersLogic/RemoveSegmentFromAnnouncementLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/RemoveSegmentFromAnnouncementLogic.php
new file mode 100644
index 00000000..284d20b9
--- /dev/null
+++ b/app/Classes/Modules/Announcements/ControllersLogic/RemoveSegmentFromAnnouncementLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Announcements\Services\RemovesAnnouncementFromSegment;
+
+use App\Http\Resources\AnnouncementResource;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RemoveSegmentFromAnnouncementLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Detach Announcement From Segment',
+            'message' => 'You have successfully detached Announcement from segment'
+        ];
+    }
+
+    /** @var FetchesAnnouncement */
+    private $fetchesAnnnouncement;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var RemovesAnnouncementFromSegment */
+    private $removesAnnouncementFromSegment;
+
+    /**
+     * RemoveSegmentFromAnnouncementLogic constructor.
+     * @param FetchesAnnouncement $fetchesAnnnouncement
+     * @param FetchesSegment $fetchesSegment
+     * @param RemovesAnnouncementFromSegment $removesAnnouncementFromSegment
+     */
+    public function __construct(FetchesAnnouncement $fetchesAnnnouncement, FetchesSegment $fetchesSegment, RemovesAnnouncementFromSegment $removesAnnouncementFromSegment)
+    {
+        $this->fetchesAnnnouncement = $fetchesAnnnouncement;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->removesAnnouncementFromSegment = $removesAnnouncementFromSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+
+        $announcement = $this->fetchesAnnnouncement->execute(['id' => $request->route('id')]);
+
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
+
+        $this->removesAnnouncementFromSegment->execute($announcement, $segment);
+
+        return $this->resourceResponse(new AnnouncementResource($announcement));
+    }
+}
diff --git a/app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php b/app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php
new file mode 100644
index 00000000..4fac4144
--- /dev/null
+++ b/app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+use App\Classes\Modules\Announcements\Standards\Rules\CanUpdateAnnouncement;
+use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
+use App\Classes\Modules\Announcements\Services\UpdatesAnnouncement;
+
+use App\Http\Resources\AnnouncementResource;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class UpdateAnnouncementLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Update Announcement',
+            'message' => 'You have successfully updated the Announcement'
+        ];
+    }
+
+    /** @var CanUpdateAnnouncement */
+    private $canUpdateAnnouncement;
+
+    /** @var FetchesAnnouncement */
+    private $fetchesAnnouncement;
+
+    /** @var UpdatesAnnouncement */
+    private $updatesAnnouncement;
+
+    /**
+     * UpdateAnnouncementLogic constructor.
+     * @param CanUpdateAnnouncement $canUpdateAnnouncement
+     * @param FetchesAnnouncement $fetchesAnnouncement
+     * @param UpdatesAnnouncement $updatesAnnouncement     
+     */
+    public function __construct(
+        CanUpdateAnnouncement $canUpdateAnnouncement,
+        FetchesAnnouncement $fetchesAnnouncement,
+        UpdatesAnnouncement $updatesAnnouncement        
+    ) {
+        $this->canUpdateAnnouncement = $canUpdateAnnouncement;
+        $this->fetchesAnnouncement = $fetchesAnnouncement;
+        $this->updatesAnnouncement = $updatesAnnouncement;        
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $annoucement_object = new AnnouncementObject(
+            $request->input('title'),
+            $request->input('description'),
+            $request->input('starting_on'),
+            $request->input('ending_on')
+        );
+
+        $this->canUpdateAnnouncement->passes($annoucement_object);
+
+        $annoucement = $this->fetchesAnnouncement->execute(['id' => $request->route('id')]);
+
+        $announcement_query = $this->updatesAnnouncement->execute($annoucement, $annoucement_object);
+
+        //$announcement_query->segments()->sync($request->input('segment_id'));
+
+        return $this->resourceResponse(new AnnouncementResource($announcement_query));
+    }
+}
diff --git a/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
new file mode 100644
index 00000000..98d75e8b
--- /dev/null
+++ b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class AnnouncementObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $title;
+
+    /** @var string */
+    private $description;
+
+    /** @var string */
+    private $starting_on;
+
+    /** @var string */
+    private $ending_on;
+
+
+    /**
+     * AnnouncementObject constructor.
+     * @param string $title
+     * @param string $description
+     * @param string $start_date
+     * @param string $end_date
+     */
+
+    public function __construct(string $title, string $description, string $starting_on, string $ending_on)
+    {
+        $this->title = $title;
+        $this->description = $description;
+        $this->starting_on = $starting_on;
+        $this->ending_on = $ending_on;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStartingOn(): string
+    {
+        return $this->starting_on;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEndingOn(): string
+    {
+        return $this->ending_on;
+    }
+}
diff --git a/app/Classes/Modules/Announcements/Processors/AssignAnnouncementToSegmentProcessor.php b/app/Classes/Modules/Announcements/Processors/AssignAnnouncementToSegmentProcessor.php
new file mode 100644
index 00000000..f5468a80
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Processors/AssignAnnouncementToSegmentProcessor.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Processors;
+
+use App\Classes\Modules\Announcements\Services\AssignsAnnouncementToSegment;
+use App\Classes\Modules\Announcements\Standards\Rules\CanAssignSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\Announcement;
+use Illuminate\Database\Eloquent\Model;
+
+class AssignAnnouncementToSegmentProcessor
+{
+
+    /** @var CanAssignSegment */
+    private $canAssignSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var AssignAnnouncementToSegment */
+    private $assignsAnnouncementToSegment;
+
+
+
+    /**
+     * AssignAnnouncementToSegmentProcessor constructor.
+     * @param CanAssignSegment $canAssignSegment
+     * @param AssignAnnouncementToSegment $assignsAnnouncementToSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(CanAssignSegment $canAssignSegment, FetchesSegment $fetchesSegment, AssignsAnnouncementToSegment $assignsAnnouncementToSegment)
+    {
+        $this->canAssignSegment = $canAssignSegment;
+        $this->assignsAnnouncementToSegment = $assignsAnnouncementToSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+
+    /**
+     * @param Announcement $announcement
+     * @param int|null $segmentId
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Announcement $announcement, ?int $segmentId = SegmentConstants::STANDARD_SEGMENT): Model
+    {
+        $this->canAssignSegment->passes();
+
+        $segment = $this->fetchesSegment->execute(['id' => $segmentId]);
+
+        return $this->assignsAnnouncementToSegment->execute($announcement, $segment);
+    }
+}
diff --git a/app/Classes/Modules/Announcements/Services/AssignsAnnouncementToSegment.php b/app/Classes/Modules/Announcements/Services/AssignsAnnouncementToSegment.php
new file mode 100644
index 00000000..5cc459b1
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Services/AssignsAnnouncementToSegment.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Announcement;
+use App\Models\Segment;
+use Illuminate\Database\QueryException;
+
+class AssignsAnnouncementToSegment extends AbstractUpdateRecord
+{
+    /**
+     * @param Announcement $announcement
+     * @param Segment $segment
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(Announcement $announcement, Segment $segment)
+    {
+        try {
+
+            $announcement->segments()->attach($segment);
+
+            return $announcement;
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php b/app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php
new file mode 100644
index 00000000..4a43bac8
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+use App\Models\Announcement;
+
+class CreatesAnnouncement extends AbstractUpdateRecord
+{
+    /**
+     * @param AnnouncementObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(AnnouncementObject $object)
+    {
+        $model = new Announcement();
+        $model->title = $object->getTitle();
+        $model->description = $object->getDescription();
+        $model->starting_on = $object->getStartingOn();
+        $model->ending_on = $object->getEndingOn();
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Announcements/Services/DeletesAnnouncement.php b/app/Classes/Modules/Announcements/Services/DeletesAnnouncement.php
new file mode 100644
index 00000000..82e312cc
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Services/DeletesAnnouncement.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Announcement;
+
+class DeletesAnnouncement extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Announcement $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Announcement $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Services/FetchesAnnouncement.php b/app/Classes/Modules/Announcements/Services/FetchesAnnouncement.php
new file mode 100644
index 00000000..f43b9e46
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Services/FetchesAnnouncement.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Announcement;
+
+class FetchesAnnouncement extends AbstractFetchRecord
+{
+
+    /** @var Announcement */
+    private $repository;
+
+
+    /**
+     * FetchesAnnouncement constructor.
+     * @param Announcement $repository
+     */
+    public function __construct(Announcement $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Services/ListsAnnouncements.php b/app/Classes/Modules/Announcements/Services/ListsAnnouncements.php
new file mode 100644
index 00000000..b821819a
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Services/ListsAnnouncements.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Services;
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Announcement;
+
+class ListsAnnouncements extends AbstractListRecord
+{
+
+    /** @var Announcement */
+    private $repository;
+
+    /**
+     * ListsAnnouncement constructor.
+     * @param Announcement $repository
+     */
+    public function __construct(Announcement $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Announcements/Services/RemovesAnnouncementFromSegment.php b/app/Classes/Modules/Announcements/Services/RemovesAnnouncementFromSegment.php
new file mode 100644
index 00000000..bd34d52f
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Services/RemovesAnnouncementFromSegment.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Announcement;
+use App\Models\Segment;
+use Illuminate\Database\QueryException;
+
+class RemovesAnnouncementFromSegment extends AbstractUpdateRecord
+{
+    /**
+     * @param Announcement $announcement
+     * @param Segment $segment
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(Announcement $announcement, Segment $segment)
+    {
+        try {
+
+            $announcement->segments()->detach($segment);
+
+            return $announcement;
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Services/UpdatesAnnouncement.php b/app/Classes/Modules/Announcements/Services/UpdatesAnnouncement.php
new file mode 100644
index 00000000..98d5da7a
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Services/UpdatesAnnouncement.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+use App\Models\Announcement;
+
+class UpdatesAnnouncement extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Announcement $model
+     * @param AnnouncementObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Announcement $model, AnnouncementObject $object)
+    {
+        $model->title = $object->getTitle();
+        $model->description = $object->getDescription();
+        $model->starting_on = $object->getStartingOn();
+        $model->ending_on = $object->getEndingOn();
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Standards/Rules/CanAssignSegment.php b/app/Classes/Modules/Announcements/Standards/Rules/CanAssignSegment.php
new file mode 100644
index 00000000..625a07a1
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Standards/Rules/CanAssignSegment.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\SegmentConstants\DataTransferObjects\SegmentConstantObject;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+
+class CanAssignSegment extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Standards/Rules/CanCreateAnnouncement.php b/app/Classes/Modules/Announcements/Standards/Rules/CanCreateAnnouncement.php
new file mode 100644
index 00000000..a01e0de1
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Standards/Rules/CanCreateAnnouncement.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Announcements\Standards\Validators\AnnouncementValidation;
+use App\Classes\Modules\Companies\DataTransferObjects\AnnouncementObject;
+
+class CanCreateAnnouncement extends AbstractRule
+{
+
+    /** @var AnnouncementValidation */
+    private $AnnouncementValidation;
+
+    /**
+     * CanCreateAnnouncement constructor.
+     * @param AnnouncementValidation $AnnouncementValidation
+     */
+    public function __construct(AnnouncementValidation $AnnouncementValidation)
+    {
+        $this->AnnouncementValidation = $AnnouncementValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->AnnouncementValidation->validate($object);
+    }
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Standards/Rules/CanDeleteAnnouncement.php b/app/Classes/Modules/Announcements/Standards/Rules/CanDeleteAnnouncement.php
new file mode 100644
index 00000000..8a41deab
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Standards/Rules/CanDeleteAnnouncement.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Announcement\DataTransferObjects\AnnouncementObject;
+
+class CanDeleteAnnouncement extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Standards/Rules/CanListAnnouncements.php b/app/Classes/Modules/Announcements/Standards/Rules/CanListAnnouncements.php
new file mode 100644
index 00000000..a4c02847
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Standards/Rules/CanListAnnouncements.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+
+class CanListAnnouncements extends AbstractRule
+{
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Classes/Modules/Announcements/Standards/Rules/CanUpdateAnnouncement.php b/app/Classes/Modules/Announcements/Standards/Rules/CanUpdateAnnouncement.php
new file mode 100644
index 00000000..d861d255
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Standards/Rules/CanUpdateAnnouncement.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+use App\Classes\Modules\Announcements\Standards\Validators\AnnouncementValidation;
+
+class CanUpdateAnnouncement extends AbstractRule
+{
+
+    /** @var AnnouncementValidation */
+    private $AnnouncementValidation;
+
+
+    /**
+     * CanUpdateAnnouncement constructor.
+     * @param AnnouncementValidation $AnnouncementValidation
+     */
+    public function __construct(AnnouncementValidation $AnnouncementValidation)
+    {
+        $this->AnnouncementValidation = $AnnouncementValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->AnnouncementValidation->validate($object);
+    }
+
+    /**
+     * @param AnnouncementObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Announcements/Standards/Validators/AnnouncementValidation.php b/app/Classes/Modules/Announcements/Standards/Validators/AnnouncementValidation.php
new file mode 100644
index 00000000..f094b8aa
--- /dev/null
+++ b/app/Classes/Modules/Announcements/Standards/Validators/AnnouncementValidation.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+
+class AnnouncementValidation extends AbstractValidation
+{
+    /**
+     * @param AnnouncementObject $object
+     * @return array
+     */
+    protected function data($object): array 
+    {
+        return [
+            'title' => $object->getTitle(),
+            'description' => $object->getDescription(),
+            'starting_on' => $object->getStartingOn(),
+            'ending_on' => $object->getEndingOn()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array 
+    {
+        return [
+            'title' => 'required',
+            'description' => 'required',
+            'starting_on' => 'required',
+            'ending_on' => 'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array 
+    {
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/routes/announcement.php b/routes/announcement.php
new file mode 100644
index 00000000..7ead50e3
--- /dev/null
+++ b/routes/announcement.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'announcement', 'as' => 'announcement.', 'namespace' => 'Announcements'], function () {
+    Route::get('/list', 'ListAnnouncementsController@list')->name('list');
+    Route::post('/create', 'CreateAnnouncementController@create')->name('create');
+    Route::put('/update/{id}', 'UpdateAnnouncementController@update')->name('update');
+    Route::delete('/delete/{id}', 'DeleteAnnouncementController@delete')->name('delete');
+
+    Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
+        Route::post('/assign', 'AssignAnnouncementToSegmentController@assign')->name('assign');
+        Route::delete('/detach/{segment_id}', 'RemoveSegmentFromAnnouncementController@detach')->name('detach');
+    });
+});
\ No newline at end of file

From ea6711f06b628c7ef3dcaf51fa4dcfc606ce4d39 Mon Sep 17 00:00:00 2001
From: Obenny <sangaiprojects@gmail.com>
Date: Sun, 17 Oct 2021 21:43:25 +0800
Subject: [PATCH 003/223] copied controllers, models, migrations

---
 .../AssignAnnouncementToSegmentController.php | 20 ++++++++++
 .../CreateAnnouncementController.php          | 20 ++++++++++
 .../DeleteAnnouncementController.php          | 20 ++++++++++
 .../ListAnnouncementsController.php           | 20 ++++++++++
 ...emoveSegmentFromAnnouncementController.php | 20 ++++++++++
 .../UpdateAnnouncementController.php          | 21 ++++++++++
 app/Models/Announcement.php                   | 26 ++++++++++++
 ...0_17_201021_create_announcements_table.php | 40 +++++++++++++++++++
 ...1244_create_announcement_segment_table.php | 40 +++++++++++++++++++
 9 files changed, 227 insertions(+)
 create mode 100644 app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
 create mode 100644 app/Http/Controllers/Announcements/CreateAnnouncementController.php
 create mode 100644 app/Http/Controllers/Announcements/DeleteAnnouncementController.php
 create mode 100644 app/Http/Controllers/Announcements/ListAnnouncementsController.php
 create mode 100644 app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
 create mode 100644 app/Http/Controllers/Announcements/UpdateAnnouncementController.php
 create mode 100644 app/Models/Announcement.php
 create mode 100644 database/migrations/2021_10_17_201021_create_announcements_table.php
 create mode 100644 database/migrations/2021_10_17_201244_create_announcement_segment_table.php

diff --git a/app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php b/app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
new file mode 100644
index 00000000..508d929f
--- /dev/null
+++ b/app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Announcements;
+
+use App\Classes\Modules\Announcements\ControllersLogic\AssignAnnouncementToSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignAnnouncementToSegmentController
+{
+    /**
+     * @param Request $request
+     * @param AssignCompanyToSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function assign(Request $request, AssignAnnouncementToSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Announcements/CreateAnnouncementController.php b/app/Http/Controllers/Announcements/CreateAnnouncementController.php
new file mode 100644
index 00000000..84da07cf
--- /dev/null
+++ b/app/Http/Controllers/Announcements/CreateAnnouncementController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Announcements;
+
+use App\Classes\Modules\Announcements\ControllersLogic\CreateAnnouncementLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateAnnouncementController
+{
+    /**
+     * @param Request $request
+     * @param CreateAnnouncementLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateAnnouncementLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Announcements/DeleteAnnouncementController.php b/app/Http/Controllers/Announcements/DeleteAnnouncementController.php
new file mode 100644
index 00000000..257640d3
--- /dev/null
+++ b/app/Http/Controllers/Announcements/DeleteAnnouncementController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Announcements;
+
+use App\Classes\Modules\Announcements\ControllersLogic\DeleteAnnouncementLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteAnnouncementController
+{
+    /**
+     * @param Request $request
+     * @param DeleteAnnouncementLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteAnnouncementLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Announcements/ListAnnouncementsController.php b/app/Http/Controllers/Announcements/ListAnnouncementsController.php
new file mode 100644
index 00000000..a69dff50
--- /dev/null
+++ b/app/Http/Controllers/Announcements/ListAnnouncementsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Announcements;
+
+use App\Classes\Modules\Announcements\ControllersLogic\ListAnnouncementsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListAnnouncementsController
+{
+    /**
+     * @param Request $request
+     * @param ListAnnouncementsLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListAnnouncementsLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php b/app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
new file mode 100644
index 00000000..86e15877
--- /dev/null
+++ b/app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Announcements;
+
+use App\Classes\Modules\Announcements\ControllersLogic\RemoveSegmentFromAnnouncementLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RemoveSegmentFromAnnouncementController
+{
+    /**
+     * @param Request $request
+     * @param RemoveCompanyFromSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function detach(Request $request, RemoveSegmentFromAnnouncementLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Announcements/UpdateAnnouncementController.php b/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
new file mode 100644
index 00000000..72431980
--- /dev/null
+++ b/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Announcements;
+
+use App\Classes\Modules\Announcements\ControllersLogic\UpdateAnnouncementLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateAnnouncementController
+{
+    /**
+     * @param Request $request
+     * @param UpdateAnnouncementLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateAnnouncementLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
+
diff --git a/app/Models/Announcement.php b/app/Models/Announcement.php
new file mode 100644
index 00000000..b0094a6c
--- /dev/null
+++ b/app/Models/Announcement.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * Class Announcement
+ * @package App\Models
+ *
+ */
+class Announcement extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'announcements';
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     **/
+    public function segments(): BelongsToMany
+    {
+        return $this->BelongsToMany(Segment::class);
+    }
+}
diff --git a/database/migrations/2021_10_17_201021_create_announcements_table.php b/database/migrations/2021_10_17_201021_create_announcements_table.php
new file mode 100644
index 00000000..35508479
--- /dev/null
+++ b/database/migrations/2021_10_17_201021_create_announcements_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAnnouncementsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('announcements', function (Blueprint $table) {
+            $table->id();
+            $table->string('title', 50);
+            $table->longText('description');
+            $table->timestamp('starting_on')->nullable();
+            $table->timestamp('ending_on')->nullable();
+            $table->boolean('is_all_day')->default(false);
+            $table->integer('duration')->default(0);
+            $table->boolean('is_recurring')->default(false);
+            $table->string('recurrence_pattern')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('announcements');
+    }
+}
diff --git a/database/migrations/2021_10_17_201244_create_announcement_segment_table.php b/database/migrations/2021_10_17_201244_create_announcement_segment_table.php
new file mode 100644
index 00000000..c2777abf
--- /dev/null
+++ b/database/migrations/2021_10_17_201244_create_announcement_segment_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAnnouncementSegmentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('announcement_segment', function (Blueprint $table) {
+
+            $table->primary(['announcement_id', 'segment_id']);
+            $table->bigInteger('announcement_id')->unsigned();
+            $table->bigInteger('segment_id')->unsigned();
+            $table->timestamps();
+            $table->foreign('announcement_id')
+                ->references('id')
+                ->on('announcements')->onDelete('cascade');
+            $table->foreign('segment_id')
+                ->references('id')
+                ->on('segments')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('announcement_segment');
+    }
+}

From 624df67ca535b4b5affd1758107a476b011a730b Mon Sep 17 00:00:00 2001
From: Obenny <sangaiprojects@gmail.com>
Date: Mon, 18 Oct 2021 19:38:56 +0800
Subject: [PATCH 004/223] copied modules, resources, and updated route files

---
 .../AnnouncementObject.php                    | 15 ++++++----
 app/Http/Resources/AnnouncementResource.php   | 28 +++++++++++++++++++
 routes/announcement.php                       |  3 +-
 routes/api.php                                |  2 ++
 4 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 app/Http/Resources/AnnouncementResource.php

diff --git a/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
index 98d75e8b..6493811d 100644
--- a/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
+++ b/app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Announcements\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
+use Carbon\Carbon;
 
 class AnnouncementObject implements DataTransferObject
 {
@@ -53,18 +54,20 @@ class AnnouncementObject implements DataTransferObject
     }
 
     /**
-     * @return string
+     * @return Carbon
      */
-    public function getStartingOn(): string
+    public function getStartingOn(): Carbon
     {
-        return $this->starting_on;
+//        return $this->starting_on;
+        return Carbon::parse($this->starting_on);
     }
 
     /**
-     * @return string
+     * @return Carbon
      */
-    public function getEndingOn(): string
+    public function getEndingOn(): Carbon
     {
-        return $this->ending_on;
+//        return $this->ending_on;
+        return Carbon::parse($this->ending_on);
     }
 }
diff --git a/app/Http/Resources/AnnouncementResource.php b/app/Http/Resources/AnnouncementResource.php
new file mode 100644
index 00000000..26e1c2f9
--- /dev/null
+++ b/app/Http/Resources/AnnouncementResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use Carbon\Carbon;
+
+class AnnouncementResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'title' => $this->title,
+            'description' => $this->description,
+            'segments' => $this->segments,
+            'starting_on' => Carbon::parse($this->starting_on)->format('Y-m-d'),
+            'ending_on' => Carbon::parse($this->ending_on)->format('Y-m-d'),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+        ];
+    }
+}
diff --git a/routes/announcement.php b/routes/announcement.php
index 7ead50e3..6b460a01 100644
--- a/routes/announcement.php
+++ b/routes/announcement.php
@@ -8,8 +8,9 @@ Route::group(['prefix' => 'announcement', 'as' => 'announcement.', 'namespace' =
     Route::put('/update/{id}', 'UpdateAnnouncementController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteAnnouncementController@delete')->name('delete');
 
-    Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
+    Route::group(['prefix' => '/{id}/segment', 'as' => 'segment.'], function () {
         Route::post('/assign', 'AssignAnnouncementToSegmentController@assign')->name('assign');
         Route::delete('/detach/{segment_id}', 'RemoveSegmentFromAnnouncementController@detach')->name('detach');
     });
+
 });
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 1ebe1740..b681ce82 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -56,4 +56,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         Route::get('/report/service', 'Reports\MonthlyReportController@serviceReport')->name('report.service');
 
     });
+
+    require __DIR__ . '/announcement.php';
 });

From ba0dbf80a1e8e897a18f8405d43673bbf6d00d5a Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 21 Oct 2021 00:38:16 +0800
Subject: [PATCH 005/223] update order no

---
 .../forms/ChangeOrderNumberFormComponent.vue  | 49 +++++++++++++++++++
 .../sections/OrderProfileSectionComponent.vue |  8 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue

diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue
new file mode 100644
index 00000000..ea9cb2e3
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue
@@ -0,0 +1,49 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <p>Plese enter the new order number.</p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.orderNo">
+                        <label class="text-primary">Order Number</label>
+                        <input class="form-control" name="orderNo" v-model="parameters.orderNo">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.order.reference.update', data.id), 'post', section, true, true)">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        data() {
+            return {
+                parameters: {
+                    id: this.data.id, 
+                    orderNo: this.orderNo, 
+                }
+            };
+        },
+        validations: {
+            parameters: {
+                orderNo: { required },
+            }
+        },
+        mixins: [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 26903e73..cd99ba43 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -17,9 +17,15 @@
                         </div>
                         <div class="col">
                             <div class="row m-b-20">
-                                <div class="col">
+                                <div class="col-auto">
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
+                                <div class="col">
+                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal" data-type="changeOrderNo">Change Order Number</div>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
+                                        <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
+                                    </modal-component>
+                                </div>
                             </div>
                             <div class="row m-b-20">
                                 <div class="col-auto">

From 25c36d085f064f21ff9d9b34725c390b56ab9a54 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 21 Oct 2021 15:50:31 +0800
Subject: [PATCH 006/223] code review update id number, min length

---
 .../forms/ChangeOrderNumberFormComponent.vue   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue
index ea9cb2e3..0d5d8882 100644
--- a/resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/ChangeOrderNumberFormComponent.vue
@@ -8,9 +8,9 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.orderNo">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.reference_id">
                         <label class="text-primary">Order Number</label>
-                        <input class="form-control" name="orderNo" v-model="parameters.orderNo">
+                        <input class="form-control" v-model="parameters.reference_id">
                     </validation-wrapper-component>
                 </div>
             </div>
@@ -27,20 +27,28 @@
 </template>
 <script>
     import modalFormHandler from '../../../general/mixins/modalFormHandler';
-    import { required } from "vuelidate/lib/validators";
+    import { required, minLength } from "vuelidate/lib/validators";
 
     export default {
         data() {
             return {
                 parameters: {
                     id: this.data.id, 
-                    orderNo: this.orderNo, 
+                    reference_id: '', 
                 }
             };
         },
         validations: {
             parameters: {
-                orderNo: { required },
+                reference_id: { 
+                    required,
+                    minLength: minLength(8)
+                },
+            }
+        },
+        methods: {
+            successHandler(response) {
+                window.location.replace(this.route('order.show', response.payload.data.reference));
             }
         },
         mixins: [modalFormHandler]

From 487d024039614a2a0e35c80f52003145afbc23c8 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 23 Oct 2021 15:00:16 +0800
Subject: [PATCH 007/223] wip

---
 .../orders/sections/OrderSectionComponent.vue |  9 ++++++
 resources/views/pages/orders/index.blade.php  | 28 ++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
index 88d5362b..61590b82 100644
--- a/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
@@ -1,6 +1,15 @@
 <template>
     <div class="row tabsContainer">
         <div class="col no-padding">
+            <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, order_by: {column: 'created_at', DESC: false}, status_in: [2], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :columns=3>
+                        <template slot="list" slot-scope="{data}">
+                            <order-component :data="data"></order-component>
+                        </template>
+                    </list-component> -->
+                </div>
+            </div>
             <div class="row m-l-0 m-r-0">
                 <div class="col col-md-2 m-r-5">
                     <div class="row justify-content-end">
diff --git a/resources/views/pages/orders/index.blade.php b/resources/views/pages/orders/index.blade.php
index d17bf3e0..3bb3fed0 100644
--- a/resources/views/pages/orders/index.blade.php
+++ b/resources/views/pages/orders/index.blade.php
@@ -1,10 +1,30 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row m-b-20" v-if="$store.getters.isAdmin">
-        <div class="col"></div>
-        <div class="col-auto">
+    <div class="row m-b-20 flex-sm-row flex-column-reverse" v-if="$store.getters.isAdmin">
+        <div class="col-12 col-md">
+            <div class="row mt-3 mt-md-0">
+                <div class="col">
+                    <div class="input-group form-group no-margin form-group-default">
+                        <input class="form-control p-t-10" placeholder="Search Order No.">
+                        <button type="button" class="btn btn-primary" @click="$store.dispatch('toggleSection', {name: 'searchOrderSection', status: true})">
+                            <i class="fa fa-search"></i>
+                        </button>
+                        <button type="button" class="btn btn-default bg-master-light m-l-5" @click="$store.dispatch('toggleSection', {name: 'searchOrderSection', status: false})">
+                            Reset
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-12 col-md-auto text-right">
             <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>
+    <order-section-component v-show="!$store.getters.isShowing('searchOrderSection')"></order-section-component>
+
+    <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, with_packing_lists: true} : {per_page: 6, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :columns=3 v-show="$store.getters.isShowing('searchOrderSection')">
+        <template slot="list" slot-scope="{data}">
+            <order-component :data="data"></order-component>
+        </template>
+    </list-component>
 @endsection
\ No newline at end of file

From 274cd83c81b3dca34057b6c02e5ffe029c9a5902 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 25 Oct 2021 22:26:19 +0800
Subject: [PATCH 008/223] order search funtion

---
 .../sections/OrderSearchSectionComponent.vue  | 47 +++++++++++++++++++
 resources/views/pages/orders/index.blade.php  | 27 +----------
 2 files changed, 48 insertions(+), 26 deletions(-)
 create mode 100644 resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue

diff --git a/resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue
new file mode 100644
index 00000000..802f38d0
--- /dev/null
+++ b/resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue
@@ -0,0 +1,47 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row m-b-20 flex-sm-row flex-column-reverse" v-if="$store.getters.isAdmin">
+                <div class="col-12 col-md">
+                    <div class="row mt-3 mt-md-0">
+                        <div class="col">
+                            <div class="input-group form-group no-margin form-group-default">
+                                <input class="form-control p-t-10" placeholder="Search Order No.">
+                                <button type="button" class="btn btn-primary" @click="search">
+                                    <i class="fa fa-search"></i>
+                                </button>
+                                <button type="button" class="btn btn-default bg-master-light m-l-5" @click="$store.dispatch('toggleSection', {name: 'searchOrderSection', status: false})">
+                                    Reset
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-md-auto text-right">
+                    <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>
+            
+            <list-component section="searchOrderListSection" :endpoint="route('api.order.list')" :options="{reference_like:query, with_packing_lists: true}" :columns=3 v-show="$store.getters.isShowing('searchOrderSection')">
+                <template slot="list" slot-scope="{data}">
+                    <order-component :data="data"></order-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                query: ''
+            }
+        },
+        methods: {
+            search() {
+                this.$store.dispatch('toggleSection', {name: 'searchOrderSection', status: true});
+                this.$store.dispatch('updateListQueue', {name: 'searchOrderListSection', filters: {reference_like:query, with_packing_lists: true}});
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/pages/orders/index.blade.php b/resources/views/pages/orders/index.blade.php
index 3bb3fed0..a4465718 100644
--- a/resources/views/pages/orders/index.blade.php
+++ b/resources/views/pages/orders/index.blade.php
@@ -1,30 +1,5 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row m-b-20 flex-sm-row flex-column-reverse" v-if="$store.getters.isAdmin">
-        <div class="col-12 col-md">
-            <div class="row mt-3 mt-md-0">
-                <div class="col">
-                    <div class="input-group form-group no-margin form-group-default">
-                        <input class="form-control p-t-10" placeholder="Search Order No.">
-                        <button type="button" class="btn btn-primary" @click="$store.dispatch('toggleSection', {name: 'searchOrderSection', status: true})">
-                            <i class="fa fa-search"></i>
-                        </button>
-                        <button type="button" class="btn btn-default bg-master-light m-l-5" @click="$store.dispatch('toggleSection', {name: 'searchOrderSection', status: false})">
-                            Reset
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-12 col-md-auto text-right">
-            <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-search-section-component v-show="!$store.getters.isShowing('createOrderForm')"></order-search-section-component>
     <order-section-component v-show="!$store.getters.isShowing('searchOrderSection')"></order-section-component>
-
-    <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, with_packing_lists: true} : {per_page: 6, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :columns=3 v-show="$store.getters.isShowing('searchOrderSection')">
-        <template slot="list" slot-scope="{data}">
-            <order-component :data="data"></order-component>
-        </template>
-    </list-component>
 @endsection
\ No newline at end of file

From a846028919037114173d4f9afe57bc201a5d17f4 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 25 Oct 2021 22:49:42 +0800
Subject: [PATCH 009/223] wip

---
 .../CreateOrderRemarkLogic.php                | 67 +++++++++++++++++++
 .../Containers/CreateContainerRemarkLogic.php |  1 +
 .../Orders/CreateOrderRemarkController.php    | 14 ++++
 app/Models/Order.php                          | 11 ++-
 routes/web.php                                | 10 +++
 5 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php
 create mode 100644 app/Http/Controllers/Orders/CreateOrderRemarkController.php

diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php
new file mode 100644
index 00000000..97c91a96
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Services\CreatesRemark;
+use App\Models\Order;
+use App\Models\Remark;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateOrderRemarkLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Order',
+            'message' => 'You have successfully created a new Order'
+        ];
+    }
+
+    /** @var CreatesRemark */
+    private $createsRemark;
+
+    /**
+     * CreateContainerRemarkLogic constructor.
+     * @param CreatesRemark $createsRemark
+     */
+    public function __construct(CreatesRemark $createsRemark)
+    {
+        $this->createsRemark = $createsRemark;
+    }
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        // get the order
+        // $order = Order::findOrFail($request->input('order_id'));
+
+        // $object = new RemarkObject(
+        //     $request->input('content'), 
+        //     // commenter_id is hardcoded
+        //     1
+        // );
+
+        // $this->createsRemark->passes($object);
+
+        // $remark = $this->createsRemark->execute($order, $object);
+        // return $remark;
+
+        // $query = $this->createsRemark->execute($order, $object);
+        return $this->response(['nihao']);
+
+        // return $query;
+
+        // return $this->resourceResponse(new RemarkResource($query));
+
+
+
+
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php
index 8186a034..847704ea 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php
@@ -46,6 +46,7 @@ class CreateContainerRemarkLogic extends AbstractControllerLogic
     {
 
         // get the container
+
         $container = Container::findOrFail($request->input('container_id'));
 
         $object = new RemarkObject($request->input('content'), 1);
diff --git a/app/Http/Controllers/Orders/CreateOrderRemarkController.php b/app/Http/Controllers/Orders/CreateOrderRemarkController.php
new file mode 100644
index 00000000..12cfbf8a
--- /dev/null
+++ b/app/Http/Controllers/Orders/CreateOrderRemarkController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\CreateOrderRemarkLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class OrderRemarksController
+{
+    public function create(Request $request, CreateOrderRemarkLogic $logic): JsonResponse{
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 9d3099a5..999c04cf 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Classes\General\Interfaces\Addressable;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\General\Interfaces\Packable;
+use App\Classes\General\Interfaces\Remarkable;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Scopes\CustomerOrdersScope;
@@ -14,7 +15,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
-class Order extends AbstractModel implements Addressable, Packable
+class Order extends AbstractModel implements Addressable, Packable, Remarkable
 {
     use SoftDeletes;
 
@@ -88,4 +89,12 @@ class Order extends AbstractModel implements Addressable, Packable
     {
         return $this->addresses()->where('status','=',ApprovalStatus::APPROVED);
     }
+
+    /**
+     * @return MorphMany
+     */
+    public function remarks(): morphMany
+    {
+        return $this->morphMany(Remark::class, 'owner');
+    }
 }
diff --git a/routes/web.php b/routes/web.php
index 6c3097e4..9f5b61a3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -150,3 +150,13 @@ Route::get('/debug', function (){
 
     dd($issues);
 });
+
+// http://localhost/cief/shipping-portal/public/order/remark/create
+Route::post('/order/remark/create', 'orders\CreateOrderRemarkController@create')->name('orderRemarks.create');
+Route::get('/order/remark/update', 'remarks\UpdateRemarkController@update')->name('orderRemarks.update');
+// http://localhost/cief/shipping-portal/public/order/remark/list   
+Route::get('/order/remark/list', 'remarks\ListRemarksController@list')->name('orderRemarks.list');
+// http://localhost/cief/shipping-portal/public/order/remark/4/show
+Route::get('/order/remark/{id}/show', 'remarks\FetchRemarkController@fetch')->name('orderRemarks.fetch');
+// http://localhost/cief/shipping-portal/public/order/remark/4/delete
+Route::get('/order/remark/{id}/delete', 'remarks\DeleteRemarkController@delete')->name('orderRemarks.delete');

From 5e7cfd4da0bbcb83bde8922008d5f1300fe2a554 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 31 Oct 2021 15:43:57 +0800
Subject: [PATCH 010/223] tidy up the order remark backend api

---
 .../CreateOrderRemarkLogic.php                | 51 ++++++++-----------
 .../Orders/CreateOrderRemarkController.php    |  2 +-
 app/Http/Resources/OrderResource.php          |  1 +
 app/Models/Order.php                          |  8 +++
 routes/order.php                              |  2 +
 routes/web.php                                | 10 ----
 6 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php
index 97c91a96..e134bcc7 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderRemarkLogic.php
@@ -3,10 +3,10 @@
 namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Services\CreatesRemark;
-use App\Models\Order;
-use App\Models\Remark;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Http\Resources\OrderResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -22,46 +22,39 @@ class CreateOrderRemarkLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var CreatesRemark */
-    private $createsRemark;
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
 
     /**
-     * CreateContainerRemarkLogic constructor.
-     * @param CreatesRemark $createsRemark
+     * CreateOrderRemarkLogic constructor.
+     * @param FetchesOrder $fetchesOrder
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CreatesRemark $createsRemark)
+    public function __construct(FetchesOrder $fetchesOrder, CreateRemarkProcessor $createRemarkProcessor)
     {
-        $this->createsRemark = $createsRemark;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
+
     /**
      * @param Request $request
      * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        // get the order
-        // $order = Order::findOrFail($request->input('order_id'));
-
-        // $object = new RemarkObject(
-        //     $request->input('content'), 
-        //     // commenter_id is hardcoded
-        //     1
-        // );
-
-        // $this->createsRemark->passes($object);
-
-        // $remark = $this->createsRemark->execute($order, $object);
-        // return $remark;
-
-        // $query = $this->createsRemark->execute($order, $object);
-        return $this->response(['nihao']);
-
-        // return $query;
-
-        // return $this->resourceResponse(new RemarkResource($query));
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
 
+        $object = new RemarkObject($request->input('content'), auth()->user()->id);
 
+        $this->createRemarkProcessor->execute($order, $object);
 
+        return $this->resourceResponse(new OrderResource($order));
 
     }
 }
diff --git a/app/Http/Controllers/Orders/CreateOrderRemarkController.php b/app/Http/Controllers/Orders/CreateOrderRemarkController.php
index 12cfbf8a..3464566a 100644
--- a/app/Http/Controllers/Orders/CreateOrderRemarkController.php
+++ b/app/Http/Controllers/Orders/CreateOrderRemarkController.php
@@ -6,7 +6,7 @@ use App\Classes\Modules\Orders\ControllersLogic\CreateOrderRemarkLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class OrderRemarksController
+class CreateOrderRemarkController
 {
     public function create(Request $request, CreateOrderRemarkLogic $logic): JsonResponse{
         return $logic->execute($request);
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 06e31b6f..0c30bb62 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -46,6 +46,7 @@ class OrderResource extends JsonResource
                     'received_packages' => PackageResource::collection($this->parcels()->warehouseReceiveList()->get()),
                 ];
             }),
+            'remarks' => RemarkResource::collection($this->remarks),
             'created_at' => $this->created_at->format('d-m-Y')
         ];
 
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 3d7bdcab..3923d913 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -148,4 +148,12 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
     {
         return $this->morphMany(Transaction::class, 'owner');
     }
+
+    /**
+     * @return MorphMany
+     */
+    public function remarks(): morphMany
+    {
+        return $this->morphMany(Remark::class, 'owner');
+    }
 }
diff --git a/routes/order.php b/routes/order.php
index 2da8880f..ea7bc389 100644
--- a/routes/order.php
+++ b/routes/order.php
@@ -17,4 +17,6 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f
     // Route::post('/create', 'CreateOrderController@create')->name('create');
 
     Route::get('/{id}/shipping-cost', 'ShippingCostController@calculate')->name('shipping.cost');
+    
+    Route::post('/{id}/remark/create', 'CreateOrderRemarkController@create')->name('remark.create');
 });
diff --git a/routes/web.php b/routes/web.php
index 9f5b61a3..6c3097e4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -150,13 +150,3 @@ Route::get('/debug', function (){
 
     dd($issues);
 });
-
-// http://localhost/cief/shipping-portal/public/order/remark/create
-Route::post('/order/remark/create', 'orders\CreateOrderRemarkController@create')->name('orderRemarks.create');
-Route::get('/order/remark/update', 'remarks\UpdateRemarkController@update')->name('orderRemarks.update');
-// http://localhost/cief/shipping-portal/public/order/remark/list   
-Route::get('/order/remark/list', 'remarks\ListRemarksController@list')->name('orderRemarks.list');
-// http://localhost/cief/shipping-portal/public/order/remark/4/show
-Route::get('/order/remark/{id}/show', 'remarks\FetchRemarkController@fetch')->name('orderRemarks.fetch');
-// http://localhost/cief/shipping-portal/public/order/remark/4/delete
-Route::get('/order/remark/{id}/delete', 'remarks\DeleteRemarkController@delete')->name('orderRemarks.delete');

From 6fcf952967d845093bbd9e74ab3c78699a276d38 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 2 Nov 2021 00:00:31 +0800
Subject: [PATCH 011/223] update order remark ui

---
 .../ControllersLogic/UpdateRemarkLogic.php    |  2 +-
 .../orders/elements/OrderComponent.vue        | 15 +++++-
 .../forms/DeleteOrderRemarkFormComponent.vue  | 32 ++++++++++++
 .../orders/forms/OrderRemarkFormComponent.vue | 49 +++++++++++++++++++
 .../sections/OrderProfileSectionComponent.vue | 45 ++++++++++++++++-
 5 files changed, 139 insertions(+), 4 deletions(-)
 create mode 100644 resources/assets/vue/components/orders/forms/DeleteOrderRemarkFormComponent.vue
 create mode 100644 resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue

diff --git a/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
index e9c0738f..5b3af8f8 100644
--- a/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
+++ b/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
@@ -55,7 +55,7 @@ class UpdateRemarkLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $object = new RemarkObject($request->input('content'), $request->input('commenter_id'));
+        $object = new RemarkObject($request->input('content'), auth()->user()->id);
 
         $this->canUpdateRemark->passes($object);
 
diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index 31cc56af..e1f1db48 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -16,8 +16,19 @@
                 <div class="col-6">
                     <div class="row m-b-5">
                         <div class="col">
-                            <small class="fs-10 all-caps muted">Order No.</small>
-                            <h6 class="no-margin small">{{item.reference}}</h6>
+                            <div class="row">
+                                <div class="col">
+                                    <small class="fs-10 all-caps muted">Order No</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.reference}}</h6>
+                                </div>
+                                <div class="col p-l-0" v-if="item.remarks.length >= 1">
+                                    <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\'>Remarks</h6><p class=\'text-white text-left lh-17 no-margin\'>'+item.remarks[0].content+'</p>'" ></i>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="row m-b-5">
diff --git a/resources/assets/vue/components/orders/forms/DeleteOrderRemarkFormComponent.vue b/resources/assets/vue/components/orders/forms/DeleteOrderRemarkFormComponent.vue
new file mode 100644
index 00000000..a23d077f
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/DeleteOrderRemarkFormComponent.vue
@@ -0,0 +1,32 @@
+<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 comment?</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.remark.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>
diff --git a/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
new file mode 100644
index 00000000..79273650
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
@@ -0,0 +1,49 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <validation-wrapper-component :validator="$v.parameters.content">
+                <input type="text" class="form-control fs-12" placeholder="Make a remark on this order." v-model.trim="parameters.content">
+            </validation-wrapper-component>
+        </div>
+        <div class="col-auto b-a b-grey d-flex justify-content-center align-items-center rounded pointer">
+            <i class="fa fa-paper-plane" @click="submitForm"></i>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        props: {
+            id: {
+                type: Number,
+                required: true
+            }
+        },
+        data() {
+            return {
+                parameters: {
+                    content: this.content,
+                },
+            };
+        },
+        validations: {
+            parameters: {
+                content: { required },
+            }
+        },
+        created() {
+            if (this.data) {
+                this.parameters.content = this.data.content
+            }
+        },
+        methods: {
+            submitForm() {
+                this.submit(this.data ? this.route('api.remark.update', this.data.id) : this.route('api.order.remark.create', this.id), this.data ? 'put' : 'post', this.section, true, true);
+                this.$emit('submit')
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 5e4a5732..2ebb27ce 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -21,6 +21,47 @@
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
                             </div>
+                            <div class="row m-b-20">
+                                <div class="col-12">
+                                    <div class="row">
+                                        <div class="col-auto d-flex align-items-center">
+                                            <h6 class="no-margin"><b>Remark:</b></h6>
+                                        </div>
+                                        <div class="col-auto p-l-0" v-if="!addComment">
+                                            <div class="btn btn-xs btn-outline-info b-rad-none pointer" @click="addComment = !addComment">Add a Remark</div>
+                                        </div>
+                                        <div class="col d-flex align-items-center pl-3 pl-md-0" v-if="order.remarks.length >= 1 && !isEditRemark">
+                                            <h6 class="no-margin">{{order.remarks[0].content}}</h6> 
+                                            <span class="btn btn-md btn-default m-l-10" @click="isEditRemark = !isEditRemark">
+                                                <i class="fa fa-edit"></i>
+                                            </span>
+                                            <span class="btn btn-md btn-default m-l-5 requestModal" data-type="deleteOrderRemark">
+                                                <i class="fa fa-trash"></i>
+                                            </span>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteOrderRemark">
+                                                <delete-order-remark-form-component :section="section" :data="order.remarks[0]" v-on:submit="addComment=false"></delete-order-remark-form-component>
+                                            </modal-component>
+                                        </div>
+                                        <div class="col pl-2 pl-md-0" v-if="isEditRemark">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <order-remark-form-component :section="section" :data="order.remarks[0]" :id="order.id" v-on:submit="isEditRemark=false"></order-remark-form-component>
+                                                </div>
+                                                 <div class="col-auto d-flex align-items-center">
+                                                    <div class="row m-l-5">
+                                                        <div class="col b-a btn btn-sm btn-default" @click="isEditRemark = !isEditRemark">
+                                                            Cancel
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col p-l-0" v-if="order.remarks.length === 0 && addComment">
+                                            <order-remark-form-component :section="section" :id="order.id"></order-remark-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="row m-b-20">
                                 <div class="col-12 col-sm-auto">
                                     <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
@@ -412,7 +453,9 @@
             return {
                 section: 'orderProfileSection',
                 isLoading: true,
-                order: null
+                order: null,
+                isEditRemark: false,
+                addComment: false,
             }
         },
         computed: {

From 92c086a5bcc4081f46924d411add08fd99101cde Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 27 Nov 2021 17:24:30 +0800
Subject: [PATCH 012/223] clear merge bug dupplicated code

---
 app/Models/Order.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/Models/Order.php b/app/Models/Order.php
index ee8a7b5f..ffa0550a 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -156,12 +156,4 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
     {
         return $this->morphMany(Transaction::class, 'owner');
     }
-
-    /**
-     * @return MorphMany
-     */
-    public function remarks(): morphMany
-    {
-        return $this->morphMany(Remark::class, 'owner');
-    }
 }

From 327c2958c4332720768fd5a6a126ca2e27a62ffa Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 27 Nov 2021 21:37:40 +0800
Subject: [PATCH 013/223] adjust alignment for order remarks

---
 .../orders/sections/OrderProfileSectionComponent.vue        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 80bd2cd0..4cab0ccb 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -20,8 +20,8 @@
                                 <div class="col-auto">
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
-                                <div class="col">
-                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal" data-type="changeOrderNo">Change Order Number</div>
+                                <div class="col d-flex">
+                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo">Change Order Number</div>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
                                         <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                     </modal-component>
@@ -33,7 +33,7 @@
                                         <div class="col-auto d-flex align-items-center">
                                             <h6 class="no-margin"><b>Remark:</b></h6>
                                         </div>
-                                        <div class="col-auto p-l-0" v-if="!addComment">
+                                        <div class="col-auto p-l-0" v-if="!addComment && order.remarks.length == 0">
                                             <div class="btn btn-xs btn-outline-info b-rad-none pointer" @click="addComment = !addComment">Add a Remark</div>
                                         </div>
                                         <div class="col d-flex align-items-center pl-3 pl-md-0" v-if="order.remarks.length >= 1 && !isEditRemark">

From fd686d9ca5da4037b1551b5e62c7707e916e2bd6 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 13:55:13 +0800
Subject: [PATCH 014/223] fix contact processor and remarks database

---
 .../Contacts/Processors/CreateContactProcessor.php  | 12 +++++++-----
 app/Classes/ValueObjects/Constants/RemarkTypes.php  | 13 +++++++++++++
 .../2021_07_21_110310_create_remarks_table.php      |  2 ++
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 app/Classes/ValueObjects/Constants/RemarkTypes.php

diff --git a/app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php b/app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php
index 9e04a134..060e4ad5 100644
--- a/app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php
+++ b/app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php
@@ -2,11 +2,10 @@
 
 namespace App\Classes\Modules\Contacts\Processors;
 
+use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Services\CreatesContact;
 use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
-use App\Models\Company;
-use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateContactProcessor
@@ -15,6 +14,9 @@ class CreateContactProcessor
     /** @var CanCreateContact */
     private $canCreateContact;
 
+    /** @var CreatesContact */
+    private $createsContact;
+
     /**
      * CreateContactProcessor constructor.
      * @param CanCreateContact $canCreateContact
@@ -28,17 +30,17 @@ class CreateContactProcessor
 
     /**
      * @param ContactObject $object
-     * @param Company $company
+     * @param Contactable $contactable
      * @return Model
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(ContactObject $object, Company $company): Model
+    public function execute(ContactObject $object, Contactable $contactable): Model
     {
 
         $this->canCreateContact->passes($object);
 
-        return $this->createsContact->execute($company,$object);
+        return $this->createsContact->execute($contactable,$object);
     }
 }
diff --git a/app/Classes/ValueObjects/Constants/RemarkTypes.php b/app/Classes/ValueObjects/Constants/RemarkTypes.php
new file mode 100644
index 00000000..9629e89a
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/RemarkTypes.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+
+final class RemarkTypes
+{
+
+    public const INTERNAL = 0;
+
+    public const EXTERNAL = 1;
+
+}
\ No newline at end of file
diff --git a/database/migrations/2021_07_21_110310_create_remarks_table.php b/database/migrations/2021_07_21_110310_create_remarks_table.php
index e02b0f44..6656fd77 100644
--- a/database/migrations/2021_07_21_110310_create_remarks_table.php
+++ b/database/migrations/2021_07_21_110310_create_remarks_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\RemarkTypes;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -18,6 +19,7 @@ class CreateRemarksTable extends Migration
             $table->morphs('owner');
             $table->bigInteger('commenter_id')->unsigned()->index();
             $table->string('content',200);
+            $table->integer('type')->default(RemarkTypes::INTERNAL);
             $table->softDeletes();
             $table->timestamps();
         });

From bb2e6f0c6750c20c9c9a13b03f89431c30870c54 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 14:21:36 +0800
Subject: [PATCH 015/223] package tracking page

---
 .../views/pages/orders/packages.blade.php     | 172 ++++++++++++++++++
 routes/web.php                                |   4 +
 2 files changed, 176 insertions(+)
 create mode 100644 resources/views/pages/orders/packages.blade.php

diff --git a/resources/views/pages/orders/packages.blade.php b/resources/views/pages/orders/packages.blade.php
new file mode 100644
index 00000000..31a6173b
--- /dev/null
+++ b/resources/views/pages/orders/packages.blade.php
@@ -0,0 +1,172 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col">
+            <div class="row m-b-20">
+                <div class="col">
+                    <h4 class="bold">Packages</h4>
+                    <p>You can trace and track all packages associated with this order number.</p>
+                </div>
+            </div>
+            <div class="row tabsContainer">
+                <div class="col no-padding">
+                    <div class="row m-l-0 m-r-0 align-items-center overflow-auto flex-nowrap">
+                        <div class="col flex-fill" style="min-width:125px;">
+                            <div class="row justify-content-end">
+                                <div class="col">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="originWarehouse">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                         width="35" height="35"
+                                                         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="M86.06719,12.9c-0.25976,-0.00731 -0.5187,0.03252 -0.76426,0.11758l-68.8,23.65c-0.86858,0.29776 -1.45225,1.11422 -1.45293,2.03242v12.9c-0.00043,0.68443 0.325,1.32819 0.8764,1.73365c0.5514,0.40547 1.2629,0.5242 1.91608,0.31977l1.50752,-0.47031v99.46689h19.35h10.75h36.55h2.15h34.4h12.9h17.2v-99.46689l1.50752,0.47031c0.65319,0.20444 1.36468,0.0857 1.91608,-0.31977c0.5514,-0.40547 0.87683,-1.04922 0.8764,-1.73365v-12.9c-0.00068,-0.9182 -0.58435,-1.73466 -1.45293,-2.03242l-68.8,-23.65c-0.20291,-0.07043 -0.41523,-0.11007 -0.62988,-0.11758zM86,17.32178l66.65,22.91094v8.44043l-7.95752,-2.48174c-0.27786,-0.09509 -0.57226,-0.13224 -0.86504,-0.10918l-0.21416,-0.22676l-0.74326,-0.13437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.41094l0.67607,0.11758c0.18673,0.12653 0.3922,0.22289 0.60889,0.28555l4.94248,1.54531v96.51064h-10.75v-86h-103.2v86h-10.75v-96.51484l4.94248,-1.54531c0.75045,-0.21514 1.32533,-0.82012 1.50193,-1.58056c0.1766,-0.76044 -0.07284,-1.55685 -0.65168,-2.08069c-0.57883,-0.52383 -1.39612,-0.69278 -2.13521,-0.44139l-7.95752,2.48594v-8.44043zM85.40791,28.13477l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13437l1.72588,-0.86504l0.33594,-1.89385l-1.31436,-1.40674zM93.61738,30.33096l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM77.20264,30.70049l-1.72588,0.86084l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31856,-1.40674zM101.82686,32.89668l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM68.99316,33.26621l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31855,-1.40674zM110.03633,35.4624l-1.72588,0.86084l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31855,-1.40674zM60.78369,35.83193l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.41094zM118.2416,38.02812l-1.72168,0.86084l-0.34014,1.89805l1.31856,1.40674l0.74326,0.13437l1.72588,-0.86504l0.33594,-1.89385l-1.31436,-1.41094zM52.57422,38.39766l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13438l1.72168,-0.86504l0.34014,-1.89805l-1.31436,-1.40674zM126.45107,40.59385l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13438l1.72168,-0.86504l0.34014,-1.89805l-1.31436,-1.40674zM44.36895,40.95918l-1.72588,0.86504l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31855,-1.40674zM134.66055,43.15537l-1.72168,0.86504l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM36.15947,43.5249l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.41094l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM38.7,66.65h94.6v81.7h-10.75v-34.4h-17.2v-34.4h-38.7v2.15v32.25h-17.2v2.15v32.25h-10.75zM70.95,83.85h30.1v30.1h-12.9h-2.15h-15.05zM53.75,118.25h12.9h17.2v30.1h-30.1zM88.15,118.25h17.2h12.9v30.1h-30.1z"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5">Warehouse (China)</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto d-inline-block">
+                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                 width="35" height="35"
+                                 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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
+                        </div>
+                        <div class="col flex-fill" style="min-width:125px;">
+                            <div class="row justify-content-end">
+                                <div class="col">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="inTransit">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                         width="35" height="35"
+                                                         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>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5">In Transit</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto d-inline-block" >
+                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                 width="35" height="35"
+                                 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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
+                        </div>
+                        <div class="col flex-fill" style="min-width:125px;">
+                            <div class="row justify-content-end">
+                                <div class="col">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="destinationWarehouse">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                         width="35" height="35"
+                                                         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="M86,12.78242l-70.95,24.38066v17.35957l2.78828,-0.87344l1.51172,-0.47031v99.47109h19.35v-64.5h94.6v62.35h19.35v-97.32109l4.3,1.34375v-17.35957zM86,17.31758l66.65,22.91934v7.31504h-3.59453l-63.05547,-19.70274l-66.65,20.82813v-8.44043zM86,32.35078l62.35,19.48438v94.36484h-10.75v-59.83887c0.04199,-0.23516 0.04199,-0.47031 0,-0.69707v-23.31406h-4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v17.2h-94.6v-17.2c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-4.3v23.28887c-0.04199,0.23516 -0.04199,0.47031 0,0.69707v62.01406h-10.75v-96.51484zM47.3,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.15zM55.9,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.15zM64.5,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.15zM73.1,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.15zM81.7,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.15zM90.3,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.15zM98.9,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.15zM107.5,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.15zM116.1,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.15zM124.7,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,75.25c-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.0666z"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5">Warehouse (Malaysia)</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto d-inline-block" >
+                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                 width="35" height="35"
+                                 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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
+                        </div>
+                        <div class="col flex-fill" style="min-width:125px;">
+                            <div class="row justify-content-end">
+                                <div class="col">
+                                    <div class="row fs-12 text-center">
+                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery">
+                                            <div class="row justify-content-center m-b-5">
+                                                <div class="col-auto">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                         width="35" height="35"
+                                                         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="M0,19.35v92.45h6.45v27.95h10.87598c1.075,9.6498 9.28867,17.2 19.22402,17.2c9.93535,0 18.14902,-7.5502 19.22402,-17.2h51.85195c1.075,9.6498 9.28867,17.2 19.22402,17.2c9.93535,0 18.14902,-7.5502 19.22402,-17.2h21.62598c2.35156,0 4.3,-1.94844 4.3,-4.3v-8.6c0,-1.52012 -0.94063,-2.63711 -2.15,-3.40137v-29.82285l-14.15976,-36.69277c-2.23399,-5.79492 -7.82734,-9.63301 -14.03379,-9.63301h-40.60645v-27.95zM4.3,23.65h92.45v83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v23.65h-40.97598c-1.075,-9.6498 -9.28867,-17.2 -19.22402,-17.2c-9.93535,0 -18.14902,7.5502 -19.22402,17.2h-6.57598v-23.65c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-6.45zM75.56074,48.10625l-31.58652,30.46113l-16.02422,-16.43574l-4.61914,4.50156l20.50059,21.02129l36.20566,-34.90391zM101.05,51.6h30.1v30.1c0,4.72832 3.87168,8.6 8.6,8.6h2.99824c1.44453,0 2.77988,0.71387 3.57774,1.91484l0.47031,0.70547c1.5957,2.39355 4.2832,3.82969 7.15547,3.82969h11.59824v4.3h-4.3c-4.72832,0 -8.6,3.87168 -8.6,8.6v2.15h0.43672c0.98262,3.67012 4.19922,6.45 8.16328,6.45h4.3v4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h2.15v8.6h-21.62598c-1.075,-9.6498 -9.28867,-17.2 -19.22402,-17.2c-9.93535,0 -18.14902,7.5502 -19.22402,17.2h-6.57598zM135.45,51.6h6.20645c4.44277,0 8.42363,2.72949 10.01934,6.87832l13.10996,33.97168h-10.83398c-1.44453,0 -2.77988,-0.71387 -3.57774,-1.91484l-0.47871,-0.70547c-1.5873,-2.39355 -4.2748,-3.82969 -7.14707,-3.82969h-2.99824c-2.40195,0 -4.3,-1.89805 -4.3,-4.3zM113.95,58.05c-3.53574,0 -6.45,2.91426 -6.45,6.45v19.35c0,3.53574 2.91426,6.45 6.45,6.45h4.3c3.53574,0 6.45,-2.91426 6.45,-6.45v-19.35c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM113.95,62.35h4.3c1.21777,0 2.15,0.93223 2.15,2.15v19.35c0,1.21777 -0.93223,2.15 -2.15,2.15h-4.3c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-19.35c0,-1.21777 0.93223,-2.15 2.15,-2.15zM161.25,105.35h4.3v8.6h-4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM19.35,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.15zM27.95,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.15zM36.55,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.15zM45.15,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.15zM53.75,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.15zM62.35,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.15zM70.95,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.15zM79.55,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.15zM88.15,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.15zM36.55,122.55c8.33965,0 15.05,6.71035 15.05,15.05c0,8.33965 -6.71035,15.05 -15.05,15.05c-8.33965,0 -15.05,-6.71035 -15.05,-15.05c0,-8.33965 6.71035,-15.05 15.05,-15.05zM126.85,122.55c8.33965,0 15.05,6.71035 15.05,15.05c0,8.33965 -6.71035,15.05 -15.05,15.05c-8.33965,0 -15.05,-6.71035 -15.05,-15.05c0,-8.33965 6.71035,-15.05 15.05,-15.05zM148.35,122.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.15zM156.95,122.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.15zM36.55,131.15c-3.53574,0 -6.45,2.91426 -6.45,6.45c0,3.53574 2.91426,6.45 6.45,6.45c3.53574,0 6.45,-2.91426 6.45,-6.45c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM126.85,131.15c-3.53574,0 -6.45,2.91426 -6.45,6.45c0,3.53574 2.91426,6.45 6.45,6.45c3.53574,0 6.45,-2.91426 6.45,-6.45c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM36.55,135.45c1.20938,0 2.15,0.94063 2.15,2.15c0,1.20937 -0.94062,2.15 -2.15,2.15c-1.20938,0 -2.15,-0.94063 -2.15,-2.15c0,-1.20937 0.94062,-2.15 2.15,-2.15zM126.85,135.45c1.20937,0 2.15,0.94063 2.15,2.15c0,1.20937 -0.94063,2.15 -2.15,2.15c-1.20937,0 -2.15,-0.94063 -2.15,-2.15c0,-1.20937 0.94063,-2.15 2.15,-2.15z"></path></g></g></svg>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="fs-12 m-t-5">Delivered</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row no-margin">
+                        <div class="col bg-master-lightest p-1 p-sm-4">
+                            <div class="row tabsContainer tabContent active" tab-name="originWarehouse">
+                                <div class="col-12 col-sm-4">
+                                    <div class="row">
+                                        <div class="col bg-complete-lighter p-b-10 ml-4 mr-4 mt-2 m-sm-0">
+                                            <div class="row align-item-center p-t-10 p-b-10">
+                                                <div class="col">
+                                                    <h6 class="bold no-margin">Received Parcels</h6>
+                                                    <p class="no-margin ">Parcels received at our warehouse</p>
+                                                </div>
+                                                <div class="col-auto">
+                                                    <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="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>
+                                            // arrived parcels
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+
+                                </div>
+                            </div>
+                            <div class="row tabsContainer tabContent hide" tab-name="inTransit">
+                                <div class="col">
+
+                                </div>
+                            </div>
+                            <div class="row tabsContainer tabContent hide" tab-name="destinationWarehouse">
+                                <div class="col">
+
+                                </div>
+                            </div>
+                            <div class="row tabsContainer tabContent hide" tab-name="delivery">
+                                <div class="col">
+                                    
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 6c3097e4..2efe01b4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -60,6 +60,10 @@ Route::get('/orders', function () {
     return view('pages.orders.index');
 })->name('orders');
 
+Route::get('/packages', function () {
+    return view('pages.orders.packages');
+})->name('packages');
+
 Route::get('/order/show/{order_number}', function ($orderNumber) {
     return view('pages.orders.profile', ['id' => $orderNumber]);
 })->name('order.show');

From 13fa34960596f84acfbac264704f114cdfd97d4f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 14:28:17 +0800
Subject: [PATCH 016/223] package tracking page

---
 resources/views/pages/orders/packages.blade.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/orders/packages.blade.php b/resources/views/pages/orders/packages.blade.php
index 31a6173b..552189b8 100644
--- a/resources/views/pages/orders/packages.blade.php
+++ b/resources/views/pages/orders/packages.blade.php
@@ -5,7 +5,7 @@
             <div class="row m-b-20">
                 <div class="col">
                     <h4 class="bold">Packages</h4>
-                    <p>You can trace and track all packages associated with this order number.</p>
+                    <p>You can trace and track all your packages.</p>
                 </div>
             </div>
             <div class="row tabsContainer">
@@ -140,7 +140,11 @@
                                                          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>
-                                            // arrived parcels
+                                            <list-component  key="2" section="customerListSection" :endpoint="route('api.packing_list.package.list')" >
+                                                <template slot="list" slot-scope="{data}">
+                                                    <parcel-component :data="data"></parcel-component>
+                                                </template>
+                                            </list-component>
                                         </div>
                                     </div>
                                 </div>
@@ -160,7 +164,7 @@
                             </div>
                             <div class="row tabsContainer tabContent hide" tab-name="delivery">
                                 <div class="col">
-                                    
+
                                 </div>
                             </div>
                         </div>

From 4601d5191b3b7e7119e6fa1e1fb81ff8dc7a6c5f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 14:31:05 +0800
Subject: [PATCH 017/223] package tracking page

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

diff --git a/app/Http/Resources/PackageResource.php b/app/Http/Resources/PackageResource.php
index 75f5589f..aba71697 100644
--- a/app/Http/Resources/PackageResource.php
+++ b/app/Http/Resources/PackageResource.php
@@ -14,6 +14,7 @@ class PackageResource extends JsonResource
      */
     public function toArray($request)
     {
+        dd($this->transport);
         return [
             'id' => $this->id,
             'type' => $this->type,

From d626c0bb515179ee9741a5fa4cd7f5564df7efa7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 16:49:40 +0800
Subject: [PATCH 018/223] package tracking page

---
 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 aba71697..6e45f91f 100644
--- a/app/Http/Resources/PackageResource.php
+++ b/app/Http/Resources/PackageResource.php
@@ -14,7 +14,7 @@ class PackageResource extends JsonResource
      */
     public function toArray($request)
     {
-        dd($this->transport);
+
         return [
             'id' => $this->id,
             'type' => $this->type,

From 2cc046516552a4c5aa165b25c7f30afc51379f18 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 19:19:18 +0800
Subject: [PATCH 019/223] package tracking page

---
 .../Eloquent/Filters/InOriginWarehouse.php    | 29 +++++++++++++++++++
 .../General/Eloquent/Filters/InTransit.php    | 29 +++++++++++++++++++
 .../Eloquent/Filters/WarehouseParcels.php     | 24 +++++++++++++++
 .../Packages/ListPackagesLogic.php            | 16 ++++------
 app/Models/Package.php                        | 10 +++++++
 app/Scopes/CustomerPackagesScope.php          | 29 +++++++++++++++++++
 .../orders/elements/ParcelComponent.vue       |  4 +--
 .../views/pages/orders/packages.blade.php     | 14 +++++++--
 8 files changed, 140 insertions(+), 15 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/InOriginWarehouse.php
 create mode 100644 app/Classes/General/Eloquent/Filters/InTransit.php
 create mode 100644 app/Classes/General/Eloquent/Filters/WarehouseParcels.php
 create mode 100644 app/Scopes/CustomerPackagesScope.php

diff --git a/app/Classes/General/Eloquent/Filters/InOriginWarehouse.php b/app/Classes/General/Eloquent/Filters/InOriginWarehouse.php
new file mode 100644
index 00000000..80bac25a
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/InOriginWarehouse.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InOriginWarehouse implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereDoesntHave('shippingSchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())
+                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/InTransit.php b/app/Classes/General/Eloquent/Filters/InTransit.php
new file mode 100644
index 00000000..258d7e5c
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/InTransit.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InOriginWarehouse implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('shippingSchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())
+                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/WarehouseParcels.php b/app/Classes/General/Eloquent/Filters/WarehouseParcels.php
new file mode 100644
index 00000000..a342a964
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WarehouseParcels.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+
+class WarehouseParcels implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function ($query){
+            return $query->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->where('status', ApprovalStatus::APPROVED);
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
index 80d73e5b..73b05ddb 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
@@ -45,21 +45,17 @@ class ListPackagesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canListPackages->passes();
 
-            $this->canListPackages->passes();
+        $query = $this->listsPackages->execute($this->listsPackages->deserializeFilters($request->input('filters')));
 
-            $query = $this->listsPackages->execute($this->listsPackages->deserializeFilters($request->input('filters')));
-
-            return $this->collectionResponse(PackageResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->collectionResponse(PackageResource::collection($query));
 
     }
 
diff --git a/app/Models/Package.php b/app/Models/Package.php
index e78402f2..cfc50f2f 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -4,6 +4,9 @@ namespace App\Models;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Scopes\CustomerOrdersScope;
+use App\Scopes\CustomerPackagesScope;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
@@ -137,4 +140,11 @@ class Package extends AbstractModel
         });
     }
 
+    protected static function booted()
+    {
+        if (auth()->user()->type === RoleTypes::USER) {
+            static::addGlobalScope(new CustomerPackagesScope());
+        }
+    }
+
 }
diff --git a/app/Scopes/CustomerPackagesScope.php b/app/Scopes/CustomerPackagesScope.php
new file mode 100644
index 00000000..dd8a50d1
--- /dev/null
+++ b/app/Scopes/CustomerPackagesScope.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Scopes;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+
+class CustomerPackagesScope implements Scope
+{
+    /**
+     * Apply the scope to a given Eloquent query builder.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @return void
+     */
+    public function apply(Builder $builder, Model $model)
+    {
+        $builder->whereHas('order', function ($query) {
+            $query->whereHas('companyModule', function($query){
+                return $query->whereHas('employees', function($query){
+                    return $query->where('user_id', Auth()->user()->id);
+                });
+            });
+        });
+    }
+
+}
\ 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 44303afb..41900336 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -20,7 +20,7 @@
                     <div class="row align-items-center">
                         <div class="col-auto">
                             <p class="no-margin all-caps fs-10 light">Arrival Date</p>
-                            <p class="no-margin text-success bold">{{item.transport.drop_date}}</p>
+                            <p class="no-margin text-success bold">{{item.transport ? item.transport.drop_date : 'n/a'}}</p>
                         </div>
                         <div class="col-auto text-center">
                             <p class="no-margin all-caps fs-10 light">Qty</p>
@@ -62,7 +62,7 @@
                             <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">
+                    <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>
diff --git a/resources/views/pages/orders/packages.blade.php b/resources/views/pages/orders/packages.blade.php
index 552189b8..a85544f4 100644
--- a/resources/views/pages/orders/packages.blade.php
+++ b/resources/views/pages/orders/packages.blade.php
@@ -140,7 +140,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="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>
-                                            <list-component  key="2" section="customerListSection" :endpoint="route('api.packing_list.package.list')" >
+                                            <list-component  key="2" section="warehouseParcel" :endpoint="route('api.packing_list.package.list')" :options="{warehouse_parcels: true}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <parcel-component :data="data"></parcel-component>
                                                 </template>
@@ -149,12 +149,20 @@
                                     </div>
                                 </div>
                                 <div class="col">
-
+                                    <list-component  key="2" section="originWarehouse" :endpoint="route('api.packing_list.package.list')" :options="{in_origin_warehouse: true}" :columns=3>
+                                        <template slot="list" slot-scope="{data}">
+                                            <package-component :data="data"></package-component>
+                                        </template>
+                                    </list-component>
                                 </div>
                             </div>
                             <div class="row tabsContainer tabContent hide" tab-name="inTransit">
                                 <div class="col">
-
+                                    <list-component  key="3" section="inTransit" :endpoint="route('api.packing_list.package.list')" :options="{in_transit: true}" :columns=3>
+                                        <template slot="list" slot-scope="{data}">
+                                            <package-component :data="data"></package-component>
+                                        </template>
+                                    </list-component>
                                 </div>
                             </div>
                             <div class="row tabsContainer tabContent hide" tab-name="destinationWarehouse">

From 95daebb8f16cf1190dd636cd43555917744665f1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 19:21:27 +0800
Subject: [PATCH 020/223] package tracking page

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

diff --git a/resources/views/pages/orders/packages.blade.php b/resources/views/pages/orders/packages.blade.php
index a85544f4..e5c2921a 100644
--- a/resources/views/pages/orders/packages.blade.php
+++ b/resources/views/pages/orders/packages.blade.php
@@ -151,7 +151,7 @@
                                 <div class="col">
                                     <list-component  key="2" section="originWarehouse" :endpoint="route('api.packing_list.package.list')" :options="{in_origin_warehouse: true}" :columns=3>
                                         <template slot="list" slot-scope="{data}">
-                                            <package-component :data="data"></package-component>
+                                            <package-component :data="data" status="Ready To Ship"></package-component>
                                         </template>
                                     </list-component>
                                 </div>
@@ -160,7 +160,7 @@
                                 <div class="col">
                                     <list-component  key="3" section="inTransit" :endpoint="route('api.packing_list.package.list')" :options="{in_transit: true}" :columns=3>
                                         <template slot="list" slot-scope="{data}">
-                                            <package-component :data="data"></package-component>
+                                            <package-component :data="data" status="In Transit"></package-component>
                                         </template>
                                     </list-component>
                                 </div>

From 4302b42ad8873089abe784a2a2350e6bb73f4455 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 19:22:28 +0800
Subject: [PATCH 021/223] package tracking page

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

diff --git a/resources/views/pages/orders/packages.blade.php b/resources/views/pages/orders/packages.blade.php
index e5c2921a..2d3e3cb9 100644
--- a/resources/views/pages/orders/packages.blade.php
+++ b/resources/views/pages/orders/packages.blade.php
@@ -149,7 +149,7 @@
                                     </div>
                                 </div>
                                 <div class="col">
-                                    <list-component  key="2" section="originWarehouse" :endpoint="route('api.packing_list.package.list')" :options="{in_origin_warehouse: true}" :columns=3>
+                                    <list-component  key="2" section="originWarehouse" :endpoint="route('api.packing_list.package.list')" :options="{in_origin_warehouse: true, per_page: 12}" :columns=3>
                                         <template slot="list" slot-scope="{data}">
                                             <package-component :data="data" status="Ready To Ship"></package-component>
                                         </template>
@@ -158,7 +158,7 @@
                             </div>
                             <div class="row tabsContainer tabContent hide" tab-name="inTransit">
                                 <div class="col">
-                                    <list-component  key="3" section="inTransit" :endpoint="route('api.packing_list.package.list')" :options="{in_transit: true}" :columns=3>
+                                    <list-component  key="3" section="inTransit" :endpoint="route('api.packing_list.package.list')" :options="{in_transit: true, per_page: 12}" :columns=3>
                                         <template slot="list" slot-scope="{data}">
                                             <package-component :data="data" status="In Transit"></package-component>
                                         </template>

From 0dc1a3c28974deaa5a3a266131f2171b6f9601d5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 19:24:18 +0800
Subject: [PATCH 022/223] package tracking page

---
 .../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 781fe424..16d8f5c0 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -46,7 +46,7 @@
                                     <div class="row m-b-5">
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Order Number</small>
-                                            <p class="no-margin bold">{{item.order.reference}}</p>
+                                            <p class="no-margin bold"><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></p>
                                         </div>
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Status</small>

From 3de95f70193b07e204293ddf318bec97a3abeac0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 19:27:02 +0800
Subject: [PATCH 023/223] package tracking page

---
 app/Classes/General/Eloquent/Filters/InTransit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/General/Eloquent/Filters/InTransit.php b/app/Classes/General/Eloquent/Filters/InTransit.php
index 258d7e5c..d7295cb0 100644
--- a/app/Classes/General/Eloquent/Filters/InTransit.php
+++ b/app/Classes/General/Eloquent/Filters/InTransit.php
@@ -7,7 +7,7 @@ use App\Classes\ValueObjects\Constants\PackingListType;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 
-class InOriginWarehouse implements Filter
+class InTransit implements Filter
 {
 
     /**

From 036f38930851f5d13de69af720252dbe2054fbd9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 19:29:06 +0800
Subject: [PATCH 024/223] package tracking page

---
 app/Classes/General/Eloquent/Filters/InTransit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/General/Eloquent/Filters/InTransit.php b/app/Classes/General/Eloquent/Filters/InTransit.php
index d7295cb0..e7ce4fea 100644
--- a/app/Classes/General/Eloquent/Filters/InTransit.php
+++ b/app/Classes/General/Eloquent/Filters/InTransit.php
@@ -21,7 +21,7 @@ class InTransit implements Filter
             return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
         })->whereHas('shippingSchedules',
             function($schedule) {
-                return $schedule->where('etd', '<', Carbon::now())
+                return $schedule->where('etd', '<', Carbon::now())->where('eta', '>', Carbon::now())
                     ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
             }
         );

From 5d9782d1c951691ee6577c49f60383bd196b00a3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 20:19:09 +0800
Subject: [PATCH 025/223] package tracking page

---
 .../General/Eloquent/Filters/Delivered.php    | 32 +++++++++++++++++++
 .../Filters/InDestinationWarehouse.php        | 32 +++++++++++++++++++
 .../General/Eloquent/Filters/InTransit.php    |  8 +++--
 app/Models/Package.php                        |  2 +-
 .../views/pages/orders/packages.blade.php     | 14 ++++++--
 5 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/Delivered.php
 create mode 100644 app/Classes/General/Eloquent/Filters/InDestinationWarehouse.php

diff --git a/app/Classes/General/Eloquent/Filters/Delivered.php b/app/Classes/General/Eloquent/Filters/Delivered.php
new file mode 100644
index 00000000..f6c09b98
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/Delivered.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class Delivered implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::COMPLETED);
+            }
+        )->whereHas('deliverySchedules',
+            function($schedule) {
+                return $schedule->where('eta', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/InDestinationWarehouse.php b/app/Classes/General/Eloquent/Filters/InDestinationWarehouse.php
new file mode 100644
index 00000000..b4a56b23
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/InDestinationWarehouse.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InDestinationWarehouse implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::COMPLETED);
+            }
+        )->whereDoesntHave('deliverySchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/InTransit.php b/app/Classes/General/Eloquent/Filters/InTransit.php
index e7ce4fea..db453486 100644
--- a/app/Classes/General/Eloquent/Filters/InTransit.php
+++ b/app/Classes/General/Eloquent/Filters/InTransit.php
@@ -19,9 +19,13 @@ class InTransit implements Filter
     {
         return $builder->whereHas('packingList', function($packingList){
             return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
-        })->whereHas('shippingSchedules',
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::PENDING_VERIFICATION);
+            }
+        )->whereHas('shippingSchedules',
             function($schedule) {
-                return $schedule->where('etd', '<', Carbon::now())->where('eta', '>', Carbon::now())
+                return $schedule->where('etd', '<', Carbon::now())
                     ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
             }
         );
diff --git a/app/Models/Package.php b/app/Models/Package.php
index cfc50f2f..89ef8328 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -143,7 +143,7 @@ class Package extends AbstractModel
     protected static function booted()
     {
         if (auth()->user()->type === RoleTypes::USER) {
-            static::addGlobalScope(new CustomerPackagesScope());
+//            static::addGlobalScope(new CustomerPackagesScope());
         }
     }
 
diff --git a/resources/views/pages/orders/packages.blade.php b/resources/views/pages/orders/packages.blade.php
index 2d3e3cb9..2629c58b 100644
--- a/resources/views/pages/orders/packages.blade.php
+++ b/resources/views/pages/orders/packages.blade.php
@@ -160,19 +160,27 @@
                                 <div class="col">
                                     <list-component  key="3" section="inTransit" :endpoint="route('api.packing_list.package.list')" :options="{in_transit: true, per_page: 12}" :columns=3>
                                         <template slot="list" slot-scope="{data}">
-                                            <package-component :data="data" status="In Transit"></package-component>
+                                            <package-component :data="data" status="Shipping"></package-component>
                                         </template>
                                     </list-component>
                                 </div>
                             </div>
                             <div class="row tabsContainer tabContent hide" tab-name="destinationWarehouse">
                                 <div class="col">
-
+                                    <list-component  key="2" section="destinationWarehouse" :endpoint="route('api.packing_list.package.list')" :options="{in_destination_warehouse: true, per_page: 12}" :columns=3>
+                                        <template slot="list" slot-scope="{data}">
+                                            <package-component :data="data" status="Preparing Delivery"></package-component>
+                                        </template>
+                                    </list-component>
                                 </div>
                             </div>
                             <div class="row tabsContainer tabContent hide" tab-name="delivery">
                                 <div class="col">
-
+                                    <list-component  key="2" section="delivery" :endpoint="route('api.packing_list.package.list')" :options="{delivered: true, per_page: 12}" :columns=3>
+                                        <template slot="list" slot-scope="{data}">
+                                            <package-component :data="data" status="Delivered"></package-component>
+                                        </template>
+                                    </list-component>
                                 </div>
                             </div>
                         </div>

From 32465e21705e1e5d41c5161aba0a636b08928856 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 28 Nov 2021 21:03:04 +0800
Subject: [PATCH 026/223] add contact and remark to address

---
 .../ControllersLogic/CreateAddressLogic.php   | 31 +++++++++++-
 .../ControllersLogic/UpdateAddressLogic.php   | 33 ++++++++++++-
 app/Http/Resources/AddressResource.php        |  2 +
 app/Models/Address.php                        | 21 +++++++-
 .../addresses/forms/AddressFormComponent.vue  | 49 ++++++++++++++++---
 .../validation/addressFormValidation.js       |  5 +-
 6 files changed, 130 insertions(+), 11 deletions(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index f0240e5c..855d552b 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -4,12 +4,18 @@ namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Http\Resources\AddressResource;
+use App\Models\Address;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -39,19 +45,29 @@ class CreateAddressLogic extends AbstractControllerLogic
     /** @var CreatesAddress */
     private $createsAddress;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param FetchesDistrict $fetchesDistrict
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param CreatesAddress $createsAddress
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->canCreateAddress = $canCreateAddress;
         $this->fetchesDistrict = $fetchesDistrict;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsAddress = $createsAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
     /**
@@ -70,8 +86,21 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $this->canCreateAddress->passes($object);
 
+        /** @var Address $address */
         $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
+        $contactObject = new ContactObject($request->input('pic'), $request->input('phone'), '', '');
+
+        if($contactObject->getPhone()){
+            $this->createContactProcessor->execute($contactObject, $address);
+        }
+
+        $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
+
+        if($remarkObject->getContent()){
+            $this->createRemarkProcessor->execute($address, $remarkObject);
+        }
+
         return $this->resourceResponse(new AddressResource($address));
 
     }
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index 9d8f0600..345dd777 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -9,7 +9,12 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Http\Resources\AddressResource;
+use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -38,22 +43,31 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateAddress $canUpdateAddress
      * @param UpdatesAddress $updatesAddress
      * @param FetchesAddress $fetchesAddress
      * @param FetchesDistrict $fetchesDistrict
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->canUpdateAddress = $canUpdateAddress;
         $this->updatesAddress = $updatesAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->fetchesDistrict = $fetchesDistrict;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
@@ -71,8 +85,23 @@ class UpdateAddressLogic extends AbstractControllerLogic
 
         $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
+        /** @var Address $address */
         $address = $this->updatesAddress->execute($address, $object);
 
+        $address->contacts()->delete(); $address->remarks()->delete();
+
+        $contactObject = new ContactObject($request->input('pic'), $request->input('phone'), '', '');
+
+        if($contactObject->getPhone()){
+            $this->createContactProcessor->execute($contactObject, $address);
+        }
+
+        $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
+
+        if($remarkObject->getContent()){
+            $this->createRemarkProcessor->execute($address, $remarkObject);
+        }
+
         return $this->resourceResponse(new AddressResource($address));
 
     }
diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index 6f6a6237..95a60b9f 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -28,6 +28,8 @@ class AddressResource extends JsonResource
             'country' => $this->country,
             'default' => (int) $this->default,
             'status' => (int) $this->status,
+            'contact' => new ContactResource($this->contacts->first()),
+            'remark' => new RemarkResource($this->remarks->first()),
             $this->mergeWhen($this->relationLoaded('owner'), [
                 'owner' => $this->when($this->owner instanceof Order, [
                     'reference' => $this->owner->reference,
diff --git a/app/Models/Address.php b/app/Models/Address.php
index bbd60d70..8357940f 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -2,9 +2,12 @@
 
 namespace App\Models;
 
+use App\Classes\General\Interfaces\Contactable;
+use App\Classes\General\Interfaces\Remarkable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 /**
@@ -20,7 +23,7 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
  * @property string street_two
  * @property integer billing_type
  */
-class Address extends AbstractModel
+class Address extends AbstractModel implements Contactable, Remarkable
 {
     use SoftDeletes;
 
@@ -70,4 +73,20 @@ class Address extends AbstractModel
     {
         return $query->where('default', true);
     }
+
+    /**
+     * @return MorphMany
+     */
+    public function contacts(): morphMany
+    {
+        return $this->morphMany(Contact::class, 'owner');
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function remarks(): morphMany
+    {
+        return $this->morphMany(Remark::class, 'owner');
+    }
 }
diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 3a0b4ac8..98d405e9 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -3,6 +3,14 @@
         <div class="col">
             <div class="row">
                 <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.reference">
+                                <label>Address Reference/Label</label>
+                                <input class="form-control" name="reference" v-model="parameters.reference">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
                     <div class="row m-b-15">
                         <div class="col">
                             <validation-wrapper-component :validator="$v.parameters.street_one">
@@ -33,12 +41,34 @@
                             </validation-wrapper-component>
                         </div>
                     </div>
-                    <div class="row m-b-15">
+                    <div class="row">
                         <div class="col">
-                            <validation-wrapper-component :validator="$v.parameters.reference">
-                                <label>Address Reference/Label</label>
-                                <input class="form-control" name="reference" v-model="parameters.reference">
-                            </validation-wrapper-component>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row m-b-15">
+                                        <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                                            <validation-wrapper-component :validator="$v.parameters.pic">
+                                                <label>Person In Charge</label>
+                                                <input class="form-control" name="pic" v-model="parameters.pic">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-12 col-md pl-md-1">
+                                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                                <label>Phone</label>
+                                                <input class="form-control" name="phone" v-model="parameters.phone">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.remark">
+                                                <label>Delivery Remark</label>
+                                                <input class="form-control" name="remark" v-model="parameters.remark">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -46,7 +76,8 @@
             <div class="row">
                 <div class="col">
                     <div class="row">
-                        <div class="col text-right">
+                        <div class="col"></div>
+                        <div class="col-auto">
                             <button type="button" class="btn btn-sm btn-complete b-rad-none" @click="submitForm()">{{ this.data ? "Update" : "Save" }} Address</button>
                         </div>
                     </div>
@@ -73,6 +104,9 @@
                     street_two: '',
                     district_id: '',
                     post_code: '',
+                    remark: '',
+                    phone: '',
+                    pic: '',
 				}
 
             }            
@@ -84,6 +118,9 @@
                 this.parameters.street_two = this.data.street_two;
                 this.parameters.district_id = this.data.district.id;
                 this.parameters.post_code = this.data.post_code;
+                this.parameters.phone = this.data.contact.phone;
+                this.parameters.pic = this.data.contact.reference;
+                this.parameters.remark = this.data.remark.content;
             }
         },
         watch: {
diff --git a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
index 4180331f..6a59841c 100644
--- a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
+++ b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
@@ -1,4 +1,4 @@
-import { required } from "vuelidate/lib/validators";
+import { required, numeric } from "vuelidate/lib/validators";
 import addressFormHandler from '../addressFormHandler'
 export default {
     validations: {
@@ -8,6 +8,9 @@ export default {
             street_two: {},
             district_id: { required },
             post_code: { required },
+            remark: {},
+            phone: {numeric},
+            pic: {},
         }
     },
     mixins: [addressFormHandler]

From 4440f229d9f617a1652a4d76dec4439dea25320c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 29 Nov 2021 11:33:26 +0800
Subject: [PATCH 027/223] add contact and remark to address

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

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index 62a75f36..4c6f3045 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -58,7 +58,7 @@
                                 <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-3">Delivery Address</div>
+                                <div class="col-3">Delivery Details</div>
                                 <div class="col">Delivery Date</div>
                             </div>
                         </div>
@@ -72,7 +72,7 @@
                                         <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)) * 1000) / 1000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.transport ? 'Delivery' : packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
-                                        <div class="col-3">{{packingList.order.address.street_one+' '+(packingList.order.address.street_two ? packingList.order.address.street_two : '')+', '+ packingList.order.address.district.name+', '+packingList.order.address.post_code+' '+packingList.order.address.state.name+', '+packingList.order.address.country.name}}</div>
+                                        <div class="col-3">{{packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone}}<br>{{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}}<br>{{packingList.order.address.remark.content}}</div>
                                         <div class="col">
                                             <p class="no-margin">{{packingList.transport ? packingList.transport.current_schedule.eta : 'n/a'}}</p>
                                         </div>

From 098297188d0669c1efb39e2438c7294b504cfefa Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 29 Nov 2021 11:44:02 +0800
Subject: [PATCH 028/223] add contact and remark to address

---
 .../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 4c6f3045..34341c48 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -72,7 +72,7 @@
                                         <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)) * 1000) / 1000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.transport ? 'Delivery' : packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
-                                        <div class="col-3">{{packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone}}<br>{{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}}<br>{{packingList.order.address.remark.content}}</div>
+                                        <div class="col-3">{{packingList.order.address.contact ? packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone : ''}}{{<br>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}}<br>{{packingList.order.address.remark ? packingList.order.address.remark.content: ''}}</div>
                                         <div class="col">
                                             <p class="no-margin">{{packingList.transport ? packingList.transport.current_schedule.eta : 'n/a'}}</p>
                                         </div>

From 3a74fa5e1270350a0f7cae41c1291e487b6807b5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 29 Nov 2021 11:46:43 +0800
Subject: [PATCH 029/223] add contact and remark to address

---
 .../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 34341c48..f894385c 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -72,7 +72,7 @@
                                         <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)) * 1000) / 1000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.transport ? 'Delivery' : packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
-                                        <div class="col-3">{{packingList.order.address.contact ? packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone : ''}}{{<br>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}}<br>{{packingList.order.address.remark ? packingList.order.address.remark.content: ''}}</div>
+                                        <div class="col-3">{{packingList.order.address.contact ? packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone : ''}}<br>{{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}}<br>{{packingList.order.address.remark ? packingList.order.address.remark.content: ''}}</div>
                                         <div class="col">
                                             <p class="no-margin">{{packingList.transport ? packingList.transport.current_schedule.eta : 'n/a'}}</p>
                                         </div>

From 13c4b173d38a0b4ec706571b52f821f9ee5e55cf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 3 Dec 2021 13:44:08 +0800
Subject: [PATCH 030/223] list yiwu to sabah or srawak orders

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

diff --git a/routes/web.php b/routes/web.php
index 2efe01b4..9fef0fc2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -136,6 +136,19 @@ Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
     })->name('shipping-queue');
 });
 
+Route::get('/yiwu', function () {
+    $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
+        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 4);
+    })->whereHas('OrderRoles', function($query){
+        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::DESTINATION_WAREHOUSE)->where(function ($query){
+            $query->where('company_module_id', 6)->orWhere('company_module_id', 6);
+        });
+    })->get();
+
+    dd($orders);
+
+});
+
 Route::get('/debug', function (){
     $orders = \App\Models\Order::all();
 

From 3d89a25f5c06f513815d4083aa5671403414a36b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 3 Dec 2021 13:44:42 +0800
Subject: [PATCH 031/223] remove list yiwu to sabah or srawak orders

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

diff --git a/routes/web.php b/routes/web.php
index 9fef0fc2..0f1cf198 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -136,18 +136,6 @@ Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
     })->name('shipping-queue');
 });
 
-Route::get('/yiwu', function () {
-    $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
-        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 4);
-    })->whereHas('OrderRoles', function($query){
-        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::DESTINATION_WAREHOUSE)->where(function ($query){
-            $query->where('company_module_id', 6)->orWhere('company_module_id', 6);
-        });
-    })->get();
-
-    dd($orders);
-
-});
 
 Route::get('/debug', function (){
     $orders = \App\Models\Order::all();

From 3aec23525cf29e36757ce6acd528547bde41c4e2 Mon Sep 17 00:00:00 2001
From: Fairuz <fairuz.tester@gmail.com>
Date: Mon, 13 Dec 2021 11:45:48 +0800
Subject: [PATCH 032/223] Duplicate packing list for admin CIEF reference

---
 .../FetchLoadedContainersFromVTPortalProcessor.php         | 7 ++++++-
 app/Models/PackingList.php                                 | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index bb9986c0..32c17cd1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -21,6 +21,7 @@ use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\ContainerTypes;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\Order;
 use App\Models\PackingList;
@@ -194,7 +195,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                         $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
 
                         $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+                        $order->orderRoles()->where('role_id', '=', RoleT::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
 
                         $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
 
@@ -207,6 +208,10 @@ class FetchLoadedContainersFromVTPortalProcessor
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
                         $container->packingLists()->attach($packingList);
 
+                        //Duplicate a copy for internal reference
+                        $packingListObject = new PackingListObject($packingListReference,  RoleTypes::SUPER_ADMIN, PackingListType::SHIPPING_PACKING_LIST, (int) filter_var($marking, FILTER_SANITIZE_NUMBER_INT) <= 1000 ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::SUSPENDED, $contractReference);
+                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $packingList);
+
                         foreach($contractObligations as $obligation) {
                             $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
                             $this->createsStep->execute($packingList, $stepObject);
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index fc775ba2..24565d9c 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
+use App\Classes\General\Interfaces\Packable;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -11,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class PackingList extends AbstractModel implements Transportable, Steppable
+class PackingList extends AbstractModel implements Transportable, Steppable, Packable
 {
     use SoftDeletes;
 

From 926cb61ca371c3f4d09cc37c8afc45965d4d6d24 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Mon, 13 Dec 2021 21:23:04 +0800
Subject: [PATCH 033/223] Vt sync update

---
 .../ApproveChangeOrderAddressProcessor.php    |   9 +-
 .../RequestChangeOrderAddressProcessor.php    |  40 +++-
 .../UpdateDoFromVTPortalProcessor.php         | 202 ++++++++++++++++++
 .../UpdatePackingListStatusLogic.php          |  14 +-
 4 files changed, 256 insertions(+), 9 deletions(-)
 create mode 100644 app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php

diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
index fbd84f90..40112301 100644
--- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -6,6 +6,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 
 use Illuminate\Http\Request;
 
@@ -26,11 +27,12 @@ class ApproveChangeOrderAddressProcessor
      * @param FetchesAddress $fetchesAddress
      * @param UpdatesOrdersAddress $updatesOrdersAddress
      */
-    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
+    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor)
     {
         $this->canApproveChangeOrderAddress = $canApproveChangeOrderAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->updatesOrdersAddress = $updatesOrdersAddress;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
     }
 
 
@@ -43,7 +45,6 @@ class ApproveChangeOrderAddressProcessor
      */
     public function execute(Request $request)
     {
-
         $status = (int) $request->route('status');
 
         $this->canApproveChangeOrderAddress->passes();
@@ -54,7 +55,9 @@ class ApproveChangeOrderAddressProcessor
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
         }
 
-        $this->updatesOrdersAddress->execute($address, $status);
+        $address = $this->updatesOrdersAddress->execute($address, $status);
+
+        $vt_do_update = $this->updateDoFromVTPortalProcessor->execute($address);
 
         return $address;
     }
diff --git a/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
index 7f01726b..994803e3 100644
--- a/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
@@ -9,6 +9,10 @@ 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 App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 
 use Illuminate\Http\Request;
 
@@ -29,6 +33,12 @@ class RequestChangeOrderAddressProcessor
     /** @var DeletesAddress */
     private $deletesAddress;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * ChangeOrderAddressProcessor constructor.
      * @param FetchesOrder $fetchesOrder
@@ -36,7 +46,7 @@ class RequestChangeOrderAddressProcessor
      * @param FetchesAddress $fetchesAddress
      * @param DeletesAddress $deletesAddress
      */
-    public function __construct(CanChangeOrderAddress $canChangeOrderAddress, FetchesOrder $fetchesOrder, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress, DeletesAddress $deletesAddress)
+    public function __construct(CanChangeOrderAddress $canChangeOrderAddress, FetchesOrder $fetchesOrder, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress, DeletesAddress $deletesAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
 
         $this->canChangeOrderAddress = $canChangeOrderAddress;
@@ -44,12 +54,13 @@ class RequestChangeOrderAddressProcessor
         $this->createsAddress = $createsAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->deletesAddress = $deletesAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
 
     public function execute(Request $request)
     {
-
         $this->canChangeOrderAddress->passes();
 
         $order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
@@ -59,7 +70,30 @@ class RequestChangeOrderAddressProcessor
 
         $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);
+       $order_address = $this->createsAddress->execute($order, $addressObject);
+
+        $contact = $address->contacts()->first();
+        $contactObject = new ContactObject(
+            $contact->reference, 
+            $contact->phone, 
+            '', 
+            ''
+        );
+
+        if($contactObject->getPhone()){
+            $order_remark =  $this->createContactProcessor->execute($contactObject, $order_address);
+        }
+
+        $remark = $address->remarks()->first();
+
+        $remarkObject = new RemarkObject(
+            $remark->content, 
+            Auth()->user()->id
+        );
+
+        if($remarkObject->getContent()){
+            $this->createRemarkProcessor->execute($order_address, $remarkObject);
+        }
 
         return $order;
     }
diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
new file mode 100644
index 00000000..8b3faeb2
--- /dev/null
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\PackingList;
+use App\Models\Transport;
+use Carbon\Carbon;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\Log;
+
+use Illuminate\Http\Request;
+
+class UpdateDoFromVTPortalProcessor
+{
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /**
+     * FetchDeliveryListFromVTPortalProcessor constructor.
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param UpdatesContractObligation $updatesContractObligations
+     */
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, FetchesAddress $fetchesAddress)
+    {
+        $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->fetchesAddress = $fetchesAddress;
+    }
+
+    /**
+     * @return array
+     */
+    public function execute($address) {
+
+        try {
+            $order = $address->owner()->orderBy('id', 'desc')->first();
+            $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
+
+            if ($packing_list) {
+                $contact = $address->contacts()->first();
+                $remark = $address->remarks()->first();
+
+                $status = 'Release';
+
+                if ($packing_list->status == ApprovalStatus::PENDING_VERIFICATION) {
+                    $status = 'Release';
+                }
+                else if($packing_list->status == ApprovalStatus::SUSPENDED) {
+                    $status = 'On Hold';
+
+                }
+
+                $vt_do = $this->fetchesDataFRomVTPortal->clientRequest(
+                    'http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 
+                    'POST', 
+                    json_decode('{
+                        "controller": "Do",
+                        "view": "grid1",
+                        "request": {
+                        "PageIndex": -2,
+                        "PageSize": 10,
+                        "PageOffset": 0,
+                        "SortExpression": "",
+                        "GroupExpression": "",
+                        "Filter": [
+                            "FullMarking:$contains$%js%\"' . $order->reference . '\"\u0000"
+                        ],
+                        "ContextKey": "view2",
+                        "FilterIsExternal": true,
+                        "LookupContextFieldName": null,
+                        "LookupContextController": null,
+                        "LookupContextView": null,
+                        "LookupContext": null,
+                        "Inserting": false,
+                        "LastCommandName": null,
+                        
+                        "DoesNotRequireData": false,
+                        "LastView": "grid1",
+                        "Tag": null,
+                        "RequiresFirstLetters": false,
+                        "ViewType": "Grid",
+                        "SupportsCaching": true,
+                        "SystemFilter": null,
+                        "RequiresRowCount": true,
+                        "QuickFindHint": null,
+                        "RequiresPivot": false,
+                        "PivotDefinitions": null,
+                        "RequiresMetaData": true
+                        }
+                        }'
+                    ), '');
+
+                $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do);
+
+                if ($vt_do) {
+                    foreach ($vt_do->Rows as $key => $row) {
+
+                        $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
+                        'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
+                        'POST', 
+                        json_decode('{
+                              "controller": "Do",
+                              "view": "editForm1",
+                              "args": {
+                                "CommandName": "Update",
+                                "CommandArgument": "Save",
+                                "Path": "ag2/a4",
+                                "LastCommandName": "Edit",
+                                "Values": [
+                                  {
+                                    "Name": "ShippingAddress",
+                                    "NewValue": "' . $address->street_one . ' ' . $address->street_two  . '",
+                                    "Modified": true,
+                                    "ReadOnly": false,
+                                    "Error": null
+                                  },
+                                  {
+                                    "Name": "Attn",
+                                    "NewValue": "' . $contact->reference . '",
+                                    "Modified": true,
+                                    "ReadOnly": false,
+                                    "Error": null
+                                  },
+                                  {
+                                    "Name": "Tel",
+                                    "NewValue": "' . $contact->phone . '",
+                                    "Modified": true,
+                                    "ReadOnly": false,
+                                    "Error": null
+                                  },
+                                  {
+                                    "Name": "Status",
+                                    "NewValue": "' . $status . '",
+                                    "Modified": true,
+                                    "ReadOnly": false,
+                                    "Error": null
+                                  },
+                                  {
+                                    "Name": "Doremarks",
+                                    "NewValue": "' . $remark->content . '",
+                                    "Modified": true,
+                                    "ReadOnly": false,
+                                    "Error": null
+                                  },
+                                  {
+                                    "Name": "ModifiedBy",
+                                    "OldValue": "CIEF",
+                                    "NewValue": "CIEF",
+                                    "Modified": false,
+                                    "ReadOnly": false,
+                                    "Error": null
+                                  },
+                                  {
+                                    "Name": "DoID",
+                                    "OldValue": 1471,
+                                    "NewValue": ' . $row[0] . ',
+                                    "Modified": false,
+                                    "ReadOnly": true,
+                                    "Error": null
+                                  }
+                                ],
+                                "ContextKey": "do",
+                                "Controller": "Do",
+                                "View": "editForm1",
+                                "LastView": "grid1",
+                                "Tag": null,
+                                "Filter": [
+                                  "DoID:=%js%' . $row[0] . '",
+                                  "ContainerID:=%js%' . $row[1] . '"
+                                ],
+                                "SortExpression": "",
+                                "GroupExpression": "",
+                                "SelectedValues": []
+                              }
+                        }'), '');
+                    }
+                }
+            }
+
+        } catch (\Exception $exception){
+            Log::error($exception);
+        }
+
+        return [];
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
index 67a1733c..c4266dc1 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
@@ -9,6 +9,7 @@ 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\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -34,15 +35,19 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     /** @var UpdatesPackingListStatus */
     private $updatesPackingListStatus;
 
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
     /**
      * UpdatePackingListStatusLogic constructor.
      * @param FetchesPackingList $fetchesPackingList
      * @param UpdatesPackingListStatus $updatesPackingListStatus
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesPackingListStatus $updatesPackingListStatus)
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesPackingListStatus $updatesPackingListStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor)
     {
         $this->fetchesPackingList = $fetchesPackingList;
         $this->updatesPackingListStatus = $updatesPackingListStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
     }
 
     /**
@@ -54,9 +59,12 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $query = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+        $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+        $address = $packing_list->owner()->first()->addresses()->first();
 
-        return $this->resourceResponse(new PackingListResource($query));
+        $vt_do_update = $this->updateDoFromVTPortalProcessor->execute($address);
+
+        return $this->resourceResponse(new PackingListResource($packing_list));
     }
 
 }

From 280f5f497476bb64c77bb20af244a0464dc51672 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 16 Dec 2021 13:50:04 +0800
Subject: [PATCH 034/223] update order profile section - only admins can edit
 the order reference number

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

diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 4cab0ccb..4724d723 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -21,7 +21,7 @@
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
                                 <div class="col d-flex">
-                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo">Change Order Number</div>
+                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isAdmin">Change Order Number</div>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
                                         <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                     </modal-component>

From 4a158b8dacce24eb5e3caa83a7bf3f9aea5c5ec6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 16 Dec 2021 18:17:27 +0800
Subject: [PATCH 035/223] update order profile section - only super admin can
 edit the order reference number

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

diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 4724d723..1332bfe6 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -21,7 +21,7 @@
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
                                 <div class="col d-flex">
-                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isAdmin">Change Order Number</div>
+                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isSuperAdmin">Change Order Number</div>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
                                         <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                     </modal-component>

From 5e11b8ebdfe495d3dd9d33d00c56295ff122d9c4 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Thu, 16 Dec 2021 21:46:33 +0800
Subject: [PATCH 036/223] job connect YD portal

---
 .../Services/FetchesDataFromYDPortal.php      | 32 +++++++++++++
 .../FetchOrderListsFromYdPortalProcessor.php  | 40 ++++++++++++++++
 .../Commands/CurlYdOrderListCommand.php       | 48 +++++++++++++++++++
 app/Job/CurlYdOrderListJob.php                | 37 ++++++++++++++
 4 files changed, 157 insertions(+)
 create mode 100644 app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
 create mode 100644 app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
 create mode 100644 app/Console/Commands/CurlYdOrderListCommand.php
 create mode 100644 app/Job/CurlYdOrderListJob.php

diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
new file mode 100644
index 00000000..37b1c295
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use Psr\Http\Message\ResponseInterface;
+
+class FetchesDataFromYDPortal
+{
+
+    /**
+     * @param string $url
+     * @param string $method
+     * @param $body
+     * @param bool $requiresAuthentication
+     * @return \Psr\Http\Message\ResponseInterface
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function clientRequest(string $url, string $method, $body){
+        
+        $client = new \GuzzleHttp\Client();
+
+        $request = $client->requestAsync($method, $url, ['query' => $body]);
+
+        return $request->wait();
+    }
+
+    public function getResponseBody(ResponseInterface $request){
+        $content = $request->getBody()->getContents();
+        $content =  str_replace("\r",'', $content);
+        return json_decode($content);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
new file mode 100644
index 00000000..c65b8ee9
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class FetchOrderListsFromYdPortalProcessor
+{
+    /**
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomYDPortal;
+
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal)
+    {
+        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+    }
+
+    /**
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     * @return array
+     * @throws GuzzleException
+     */
+    public function execute(?Carbon $start = null, ?Carbon $end = null) {
+
+
+            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                'apicode' => '393b1cb4b8b37d09',
+                'begintime' => '1633968000',
+                'endtime' => '1639308222',
+            ]);
+
+            $order = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+            dd($order);
+    }
+}
diff --git a/app/Console/Commands/CurlYdOrderListCommand.php b/app/Console/Commands/CurlYdOrderListCommand.php
new file mode 100644
index 00000000..b68f6cd1
--- /dev/null
+++ b/app/Console/Commands/CurlYdOrderListCommand.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\State; 
+use App\Http\Helpers\General;
+
+use Illuminate\Console\Command;
+use App\Jobs\CurlYdOrderListJob;
+
+class CurlYdOrderListCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    
+    protected $signature = 'command:curlYdOrderListCommand';
+    // 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()
+    {
+        CurlYdOrderListJob::dispatch();
+    }
+}
diff --git a/app/Job/CurlYdOrderListJob.php b/app/Job/CurlYdOrderListJob.php
new file mode 100644
index 00000000..713df1bc
--- /dev/null
+++ b/app/Job/CurlYdOrderListJob.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CurlYdOrderListJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+
+    public function __construct()
+    {
+       
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+    }
+}

From 1d3ab4ab2ad65f1c684bff30dc174eb2a844ae65 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Thu, 16 Dec 2021 21:48:59 +0800
Subject: [PATCH 037/223] yd-job connect

---
 app/Classes/Jobs/CurlYdOrderListJob.php       | 37 ++++++++++++++
 .../Services/FetchesDataFromYDPortal.php      | 32 +++++++++++++
 .../FetchOrderListsFromYdPortalProcessor.php  | 40 ++++++++++++++++
 .../Commands/CurlYdOrderListCommand.php       | 48 +++++++++++++++++++
 4 files changed, 157 insertions(+)
 create mode 100644 app/Classes/Jobs/CurlYdOrderListJob.php
 create mode 100644 app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
 create mode 100644 app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
 create mode 100644 app/Console/Commands/CurlYdOrderListCommand.php

diff --git a/app/Classes/Jobs/CurlYdOrderListJob.php b/app/Classes/Jobs/CurlYdOrderListJob.php
new file mode 100644
index 00000000..462f2b3f
--- /dev/null
+++ b/app/Classes/Jobs/CurlYdOrderListJob.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CurlYdOrderListJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+
+    public function __construct()
+    {
+       
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+    }
+}
diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
new file mode 100644
index 00000000..37b1c295
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use Psr\Http\Message\ResponseInterface;
+
+class FetchesDataFromYDPortal
+{
+
+    /**
+     * @param string $url
+     * @param string $method
+     * @param $body
+     * @param bool $requiresAuthentication
+     * @return \Psr\Http\Message\ResponseInterface
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function clientRequest(string $url, string $method, $body){
+        
+        $client = new \GuzzleHttp\Client();
+
+        $request = $client->requestAsync($method, $url, ['query' => $body]);
+
+        return $request->wait();
+    }
+
+    public function getResponseBody(ResponseInterface $request){
+        $content = $request->getBody()->getContents();
+        $content =  str_replace("\r",'', $content);
+        return json_decode($content);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
new file mode 100644
index 00000000..c65b8ee9
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class FetchOrderListsFromYdPortalProcessor
+{
+    /**
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomYDPortal;
+
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal)
+    {
+        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+    }
+
+    /**
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     * @return array
+     * @throws GuzzleException
+     */
+    public function execute(?Carbon $start = null, ?Carbon $end = null) {
+
+
+            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                'apicode' => '393b1cb4b8b37d09',
+                'begintime' => '1633968000',
+                'endtime' => '1639308222',
+            ]);
+
+            $order = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+            dd($order);
+    }
+}
diff --git a/app/Console/Commands/CurlYdOrderListCommand.php b/app/Console/Commands/CurlYdOrderListCommand.php
new file mode 100644
index 00000000..46fa4206
--- /dev/null
+++ b/app/Console/Commands/CurlYdOrderListCommand.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\State; 
+use App\Http\Helpers\General;
+
+use Illuminate\Console\Command;
+use App\Classes\Jobs\CurlYdOrderListJob;
+
+class CurlYdOrderListCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    
+    protected $signature = 'command:curlYdOrderListCommand';
+    // 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()
+    {
+        CurlYdOrderListJob::dispatch();
+    }
+}

From bec9f121ab24ec01c2e176ae087c2dfb4c96ee22 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:02:01 +0800
Subject: [PATCH 038/223] add packing list relationship in packing list model

---
 app/Models/PackingList.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 24565d9c..21b0d692 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -72,4 +72,12 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
     {
         return $this->BelongsToMany(PackingList::class, 'packing_list_owner', 'owner_packing_list_id', 'packing_list_id');
     }
+
+    /**
+     * @return MorphMany
+     */
+    public function packingLists(): morphMany
+    {
+        return $this->morphMany(PackingList::class, 'owner');
+    }
 }

From ce1a2556b706bcd4c6e054644ac96f956019bf55 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:12:34 +0800
Subject: [PATCH 039/223] debug address contact

---
 .../Modules/Addresses/ControllersLogic/UpdateAddressLogic.php | 2 +-
 .../vue/components/addresses/forms/AddressFormComponent.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index 345dd777..25fb6054 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -90,7 +90,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
 
         $address->contacts()->delete(); $address->remarks()->delete();
 
-        $contactObject = new ContactObject($request->input('pic'), $request->input('phone'), '', '');
+        $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
 
         if($contactObject->getPhone()){
             $this->createContactProcessor->execute($contactObject, $address);
diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 98d405e9..5a9d22c6 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -106,7 +106,7 @@
                     post_code: '',
                     remark: '',
                     phone: '',
-                    pic: '',
+                    person_in_charge: '',
 				}
 
             }            
@@ -119,7 +119,7 @@
                 this.parameters.district_id = this.data.district.id;
                 this.parameters.post_code = this.data.post_code;
                 this.parameters.phone = this.data.contact.phone;
-                this.parameters.pic = this.data.contact.reference;
+                this.parameters.person_in_charge = this.data.contact.reference;
                 this.parameters.remark = this.data.remark.content;
             }
         },

From 7b1df816490299ad839276a48817cd45bbc6113e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:14:17 +0800
Subject: [PATCH 040/223] debug address contact

---
 .../Modules/Addresses/ControllersLogic/UpdateAddressLogic.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index 25fb6054..f2b2c7c0 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -89,7 +89,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
         $address = $this->updatesAddress->execute($address, $object);
 
         $address->contacts()->delete(); $address->remarks()->delete();
-
+dd($request->all());
         $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
 
         if($contactObject->getPhone()){

From 71eb8db3f347f06405a9ed95ce3c632b0c8337cf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:15:23 +0800
Subject: [PATCH 041/223] debug address contact

---
 .../Modules/Addresses/ControllersLogic/UpdateAddressLogic.php | 2 +-
 .../vue/components/addresses/forms/AddressFormComponent.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index f2b2c7c0..25fb6054 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -89,7 +89,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
         $address = $this->updatesAddress->execute($address, $object);
 
         $address->contacts()->delete(); $address->remarks()->delete();
-dd($request->all());
+
         $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
 
         if($contactObject->getPhone()){
diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 5a9d22c6..8debbb82 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -47,9 +47,9 @@
                                 <div class="col">
                                     <div class="row m-b-15">
                                         <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
-                                            <validation-wrapper-component :validator="$v.parameters.pic">
+                                            <validation-wrapper-component :validator="$v.parameters.person_in_charge">
                                                 <label>Person In Charge</label>
-                                                <input class="form-control" name="pic" v-model="parameters.pic">
+                                                <input class="form-control" name="person_in_charge" v-model="parameters.person_in_charge">
                                             </validation-wrapper-component>
                                         </div>
                                         <div class="col-12 col-md pl-md-1">

From d29ead2144e92db0f564c70493cb8380abe3da30 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:16:48 +0800
Subject: [PATCH 042/223] debug address contact

---
 .../Modules/Addresses/ControllersLogic/UpdateAddressLogic.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index 25fb6054..baf5588c 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -89,7 +89,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
         $address = $this->updatesAddress->execute($address, $object);
 
         $address->contacts()->delete(); $address->remarks()->delete();
-
+dd($request->input('person_in_charge'));
         $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
 
         if($contactObject->getPhone()){

From b057cd91c3f2a07e39b653efca4fa85e35eb2bd7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:17:53 +0800
Subject: [PATCH 043/223] debug address contact

---
 .../Modules/Addresses/ControllersLogic/UpdateAddressLogic.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index baf5588c..f2b2c7c0 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -89,7 +89,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
         $address = $this->updatesAddress->execute($address, $object);
 
         $address->contacts()->delete(); $address->remarks()->delete();
-dd($request->input('person_in_charge'));
+dd($request->all());
         $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
 
         if($contactObject->getPhone()){

From c972bc87a35a1f3337b333d93a1126751638a2ad Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:19:43 +0800
Subject: [PATCH 044/223] debug address contact

---
 .../mixins/addresses/validation/addressFormValidation.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
index 6a59841c..98d57e59 100644
--- a/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
+++ b/resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js
@@ -10,7 +10,7 @@ export default {
             post_code: { required },
             remark: {},
             phone: {numeric},
-            pic: {},
+            person_in_charge: {},
         }
     },
     mixins: [addressFormHandler]

From 3f9874a0bd4cc37fa5cb53367afc469802a4dae0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:21:44 +0800
Subject: [PATCH 045/223] debug address contact

---
 .../vue/components/addresses/forms/AddressFormComponent.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 8debbb82..0b6edc6b 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -118,9 +118,9 @@
                 this.parameters.street_two = this.data.street_two;
                 this.parameters.district_id = this.data.district.id;
                 this.parameters.post_code = this.data.post_code;
-                this.parameters.phone = this.data.contact.phone;
-                this.parameters.person_in_charge = this.data.contact.reference;
-                this.parameters.remark = this.data.remark.content;
+                this.parameters.phone = this.data.contact ? this.data.contact.phone : '';
+                this.parameters.person_in_charge = this.data.contact ? this.data.contact.reference : '';
+                this.parameters.remark = this.data.remark ? this.data.remark.content : '';
             }
         },
         watch: {

From 4a7c4f51a57b433616fc98e8c6764269d4f06fc8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 17 Dec 2021 12:23:09 +0800
Subject: [PATCH 046/223] debug address contact

---
 .../Modules/Addresses/ControllersLogic/UpdateAddressLogic.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index f2b2c7c0..25fb6054 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -89,7 +89,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
         $address = $this->updatesAddress->execute($address, $object);
 
         $address->contacts()->delete(); $address->remarks()->delete();
-dd($request->all());
+
         $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
 
         if($contactObject->getPhone()){

From 565fd5eae343ca88f2d7ecad2be8016c0e3734a1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 20 Dec 2021 14:47:52 +0800
Subject: [PATCH 047/223] fix create address logic

---
 .../Modules/Addresses/ControllersLogic/CreateAddressLogic.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index 855d552b..8b7a6fb8 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -89,7 +89,7 @@ class CreateAddressLogic extends AbstractControllerLogic
         /** @var Address $address */
         $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
-        $contactObject = new ContactObject($request->input('pic'), $request->input('phone'), '', '');
+        $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
 
         if($contactObject->getPhone()){
             $this->createContactProcessor->execute($contactObject, $address);

From 22a2d7d7a16bb2def8c1105c6ec027a73a2d564b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 21 Dec 2021 19:10:03 +0800
Subject: [PATCH 048/223] sync vt do with shipping portal

---
 .env.example                                  |   2 +
 app/Classes/Jobs/CurlYdOrderListJob.php       |   1 +
 .../ControllersLogic/CreateAddressLogic.php   |  10 +-
 .../ControllersLogic/UpdateAddressLogic.php   |  10 +-
 .../ApproveChangeOrderAddressProcessor.php    |   5 +-
 .../RequestChangeOrderAddressProcessor.php    |  37 ++--
 .../UpdateDoFromVTPortalProcessor.php         | 179 ++++++------------
 .../Services/FetchesDataFromYDPortal.php      |   4 +-
 .../UpdatePackingListStatusLogic.php          |   4 +-
 .../FetchOrderListsFromYdPortalProcessor.php  |  44 ++++-
 routes/web.php                                |   5 +
 11 files changed, 142 insertions(+), 159 deletions(-)

diff --git a/.env.example b/.env.example
index a75778c8..5ae78676 100644
--- a/.env.example
+++ b/.env.example
@@ -53,3 +53,5 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 UNITY_APP_URL="https://unity.izyim.com"
 EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
 MIX_EXCHANGE_URL="${EXCHANGE_URL}"
+
+YD_API_CODE=''
diff --git a/app/Classes/Jobs/CurlYdOrderListJob.php b/app/Classes/Jobs/CurlYdOrderListJob.php
index 462f2b3f..ee5fba54 100644
--- a/app/Classes/Jobs/CurlYdOrderListJob.php
+++ b/app/Classes/Jobs/CurlYdOrderListJob.php
@@ -29,6 +29,7 @@ class CurlYdOrderListJob implements ShouldQueue
      * Execute the job.
      *
      * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function handle()
     {
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index 8b7a6fb8..91f5c42e 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -89,15 +89,13 @@ class CreateAddressLogic extends AbstractControllerLogic
         /** @var Address $address */
         $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
-        $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
-
-        if($contactObject->getPhone()){
+        if($request->input('phone')){
+            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
             $this->createContactProcessor->execute($contactObject, $address);
         }
 
-        $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
-
-        if($remarkObject->getContent()){
+        if($request->input('remark')){
+            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
index 25fb6054..95b8bf64 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
@@ -90,15 +90,13 @@ class UpdateAddressLogic extends AbstractControllerLogic
 
         $address->contacts()->delete(); $address->remarks()->delete();
 
-        $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
-
-        if($contactObject->getPhone()){
+        if($request->input('phone')){
+            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
             $this->createContactProcessor->execute($contactObject, $address);
         }
 
-        $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
-
-        if($remarkObject->getContent()){
+        if($request->input('remark')){
+            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
index 40112301..c7d17487 100644
--- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -40,8 +40,10 @@ class ApproveChangeOrderAddressProcessor
      * @param Request $request
      * @return mixed
      * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(Request $request)
     {
@@ -53,12 +55,11 @@ class ApproveChangeOrderAddressProcessor
 
         if($status === ApprovalStatus::APPROVED){
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
+            $this->updateDoFromVTPortalProcessor->execute($address);
         }
 
         $address = $this->updatesOrdersAddress->execute($address, $status);
 
-        $vt_do_update = $this->updateDoFromVTPortalProcessor->execute($address);
-
         return $address;
     }
 }
diff --git a/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
index 994803e3..81b31026 100644
--- a/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
@@ -59,6 +59,13 @@ class RequestChangeOrderAddressProcessor
     }
 
 
+    /**
+     * @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)
     {
         $this->canChangeOrderAddress->passes();
@@ -70,31 +77,33 @@ class RequestChangeOrderAddressProcessor
 
         $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);
-       $order_address = $this->createsAddress->execute($order, $addressObject);
+        $order_address = $this->createsAddress->execute($order, $addressObject);
 
         $contact = $address->contacts()->first();
-        $contactObject = new ContactObject(
-            $contact->reference, 
-            $contact->phone, 
-            '', 
-            ''
-        );
+        if($contact){
+            $contactObject = new ContactObject(
+                $contact->reference,
+                $contact->phone,
+                '',
+                ''
+            );
+
+            $this->createContactProcessor->execute($contactObject, $order_address);
 
-        if($contactObject->getPhone()){
-            $order_remark =  $this->createContactProcessor->execute($contactObject, $order_address);
         }
 
         $remark = $address->remarks()->first();
 
-        $remarkObject = new RemarkObject(
-            $remark->content, 
-            Auth()->user()->id
-        );
+        if($remark){
+            $remarkObject = new RemarkObject(
+                $remark->content,
+                Auth()->user()->id
+            );
 
-        if($remarkObject->getContent()){
             $this->createRemarkProcessor->execute($order_address, $remarkObject);
         }
 
+
         return $order;
     }
 }
diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
index 8b3faeb2..55eae21a 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\Orders\Processors;
 
+use App\Classes\Exceptions\InternalServerErrorException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
@@ -33,9 +34,7 @@ class UpdateDoFromVTPortalProcessor
     /**
      * FetchDeliveryListFromVTPortalProcessor constructor.
      * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
-     * @param CreatesTransport $createsTransport
-     * @param CreatesSchedule $createsSchedule
-     * @param UpdatesContractObligation $updatesContractObligations
+     * @param FetchesAddress $fetchesAddress
      */
     public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, FetchesAddress $fetchesAddress)
     {
@@ -44,7 +43,10 @@ class UpdateDoFromVTPortalProcessor
     }
 
     /**
+     * @param $address
      * @return array
+     * @throws GuzzleException
+     * @throws InternalServerErrorException
      */
     public function execute($address) {
 
@@ -56,147 +58,88 @@ class UpdateDoFromVTPortalProcessor
                 $contact = $address->contacts()->first();
                 $remark = $address->remarks()->first();
 
-                $status = 'Release';
+                $remark = $remark ? $remark->content : 'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
+                $phone = $contact ? $contact->phone : null;
+                $reference = $contact ? $contact->reference : null;
 
-                if ($packing_list->status == ApprovalStatus::PENDING_VERIFICATION) {
+                $status = 'On Hold';
+
+                if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
                     $status = 'Release';
                 }
-                else if($packing_list->status == ApprovalStatus::SUSPENDED) {
-                    $status = 'On Hold';
 
-                }
-
-                $vt_do = $this->fetchesDataFRomVTPortal->clientRequest(
-                    'http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 
-                    'POST', 
-                    json_decode('{
-                        "controller": "Do",
-                        "view": "grid1",
-                        "request": {
-                        "PageIndex": -2,
-                        "PageSize": 10,
-                        "PageOffset": 0,
-                        "SortExpression": "",
-                        "GroupExpression": "",
-                        "Filter": [
-                            "FullMarking:$contains$%js%\"' . $order->reference . '\"\u0000"
-                        ],
-                        "ContextKey": "view2",
-                        "FilterIsExternal": true,
-                        "LookupContextFieldName": null,
-                        "LookupContextController": null,
-                        "LookupContextView": null,
-                        "LookupContext": null,
-                        "Inserting": false,
-                        "LastCommandName": null,
-                        
-                        "DoesNotRequireData": false,
-                        "LastView": "grid1",
-                        "Tag": null,
-                        "RequiresFirstLetters": false,
-                        "ViewType": "Grid",
-                        "SupportsCaching": true,
-                        "SystemFilter": null,
-                        "RequiresRowCount": true,
-                        "QuickFindHint": null,
-                        "RequiresPivot": false,
-                        "PivotDefinitions": null,
-                        "RequiresMetaData": true
-                        }
-                        }'
-                    ), '');
+                $vt_do = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Do","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"Filter": ["FullMarking:$contains$%js%\"' . $order->reference . '\"\u0000"]}}'), '');
 
                 $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do);
 
                 if ($vt_do) {
                     foreach ($vt_do->Rows as $key => $row) {
-
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                         'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                         'POST', 
                         json_decode('{
-                              "controller": "Do",
-                              "view": "editForm1",
-                              "args": {
+                            "controller": "Do",
+                            "view": "editForm1",
+                            "args": {
                                 "CommandName": "Update",
                                 "CommandArgument": "Save",
                                 "Path": "ag2/a4",
                                 "LastCommandName": "Edit",
                                 "Values": [
-                                  {
-                                    "Name": "ShippingAddress",
-                                    "NewValue": "' . $address->street_one . ' ' . $address->street_two  . '",
-                                    "Modified": true,
-                                    "ReadOnly": false,
-                                    "Error": null
-                                  },
-                                  {
-                                    "Name": "Attn",
-                                    "NewValue": "' . $contact->reference . '",
-                                    "Modified": true,
-                                    "ReadOnly": false,
-                                    "Error": null
-                                  },
-                                  {
-                                    "Name": "Tel",
-                                    "NewValue": "' . $contact->phone . '",
-                                    "Modified": true,
-                                    "ReadOnly": false,
-                                    "Error": null
-                                  },
-                                  {
-                                    "Name": "Status",
-                                    "NewValue": "' . $status . '",
-                                    "Modified": true,
-                                    "ReadOnly": false,
-                                    "Error": null
-                                  },
-                                  {
-                                    "Name": "Doremarks",
-                                    "NewValue": "' . $remark->content . '",
-                                    "Modified": true,
-                                    "ReadOnly": false,
-                                    "Error": null
-                                  },
-                                  {
-                                    "Name": "ModifiedBy",
-                                    "OldValue": "CIEF",
-                                    "NewValue": "CIEF",
-                                    "Modified": false,
-                                    "ReadOnly": false,
-                                    "Error": null
-                                  },
-                                  {
-                                    "Name": "DoID",
-                                    "OldValue": 1471,
-                                    "NewValue": ' . $row[0] . ',
-                                    "Modified": false,
-                                    "ReadOnly": true,
-                                    "Error": null
-                                  }
+                                    {
+                                        "Name": "ShippingAddress",
+                                        "NewValue": "' . $address->street_one . ' ' . $address->street_two  . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Attn",
+                                        "NewValue": "'.$reference.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Tel",
+                                        "NewValue": "'.$phone.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Status",
+                                        "NewValue": "' . $status . '",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Doremarks",
+                                        "NewValue": "'. $remark .'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "DoID",
+                                        "OldValue": '.$row[0].',
+                                        "NewValue": '.$row[0].',
+                                        "Modified": false,
+                                        "ReadOnly": true,
+                                        "Error": null
+                                    }
                                 ],
-                                "ContextKey": "do",
-                                "Controller": "Do",
-                                "View": "editForm1",
-                                "LastView": "grid1",
-                                "Tag": null,
-                                "Filter": [
-                                  "DoID:=%js%' . $row[0] . '",
-                                  "ContainerID:=%js%' . $row[1] . '"
-                                ],
-                                "SortExpression": "",
-                                "GroupExpression": "",
-                                "SelectedValues": []
-                              }
+                                "Controller": "Do"
+                            }
                         }'), '');
                     }
                 }
             }
 
         } catch (\Exception $exception){
-            Log::error($exception);
+            throw new InternalServerErrorException('failed to approve address due to an error related to VT portal');
         }
 
-        return [];
     }
 }
diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
index 37b1c295..387a2b24 100644
--- a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
@@ -11,14 +11,14 @@ class FetchesDataFromYDPortal
      * @param string $url
      * @param string $method
      * @param $body
-     * @param bool $requiresAuthentication
      * @return \Psr\Http\Message\ResponseInterface
-     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function clientRequest(string $url, string $method, $body){
         
         $client = new \GuzzleHttp\Client();
 
+        $body['apicode'] = env('YD_API_CODE');
+
         $request = $client->requestAsync($method, $url, ['query' => $body]);
 
         return $request->wait();
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
index c4266dc1..9bf1735a 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
@@ -53,7 +53,9 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function logic(Request $request) : JsonResponse
     {
@@ -62,7 +64,7 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
         $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
         $address = $packing_list->owner()->first()->addresses()->first();
 
-        $vt_do_update = $this->updateDoFromVTPortalProcessor->execute($address);
+        $this->updateDoFromVTPortalProcessor->execute($address);
 
         return $this->resourceResponse(new PackingListResource($packing_list));
     }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index c65b8ee9..4718a874 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -4,6 +4,8 @@ namespace App\Classes\Modules\PackingLists\Processors;
 
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
 
+use App\Models\Order;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
@@ -21,20 +23,42 @@ class FetchOrderListsFromYdPortalProcessor
     /**
      * @param Carbon|null $start
      * @param Carbon|null $end
-     * @return array
-     * @throws GuzzleException
+     * @return void
      */
-    public function execute(?Carbon $start = null, ?Carbon $end = null) {
+    public function execute(?Carbon $start = null, ?Carbon $end = null)
+    {
+        $start = $start ? $start : Carbon::now()->subMonths(2);
 
+        $startLimit = Carbon::parse('01-12-2021');
 
-            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                'apicode' => '393b1cb4b8b37d09',
-                'begintime' => '1633968000',
-                'endtime' => '1639308222',
-            ]);
+        if($start->isBefore($startLimit)){
+            $start = $startLimit;
+        }
 
-            $order = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+        $end = $end ? $end : Carbon::now();
+
+        $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+            'begintime' => $start->timestamp,
+            'endtime' => $end->timestamp,
+        ]);
+
+        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+        foreach($rows->data as $row){
+            if (strpos($row->customerno, '/') !== false) { $customerno = explode('/', explode('CIEF/', $row->customerno)[1]); }
+            if(strpos($row->customerno, '-') !== false){ $customerno = explode('-', explode('CIEF-', $row->customerno)[1]); }
+
+            $marking = $customerno[0];
+            $orderNumber = $customerno[1];
+
+            $order = Order::where('reference', $orderNumber)->first();
+
+            if(!$order){
+                continue;
+            }
+
+            dump($order);
+        }
 
-            dd($order);
     }
 }
diff --git a/routes/web.php b/routes/web.php
index 73f7841b..8234457f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -5,6 +5,7 @@ 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\FetchOrderListsFromYdPortalProcessor;
 use App\Models\CompanyConnection;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
@@ -177,3 +178,7 @@ Route::get('/debug', function (){
 
     dd($issues);
 });
+
+Route::get('/yd', function (){
+    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();;
+});

From 47eb9262ad2923b7a6920a22e5b2a626307a10f4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Dec 2021 01:19:26 +0800
Subject: [PATCH 049/223] add packing list replica

---
 ...inersStatusUpdateFromVTPortalProcessor.php |  3 ++
 ...hLoadedContainersFromVTPortalProcessor.php | 10 ++---
 .../FetchPackingListFromVTPortalProcessor.php |  9 ++++
 ...ehouseReceiveListFromVTPortalProcessor.php | 15 +++++++
 .../Constants/PackingListType.php             |  5 +++
 app/Http/Resources/OrderResource.php          |  4 +-
 app/Http/Resources/PackageResource.php        |  7 +--
 app/Http/Resources/PackingListResource.php    | 11 ++++-
 app/Models/Order.php                          | 13 +++---
 app/Models/Package.php                        |  4 +-
 app/Models/PackingList.php                    | 43 +++++++++++++++++++
 .../sections/OrderProfileSectionComponent.vue | 28 ++++++------
 resources/views/pages/orders/index.blade.php  |  2 +-
 13 files changed, 119 insertions(+), 35 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index 955d68d0..d1e69706 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -80,6 +80,9 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
 
                     $containerDetails = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailsRequest);
 
+                    if(!$containerDetails->Rows){
+                        continue;
+                    }
                     $containerDetails = $containerDetails->Rows[0];
 
                     if(!$eta = $containerDetails[3]){
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 32c17cd1..330c3200 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -195,7 +195,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                         $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
 
                         $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                        $order->orderRoles()->where('role_id', '=', RoleT::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
 
                         $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
 
@@ -208,15 +208,15 @@ class FetchLoadedContainersFromVTPortalProcessor
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
                         $container->packingLists()->attach($packingList);
 
-                        //Duplicate a copy for internal reference
-                        $packingListObject = new PackingListObject($packingListReference,  RoleTypes::SUPER_ADMIN, PackingListType::SHIPPING_PACKING_LIST, (int) filter_var($marking, FILTER_SANITIZE_NUMBER_INT) <= 1000 ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::SUSPENDED, $contractReference);
-                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $packingList);
-
                         foreach($contractObligations as $obligation) {
                             $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
                             $this->createsStep->execute($packingList, $stepObject);
                         }
 
+                        //Duplicate a copy for internal reference
+                        $packingListObject = new PackingListObject($packingListReference.'_01',  $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST_REPLICA, ApprovalStatus::PENDING_SUBMISSION);
+                        $this->createPackingListProcessor->execute($packingListObject, $packingList);
+
 
                     }
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 00c3e112..9a47ed50 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -63,6 +63,9 @@ class FetchPackingListFromVTPortalProcessor
 
                 $packingList->packages()->delete();
 
+                $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                if($replica) $replica->packages()->delete();
+
                 foreach($shippingPackingLists->Rows as $shippingPackingList){
                     if(!$shippingPackingList[22]) {
                         continue;
@@ -70,6 +73,12 @@ class FetchPackingListFromVTPortalProcessor
 
                     $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
                     $this->createPackageProcessor->execute($packageObject, $packingList);
+
+                    if($replica) {
+                        $modificationValue = 1;
+                        $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31] + $modificationValue, $shippingPackingList[30] + $modificationValue, $shippingPackingList[29] + $modificationValue, 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
+                        $this->createPackageProcessor->execute($packageObject, $replica);
+                    }
                 }
 
                 DB::commit();
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index d1eb8516..397dacce 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -207,6 +207,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 if(!$packingList) {
                     $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
+                    $packingListObject = new PackingListObject($packingListReference.'_01', $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA, ApprovalStatus::APPROVED);
+                    $this->createPackingListProcessor->execute($packingListObject, $packingList);
+
                     $transportObject = new TransportObject(TransportType::LAND, null, $tracking, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
 
 
@@ -220,15 +223,27 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
                 $this->createsSchedule->execute($transport, new ScheduleObject(Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED));
 
+                /** @var PackingList $replica */
+                $replica = $packingList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
                 $packingList->packages()->delete();
 
+
                 $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement, $measurement, $measurement, 0, $quantity, ApprovalStatus::APPROVED);
                 $this->createPackageProcessor->execute($packageObject, $packingList);
 
+                if($replica){
+                    $replica->packages()->delete();
+                    $modificationValue = 1;
+                    $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement + $modificationValue, $measurement + $modificationValue, $measurement + $modificationValue, 0, $quantity, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $replica);
+
+                }
+
             }
 
 
         } catch (\Exception $exception){
+            dd($exception);
             Log::error($exception->getMessage());
         }
 
diff --git a/app/Classes/ValueObjects/Constants/PackingListType.php b/app/Classes/ValueObjects/Constants/PackingListType.php
index 56f29244..bd83c6ba 100644
--- a/app/Classes/ValueObjects/Constants/PackingListType.php
+++ b/app/Classes/ValueObjects/Constants/PackingListType.php
@@ -14,5 +14,10 @@ final class PackingListType {
 
     public const DELIVERY_PACKING_LIST = 4;
 
+    public const WAREHOUSE_RECEIVE_LIST_REPLICA = 5;
+
+    public const SHIPPING_PACKING_LIST_REPLICA = 6;
+
+
 
 }
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 0c30bb62..b5bdf0ab 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -31,7 +31,7 @@ class OrderResource extends JsonResource
             'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             'parcels' =>  $this->whenLoaded('packingLists', function() {
                 return [
-                    'origin_warehouse_packages' => PackageResource::collection(
+                    'origin_warehouse_packages' => PackingListResource::collection(
                         $this->originWarehousePackages()->get()
                     ),
                     'in_transit_packages' => PackageResource::collection(
@@ -43,7 +43,7 @@ class OrderResource extends JsonResource
                     'delivered_packages' => PackageResource::collection(
                         $this->deliveredPackages()->get()
                     ),
-                    'received_packages' => PackageResource::collection($this->parcels()->warehouseReceiveList()->get()),
+                    'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->get()),
                 ];
             }),
             'remarks' => RemarkResource::collection($this->remarks),
diff --git a/app/Http/Resources/PackageResource.php b/app/Http/Resources/PackageResource.php
index 6e45f91f..2cd76a1b 100644
--- a/app/Http/Resources/PackageResource.php
+++ b/app/Http/Resources/PackageResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Models\Order;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class PackageResource extends JsonResource
@@ -26,9 +27,9 @@ class PackageResource extends JsonResource
             'quantity' => $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->container),
-            'transport' => new TransportResource($this->transport)
+            'order' => New OrderResource($this->packingList->owner instanceof Order ? $this->packingList->owner : $this->packingList->owner->owner),
+            'container' => new ContainerResource($this->packingList->owner instanceof Order ? $this->container : $this->packingList->owner->containers()->first()),
+            'transport' => new TransportResource($this->packingList->owner instanceof Order ? $this->transport : $this->packingList->owner->transports()->first())
         ];
     }
 }
diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 4024833d..67667ddf 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -2,6 +2,8 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Order;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class PackingListResource extends JsonResource
@@ -14,14 +16,19 @@ class PackingListResource extends JsonResource
      */
     public function toArray($request)
     {
+        $replica = $this->packingLists()->first();
         return [
             'id' => $this->id,
             'claimant_id' => $this->claimant_id,
             'reference' => $this->reference,
             'status' => $this->status,
             'transport' => new TransportResource($this->transports()->first()),
-            'packages' => PackageResource::collection($this->packages),
-            'order' => New OrderResource($this->owner)
+            'type' => $this->type,
+            'packages' => PackageResource::collection(Auth()->user()->role === RoleTypes::SUPER_ADMIN ? $this->packages : $replica ? $replica->packages : $this->packages),
+            'packing_list' => new PackingListResource($replica),
+            $this->mergeWhen($this->owner instanceof Order, [
+                'order' => New OrderResource($this->owner)
+            ])
         ];
     }
 }
diff --git a/app/Models/Order.php b/app/Models/Order.php
index ffa0550a..763e064e 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -6,6 +6,7 @@ use App\Classes\General\Interfaces\Addressable;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\General\Interfaces\Packable;
 use App\Classes\General\Interfaces\Remarkable;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Scopes\CustomerOrdersScope;
@@ -100,7 +101,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
 
     public function originWarehousePackages()
     {
-        return $this->parcels()->shippingList()
+        return $this->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST)
             ->whereDoesntHave('shippingSchedules',
                 function($schedule) {
                     return $schedule->dispatched()
@@ -111,14 +112,14 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
 
     public function inTransitPackages()
     {
-        return $this->parcels()->shippingList()->Shipping()
+        return $this->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST)->Shipping()
             ->whereHas('shippingSchedules',
                 function($schedule) {
                     return $schedule->dispatched()
                         ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                 }
             )
-            ->whereDoesntHave('container', function($container) {
+            ->whereDoesntHave('containers', function($container) {
                 return $container->where('containers.status', ApprovalStatus::COMPLETED);
             }
         );
@@ -126,8 +127,8 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
 
     public function destinationWarehousePackages()
     {
-        return $this->parcels()->shippingList()
-            ->whereHas('container',
+        return $this->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST)
+            ->whereHas('containers',
                 function($container) {
                     return $container->where('containers.status', ApprovalStatus::COMPLETED);
                 }
@@ -141,7 +142,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
 
     public function deliveredPackages()
     {
-        return $this->parcels()->shippingList()
+        return $this->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST)
             ->whereHas('deliverySchedules',
                 function($schedule) {
                     return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
diff --git a/app/Models/Package.php b/app/Models/Package.php
index 89ef8328..cb2bf35f 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -142,9 +142,9 @@ class Package extends AbstractModel
 
     protected static function booted()
     {
-        if (auth()->user()->type === RoleTypes::USER) {
+//        if (auth()->user()->type === RoleTypes::USER) {
 //            static::addGlobalScope(new CustomerPackagesScope());
-        }
+//        }
     }
 
 }
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 21b0d692..d2594210 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -5,15 +5,21 @@ namespace App\Models;
 use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
 use App\Classes\General\Interfaces\Packable;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
 class PackingList extends AbstractModel implements Transportable, Steppable, Packable
 {
+    use HasRelationships;
     use SoftDeletes;
 
     protected $table = 'packing_lists';
@@ -80,4 +86,41 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
     {
         return $this->morphMany(PackingList::class, 'owner');
     }
+
+    /**
+     * @return hasManyDeep
+     */
+    public function shippingTransports(): hasManyDeep
+    {
+        return $this->hasManyDeep(Transport::class, [ContainerPackingList::class, Container::class], ['packing_list_id', 'id', ['owner_type', 'owner_id']], ['id', 'container_id', null]);
+    }
+
+    /**
+     * @return hasManyDeep
+     */
+    public function shippingSchedules(): hasManyDeep
+    {
+        return $this->hasManyDeep(Schedule::class, [ContainerPackingList::class, Container::class, Transport::class], ['packing_list_id', 'id', ['owner_type', 'owner_id'], ['owner_type', 'owner_id']], ['id', 'container_id', null, null]);
+    }
+
+
+    /**
+     * @return hasManyDeep
+     */
+    public function deliverySchedules(): hasManyDeep
+    {
+        return $this->hasManyDeep(Schedule::class, [Transport::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id']], [null, null]);
+    }
+
+    /**
+     * @param $query
+     * @return mixed
+     */
+    public function scopeShipping($query){
+        return $query->whereHas('shippingSchedules', function($schedule){
+            return $schedule->where('etd', '<', Carbon::now())->where('schedules.status', ApprovalStatus::APPROVED);
+        })->whereDoesntHave('shippingTransports', function($transport){
+            return $transport->where('transport_arrangements.status', ApprovalStatus::COMPLETED);
+        });
+    }
 }
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 1332bfe6..33a69cb6 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -293,7 +293,7 @@
                                                     </div>
                                                     <div class="row">
                                                         <div class="col">
-                                                            <parcel-component v-for="parcel in order.parcels.received_packages" :data="parcel" :key="parcel.id"></parcel-component>
+                                                            <parcel-component v-for="parcel in order.parcels.received_packages.flatMap(packing_list => packing_list.packages)" :data="parcel" :key="parcel.id"></parcel-component>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -310,10 +310,10 @@
                                                     </modal-component>
                                                 </div>
                                                 <div class="col">
-                                                    <div class="row" v-if="order.parcels.origin_warehouse_packages.length">
+                                                    <div class="row" v-if="order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).length">
                                                         <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.origin_warehouse_packages.length / 2)">
-                                                                <div class="col-12 p-r-0" :class="'col-md-'+(12/2)" v-for="item in order.parcels.origin_warehouse_packages.slice((group - 1) * 2, group * 2)" v-bind:key="item.id" :data="item">
+                                                            <div class="row" v-for="group in Math.ceil(order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).length / 2)">
+                                                                <div class="col-12 p-r-0" :class="'col-md-'+(12/2)" v-for="item in order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 2, group * 2)" v-bind:key="item.id" :data="item">
                                                                     <package-component :data="item" status="Ready To Ship"></package-component>
                                                                 </div>
                                                             </div>
@@ -343,10 +343,10 @@
                                         <div class="col">
                                             <div class="row">
                                                 <div class="col">
-                                                    <div class="row" v-if="order.parcels.in_transit_packages.length">
+                                                    <div class="row" v-if="order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).length">
                                                         <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.in_transit_packages.length / 3)">
-                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.in_transit_packages.slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
+                                                            <div class="row" v-for="group in Math.ceil(order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).length / 3)">
+                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
                                                                     <package-component :data="item" status="Shipping"></package-component>
                                                                 </div>
                                                             </div>
@@ -376,10 +376,10 @@
                                         <div class="col">
                                             <div class="row">
                                                 <div class="col">
-                                                    <div class="row" v-if="order.parcels.destination_warehouse_packages.length">
+                                                    <div class="row" v-if="order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).length">
                                                         <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.destination_warehouse_packages.length / 3)">
-                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.destination_warehouse_packages.slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
+                                                            <div class="row" v-for="group in Math.ceil(order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).length / 3)">
+                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
                                                                     <package-component :data="item" status="Preparing Delivery"></package-component>
                                                                 </div>
                                                             </div>
@@ -409,16 +409,16 @@
                                         <div class="col">
                                             <div class="row">
                                                 <div class="col">
-                                                    <div class="row" v-if="order.parcels.delivered_packages.length">
+                                                    <div class="row" v-if="order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length">
                                                         <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.delivered_packages.length / 3)">
-                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.delivered_packages.slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
+                                                            <div class="row" v-for="group in Math.ceil(order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length / 3)">
+                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
                                                                     <package-component :data="item" status="Delivered"></package-component>
                                                                 </div>
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.delivered_packages.length">
+                                                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length">
                                                         <div class="col-10">
                                                             <div class="row align-items-center justify-content-center  hint-text">
                                                                 <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
diff --git a/resources/views/pages/orders/index.blade.php b/resources/views/pages/orders/index.blade.php
index 056d5fbd..d4633a81 100644
--- a/resources/views/pages/orders/index.blade.php
+++ b/resources/views/pages/orders/index.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row m-b-20 hide" v-if="$store.getters.isAdmin">
+    <div class="row m-b-20" v-if="$store.getters.isAdmin">
         <div class="col"></div>
         <div class="col-auto">
             <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>

From 9774f4b823d0b52d57382b346940f616de9a628b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Dec 2021 15:42:42 +0800
Subject: [PATCH 050/223] add packing list replica

---
 app/Http/Resources/PackingListResource.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 67667ddf..b1355331 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -17,6 +17,13 @@ class PackingListResource extends JsonResource
     public function toArray($request)
     {
         $replica = $this->packingLists()->first();
+
+        $packages = $replica ? $replica->packages : $this->packages;
+
+        if(Auth()->user()->type === RoleTypes::SHADOW_ADMIN) {
+            $packages = $this->packages;
+        }
+
         return [
             'id' => $this->id,
             'claimant_id' => $this->claimant_id,
@@ -24,7 +31,7 @@ class PackingListResource extends JsonResource
             'status' => $this->status,
             'transport' => new TransportResource($this->transports()->first()),
             'type' => $this->type,
-            'packages' => PackageResource::collection(Auth()->user()->role === RoleTypes::SUPER_ADMIN ? $this->packages : $replica ? $replica->packages : $this->packages),
+            'packages' => PackageResource::collection($packages),
             'packing_list' => new PackingListResource($replica),
             $this->mergeWhen($this->owner instanceof Order, [
                 'order' => New OrderResource($this->owner)

From 64a4e4b45ff76a1fda69706220535b024a8585af Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Tue, 28 Dec 2021 17:35:16 +0800
Subject: [PATCH 051/223] customer order latest date export

---
 .../ExportsCustomersOrderLatestDate.php       | 60 +++++++++++++++++++
 .../ExportCustomersToExcelController.php      | 19 ++++++
 routes/web.php                                |  2 +
 3 files changed, 81 insertions(+)
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsCustomersOrderLatestDate.php
 create mode 100644 app/Http/Controllers/Exports/ExportCustomersToExcelController.php

diff --git a/app/Classes/Modules/Exports/Services/ExportsCustomersOrderLatestDate.php b/app/Classes/Modules/Exports/Services/ExportsCustomersOrderLatestDate.php
new file mode 100644
index 00000000..3d57991e
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsCustomersOrderLatestDate.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\CompanyModule;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+
+class ExportsCustomersOrderLatestDate implements FromQuery, WithHeadingRow, WithMapping
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Marking',
+            'Name',
+            'Email',
+            'Latest Order'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return CompanyModule::where('type', '=', 1);
+    }
+
+    /**
+     * @param Company $company
+     *
+     * @return array
+     */
+    public function map($company): array
+    {
+        $connection = $company->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $employees = $company->employees()->first();
+
+        $order = $company->orders()
+            ->join('packing_lists', 'packing_lists.owner_id', '=', 'orders.id')
+            ->join('transport_arrangements', 'transport_arrangements.owner_id', '=', 'packing_lists.id')
+            ->orderBy('drop_date', 'desc')
+            ->first();
+
+        return [
+            $marking,
+            $employees ? $employees->name : '',
+            $employees ? $employees->email : '',
+            $order ? $order->drop_date : ''
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
new file mode 100644
index 00000000..80701563
--- /dev/null
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+
+use App\Classes\Modules\Exports\Services\ExportsCustomersOrderLatestDate;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportCustomersToExcelController
+{
+    public function export(ExportsCustomersOrderLatestDate $exportsCustomers, Request $request){
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+        return $exportsCustomers->download('customer-latest-order-date.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
+    }
+}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 8234457f..0eca4f51 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -182,3 +182,5 @@ Route::get('/debug', function (){
 Route::get('/yd', function (){
     (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();;
 });
+
+Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
\ No newline at end of file

From 0671e24916a7b09a87eb1c34d6852a56babe7992 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Dec 2021 21:45:16 +0800
Subject: [PATCH 052/223] add packing list replica

---
 .../Processors/CreateOrderProcessor.php       | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php b/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
index 9d3561ce..5a7c22eb 100644
--- a/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
@@ -86,31 +86,38 @@ class CreateOrderProcessor
 
         $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode,$address->reference);
 
+        /** @var Address $order_address */
         $order_address = $this->createAddress->execute($order, $addressObject);
 
         $contact = $address->contacts()->first();
-        $contactObject = new ContactObject(
-            $contact->reference, 
-            $contact->phone, 
-            '', 
-            ''
-        );
 
-        if($contactObject->getPhone()){
-            $order_remark =  $this->createContactProcessor->execute($contactObject, $order_address);
+        if ($contact) {
+            $contactObject = new ContactObject(
+                $contact->reference,
+                $contact->phone,
+                '',
+                ''
+            );
+
+            if($contactObject->getPhone()){
+                $order_remark =  $this->createContactProcessor->execute($contactObject, $order_address);
+            }
         }
 
         $remark = $address->remarks()->first();
 
-        $remarkObject = new RemarkObject(
-            $remark->content, 
-            Auth()->user()->id
-        );
+        if ($remark){
+            $remarkObject = new RemarkObject(
+                $remark->content,
+                Auth()->user()->id
+            );
 
-        if($remarkObject->getContent()){
-            $this->createRemarkProcessor->execute($order_address, $remarkObject);
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($order_address, $remarkObject);
+            }
         }
 
+
         $this->createOrderRolesProcessor->execute($originWarehouse, $order);
 
         return $order;

From 78fcb6c111c340ec1af159c366a583a56156bd88 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Dec 2021 21:50:30 +0800
Subject: [PATCH 053/223] add packing list replica

---
 .../Processors/CreatePackageProcessor.php     | 14 +++++++++++--
 .../Processors/CreatePackingListProcessor.php | 13 +++++++++++-
 ...hLoadedContainersFromVTPortalProcessor.php |  5 -----
 .../FetchPackingListFromVTPortalProcessor.php |  6 ------
 ...ehouseReceiveListFromVTPortalProcessor.php | 20 +------------------
 5 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
index 500a4550..fcd9bf52 100644
--- a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
@@ -33,7 +33,7 @@ class CreatePackageProcessor
     /**
      * @param PackageObject $object
      * @param PackingList $packingList
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return void
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -41,7 +41,17 @@ class CreatePackageProcessor
 
         $this->canCreatePackage->passes($object);
 
-        return $this->createsPackage->execute($object, $packingList);
+        $this->createsPackage->execute($object, $packingList);
+
+        $replica = $packingList->packingList()->first();
+
+        if($replica) {
+            $modificationValue = 1;
+            $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
+            $this->createsPackage->execute($packageObject, $replica);
+        }
+
+        return ;
 
     }
 
diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
index 982b7307..0a546546 100644
--- a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
@@ -7,6 +7,10 @@ use App\Classes\General\Interfaces\Packable;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 
 class CreatePackingListProcessor
 {
@@ -41,7 +45,14 @@ class CreatePackingListProcessor
     public function execute(PackingListObject $object, Packable $packable){
 
         $this->canCreatePackingList->passes($object);
-        return $this->createsPackingList->execute($object, $packable);
+        /** @var PackingList $packingList */
+        $packingList = $this->createsPackingList->execute($object, $packable);
+
+        /** create packing list replica */
+        $object = new PackingListObject($object->getReference().'_01', $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? $object->getType() === PackingListType::SHIPPING_PACKING_LIST_REPLICA : $object->getType() === PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA, ApprovalStatus::PENDING_SUBMISSION);
+        $this->createsPackingList->execute($object, $packingList);
+
+        return $packingList;
     }
 
 }
\ 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 330c3200..f77c9fe2 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -213,11 +213,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                             $this->createsStep->execute($packingList, $stepObject);
                         }
 
-                        //Duplicate a copy for internal reference
-                        $packingListObject = new PackingListObject($packingListReference.'_01',  $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST_REPLICA, ApprovalStatus::PENDING_SUBMISSION);
-                        $this->createPackingListProcessor->execute($packingListObject, $packingList);
-
-
                     }
 
                 }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 9a47ed50..53dbbab1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -73,12 +73,6 @@ class FetchPackingListFromVTPortalProcessor
 
                     $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
                     $this->createPackageProcessor->execute($packageObject, $packingList);
-
-                    if($replica) {
-                        $modificationValue = 1;
-                        $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31] + $modificationValue, $shippingPackingList[30] + $modificationValue, $shippingPackingList[29] + $modificationValue, 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $replica);
-                    }
                 }
 
                 DB::commit();
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 397dacce..a4b846cf 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -206,13 +206,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
                 if(!$packingList) {
                     $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                    $packingListObject = new PackingListObject($packingListReference.'_01', $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA, ApprovalStatus::APPROVED);
-                    $this->createPackingListProcessor->execute($packingListObject, $packingList);
-
                     $transportObject = new TransportObject(TransportType::LAND, null, $tracking, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
-
-
                     $this->createsTransport->execute($transportObject, $packingList);
                 }
 
@@ -226,24 +220,12 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 /** @var PackingList $replica */
                 $replica = $packingList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
                 $packingList->packages()->delete();
-
+                if($replica) $replica->packages()->delete();
 
                 $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement, $measurement, $measurement, 0, $quantity, ApprovalStatus::APPROVED);
                 $this->createPackageProcessor->execute($packageObject, $packingList);
-
-                if($replica){
-                    $replica->packages()->delete();
-                    $modificationValue = 1;
-                    $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement + $modificationValue, $measurement + $modificationValue, $measurement + $modificationValue, 0, $quantity, ApprovalStatus::APPROVED);
-                    $this->createPackageProcessor->execute($packageObject, $replica);
-
-                }
-
             }
-
-
         } catch (\Exception $exception){
-            dd($exception);
             Log::error($exception->getMessage());
         }
 

From e11e0307af53c48ad1ce9c8f7a353240face0cde Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 28 Dec 2021 22:03:11 +0800
Subject: [PATCH 054/223] add packing list replica

---
 .../Modules/PackingLists/Processors/CreatePackageProcessor.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
index fcd9bf52..13e4a83b 100644
--- a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
@@ -43,7 +43,8 @@ class CreatePackageProcessor
 
         $this->createsPackage->execute($object, $packingList);
 
-        $replica = $packingList->packingList()->first();
+        /** @var PackingList $replica */
+        $replica = $packingList->packingLists()->first();
 
         if($replica) {
             $modificationValue = 1;

From 87c60dc488766c2ad9f4cb52af8a2713a200ab5d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:29:38 +0800
Subject: [PATCH 055/223] YD curl request

---
 app/Classes/Jobs/CurlContainerListJob.php     |  94 ------
 ...Job.php => FetchOrdersFromYDPortalJob.php} |  14 +-
 .../Processors/CreatePackingListProcessor.php |   3 +-
 .../FetchOrderListsFromYdPortalProcessor.php  | 286 +++++++++++++++++-
 .../Commands/CurlContainerListCommand.php     |  48 ---
 app/Console/Commands/CurlVTCommand.php        |   2 +-
 .../Commands/CurlWarehouseListCommand.php     |  48 ---
 .../Commands/CurlYdOrderListCommand.php       |   3 +-
 app/Console/Kernel.php                        |  15 +
 app/Http/Resources/OrderResource.php          |   6 +-
 app/Job/CurlYdOrderListJob.php                |   1 +
 routes/web.php                                |   3 +
 12 files changed, 303 insertions(+), 220 deletions(-)
 delete mode 100644 app/Classes/Jobs/CurlContainerListJob.php
 rename app/Classes/Jobs/{CurlYdOrderListJob.php => FetchOrdersFromYDPortalJob.php} (78%)
 delete mode 100644 app/Console/Commands/CurlContainerListCommand.php
 delete mode 100644 app/Console/Commands/CurlWarehouseListCommand.php

diff --git a/app/Classes/Jobs/CurlContainerListJob.php b/app/Classes/Jobs/CurlContainerListJob.php
deleted file mode 100644
index e65a1a18..00000000
--- a/app/Classes/Jobs/CurlContainerListJob.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use Carbon\Carbon;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class CurlContainerListJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-
-    private $page;
-
-    public function __construct($page = 1)
-    {
-        $this->page = $page;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function handle()
-    {
-        $cookies = $this->getCookie();
-
-        $headers = [
-            'Content-Type' => 'application/json',
-            'Cookie' => $cookies,
-        ];
-
-        $last_two_month = Carbon::now()->subMonth(2)->format('Y-m-d');
-
-        $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $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());
-
-        if (!empty($data->d->Rows)) {
-            // insert data here
-
-            // next page
-            $this->page = $this->page > 0 ? $this->page + 1 : 1;
-            CurlContainerListJob::dispatch($this->page + 1)
-                ->delay(Carbon::now()->addSeconds(10));
-        }
-    }
-
-    public function getCookie()
-    {
-        // get latest cookies
-        $client = new \GuzzleHttp\Client(['cookies' => true]);
-        $r = $client->request('GET', 'http://portal.vtnation.com.my');
-        $call_cookie = $client->getConfig('cookies');
-        $call_cookie = $call_cookie->toArray();
-        $latest_cookie = [];
-
-        foreach ($call_cookie as $key => $row) {
-            $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
-        }
-        $latest_cookie = implode(';', $latest_cookie);
-
-        // get access token
-        $headers = [
-            'Content-Type' => 'application/json',
-            'Cookie' => $latest_cookie,
-        ];
-        $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
-            "username" => "CIEF",
-            "password" => "0122120880",
-            "createPersistentCookie" => true,
-        ]]);
-
-        $token = json_decode($res->getBody()->getContents());
-        $token = $token->d->AccessToken;
-
-        $latest_cookie = $latest_cookie . ';AppVTCC=' . $token;
-        return $latest_cookie;
-    }
-}
diff --git a/app/Classes/Jobs/CurlYdOrderListJob.php b/app/Classes/Jobs/FetchOrdersFromYDPortalJob.php
similarity index 78%
rename from app/Classes/Jobs/CurlYdOrderListJob.php
rename to app/Classes/Jobs/FetchOrdersFromYDPortalJob.php
index ee5fba54..b67130d3 100644
--- a/app/Classes/Jobs/CurlYdOrderListJob.php
+++ b/app/Classes/Jobs/FetchOrdersFromYDPortalJob.php
@@ -10,20 +10,12 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class CurlYdOrderListJob implements ShouldQueue
+class FetchOrdersFromYDPortalJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
 
-    public function __construct()
-    {
-       
-    }
+    public $timeout = 900;
 
     /**
      * Execute the job.
@@ -33,6 +25,8 @@ class CurlYdOrderListJob implements ShouldQueue
      */
     public function handle()
     {
+
         (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
+
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
index 0a546546..3e2a861d 100644
--- a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
@@ -48,8 +48,9 @@ class CreatePackingListProcessor
         /** @var PackingList $packingList */
         $packingList = $this->createsPackingList->execute($object, $packable);
 
+        $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
         /** create packing list replica */
-        $object = new PackingListObject($object->getReference().'_01', $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? $object->getType() === PackingListType::SHIPPING_PACKING_LIST_REPLICA : $object->getType() === PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA, ApprovalStatus::PENDING_SUBMISSION);
+        $object = new PackingListObject($object->getReference().'_01', $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);
 
         return $packingList;
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index c65b8ee9..4821d4a7 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -2,39 +2,299 @@
 
 namespace App\Classes\Modules\PackingLists\Processors;
 
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
 
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+use App\Classes\Modules\Steps\Services\CreatesStep;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
+use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
+use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
+use App\Classes\Modules\Unity\Services\CreatesContract;
+use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\ContainerTypes;
+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\Container;
+use App\Models\Order;
+use App\Models\PackingList;
+use App\Models\Transport;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 
 class FetchOrderListsFromYdPortalProcessor
 {
-    /**
-    /** @var FetchesDataFromVTPortal */
+    /** @var FetchesDataFromYDPortal */
     private $fetchesDataFRomYDPortal;
 
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal)
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var FetchesContainer */
+    private $fetchesContainer;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreateContainerProcessor */
+    private $createContainerProcessor;
+
+    /** @var CreatesContract */
+    private $unityCreateContract;
+
+    /** @var AssignContractEntityProcessor */
+    private $unityAssignContractEntity;
+
+    /** @var CreateContractEntityProcessor */
+    private $unityCreateContractEntity;
+
+    /** @var CreatesStep */
+    private $createsStep;
+
+    /** @var ActivateContractProcessor */
+    private $unityActivateContract;
+
+    /**
+     * FetchOrderListsFromYdPortalProcessor constructor.
+     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
+     * @param FetchesOrder $fetchesOrder
+     * @param UpdatesContractObligation $updatesContractObligations
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param CreatePackageProcessor $createPackageProcessor
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param FetchesContainer $fetchesContainer
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreateContainerProcessor $createContainerProcessor
+     * @param CreatesContract $unityCreateContract
+     * @param AssignContractEntityProcessor $unityAssignContractEntity
+     * @param CreateContractEntityProcessor $unityCreateContractEntity
+     * @param CreatesStep $createsStep
+     * @param ActivateContractProcessor $unityActivateContract
+     */
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, FetchesOrder $fetchesOrder, UpdatesContractObligation $updatesContractObligations, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreateContainerProcessor $createContainerProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
     {
         $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->updatesContractObligations = $updatesContractObligations;
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->fetchesContainer = $fetchesContainer;
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createContainerProcessor = $createContainerProcessor;
+        $this->unityCreateContract = $unityCreateContract;
+        $this->unityAssignContractEntity = $unityAssignContractEntity;
+        $this->unityCreateContractEntity = $unityCreateContractEntity;
+        $this->createsStep = $createsStep;
+        $this->unityActivateContract = $unityActivateContract;
     }
 
+
     /**
      * @param Carbon|null $start
      * @param Carbon|null $end
-     * @return array
-     * @throws GuzzleException
+     * @return void
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function execute(?Carbon $start = null, ?Carbon $end = null) {
+    public function execute(?Carbon $start = null, ?Carbon $end = null)
+    {
+        db::beginTransaction();
 
+        $start = $start ? $start : Carbon::now()->subMonths(2);
 
-            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                'apicode' => '393b1cb4b8b37d09',
-                'begintime' => '1633968000',
-                'endtime' => '1639308222',
+        $startLimit = Carbon::parse('01-12-2021');
+
+        if($start->isBefore($startLimit)){
+            $start = $startLimit;
+        }
+
+        $end = $end ? $end : Carbon::now();
+
+        $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+            'begintime' => $start->timestamp,
+            'endtime' => $end->timestamp,
+        ]);
+
+        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+        foreach($rows->data as $row){
+            $containerReference = null;
+            $loadingDate = null;
+            $unstuffingDate = null;
+            $etd = null;
+            $eta = null;
+
+            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                'trakingno' => $row->expressno
             ]);
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+            foreach ($rows->data as $trackingRow) {
+                if($trackingRow->tracking === '货物已送达仓库准备入库中'){
+                    $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                }
 
-            $order = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+                if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                    $tracking = explode(':', $trackingRow->tracking);
+                    $containerReference = explode('预计到港时间', $tracking[1])[0];
+                    $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                    $etd = Carbon::parse($tracking[2])->subDays(5);
+                    $eta = Carbon::parse($tracking[2]);
+                }
+
+                if($trackingRow->tracking === '货物已进目的港仓库'){
+                    $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                }
+            }
+
+            $customerno = preg_split('/(-|\/)/', $row->customerno);
+
+            if (!array_key_exists(2, $customerno)){
+                if (!array_key_exists(1, $customerno)){
+                    continue;
+                }
+                $customerno[2] = substr($customerno[1], -9);
+            }
+
+
+            $orderNumber = $customerno[2];
+
+            try {
+                $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+            } catch (ResourceNotFoundException $exception) {
+                continue;
+            }
+
+            $packingListReference = $row->expressno;
+
+            try{
+                $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
+            } catch (ResourceNotFoundException $exception){
+
+                $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+                /** @var PackingList $warehouseReceiveList */
+                $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+                $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
+                $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+
+                $contract = $this->unityCreateContract->execute();
+                $contractReference = $contract->hash_id;
+                $contractObligations = $contract->contract_obligation_list;
+
+                $this->unityActivateContract->execute($contractReference);
+
+                $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                $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);
+
+                /** @var PackingList $packingList */
+                $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+                foreach($contractObligations as $obligation) {
+                    $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                    $this->createsStep->execute($packingList, $stepObject);
+                }
+
+                foreach($row->deliverysize as $package) {
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+            }
+
+            if($containerReference) {
+                try {
+                    $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                } catch (ResourceNotFoundException $exception){
+                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
+                    $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                    /** @var Container $container */
+                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                    $container->packingLists()->attach($packingList);
+
+                    $transport = $container->transports()->first();
+
+                    if(!$transport){
+                        $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($etd, $eta, ApprovalStatus::APPROVED));
+                    }
+                }
+
+                if($unstuffingDate){
+                    $container->update(['status' => ApprovalStatus::COMPLETED]);
+                    $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                    /** @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);
+                            $step->update(['status' => ApprovalStatus::COMPLETED]);
+                        }
+                    }
+                }
+
+
+            }
+
+
+        }
+        db::commit();
 
-            dd($order);
     }
 }
diff --git a/app/Console/Commands/CurlContainerListCommand.php b/app/Console/Commands/CurlContainerListCommand.php
deleted file mode 100644
index e5964a40..00000000
--- a/app/Console/Commands/CurlContainerListCommand.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\State; 
-use App\Http\Helpers\General;
-
-use Illuminate\Console\Command;
-use App\Jobs\CurlContainerListJob;
-
-class CurlContainerListCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    
-    protected $signature = 'command:curlContainerListCommand';
-    // 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()
-    {
-        CurlContainerListJob::dispatch();
-    }
-}
diff --git a/app/Console/Commands/CurlVTCommand.php b/app/Console/Commands/CurlVTCommand.php
index e779cd5c..2fa093e4 100644
--- a/app/Console/Commands/CurlVTCommand.php
+++ b/app/Console/Commands/CurlVTCommand.php
@@ -47,7 +47,7 @@ class CurlVTCommand extends Command
      */
     public function handle()
     {
-        FetchWarehouseReceiveListFromVTPortalJob::withChain([
+        return FetchWarehouseReceiveListFromVTPortalJob::withChain([
             new FetchLoadedContainersFromVTPortalJob,
             new FetchPackingListFromVTPortalJob,
             new FetchContainersStatusUpdateFromVTPortalJob,
diff --git a/app/Console/Commands/CurlWarehouseListCommand.php b/app/Console/Commands/CurlWarehouseListCommand.php
deleted file mode 100644
index 04333362..00000000
--- a/app/Console/Commands/CurlWarehouseListCommand.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\State; 
-use App\Http\Helpers\General;
-
-use Illuminate\Console\Command;
-use App\Jobs\CurlWarehouseListJob;
-
-class CurlWarehouseListCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    
-    protected $signature = 'command:curlWarehouseListCommand';
-    // 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()
-    {
-        CurlWarehouseListJob::dispatch();
-    }
-}
diff --git a/app/Console/Commands/CurlYdOrderListCommand.php b/app/Console/Commands/CurlYdOrderListCommand.php
index b68f6cd1..5f913cd1 100644
--- a/app/Console/Commands/CurlYdOrderListCommand.php
+++ b/app/Console/Commands/CurlYdOrderListCommand.php
@@ -17,7 +17,6 @@ class CurlYdOrderListCommand extends Command
      */
     
     protected $signature = 'command:curlYdOrderListCommand';
-    // php artisan queue:work 
 
     /**
      * The console command description.
@@ -43,6 +42,6 @@ class CurlYdOrderListCommand extends Command
      */
     public function handle()
     {
-        CurlYdOrderListJob::dispatch();
+        return CurlYdOrderListJob::dispatch();
     }
 }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 6ee797a6..8e61b5ce 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -32,15 +32,30 @@ class Kernel extends ConsoleKernel
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
+        $schedule->command('command:curlYdOrderListCommand')
+            ->dailyAt('11:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+
         $schedule->command('command:curlVTCommand')
             ->dailyAt('14:00')
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
+        $schedule->command('command:curlYdOrderListCommand')
+            ->dailyAt('14:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+
         $schedule->command('command:curlVTCommand')
             ->dailyAt('17:00')
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
+
+        $schedule->command('command:curlYdOrderListCommand')
+            ->dailyAt('17:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
     }
 
     /**
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index b5bdf0ab..78b1b0a1 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -34,13 +34,13 @@ class OrderResource extends JsonResource
                     'origin_warehouse_packages' => PackingListResource::collection(
                         $this->originWarehousePackages()->get()
                     ),
-                    'in_transit_packages' => PackageResource::collection(
+                    'in_transit_packages' => PackingListResource::collection(
                         $this->inTransitPackages()->get()
                     ),
-                    'destination_warehouse_packages' => PackageResource::collection(
+                    'destination_warehouse_packages' => PackingListResource::collection(
                         $this->destinationWarehousePackages()->get()
                     ),
-                    'delivered_packages' => PackageResource::collection(
+                    'delivered_packages' => PackingListResource::collection(
                         $this->deliveredPackages()->get()
                     ),
                     'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->get()),
diff --git a/app/Job/CurlYdOrderListJob.php b/app/Job/CurlYdOrderListJob.php
index 713df1bc..378ada24 100644
--- a/app/Job/CurlYdOrderListJob.php
+++ b/app/Job/CurlYdOrderListJob.php
@@ -29,6 +29,7 @@ class CurlYdOrderListJob implements ShouldQueue
      * Execute the job.
      *
      * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function handle()
     {
diff --git a/routes/web.php b/routes/web.php
index 0eca4f51..099c4368 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,6 +3,7 @@
 use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
 use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
 use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
+use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
@@ -90,6 +91,8 @@ Route::get('/customer/{marking}', function ($marking) {
 
 Route::get('/orders/refresh', function(){
 
+    FetchOrdersFromYDPortalJob::dispatch();
+
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
         new FetchLoadedContainersFromVTPortalJob,
         new FetchPackingListFromVTPortalJob,

From f36bb9d09092976d0105cc1f8a7ce48761a460cf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:43:20 +0800
Subject: [PATCH 056/223] YD curl request

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 269 +++++++++---------
 1 file changed, 137 insertions(+), 132 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 4821d4a7..cb36c1d7 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -137,164 +137,169 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        db::beginTransaction();
+        try {
+            db::beginTransaction();
 
-        $start = $start ? $start : Carbon::now()->subMonths(2);
+            $start = $start ? $start : Carbon::now()->subMonths(2);
 
-        $startLimit = Carbon::parse('01-12-2021');
+            $startLimit = Carbon::parse('01-12-2021');
 
-        if($start->isBefore($startLimit)){
-            $start = $startLimit;
-        }
-
-        $end = $end ? $end : Carbon::now();
-
-        $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-            'begintime' => $start->timestamp,
-            'endtime' => $end->timestamp,
-        ]);
-
-        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
-        foreach($rows->data as $row){
-            $containerReference = null;
-            $loadingDate = null;
-            $unstuffingDate = null;
-            $etd = null;
-            $eta = null;
-
-            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                'trakingno' => $row->expressno
-            ]);
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-            foreach ($rows->data as $trackingRow) {
-                if($trackingRow->tracking === '货物已送达仓库准备入库中'){
-                    $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                }
-
-                if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                    $tracking = explode(':', $trackingRow->tracking);
-                    $containerReference = explode('预计到港时间', $tracking[1])[0];
-                    $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                    $etd = Carbon::parse($tracking[2])->subDays(5);
-                    $eta = Carbon::parse($tracking[2]);
-                }
-
-                if($trackingRow->tracking === '货物已进目的港仓库'){
-                    $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                }
+            if($start->isBefore($startLimit)){
+                $start = $startLimit;
             }
 
-            $customerno = preg_split('/(-|\/)/', $row->customerno);
+            $end = $end ? $end : Carbon::now();
 
-            if (!array_key_exists(2, $customerno)){
-                if (!array_key_exists(1, $customerno)){
+            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                'begintime' => $start->timestamp,
+                'endtime' => $end->timestamp,
+            ]);
+
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+            foreach($rows->data as $row){
+                $containerReference = null;
+                $loadingDate = null;
+                $unstuffingDate = null;
+                $etd = null;
+                $eta = null;
+
+                $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                    'trakingno' => $row->expressno
+                ]);
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+                foreach ($rows->data as $trackingRow) {
+                    if($trackingRow->tracking === '货物已送达仓库准备入库中'){
+                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                        $tracking = explode(':', $trackingRow->tracking);
+                        $containerReference = explode('预计到港时间', $tracking[1])[0];
+                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                        $etd = Carbon::parse($tracking[2])->subDays(5);
+                        $eta = Carbon::parse($tracking[2]);
+                    }
+
+                    if($trackingRow->tracking === '货物已进目的港仓库'){
+                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+                }
+
+                $customerno = preg_split('/(-|\/)/', $row->customerno);
+
+                if (!array_key_exists(2, $customerno)){
+                    if (!array_key_exists(1, $customerno)){
+                        continue;
+                    }
+                    $customerno[2] = substr($customerno[1], -9);
+                }
+
+
+                $orderNumber = $customerno[2];
+
+                try {
+                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                } catch (ResourceNotFoundException $exception) {
                     continue;
                 }
-                $customerno[2] = substr($customerno[1], -9);
-            }
 
+                $packingListReference = $row->expressno;
 
-            $orderNumber = $customerno[2];
-
-            try {
-                $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-            } catch (ResourceNotFoundException $exception) {
-                continue;
-            }
-
-            $packingListReference = $row->expressno;
-
-            try{
-                $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
-            } catch (ResourceNotFoundException $exception){
-
-                $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
-                /** @var PackingList $warehouseReceiveList */
-                $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-                $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
-                $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-
-                $contract = $this->unityCreateContract->execute();
-                $contractReference = $contract->hash_id;
-                $contractObligations = $contract->contract_obligation_list;
-
-                $this->unityActivateContract->execute($contractReference);
-
-                $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                $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);
-
-                /** @var PackingList $packingList */
-                $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                foreach($contractObligations as $obligation) {
-                    $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                    $this->createsStep->execute($packingList, $stepObject);
-                }
-
-                foreach($row->deliverysize as $package) {
-                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                    $this->createPackageProcessor->execute($packageObject, $packingList);
-                }
-            }
-
-            if($containerReference) {
-                try {
-                    $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                try{
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
                 } catch (ResourceNotFoundException $exception){
-                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
-                    $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-                    /** @var Container $container */
-                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
 
-                    $container->packingLists()->attach($packingList);
+                    $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+                    /** @var PackingList $warehouseReceiveList */
+                    $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
+                    $this->createsTransport->execute($transportObject, $warehouseReceiveList);
 
-                    $transport = $container->transports()->first();
+                    $contract = $this->unityCreateContract->execute();
+                    $contractReference = $contract->hash_id;
+                    $contractObligations = $contract->contract_obligation_list;
 
-                    if(!$transport){
-                        $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($etd, $eta, ApprovalStatus::APPROVED));
-                    }
-                }
+                    $this->unityActivateContract->execute($contractReference);
 
-                if($unstuffingDate){
-                    $container->update(['status' => ApprovalStatus::COMPLETED]);
-                    $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+                    $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                    $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                    $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                    $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);
 
                     /** @var PackingList $packingList */
-                    foreach($container->packingLists as $packingList){
+                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
-                        if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                            $packingList->status = ApprovalStatus::APPROVED;
-                            $packingList->save();
-                        }
+                    foreach($contractObligations as $obligation) {
+                        $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                        $this->createsStep->execute($packingList, $stepObject);
+                    }
 
-                        $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);
-                            $step->update(['status' => ApprovalStatus::COMPLETED]);
+                    foreach($row->deliverysize as $package) {
+                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                        $this->createPackageProcessor->execute($packageObject, $packingList);
+                    }
+                }
+
+                if($containerReference) {
+                    try {
+                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                    } catch (ResourceNotFoundException $exception){
+                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
+                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                        /** @var Container $container */
+                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                        $container->packingLists()->attach($packingList);
+
+                        $transport = $container->transports()->first();
+
+                        if(!$transport){
+                            $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($etd, $eta, ApprovalStatus::APPROVED));
                         }
                     }
+
+                    if($unstuffingDate){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                        /** @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);
+                                $step->update(['status' => ApprovalStatus::COMPLETED]);
+                            }
+                        }
+                    }
+
+
                 }
 
 
             }
-
-
+            db::commit();
+        } catch (\Exception $exception) {
+            dd($exception);
         }
-        db::commit();
+
 
     }
 }

From 8dafa7d6785ec35ff0baef00eac60c767a52c486 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:44:11 +0800
Subject: [PATCH 057/223] YD curl request

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index cb36c1d7..4025148e 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -154,6 +154,7 @@ class FetchOrderListsFromYdPortalProcessor
                 'begintime' => $start->timestamp,
                 'endtime' => $end->timestamp,
             ]);
+            dd($orderRequest);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 

From 8e3be2747f568fbf7a95d569818a2867e2ea3794 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:45:44 +0800
Subject: [PATCH 058/223] YD curl request

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 312 +++++++++---------
 1 file changed, 153 insertions(+), 159 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 4025148e..12d05880 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -137,170 +137,164 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        try {
-            db::beginTransaction();
+        db::beginTransaction();
 
-            $start = $start ? $start : Carbon::now()->subMonths(2);
+        $start = $start ? $start : Carbon::now()->subMonths(2);
 
-            $startLimit = Carbon::parse('01-12-2021');
+        $startLimit = Carbon::parse('01-12-2021');
 
-            if($start->isBefore($startLimit)){
-                $start = $startLimit;
-            }
-
-            $end = $end ? $end : Carbon::now();
-
-            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                'begintime' => $start->timestamp,
-                'endtime' => $end->timestamp,
-            ]);
-            dd($orderRequest);
-
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
-            foreach($rows->data as $row){
-                $containerReference = null;
-                $loadingDate = null;
-                $unstuffingDate = null;
-                $etd = null;
-                $eta = null;
-
-                $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                    'trakingno' => $row->expressno
-                ]);
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-                foreach ($rows->data as $trackingRow) {
-                    if($trackingRow->tracking === '货物已送达仓库准备入库中'){
-                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                    }
-
-                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                        $tracking = explode(':', $trackingRow->tracking);
-                        $containerReference = explode('预计到港时间', $tracking[1])[0];
-                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                        $etd = Carbon::parse($tracking[2])->subDays(5);
-                        $eta = Carbon::parse($tracking[2]);
-                    }
-
-                    if($trackingRow->tracking === '货物已进目的港仓库'){
-                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                    }
-                }
-
-                $customerno = preg_split('/(-|\/)/', $row->customerno);
-
-                if (!array_key_exists(2, $customerno)){
-                    if (!array_key_exists(1, $customerno)){
-                        continue;
-                    }
-                    $customerno[2] = substr($customerno[1], -9);
-                }
-
-
-                $orderNumber = $customerno[2];
-
-                try {
-                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-                } catch (ResourceNotFoundException $exception) {
-                    continue;
-                }
-
-                $packingListReference = $row->expressno;
-
-                try{
-                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
-                } catch (ResourceNotFoundException $exception){
-
-                    $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
-                    /** @var PackingList $warehouseReceiveList */
-                    $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
-                    $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-
-                    $contract = $this->unityCreateContract->execute();
-                    $contractReference = $contract->hash_id;
-                    $contractObligations = $contract->contract_obligation_list;
-
-                    $this->unityActivateContract->execute($contractReference);
-
-                    $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                    $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                    $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                    $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);
-
-                    /** @var PackingList $packingList */
-                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                    foreach($contractObligations as $obligation) {
-                        $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                        $this->createsStep->execute($packingList, $stepObject);
-                    }
-
-                    foreach($row->deliverysize as $package) {
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-                }
-
-                if($containerReference) {
-                    try {
-                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                    } catch (ResourceNotFoundException $exception){
-                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
-                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-                        /** @var Container $container */
-                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
-
-                        $container->packingLists()->attach($packingList);
-
-                        $transport = $container->transports()->first();
-
-                        if(!$transport){
-                            $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($etd, $eta, ApprovalStatus::APPROVED));
-                        }
-                    }
-
-                    if($unstuffingDate){
-                        $container->update(['status' => ApprovalStatus::COMPLETED]);
-                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
-
-                        /** @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);
-                                $step->update(['status' => ApprovalStatus::COMPLETED]);
-                            }
-                        }
-                    }
-
-
-                }
-
-
-            }
-            db::commit();
-        } catch (\Exception $exception) {
-            dd($exception);
+        if($start->isBefore($startLimit)){
+            $start = $startLimit;
         }
 
+        $end = $end ? $end : Carbon::now();
+
+        $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+            'begintime' => $start->timestamp,
+            'endtime' => $end->timestamp,
+        ]);
+
+        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+dd($rows);
+        foreach($rows->data as $row){
+            $containerReference = null;
+            $loadingDate = null;
+            $unstuffingDate = null;
+            $etd = null;
+            $eta = null;
+
+            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                'trakingno' => $row->expressno
+            ]);
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+            foreach ($rows->data as $trackingRow) {
+                if($trackingRow->tracking === '货物已送达仓库准备入库中'){
+                    $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                }
+
+                if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                    $tracking = explode(':', $trackingRow->tracking);
+                    $containerReference = explode('预计到港时间', $tracking[1])[0];
+                    $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                    $etd = Carbon::parse($tracking[2])->subDays(5);
+                    $eta = Carbon::parse($tracking[2]);
+                }
+
+                if($trackingRow->tracking === '货物已进目的港仓库'){
+                    $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                }
+            }
+
+            $customerno = preg_split('/(-|\/)/', $row->customerno);
+
+            if (!array_key_exists(2, $customerno)){
+                if (!array_key_exists(1, $customerno)){
+                    continue;
+                }
+                $customerno[2] = substr($customerno[1], -9);
+            }
+
+
+            $orderNumber = $customerno[2];
+
+            try {
+                $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+            } catch (ResourceNotFoundException $exception) {
+                continue;
+            }
+
+            $packingListReference = $row->expressno;
+
+            try{
+                $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
+            } catch (ResourceNotFoundException $exception){
+
+                $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+                /** @var PackingList $warehouseReceiveList */
+                $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+                $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
+                $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+
+                $contract = $this->unityCreateContract->execute();
+                $contractReference = $contract->hash_id;
+                $contractObligations = $contract->contract_obligation_list;
+
+                $this->unityActivateContract->execute($contractReference);
+
+                $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                $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);
+
+                /** @var PackingList $packingList */
+                $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+                foreach($contractObligations as $obligation) {
+                    $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                    $this->createsStep->execute($packingList, $stepObject);
+                }
+
+                foreach($row->deliverysize as $package) {
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+            }
+
+            if($containerReference) {
+                try {
+                    $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                } catch (ResourceNotFoundException $exception){
+                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
+                    $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                    /** @var Container $container */
+                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                    $container->packingLists()->attach($packingList);
+
+                    $transport = $container->transports()->first();
+
+                    if(!$transport){
+                        $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($etd, $eta, ApprovalStatus::APPROVED));
+                    }
+                }
+
+                if($unstuffingDate){
+                    $container->update(['status' => ApprovalStatus::COMPLETED]);
+                    $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                    /** @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);
+                            $step->update(['status' => ApprovalStatus::COMPLETED]);
+                        }
+                    }
+                }
+
+
+            }
+
+
+        }
+        db::commit();
 
     }
 }

From c698466b3d77c18170957363662b1e77bb9848a5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:46:52 +0800
Subject: [PATCH 059/223] YD curl request

---
 app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
index 37b1c295..4948ad4f 100644
--- a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
@@ -19,6 +19,8 @@ class FetchesDataFromYDPortal
         
         $client = new \GuzzleHttp\Client();
 
+        $body['apicode'] = env('YD_API_CODE');
+
         $request = $client->requestAsync($method, $url, ['query' => $body]);
 
         return $request->wait();

From 81a7d79e0cfc5ecfef3b145082e2b3e24e88db20 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:47:07 +0800
Subject: [PATCH 060/223] YD curl request

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 12d05880..4821d4a7 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -155,7 +155,7 @@ class FetchOrderListsFromYdPortalProcessor
         ]);
 
         $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+
         foreach($rows->data as $row){
             $containerReference = null;
             $loadingDate = null;

From e18f49b5b7340d27e13d99c1169a333f9e147538 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:48:00 +0800
Subject: [PATCH 061/223] YD curl request

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 4821d4a7..b5574467 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -269,7 +269,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                if($unstuffingDate){
+                if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
                     $container->update(['status' => ApprovalStatus::COMPLETED]);
                     $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
 

From 9ebacae701b0f9f660c5a55b21ccd9f42c0d5a7f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:50:32 +0800
Subject: [PATCH 062/223] YD curl request

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index b5574467..1730fe53 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -216,6 +216,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $this->createsTransport->execute($transportObject, $warehouseReceiveList);
 
                 $contract = $this->unityCreateContract->execute();
+                dd($contract);
                 $contractReference = $contract->hash_id;
                 $contractObligations = $contract->contract_obligation_list;
 

From 6b4d2736c5047ff632734fcc3f3781111fc0c00d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 00:53:04 +0800
Subject: [PATCH 063/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index 43451b1b..63ce6c85 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Unity\Services;
 
-use Config;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Modules\Unity\Services\GetAccessToken;
 
@@ -27,7 +27,7 @@ class CreatesContract
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();
 
-        return (isset($response->data)) ? $response->data : null;
+        return $response->data;
 
     }
 }

From b7077174189a51d221127bd2fe6999014dccfd30 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:02:11 +0800
Subject: [PATCH 064/223] YD curl request

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

diff --git a/routes/web.php b/routes/web.php
index 099c4368..5bfa2975 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -93,12 +93,12 @@ Route::get('/orders/refresh', function(){
 
     FetchOrdersFromYDPortalJob::dispatch();
 
-    FetchWarehouseReceiveListFromVTPortalJob::withChain([
-        new FetchLoadedContainersFromVTPortalJob,
-        new FetchPackingListFromVTPortalJob,
-        new FetchContainersStatusUpdateFromVTPortalJob,
-        new FetchDeliveryListFromVTPortalJob
-    ])->dispatch();
+//    FetchWarehouseReceiveListFromVTPortalJob::withChain([
+//        new FetchLoadedContainersFromVTPortalJob,
+//        new FetchPackingListFromVTPortalJob,
+//        new FetchContainersStatusUpdateFromVTPortalJob,
+//        new FetchDeliveryListFromVTPortalJob
+//    ])->dispatch();
 
     return redirect('orders');
 

From 28ad88900e5c6c73a846b26eb8e0627c4cc6a6a2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:05:23 +0800
Subject: [PATCH 065/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index 63ce6c85..a0dd2aa8 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -26,7 +26,7 @@ class CreatesContract
         $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();
-
+dd($response);
         return $response->data;
 
     }

From c07aa6c1f1d5d1f2bc68775284dcf50e4a931abd Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:13:51 +0800
Subject: [PATCH 066/223] YD curl request

---
 .../Unity/Services/CreatesContract.php        | 21 +++++++++++++------
 .../Modules/Unity/Services/GetAccessToken.php |  4 ++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index a0dd2aa8..b9fb1ce8 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -4,28 +4,37 @@ namespace App\Classes\Modules\Unity\Services;
 
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Http;
-use App\Classes\Modules\Unity\Services\GetAccessToken;
 
 class CreatesContract
 {
+    /** @var GetAccessToken  */
     private $getAccessToken;
 
-    private $createEntityEndpoint;
+    /** @var string  */
+    private $createContract;
 
+    /** @var string  */
     private $contract_hash_id;
 
-    public function __construct(GetAccessToken $getAccessToken)
+    /**
+     * CreatesContract constructor.
+     * @param GetAccessToken $getAccessToken
+     * @param string $createContract
+     * @param string $contract_hash_id
+     */
+    public function __construct(GetAccessToken $getAccessToken, string $createContract, string $contract_hash_id)
     {
-        $this->createEntityEndpoint = Config::get('unity.url').Config::get('unity.endpoint.create_contract');
         $this->getAccessToken = $getAccessToken;
-        $this->contract_hash_id = Config::get('unity.contract_template_hash_id');
+        $this->createContract = $createContract;
+        $this->contract_hash_id = $contract_hash_id;
     }
 
+
     public function execute(){
 
         $accessToken=$this->getAccessToken->execute();
 
-        $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();
+        $response = Http::withToken($accessToken)->post($this->createContract,['contract_template_id'=>[$this->contract_hash_id]])->object();
 dd($response);
         return $response->data;
 
diff --git a/app/Classes/Modules/Unity/Services/GetAccessToken.php b/app/Classes/Modules/Unity/Services/GetAccessToken.php
index 40cf5883..5f5e478b 100644
--- a/app/Classes/Modules/Unity/Services/GetAccessToken.php
+++ b/app/Classes/Modules/Unity/Services/GetAccessToken.php
@@ -2,8 +2,8 @@
 
 namespace App\Classes\Modules\Unity\Services;
 
-use Config;
-use Cache;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 
 class GetAccessToken

From 4ef90f7cf23ba8be6167e780df9aaf5969d11535 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:15:49 +0800
Subject: [PATCH 067/223] YD curl request

---
 .../Modules/Unity/Services/CreatesContract.php    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index b9fb1ce8..45252a36 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -10,26 +10,17 @@ class CreatesContract
     /** @var GetAccessToken  */
     private $getAccessToken;
 
-    /** @var string  */
     private $createContract;
 
-    /** @var string  */
     private $contract_hash_id;
 
-    /**
-     * CreatesContract constructor.
-     * @param GetAccessToken $getAccessToken
-     * @param string $createContract
-     * @param string $contract_hash_id
-     */
-    public function __construct(GetAccessToken $getAccessToken, string $createContract, string $contract_hash_id)
+    public function __construct(GetAccessToken $getAccessToken)
     {
+        $this->createContract = Config::get('unity.url').Config::get('unity.endpoint.create_contract');
         $this->getAccessToken = $getAccessToken;
-        $this->createContract = $createContract;
-        $this->contract_hash_id = $contract_hash_id;
+        $this->contract_hash_id = Config::get('unity.contract_template_hash_id');
     }
 
-
     public function execute(){
 
         $accessToken=$this->getAccessToken->execute();

From bfbe07dc8e8ed545dedb0c84d4deff4f93ab64b8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:18:17 +0800
Subject: [PATCH 068/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index 45252a36..1872b23a 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -16,6 +16,7 @@ class CreatesContract
 
     public function __construct(GetAccessToken $getAccessToken)
     {
+        dd(Config::get('unity.url'));
         $this->createContract = Config::get('unity.url').Config::get('unity.endpoint.create_contract');
         $this->getAccessToken = $getAccessToken;
         $this->contract_hash_id = Config::get('unity.contract_template_hash_id');
@@ -23,7 +24,7 @@ class CreatesContract
 
     public function execute(){
 
-        $accessToken=$this->getAccessToken->execute();
+        $accessToken= $this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createContract,['contract_template_id'=>[$this->contract_hash_id]])->object();
 dd($response);

From 65b49d4d613c68346115eec6a1e9c6280a562ad3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:19:17 +0800
Subject: [PATCH 069/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index 1872b23a..a76c0a89 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -4,10 +4,10 @@ namespace App\Classes\Modules\Unity\Services;
 
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Http;
+use App\Classes\Modules\Unity\Services\GetAccessToken;
 
 class CreatesContract
 {
-    /** @var GetAccessToken  */
     private $getAccessToken;
 
     private $createContract;
@@ -16,7 +16,6 @@ class CreatesContract
 
     public function __construct(GetAccessToken $getAccessToken)
     {
-        dd(Config::get('unity.url'));
         $this->createContract = Config::get('unity.url').Config::get('unity.endpoint.create_contract');
         $this->getAccessToken = $getAccessToken;
         $this->contract_hash_id = Config::get('unity.contract_template_hash_id');
@@ -24,7 +23,7 @@ class CreatesContract
 
     public function execute(){
 
-        $accessToken= $this->getAccessToken->execute();
+        $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createContract,['contract_template_id'=>[$this->contract_hash_id]])->object();
 dd($response);

From dac4470f727c77b5cc8e3fdee25dc1b61a8c33f9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:20:04 +0800
Subject: [PATCH 070/223] YD curl request

---
 .../Modules/Unity/Services/CreatesContract.php      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index a76c0a89..6e8dbf8c 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Unity\Services;
 
-use Illuminate\Support\Facades\Config;
+use Config;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Modules\Unity\Services\GetAccessToken;
 
@@ -10,13 +10,14 @@ class CreatesContract
 {
     private $getAccessToken;
 
-    private $createContract;
+    private $createEntityEndpoint;
 
     private $contract_hash_id;
 
     public function __construct(GetAccessToken $getAccessToken)
     {
-        $this->createContract = Config::get('unity.url').Config::get('unity.endpoint.create_contract');
+        dd(Config::get('unity.url'));
+        $this->createEntityEndpoint = Config::get('unity.url').Config::get('unity.endpoint.create_contract');
         $this->getAccessToken = $getAccessToken;
         $this->contract_hash_id = Config::get('unity.contract_template_hash_id');
     }
@@ -25,9 +26,9 @@ class CreatesContract
 
         $accessToken=$this->getAccessToken->execute();
 
-        $response = Http::withToken($accessToken)->post($this->createContract,['contract_template_id'=>[$this->contract_hash_id]])->object();
-dd($response);
-        return $response->data;
+        $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();
+
+        return (isset($response->data)) ? $response->data : null;
 
     }
 }

From 187411237d76541ac9e627ca059b2d3ae7ea073b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:20:18 +0800
Subject: [PATCH 071/223] YD curl request

---
 app/Classes/Modules/Unity/Services/GetAccessToken.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/GetAccessToken.php b/app/Classes/Modules/Unity/Services/GetAccessToken.php
index 5f5e478b..40cf5883 100644
--- a/app/Classes/Modules/Unity/Services/GetAccessToken.php
+++ b/app/Classes/Modules/Unity/Services/GetAccessToken.php
@@ -2,8 +2,8 @@
 
 namespace App\Classes\Modules\Unity\Services;
 
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Cache;
+use Config;
+use Cache;
 use Illuminate\Support\Facades\Http;
 
 class GetAccessToken

From 1426d6f13c3b53d8a5164d400a13dafbcca5cb11 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:21:19 +0800
Subject: [PATCH 072/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index 6e8dbf8c..2718dc04 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -16,7 +16,6 @@ class CreatesContract
 
     public function __construct(GetAccessToken $getAccessToken)
     {
-        dd(Config::get('unity.url'));
         $this->createEntityEndpoint = Config::get('unity.url').Config::get('unity.endpoint.create_contract');
         $this->getAccessToken = $getAccessToken;
         $this->contract_hash_id = Config::get('unity.contract_template_hash_id');
@@ -24,6 +23,7 @@ class CreatesContract
 
     public function execute(){
 
+        dd($this->createEntityEndpoint);
         $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();

From 1f0f5e8afd5b808025329128ab15f52d90721f68 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:22:47 +0800
Subject: [PATCH 073/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index 2718dc04..a89e920c 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -23,11 +23,11 @@ class CreatesContract
 
     public function execute(){
 
-        dd($this->createEntityEndpoint);
+
         $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();
-
+dd($response);
         return (isset($response->data)) ? $response->data : null;
 
     }

From 0220f876c45e57c28856983ea36f10d5376de2da Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 01:23:35 +0800
Subject: [PATCH 074/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index a89e920c..d7328796 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -26,7 +26,7 @@ class CreatesContract
 
         $accessToken=$this->getAccessToken->execute();
 
-        $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();
+        $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]]);
 dd($response);
         return (isset($response->data)) ? $response->data : null;
 

From 5599c1ba71fced8da2c0a7caf50f9c04c643959f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 02:54:49 +0800
Subject: [PATCH 075/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index d7328796..ae878e15 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -27,7 +27,7 @@ class CreatesContract
         $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]]);
-dd($response);
+
         return (isset($response->data)) ? $response->data : null;
 
     }

From eeaba20fb0fd04f82cc84dbcfeb79a64e4e655c7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 03:16:06 +0800
Subject: [PATCH 076/223] YD curl request

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php         | 2 +-
 app/Classes/Modules/Unity/Services/CreatesContract.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 1730fe53..a95afb3d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -216,7 +216,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $this->createsTransport->execute($transportObject, $warehouseReceiveList);
 
                 $contract = $this->unityCreateContract->execute();
-                dd($contract);
+
                 $contractReference = $contract->hash_id;
                 $contractObligations = $contract->contract_obligation_list;
 
diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index ae878e15..a1c2443c 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -27,7 +27,7 @@ class CreatesContract
         $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]]);
-
+dd($response->object());
         return (isset($response->data)) ? $response->data : null;
 
     }

From 6874d09ced038182a2c33b9f74686af78260d56a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 03:17:44 +0800
Subject: [PATCH 077/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index a1c2443c..2b753924 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -27,7 +27,7 @@ class CreatesContract
         $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]]);
-dd($response->object());
+dd('test');
         return (isset($response->data)) ? $response->data : null;
 
     }

From 27f2367e886d683e8954f2cf9b83fc8b34841e6d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 03:19:28 +0800
Subject: [PATCH 078/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index 2b753924..d7328796 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -27,7 +27,7 @@ class CreatesContract
         $accessToken=$this->getAccessToken->execute();
 
         $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]]);
-dd('test');
+dd($response);
         return (isset($response->data)) ? $response->data : null;
 
     }

From 7b791abf80631dab39ed737b971d1f142bd3d261 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 03:22:08 +0800
Subject: [PATCH 079/223] YD curl request

---
 app/Classes/Modules/Unity/Services/CreatesContract.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Unity/Services/CreatesContract.php b/app/Classes/Modules/Unity/Services/CreatesContract.php
index d7328796..88ef138d 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContract.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContract.php
@@ -26,8 +26,8 @@ class CreatesContract
 
         $accessToken=$this->getAccessToken->execute();
 
-        $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]]);
-dd($response);
+        $response = Http::withToken($accessToken)->post($this->createEntityEndpoint,['contract_template_id'=>[$this->contract_hash_id]])->object();
+
         return (isset($response->data)) ? $response->data : null;
 
     }

From 898205ec9db0594cace1df6c5fefcd51834313b1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 03:28:17 +0800
Subject: [PATCH 080/223] fix package component before loading to container

---
 .../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 fb804ad6..d0ae4ade 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -69,7 +69,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row p-t-10 p-b-10" v-if="item.container.transport">
+                            <div class="row p-t-10 p-b-10" v-if="item.container">
                                 <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">

From 906623bad3313a6f8ee5eef05250e9f71ec92d4a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 03:29:16 +0800
Subject: [PATCH 081/223] fix package component before loading to container

---
 .../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 d0ae4ade..3dac120e 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -142,7 +142,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row m-t-25" v-if="item.container.transport">
+                    <div class="row m-t-25" v-if="item.container">
                         <div class="col"></div>
                         <div class="col b-t b-primary" style="border-top-width: 5px;"></div>
                     </div>

From 41d9769d042a389acbbcc8a950e6b985b0bfce46 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 29 Dec 2021 03:30:42 +0800
Subject: [PATCH 082/223] fix package component before loading to container

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

diff --git a/routes/web.php b/routes/web.php
index 5bfa2975..099c4368 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -93,12 +93,12 @@ Route::get('/orders/refresh', function(){
 
     FetchOrdersFromYDPortalJob::dispatch();
 
-//    FetchWarehouseReceiveListFromVTPortalJob::withChain([
-//        new FetchLoadedContainersFromVTPortalJob,
-//        new FetchPackingListFromVTPortalJob,
-//        new FetchContainersStatusUpdateFromVTPortalJob,
-//        new FetchDeliveryListFromVTPortalJob
-//    ])->dispatch();
+    FetchWarehouseReceiveListFromVTPortalJob::withChain([
+        new FetchLoadedContainersFromVTPortalJob,
+        new FetchPackingListFromVTPortalJob,
+        new FetchContainersStatusUpdateFromVTPortalJob,
+        new FetchDeliveryListFromVTPortalJob
+    ])->dispatch();
 
     return redirect('orders');
 

From 82517e3cb3d658cd075c8f524ac6b705073156a8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 31 Dec 2021 17:02:49 +0800
Subject: [PATCH 083/223] sort customers 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 5000ec6d..319ba7ca 100644
--- a/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
@@ -179,7 +179,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, order_by: {column: 'created_at', DESC: false}, status_in: [2], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :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: true}, status_in: [2], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :columns=3>
                                                 <template slot="list" slot-scope="{data}">
                                                     <order-component :data="data"></order-component>
                                                 </template>

From 33086eb1a6caa7284aa50ff6d85b063705e73c72 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 31 Dec 2021 17:04:00 +0800
Subject: [PATCH 084/223] sort customers 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 f9660969..f222a238 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, order_by: {column: 'created_at', DESC: false}, status_in: [2], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :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: true}, status_in: [2], company_module_id: item.company_module.id, with_packing_lists: true} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2], with_packing_lists: true}" :columns=3>
                                                 <template slot="list" slot-scope="{data}">
                                                     <order-component :data="data"></order-component>
                                                 </template>

From 7bd24b65473409d9639c8b458087173c7d6c7a87 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 08:36:41 +0800
Subject: [PATCH 085/223] clean up before production

---
 .../orders/forms/OrderRemarkFormComponent.vue    |  4 ++--
 resources/views/pages/orders/index.blade.php     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
index 79273650..3e0f1fdc 100644
--- a/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
@@ -5,8 +5,8 @@
                 <input type="text" class="form-control fs-12" placeholder="Make a remark on this order." v-model.trim="parameters.content">
             </validation-wrapper-component>
         </div>
-        <div class="col-auto b-a b-grey d-flex justify-content-center align-items-center rounded pointer">
-            <i class="fa fa-paper-plane" @click="submitForm"></i>
+        <div class="col-auto bg-success d-flex justify-content-center align-items-center pointer text-white">
+            <i class="fa fa-check" @click="submitForm"></i>
         </div>
     </div>
 </template>
diff --git a/resources/views/pages/orders/index.blade.php b/resources/views/pages/orders/index.blade.php
index d4633a81..11bce1f4 100644
--- a/resources/views/pages/orders/index.blade.php
+++ b/resources/views/pages/orders/index.blade.php
@@ -1,11 +1,11 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row m-b-20" v-if="$store.getters.isAdmin">
-        <div class="col"></div>
-        <div class="col-auto">
-            <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-search-section-component v-show="!$store.getters.isShowing('createOrderForm')"></order-search-section-component>
-    <order-section-component v-show="!$store.getters.isShowing('searchOrderSection')"></order-section-component>
+    {{--<div class="row m-b-20" v-if="$store.getters.isAdmin">--}}
+        {{--<div class="col"></div>--}}
+        {{--<div class="col-auto">--}}
+            {{--<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-search-section-component v-show="!$store.getters.isShowing('createOrderForm')"></order-search-section-component>--}}
+    <order-section-component></order-section-component>
 @endsection
\ No newline at end of file

From d2fe2bfef47f157496c7e92d114b267b0ed87a59 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 09:28:03 +0800
Subject: [PATCH 086/223] adjust column size for order remark input

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

diff --git a/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
index 3e0f1fdc..b57e0115 100644
--- a/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderRemarkFormComponent.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="row">
-        <div class="col">
+        <div class="col-6 p-r-0">
             <validation-wrapper-component :validator="$v.parameters.content">
                 <input type="text" class="form-control fs-12" placeholder="Make a remark on this order." v-model.trim="parameters.content">
             </validation-wrapper-component>

From 9ff98196f0f27f5d9ee8f00967cdb24fd2da859b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 09:32:45 +0800
Subject: [PATCH 087/223] fix package component bug

---
 .../orders/elements/PackageComponent.vue      | 112 +++++++++---------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index 3dac120e..99a1a1bb 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -70,71 +70,75 @@
                                 </div>
                             </div>
                             <div class="row p-t-10 p-b-10" v-if="item.container">
-                                <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 class="col">
+                                    <div class="row" v-if="item.container.transport">
+                                        <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 b-danger" style="height: 35px;"></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">
+                                                <div class="col-auto">
+                                                    <i class="fa fa-check fs-15" :class="{'text-primary': item.transport, 'muted': !item.transport}"></i>
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="row justify-content-center">
-                                        <div class="col-auto">
-                                            <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">
-                                        <div class="col-auto">
-                                            <i class="fa fa-check fs-15" :class="{'text-primary': item.transport, 'muted': !item.transport}"></i>
-                                        </div>
-                                    </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 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>
-                                    </div>
-                                    <div class="row m-b-15">
-                                        <div class="col">
-                                            <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 class="row m-b-15">
+                                                <div class="col">
+                                                    <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>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <div class="col-auto">
-                                                <small class="fs-10 all-caps muted">Delivery Date</small>
-                                                <h6 class="no-margin small">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</h6>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="col-auto">
+                                                        <small class="fs-10 all-caps muted">Delivery Date</small>
+                                                        <h6 class="no-margin small">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</h6>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>

From 1fc9330d98635d363d28aa95875cf070dfdf0d75 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 09:43:32 +0800
Subject: [PATCH 088/223] fix vt container transport bug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index d1e69706..b1daeeb9 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -83,6 +83,7 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                     if(!$containerDetails->Rows){
                         continue;
                     }
+
                     $containerDetails = $containerDetails->Rows[0];
 
                     if(!$eta = $containerDetails[3]){

From dcfbbd63a7633b8477419322b96349aabda4f648 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 09:45:39 +0800
Subject: [PATCH 089/223] fix vt container transport bug

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index b1daeeb9..68cbb319 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -83,6 +83,7 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                     if(!$containerDetails->Rows){
                         continue;
                     }
+                    dd($containerDetails->Rows[0]);
 
                     $containerDetails = $containerDetails->Rows[0];
 

From 78e223844f7b66f0ba611106b6ee8b025fe18aa5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 09:46:04 +0800
Subject: [PATCH 090/223] fix vt container transport bug

---
 .../FetchContainersStatusUpdateFromVTPortalProcessor.php         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index 68cbb319..b1daeeb9 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -83,7 +83,6 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                     if(!$containerDetails->Rows){
                         continue;
                     }
-                    dd($containerDetails->Rows[0]);
 
                     $containerDetails = $containerDetails->Rows[0];
 

From 919cbc463b6832bbf1fca447ed0f16b148157a78 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 10:12:29 +0800
Subject: [PATCH 091/223] set users list allowed to see original packing
 measurements

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

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index b1355331..e5d5ac93 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -20,7 +20,7 @@ class PackingListResource extends JsonResource
 
         $packages = $replica ? $replica->packages : $this->packages;
 
-        if(Auth()->user()->type === RoleTypes::SHADOW_ADMIN) {
+        if(in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1915])) {
             $packages = $this->packages;
         }
 

From 396f9370ae1ff8492fcccd90e6a0f89a4b36c2db Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 10:13:14 +0800
Subject: [PATCH 092/223] set users list allowed to see original packing
 measurements

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

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index e5d5ac93..53823417 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -20,7 +20,7 @@ class PackingListResource extends JsonResource
 
         $packages = $replica ? $replica->packages : $this->packages;
 
-        if(in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1915])) {
+        if(in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919])) {
             $packages = $this->packages;
         }
 

From 8a8fb3e03e2fa0c5306c316f89b5b3f928a62410 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 10:37:34 +0800
Subject: [PATCH 093/223] update schedule for fetching data from api

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

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 8e61b5ce..de764786 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -27,6 +27,16 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
+        $schedule->command('command:curlVTCommand')
+            ->dailyAt('09:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');
+
+        $schedule->command('command:curlYdOrderListCommand')
+            ->dailyAt('09:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+
         $schedule->command('command:curlVTCommand')
             ->dailyAt('11:00')
             ->withoutOverlapping()
@@ -48,12 +58,22 @@ class Kernel extends ConsoleKernel
             ->appendOutputTo (storage_path().'/logs/curlyd.log');
 
         $schedule->command('command:curlVTCommand')
-            ->dailyAt('17:00')
+            ->dailyAt('16:00')
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
         $schedule->command('command:curlYdOrderListCommand')
-            ->dailyAt('17:00')
+            ->dailyAt('16:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+
+        $schedule->command('command:curlVTCommand')
+            ->dailyAt('18:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');
+
+        $schedule->command('command:curlYdOrderListCommand')
+            ->dailyAt('18:00')
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlyd.log');
     }

From 18554e9924cfafc6ffb3eeaf86896f4cac69069f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:19:15 +0800
Subject: [PATCH 094/223] fix order status count

---
 .../vue/components/orders/elements/OrderComponent.vue       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index 597fa352..bdb25e93 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -62,15 +62,15 @@
                     <div class="row text-center">
                         <div class="col b-r b-grey text-info p-t-5 p-b-10">
                             <small class="fs-10 all-caps bold">Received</small>
-                            <h6 class="bold no-margin text-info">{{item.parcels.received_packages.reduce((total, obj) => obj.quantity + total, 0)}}</h6>
+                            <h6 class="bold no-margin text-info">{{item.parcels.received_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.quantity + total, 0)}}</h6>
                         </div>
                         <div class="col b-r b-grey text-primary p-t-5 p-b-10">
                             <small class="fs-10 all-caps bold">In Transit</small>
-                            <h6 class="bold no-margin text-primary">{{item.parcels.in_transit_packages.reduce((total, obj) => obj.quantity + total, 0)}}</h6>
+                            <h6 class="bold no-margin text-primary">{{item.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).concat(item.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages)).reduce((total, obj) => obj.quantity + total, 0)}}</h6>
                         </div>
                         <div class="col text-success p-t-5 p-b-10">
                             <small class="fs-10 all-caps bold">Delivered</small>
-                            <h6 class="bold no-margin text-success">{{item.parcels.delivered_packages.reduce((total, obj) => obj.quantity + total, 0)}}</h6>
+                            <h6 class="bold no-margin text-success">{{item.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.quantity + total, 0)}}</h6>
                         </div>
                     </div>
                 </div>

From 40c56922761d396fcc26786bbc76ec06cb855ecb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:40:38 +0800
Subject: [PATCH 095/223] fix order status count

---
 app/Http/Resources/OrderResource.php | 2 +-
 app/Models/Order.php                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 78b1b0a1..d2c72930 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -43,7 +43,7 @@ class OrderResource extends JsonResource
                     'delivered_packages' => PackingListResource::collection(
                         $this->deliveredPackages()->get()
                     ),
-                    'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->get()),
+                    'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get()),
                 ];
             }),
             'remarks' => RemarkResource::collection($this->remarks),
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 763e064e..5aabfd44 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -107,7 +107,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
                     return $schedule->dispatched()
                         ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                 }
-            );
+            )->whereHas('packages');
     }
 
     public function inTransitPackages()
@@ -122,7 +122,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
             ->whereDoesntHave('containers', function($container) {
                 return $container->where('containers.status', ApprovalStatus::COMPLETED);
             }
-        );
+        )->whereHas('packages');
     }
 
     public function destinationWarehousePackages()
@@ -137,7 +137,7 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable
                 function($schedule) {
                     return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                 }
-            );
+            )->whereHas('packages');
     }
 
     public function deliveredPackages()

From d08ded395a01bb9e71f0501bb0be65d98941ab5d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:50:17 +0800
Subject: [PATCH 096/223] fix order status count

---
 .../Commands/CurlYdOrderListCommand.php       |  5 +--
 app/Job/CurlYdOrderListJob.php                | 38 -------------------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 app/Job/CurlYdOrderListJob.php

diff --git a/app/Console/Commands/CurlYdOrderListCommand.php b/app/Console/Commands/CurlYdOrderListCommand.php
index 5f913cd1..318139e8 100644
--- a/app/Console/Commands/CurlYdOrderListCommand.php
+++ b/app/Console/Commands/CurlYdOrderListCommand.php
@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Models\State; 
+use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Http\Helpers\General;
 
 use Illuminate\Console\Command;
-use App\Jobs\CurlYdOrderListJob;
 
 class CurlYdOrderListCommand extends Command
 {
@@ -42,6 +41,6 @@ class CurlYdOrderListCommand extends Command
      */
     public function handle()
     {
-        return CurlYdOrderListJob::dispatch();
+        return FetchOrdersFromYDPortalJob::dispatch();
     }
 }
diff --git a/app/Job/CurlYdOrderListJob.php b/app/Job/CurlYdOrderListJob.php
deleted file mode 100644
index 378ada24..00000000
--- a/app/Job/CurlYdOrderListJob.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class CurlYdOrderListJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-
-    public function __construct()
-    {
-       
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
-    }
-}

From d281017c24c28cd59cbba1477c96feb996ab4bb1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:53:22 +0800
Subject: [PATCH 097/223] fix order status count

---
 .../Processors/FetchPackingListFromVTPortalProcessor.php       | 2 +-
 routes/web.php                                                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 53dbbab1..5dd9bc21 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -48,7 +48,7 @@ class FetchPackingListFromVTPortalProcessor
 
         $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();
+        })->whereIn('reference', ['PO053014', 'PO052965'])->get();
 
         foreach($packingLists as $packingList){
 
diff --git a/routes/web.php b/routes/web.php
index 099c4368..1ae2a274 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -106,8 +106,9 @@ Route::get('/orders/refresh', function(){
 
 Route::get('/containers/refresh', function(){
 
+    FetchPackingListFromVTPortalJob::dispatch();
 //    FetchLoadedContainersFromVTPortalJob::dispatch();
-    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
+//    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
 
     return redirect('orders');
 

From 7b3793e6d794ea1d4dafc583bd6399d65d4892e3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:54:11 +0800
Subject: [PATCH 098/223] debug missing packages

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 5dd9bc21..16a0a3d8 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -61,6 +61,7 @@ class FetchPackingListFromVTPortalProcessor
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
+                dd($shippingPackingLists->Rows);
                 $packingList->packages()->delete();
 
                 $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();

From 5fdae14e015c8306677ff3060514243208161c4a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:57:12 +0800
Subject: [PATCH 099/223] debug missing packages

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 16a0a3d8..4123bb0e 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,9 +46,7 @@ class FetchPackingListFromVTPortalProcessor
      */
     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);
-        })->whereIn('reference', ['PO053014', 'PO052965'])->get();
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereIn('reference', ['PO053014', 'PO052965'])->get();
 
         foreach($packingLists as $packingList){
 

From 4d594bb08435e1313bd5d54fdf7804753988edb3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 15:58:29 +0800
Subject: [PATCH 100/223] debug missing packages

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 4123bb0e..22903ba9 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -59,7 +59,6 @@ class FetchPackingListFromVTPortalProcessor
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
-                dd($shippingPackingLists->Rows);
                 $packingList->packages()->delete();
 
                 $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();

From 87e155334b2ba06395d192a7819bdb8286480d0b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:02:00 +0800
Subject: [PATCH 101/223] debug missing packages

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 22903ba9..9c2dfc13 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)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereIn('reference', ['PO053014', 'PO052965'])->get();
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereIn('reference', ['PO053610', 'PO053611'])->get();
 
         foreach($packingLists as $packingList){
 

From 4a1d021b855f74f196c1f913144304c8da9dceae Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:06:08 +0800
Subject: [PATCH 102/223] debug missing packages

---
 .../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 9c2dfc13..53dbbab1 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])->whereIn('reference', ['PO053610', 'PO053611'])->get();
+        $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 a331c659a8f5e616940497d42556f1256c990991 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:08:47 +0800
Subject: [PATCH 103/223] debug yd orders

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index a95afb3d..86e73428 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -137,7 +137,6 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        db::beginTransaction();
 
         $start = $start ? $start : Carbon::now()->subMonths(2);
 
@@ -155,8 +154,10 @@ class FetchOrderListsFromYdPortalProcessor
         ]);
 
         $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows);
         foreach($rows->data as $row){
+            db::beginTransaction();
+
             $containerReference = null;
             $loadingDate = null;
             $unstuffingDate = null;
@@ -293,9 +294,9 @@ class FetchOrderListsFromYdPortalProcessor
 
             }
 
+            db::commit();
 
         }
-        db::commit();
 
     }
 }

From 1efbca15ecaed900459b73185a1aec781d72ace9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:11:35 +0800
Subject: [PATCH 104/223] fix total cbm order component

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

diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index bdb25e93..eae66bac 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -90,7 +90,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.ceil((item.parcels.origin_warehouse_packages.reduce((total, obj) => obj.cbm + total, 0) + item.parcels.in_transit_packages.reduce((total, obj) => obj.cbm + total, 0) + item.parcels.delivered_packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</h6>
+                            <h6 class="no-margin semi-bold">{{(Math.ceil((item.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0) + item.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0) + item.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0) + item.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</h6>
                         </div>
                     </div>
                 </div>

From 53809af1055eab942ea9c7f928e165fadc048ac0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:12:55 +0800
Subject: [PATCH 105/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 86e73428..f591b7c5 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -154,7 +154,7 @@ class FetchOrderListsFromYdPortalProcessor
         ]);
 
         $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+
         foreach($rows->data as $row){
             db::beginTransaction();
 

From 6b491cc2e5b5908debf02fa605339d5f1a31caa8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:16:02 +0800
Subject: [PATCH 106/223] fix yd fetch data

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

diff --git a/routes/web.php b/routes/web.php
index 1ae2a274..099c4368 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -106,9 +106,8 @@ Route::get('/orders/refresh', function(){
 
 Route::get('/containers/refresh', function(){
 
-    FetchPackingListFromVTPortalJob::dispatch();
 //    FetchLoadedContainersFromVTPortalJob::dispatch();
-//    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
+    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
 
     return redirect('orders');
 

From 07d70af213c039b3f23e9c52d91e26e6a47575ee Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:45:35 +0800
Subject: [PATCH 107/223] fix yd fetch data

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 276 +++++++++---------
 1 file changed, 141 insertions(+), 135 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index f591b7c5..c3090d91 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -35,6 +35,7 @@ use App\Models\PackingList;
 use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class FetchOrderListsFromYdPortalProcessor
 {
@@ -138,165 +139,170 @@ class FetchOrderListsFromYdPortalProcessor
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
 
-        $start = $start ? $start : Carbon::now()->subMonths(2);
+        try {
+            $start = $start ? $start : Carbon::now()->subMonths(2);
 
-        $startLimit = Carbon::parse('01-12-2021');
+            $startLimit = Carbon::parse('01-12-2021');
 
-        if($start->isBefore($startLimit)){
-            $start = $startLimit;
-        }
-
-        $end = $end ? $end : Carbon::now();
-
-        $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-            'begintime' => $start->timestamp,
-            'endtime' => $end->timestamp,
-        ]);
-
-        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
-        foreach($rows->data as $row){
-            db::beginTransaction();
-
-            $containerReference = null;
-            $loadingDate = null;
-            $unstuffingDate = null;
-            $etd = null;
-            $eta = null;
-
-            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                'trakingno' => $row->expressno
-            ]);
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-            foreach ($rows->data as $trackingRow) {
-                if($trackingRow->tracking === '货物已送达仓库准备入库中'){
-                    $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                }
-
-                if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                    $tracking = explode(':', $trackingRow->tracking);
-                    $containerReference = explode('预计到港时间', $tracking[1])[0];
-                    $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                    $etd = Carbon::parse($tracking[2])->subDays(5);
-                    $eta = Carbon::parse($tracking[2]);
-                }
-
-                if($trackingRow->tracking === '货物已进目的港仓库'){
-                    $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                }
+            if($start->isBefore($startLimit)){
+                $start = $startLimit;
             }
 
-            $customerno = preg_split('/(-|\/)/', $row->customerno);
+            $end = $end ? $end : Carbon::now();
 
-            if (!array_key_exists(2, $customerno)){
-                if (!array_key_exists(1, $customerno)){
+            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                'begintime' => $start->timestamp,
+                'endtime' => $end->timestamp,
+            ]);
+
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+            foreach($rows->data as $row){
+                db::beginTransaction();
+
+                $containerReference = null;
+                $loadingDate = null;
+                $unstuffingDate = null;
+                $etd = null;
+                $eta = null;
+
+                $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                    'trakingno' => $row->expressno
+                ]);
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+                foreach ($rows->data as $trackingRow) {
+                    if($trackingRow->tracking === '货物已送达仓库准备入库中'){
+                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                        $tracking = explode(':', $trackingRow->tracking);
+                        $containerReference = explode('预计到港时间', $tracking[1])[0];
+                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                        $etd = Carbon::parse($tracking[2])->subDays(5);
+                        $eta = Carbon::parse($tracking[2]);
+                    }
+
+                    if($trackingRow->tracking === '货物已进目的港仓库'){
+                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+                }
+
+                $customerno = preg_split('/(-|\/)/', $row->customerno);
+
+                if (!array_key_exists(2, $customerno)){
+                    if (!array_key_exists(1, $customerno)){
+                        continue;
+                    }
+                    $customerno[2] = substr($customerno[1], -9);
+                }
+
+
+                $orderNumber = $customerno[2];
+
+                try {
+                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                } catch (ResourceNotFoundException $exception) {
                     continue;
                 }
-                $customerno[2] = substr($customerno[1], -9);
-            }
 
+                $packingListReference = $row->expressno;
 
-            $orderNumber = $customerno[2];
-
-            try {
-                $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-            } catch (ResourceNotFoundException $exception) {
-                continue;
-            }
-
-            $packingListReference = $row->expressno;
-
-            try{
-                $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
-            } catch (ResourceNotFoundException $exception){
-
-                $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
-                /** @var PackingList $warehouseReceiveList */
-                $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-                $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
-                $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-
-                $contract = $this->unityCreateContract->execute();
-
-                $contractReference = $contract->hash_id;
-                $contractObligations = $contract->contract_obligation_list;
-
-                $this->unityActivateContract->execute($contractReference);
-
-                $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                $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);
-
-                /** @var PackingList $packingList */
-                $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                foreach($contractObligations as $obligation) {
-                    $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                    $this->createsStep->execute($packingList, $stepObject);
-                }
-
-                foreach($row->deliverysize as $package) {
-                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                    $this->createPackageProcessor->execute($packageObject, $packingList);
-                }
-            }
-
-            if($containerReference) {
-                try {
-                    $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                try{
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
                 } catch (ResourceNotFoundException $exception){
-                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
-                    $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-                    /** @var Container $container */
-                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
 
-                    $container->packingLists()->attach($packingList);
+                    $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+                    /** @var PackingList $warehouseReceiveList */
+                    $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
+                    $this->createsTransport->execute($transportObject, $warehouseReceiveList);
 
-                    $transport = $container->transports()->first();
+                    $contract = $this->unityCreateContract->execute();
 
-                    if(!$transport){
-                        $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($etd, $eta, ApprovalStatus::APPROVED));
-                    }
-                }
+                    $contractReference = $contract->hash_id;
+                    $contractObligations = $contract->contract_obligation_list;
 
-                if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
-                    $container->update(['status' => ApprovalStatus::COMPLETED]);
-                    $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+                    $this->unityActivateContract->execute($contractReference);
+
+                    $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                    $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                    $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                    $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                    $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);
 
                     /** @var PackingList $packingList */
-                    foreach($container->packingLists as $packingList){
+                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
-                        if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                            $packingList->status = ApprovalStatus::APPROVED;
-                            $packingList->save();
-                        }
+                    foreach($contractObligations as $obligation) {
+                        $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                        $this->createsStep->execute($packingList, $stepObject);
+                    }
 
-                        $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);
-                            $step->update(['status' => ApprovalStatus::COMPLETED]);
-                        }
+                    foreach($row->deliverysize as $package) {
+                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                        $this->createPackageProcessor->execute($packageObject, $packingList);
                     }
                 }
 
+                if($containerReference) {
+                    try {
+                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                    } catch (ResourceNotFoundException $exception){
+                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id]);
+                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                        /** @var Container $container */
+                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                        $container->packingLists()->attach($packingList);
+
+                        $transport = $container->transports()->first();
+
+                        if(!$transport){
+                            $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($etd, $eta, ApprovalStatus::APPROVED));
+                        }
+                    }
+
+                    if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                        /** @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);
+                                $step->update(['status' => ApprovalStatus::COMPLETED]);
+                            }
+                        }
+                    }
+
+
+                }
+
+                db::commit();
 
             }
-
-            db::commit();
-
+        } catch (\Exception $exception) {
+            Log::debug($exception);
         }
 
+
     }
 }

From 3897821cb7331cad0e17134702ed8d6642b07c1b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:47:00 +0800
Subject: [PATCH 108/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index c3090d91..3f84633d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -206,6 +206,7 @@ class FetchOrderListsFromYdPortalProcessor
                     continue;
                 }
 
+                dd($order);
                 $packingListReference = $row->expressno;
 
                 try{

From 68075186d4804f59701b9e3c9ba734d913e8091f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:50:25 +0800
Subject: [PATCH 109/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 3f84633d..ee45018c 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -206,7 +206,7 @@ class FetchOrderListsFromYdPortalProcessor
                     continue;
                 }
 
-                dd($order);
+
                 $packingListReference = $row->expressno;
 
                 try{
@@ -253,6 +253,8 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
+                dd($packingList);
+
                 if($containerReference) {
                     try {
                         $container = $this->fetchesContainer->execute(['reference' => $containerReference]);

From 0469a725edd5e36810ae7d3f37420b1a6eabd777 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:51:30 +0800
Subject: [PATCH 110/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index ee45018c..dddec117 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -253,8 +253,6 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                dd($packingList);
-
                 if($containerReference) {
                     try {
                         $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
@@ -299,6 +297,8 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
+                dd($packingList);
+
                 db::commit();
 
             }

From e504b31b1596637fd91c2c2a558b990fdb687b70 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:52:51 +0800
Subject: [PATCH 111/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index dddec117..ab87db34 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -131,9 +131,6 @@ class FetchOrderListsFromYdPortalProcessor
      * @param Carbon|null $start
      * @param Carbon|null $end
      * @return void
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
@@ -297,9 +294,8 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
-                dd($packingList);
-
                 db::commit();
+                dump('added');
 
             }
         } catch (\Exception $exception) {

From 2d167ef47ea90a550f3b74f49ddf0aa0b1764949 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:56:05 +0800
Subject: [PATCH 112/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index ab87db34..4ed615eb 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -30,7 +30,6 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\Container;
-use App\Models\Order;
 use App\Models\PackingList;
 use App\Models\Transport;
 use Carbon\Carbon;
@@ -155,7 +154,7 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
-                db::beginTransaction();
+                DB::beginTransaction();
 
                 $containerReference = null;
                 $loadingDate = null;
@@ -294,7 +293,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
-                db::commit();
+                DB::commit();
                 dump('added');
 
             }

From efe3a97f3ebb9c2abd4dad570bc4e9f74713e6cb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:58:44 +0800
Subject: [PATCH 113/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 4ed615eb..b1bc3631 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -154,7 +154,6 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
-                DB::beginTransaction();
 
                 $containerReference = null;
                 $loadingDate = null;
@@ -293,7 +292,6 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
-                DB::commit();
                 dump('added');
 
             }

From c7b6622a62940f59862f954c1efbe437870a02d0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 3 Jan 2022 16:59:56 +0800
Subject: [PATCH 114/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index b1bc3631..4ed615eb 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -154,6 +154,7 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
+                DB::beginTransaction();
 
                 $containerReference = null;
                 $loadingDate = null;
@@ -292,6 +293,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
+                DB::commit();
                 dump('added');
 
             }

From e2766c66a19d1bec862aa52b797e3a21f8937a13 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 19:42:35 +0800
Subject: [PATCH 115/223] fix yd fetch data

---
 .../FetchOrderListsFromYdPortalProcessor.php   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 4ed615eb..f2cd5e99 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -184,7 +184,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                $customerno = preg_split('/(-|\/)/', $row->customerno);
+                $customerno = preg_split('/(-|(|)|\/)/', $row->customerno);
 
                 if (!array_key_exists(2, $customerno)){
                     if (!array_key_exists(1, $customerno)){
@@ -257,17 +257,17 @@ class FetchOrderListsFromYdPortalProcessor
                         $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
                         /** @var Container $container */
                         $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+                    }
 
-                        $container->packingLists()->attach($packingList);
+                    $container->packingLists()->attach($packingList);
 
-                        $transport = $container->transports()->first();
+                    $transport = $container->transports()->first();
 
-                        if(!$transport){
-                            $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($etd, $eta, ApprovalStatus::APPROVED));
-                        }
+                    if(!$transport){
+                        $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($etd, $eta, ApprovalStatus::APPROVED));
                     }
 
                     if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){

From cee6ca4eeec7328e31842db66abb1afdf03440cb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 19:45:14 +0800
Subject: [PATCH 116/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index f2cd5e99..874b7892 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -260,7 +260,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
 
                     $container->packingLists()->attach($packingList);
-
+dd('okay');
                     $transport = $container->transports()->first();
 
                     if(!$transport){

From 6ecee81112e5450026f585cc5a337cb76ef0a7b2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 19:46:44 +0800
Subject: [PATCH 117/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 874b7892..20a322bf 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows);
             foreach($rows->data as $row){
                 DB::beginTransaction();
 
@@ -260,7 +260,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
 
                     $container->packingLists()->attach($packingList);
-dd('okay');
+
                     $transport = $container->transports()->first();
 
                     if(!$transport){

From 263e122dea577956d8b658b64f10768d4c03de51 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 19:58:55 +0800
Subject: [PATCH 118/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 20a322bf..21219e70 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -152,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+
             foreach($rows->data as $row){
                 DB::beginTransaction();
 
@@ -259,6 +259,7 @@ dd($rows);
                         $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                     }
 
+                    $container->packingLists()->detach($packingList);
                     $container->packingLists()->attach($packingList);
 
                     $transport = $container->transports()->first();

From d22e3884fa418f04169e8b18d0d2b04e2566e04f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:00:35 +0800
Subject: [PATCH 119/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 21219e70..08db2243 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -298,6 +298,8 @@ class FetchOrderListsFromYdPortalProcessor
                 dump('added');
 
             }
+        } catch (\Throwable $e) {
+            dd($e);
         } catch (\Exception $exception) {
             Log::debug($exception);
         }

From 6423aa63452b1a6b4b0f73fa2afc2ed7b8f8b815 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:01:34 +0800
Subject: [PATCH 120/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 08db2243..a3ea8945 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -248,6 +248,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $this->createPackageProcessor->execute($packageObject, $packingList);
                     }
                 }
+                dd($packingList);
 
                 if($containerReference) {
                     try {

From 7c17edc5fd7817b6a9acec6d9ee5c12890ba2979 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:03:12 +0800
Subject: [PATCH 121/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index a3ea8945..49ca7df0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -205,6 +205,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $packingListReference = $row->expressno;
 
+                dump($row);
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
                 } catch (ResourceNotFoundException $exception){
@@ -248,7 +249,6 @@ class FetchOrderListsFromYdPortalProcessor
                         $this->createPackageProcessor->execute($packageObject, $packingList);
                     }
                 }
-                dd($packingList);
 
                 if($containerReference) {
                     try {

From 8825e49b68b84d0cfb328d61f6e9fd3431a64ea7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:05:28 +0800
Subject: [PATCH 122/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 49ca7df0..cae6deef 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -185,7 +185,7 @@ class FetchOrderListsFromYdPortalProcessor
                 }
 
                 $customerno = preg_split('/(-|(|)|\/)/', $row->customerno);
-
+dd($customerno);
                 if (!array_key_exists(2, $customerno)){
                     if (!array_key_exists(1, $customerno)){
                         continue;
@@ -205,7 +205,6 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $packingListReference = $row->expressno;
 
-                dump($row);
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
                 } catch (ResourceNotFoundException $exception){

From ef3460f7964871b3cb8964239356fb6bc0e4f10a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:06:44 +0800
Subject: [PATCH 123/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index cae6deef..279000be 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -184,7 +184,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                $customerno = preg_split('/(-|(|)|\/)/', $row->customerno);
+                $customerno = preg_split('/(-|\/)/', $row->customerno);
 dd($customerno);
                 if (!array_key_exists(2, $customerno)){
                     if (!array_key_exists(1, $customerno)){

From 1f02b7247d0cdf804f0608d69cdbe562a7496153 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:08:09 +0800
Subject: [PATCH 124/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 279000be..c199e1c2 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -184,7 +184,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                $customerno = preg_split('/(-|\/)/', $row->customerno);
+                $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
 dd($customerno);
                 if (!array_key_exists(2, $customerno)){
                     if (!array_key_exists(1, $customerno)){

From 2d885776dd9fae70cadbe7b2face07e122641f0e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:10:55 +0800
Subject: [PATCH 125/223] fix yd fetch data

---
 routes/web.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 099c4368..99d5ad8f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -8,8 +8,10 @@ use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 use App\Models\CompanyConnection;
+use App\Models\CompanyModule;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -183,7 +185,20 @@ Route::get('/debug', function (){
 });
 
 Route::get('/yd', function (){
-    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();;
+    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
 });
 
+Route::get('/min_cbm', function (){
+    $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orders', function ($query){
+        return $query->whereHas('packingLists')->whereDoesntHave('packingLists', function($query){
+            return $query->whereHas('packages', function($query){
+                return $query->selectRaw('sum((width/100) * (height/100) * (length/100) * quantity) as cbm')->where('type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->where('status', '!=', 5)->having('cbm', '>', 0.3);
+            });
+        });
+    })->get();
+
+    foreach ($companies as $company) {
+        echo route('customer.profile', $company->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference).'<br>';
+    }
+});
 Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
\ No newline at end of file

From 95ab15df214c6580d0ba6730f3dd9e702927a75a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:12:21 +0800
Subject: [PATCH 126/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index c199e1c2..2a517663 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -185,7 +185,7 @@ class FetchOrderListsFromYdPortalProcessor
                 }
 
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
-dd($customerno);
+
                 if (!array_key_exists(2, $customerno)){
                     if (!array_key_exists(1, $customerno)){
                         continue;
@@ -298,8 +298,6 @@ dd($customerno);
                 dump('added');
 
             }
-        } catch (\Throwable $e) {
-            dd($e);
         } catch (\Exception $exception) {
             Log::debug($exception);
         }

From fdf4f211559238fe0649a56beb8f95f2bf1eba85 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:13:15 +0800
Subject: [PATCH 127/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 2a517663..240bf4b4 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -154,7 +154,6 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
-                DB::beginTransaction();
 
                 $containerReference = null;
                 $loadingDate = null;
@@ -294,7 +293,6 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
-                DB::commit();
                 dump('added');
 
             }

From f69c99b070ff3f225e03f82216387ea988120a3b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:16:20 +0800
Subject: [PATCH 128/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 240bf4b4..fdd21bd5 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -201,6 +201,7 @@ class FetchOrderListsFromYdPortalProcessor
                     continue;
                 }
 
+                DB::beginTransaction();
 
                 $packingListReference = $row->expressno;
 
@@ -293,7 +294,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
-                dump('added');
+                DB::commit();
 
             }
         } catch (\Exception $exception) {

From 04bd67573c3e71d98fc46733b515dd5c67ce4b9a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:23:47 +0800
Subject: [PATCH 129/223] fix yd fetch data

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

diff --git a/routes/web.php b/routes/web.php
index 99d5ad8f..1e400c3a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -195,7 +195,7 @@ Route::get('/min_cbm', function (){
                 return $query->selectRaw('sum((width/100) * (height/100) * (length/100) * quantity) as cbm')->where('type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->where('status', '!=', 5)->having('cbm', '>', 0.3);
             });
         });
-    })->get();
+    })->limit(1)->get();
 
     foreach ($companies as $company) {
         echo route('customer.profile', $company->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference).'<br>';

From 90420cebe78965eace1ad9f075ce365a2468032e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:25:25 +0800
Subject: [PATCH 130/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index fdd21bd5..09b20435 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -268,6 +268,9 @@ class FetchOrderListsFromYdPortalProcessor
                         $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
                         /** @var Transport $transport */
                         $transport = $this->createsTransport->execute($transportObject, $container);
+                    }
+
+                    if(!$transport->schedules) {
                         $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                     }
 

From b96dad37f56d2a3dd8c0b47e7dc5a4329696a86e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:26:34 +0800
Subject: [PATCH 131/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 09b20435..fdd21bd5 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -268,9 +268,6 @@ class FetchOrderListsFromYdPortalProcessor
                         $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
                         /** @var Transport $transport */
                         $transport = $this->createsTransport->execute($transportObject, $container);
-                    }
-
-                    if(!$transport->schedules) {
                         $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                     }
 

From 39391990af7c072f5a1899b77188eac32cf5620b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:37:19 +0800
Subject: [PATCH 132/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index fdd21bd5..e00f820c 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -206,14 +206,16 @@ class FetchOrderListsFromYdPortalProcessor
                 $packingListReference = $row->expressno;
 
                 try{
-                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+                    dump($packingList);
                 } catch (ResourceNotFoundException $exception){
 
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
                     /** @var PackingList $warehouseReceiveList */
                     $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
                     $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
-                    $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+                    $warehouseTransport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+                    $this->createsSchedule->execute($warehouseTransport, new ScheduleObject(Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED));
 
                     $contract = $this->unityCreateContract->execute();
 

From e70d804c328eebf020be04e4a5efa6909fe97009 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:38:02 +0800
Subject: [PATCH 133/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index e00f820c..b3aea14d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -207,7 +207,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-                    dump($packingList);
+                    dump($packingList->transports);
                 } catch (ResourceNotFoundException $exception){
 
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);

From 1dbade82a7e664504a454a5b5e26c25f45adb2f0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:39:02 +0800
Subject: [PATCH 134/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index b3aea14d..c9827728 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -206,8 +206,8 @@ class FetchOrderListsFromYdPortalProcessor
                 $packingListReference = $row->expressno;
 
                 try{
-                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-                    dump($packingList->transports);
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
+                    dump($packingList);
                 } catch (ResourceNotFoundException $exception){
 
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);

From 6a381446bcf731fab4eb6d5766e887e258865add Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:40:17 +0800
Subject: [PATCH 135/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index c9827728..756b2b78 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -206,8 +206,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $packingListReference = $row->expressno;
 
                 try{
-                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
-                    dump($packingList);
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                 } catch (ResourceNotFoundException $exception){
 
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);

From 8052ae3a11c7b7ea8a7fd8de5bc79992b51b6d90 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:41:31 +0800
Subject: [PATCH 136/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 756b2b78..30600ad2 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -206,7 +206,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $packingListReference = $row->expressno;
 
                 try{
-                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
                 } catch (ResourceNotFoundException $exception){
 
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
@@ -261,7 +261,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
 
                     $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
+//                    $container->packingLists()->attach($packingList);
 
                     $transport = $container->transports()->first();
 

From e0d743b5a0e6cef3d4006ae943222fd97bb623e3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:42:07 +0800
Subject: [PATCH 137/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 30600ad2..756b2b78 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -206,7 +206,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $packingListReference = $row->expressno;
 
                 try{
-                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno]);
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                 } catch (ResourceNotFoundException $exception){
 
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
@@ -261,7 +261,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
 
                     $container->packingLists()->detach($packingList);
-//                    $container->packingLists()->attach($packingList);
+                    $container->packingLists()->attach($packingList);
 
                     $transport = $container->transports()->first();
 

From d4016e869b3a7a7cb992dd4dac3050ebdbc65e2d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:45:20 +0800
Subject: [PATCH 138/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 756b2b78..037694c0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -31,6 +31,7 @@ use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\Container;
 use App\Models\PackingList;
+use App\Models\Transaction;
 use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
@@ -213,6 +214,7 @@ class FetchOrderListsFromYdPortalProcessor
                     /** @var PackingList $warehouseReceiveList */
                     $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
                     $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
+                    /** @var Transport $warehouseTransport */
                     $warehouseTransport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
                     $this->createsSchedule->execute($warehouseTransport, new ScheduleObject(Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED));
 

From bb210f8583c1ef09180edcba2b4e8810ff43ab39 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:46:17 +0800
Subject: [PATCH 139/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 037694c0..213924dd 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -264,7 +264,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                     $container->packingLists()->detach($packingList);
                     $container->packingLists()->attach($packingList);
-
+dump($packingList);
                     $transport = $container->transports()->first();
 
                     if(!$transport){

From f608bb54f00ca9660b0df9fdc8d839907a5197c9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:47:53 +0800
Subject: [PATCH 140/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 213924dd..6859cb21 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -264,7 +264,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                     $container->packingLists()->detach($packingList);
                     $container->packingLists()->attach($packingList);
-dump($packingList);
+dump($container->packingLists);
                     $transport = $container->transports()->first();
 
                     if(!$transport){

From ce6e6be2bfd3deca4257295a57dbfd86fce483b1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:50:04 +0800
Subject: [PATCH 141/223] fix yd fetch data

---
 .../FetchOrderListsFromYdPortalProcessor.php       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 6859cb21..a72a1cf1 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -202,14 +202,14 @@ class FetchOrderListsFromYdPortalProcessor
                     continue;
                 }
 
-                DB::beginTransaction();
+
 
                 $packingListReference = $row->expressno;
 
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                 } catch (ResourceNotFoundException $exception){
-
+                    DB::beginTransaction();
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
                     /** @var PackingList $warehouseReceiveList */
                     $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
@@ -250,9 +250,11 @@ class FetchOrderListsFromYdPortalProcessor
                         $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
                         $this->createPackageProcessor->execute($packageObject, $packingList);
                     }
+                    DB::commit();
                 }
 
                 if($containerReference) {
+                    DB::beginTransaction();
                     try {
                         $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
                     } catch (ResourceNotFoundException $exception){
@@ -264,7 +266,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                     $container->packingLists()->detach($packingList);
                     $container->packingLists()->attach($packingList);
-dump($container->packingLists);
+
                     $transport = $container->transports()->first();
 
                     if(!$transport){
@@ -274,7 +276,10 @@ dump($container->packingLists);
                         $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                     }
 
+                    DB::commit();
+
                     if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
+                        DB::beginTransaction();
                         $container->update(['status' => ApprovalStatus::COMPLETED]);
                         $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
 
@@ -292,13 +297,12 @@ dump($container->packingLists);
                                 $step->update(['status' => ApprovalStatus::COMPLETED]);
                             }
                         }
+                        DB::commit();
                     }
 
 
                 }
 
-                DB::commit();
-
             }
         } catch (\Exception $exception) {
             Log::debug($exception);

From 078e83477ec97ad33080ad457bda0db22c57e016 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:50:56 +0800
Subject: [PATCH 142/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index a72a1cf1..d6507952 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -209,7 +209,6 @@ class FetchOrderListsFromYdPortalProcessor
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
                 } catch (ResourceNotFoundException $exception){
-                    DB::beginTransaction();
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
                     /** @var PackingList $warehouseReceiveList */
                     $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
@@ -250,11 +249,9 @@ class FetchOrderListsFromYdPortalProcessor
                         $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
                         $this->createPackageProcessor->execute($packageObject, $packingList);
                     }
-                    DB::commit();
                 }
 
                 if($containerReference) {
-                    DB::beginTransaction();
                     try {
                         $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
                     } catch (ResourceNotFoundException $exception){
@@ -276,10 +273,8 @@ class FetchOrderListsFromYdPortalProcessor
                         $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
                     }
 
-                    DB::commit();
 
                     if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
-                        DB::beginTransaction();
                         $container->update(['status' => ApprovalStatus::COMPLETED]);
                         $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
 
@@ -297,7 +292,6 @@ class FetchOrderListsFromYdPortalProcessor
                                 $step->update(['status' => ApprovalStatus::COMPLETED]);
                             }
                         }
-                        DB::commit();
                     }
 
 

From e4f5210e832e19f071c1eda356b593af5bbac733 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:52:26 +0800
Subject: [PATCH 143/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index d6507952..43404997 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -294,6 +294,8 @@ class FetchOrderListsFromYdPortalProcessor
                         }
                     }
 
+                    dump($container->packingLists());
+
 
                 }
 

From bbadaa53ba5d8fccef86399bc66c2c1b3d9636f1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:53:01 +0800
Subject: [PATCH 144/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 43404997..ce38ab3b 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -294,7 +294,7 @@ class FetchOrderListsFromYdPortalProcessor
                         }
                     }
 
-                    dump($container->packingLists());
+                    dump($container->packingLists);
 
 
                 }

From 1d64dc9984ae287753646e474275bdee1f140e2a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:53:49 +0800
Subject: [PATCH 145/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index ce38ab3b..be2aae83 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -294,9 +294,6 @@ class FetchOrderListsFromYdPortalProcessor
                         }
                     }
 
-                    dump($container->packingLists);
-
-
                 }
 
             }

From bac81b57f4ddba6dda3242d973aa3dec9690d9c9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 20:56:01 +0800
Subject: [PATCH 146/223] fix yd fetch data

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index be2aae83..bf82a20e 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -296,6 +296,8 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
+                dump($packingList->containers);
+
             }
         } catch (\Exception $exception) {
             Log::debug($exception);

From 3e26c7e8eff6ca67865f324f4f2d8343648e7541 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:03:54 +0800
Subject: [PATCH 147/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index bf82a20e..9b6c0e45 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -135,6 +135,7 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
+        DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();
 
         try {
             $start = $start ? $start : Carbon::now()->subMonths(2);
@@ -296,8 +297,6 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
-                dump($packingList->containers);
-
             }
         } catch (\Exception $exception) {
             Log::debug($exception);

From af07299bcf1f7858c3fa95d6d9dfa471c1718c47 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:07:25 +0800
Subject: [PATCH 148/223] fix yd fetch data

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php          | 1 -
 app/Http/Resources/ContainerResource.php                         | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 9b6c0e45..be2aae83 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -135,7 +135,6 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();DB::commit();
 
         try {
             $start = $start ? $start : Carbon::now()->subMonths(2);
diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 23cb7817..5faa72e8 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -16,6 +16,7 @@ class ContainerResource extends JsonResource
      */
     public function toArray($request)
     {
+        dd($this->packingLists);
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,

From bae61caae1e23507b66a634bbe3a1b3558c92733 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:08:21 +0800
Subject: [PATCH 149/223] fix yd fetch data

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

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 5faa72e8..64e77421 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -16,7 +16,7 @@ class ContainerResource extends JsonResource
      */
     public function toArray($request)
     {
-        dd($this->packingLists);
+        dd($this->packingLists->whereHas('packages'));
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,

From 56559d3daa6fe1a6362c3090c249fb068d73eaea Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:08:45 +0800
Subject: [PATCH 150/223] fix yd fetch data

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

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 64e77421..d89e09df 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -16,7 +16,7 @@ class ContainerResource extends JsonResource
      */
     public function toArray($request)
     {
-        dd($this->packingLists->whereHas('packages'));
+        dd($this->packingLists()->whereHas('packages'));
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,

From 47d6849dfa37156899b5a3fd19c2129fe831175e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:08:56 +0800
Subject: [PATCH 151/223] fix yd fetch data

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

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index d89e09df..4c9a5582 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -16,7 +16,7 @@ class ContainerResource extends JsonResource
      */
     public function toArray($request)
     {
-        dd($this->packingLists()->whereHas('packages'));
+        dd($this->packingLists()->whereHas('packages')->get());
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,

From 8408add279fff29c5dc8f7e0995afa45f8027253 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:10:07 +0800
Subject: [PATCH 152/223] fix yd fetch data

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

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 4c9a5582..5faa72e8 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -16,7 +16,7 @@ class ContainerResource extends JsonResource
      */
     public function toArray($request)
     {
-        dd($this->packingLists()->whereHas('packages')->get());
+        dd($this->packingLists);
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,

From ff035c1f701b44e789402cbe958b7986abc76334 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:24:30 +0800
Subject: [PATCH 153/223] fix yd fetch data

---
 .../FetchOrderListsFromYdPortalProcessor.php  |  5 ++--
 .../FetchPackingListFromVTPortalProcessor.php | 23 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index be2aae83..e2aaebc4 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -202,12 +202,11 @@ class FetchOrderListsFromYdPortalProcessor
                     continue;
                 }
 
-
-
                 $packingListReference = $row->expressno;
 
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+                    $packingList->packages()->withTrashed()->restore();
                 } catch (ResourceNotFoundException $exception){
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
                     /** @var PackingList $warehouseReceiveList */
@@ -234,7 +233,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                     $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);
+                    $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::APPROVED , $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 53dbbab1..2f977222 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -61,20 +61,25 @@ class FetchPackingListFromVTPortalProcessor
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
-                $packingList->packages()->delete();
+                if(count($shippingPackingLists->Rows)) {
 
-                $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                if($replica) $replica->packages()->delete();
+                    $packingList->packages()->delete();
 
-                foreach($shippingPackingLists->Rows as $shippingPackingList){
-                    if(!$shippingPackingList[22]) {
-                        continue;
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    foreach($shippingPackingLists->Rows as $shippingPackingList){
+                        if(!$shippingPackingList[22]) {
+                            continue;
+                        }
+
+                        $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
+                        $this->createPackageProcessor->execute($packageObject, $packingList);
                     }
-
-                    $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
-                    $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
+
+
                 DB::commit();
             } catch (GuzzleException $exception) {
                 continue;

From 9e872dfb3508e7fadd8b18bc0875c94ce61c96f8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:25:03 +0800
Subject: [PATCH 154/223] fix yd fetch data

---
 app/Http/Resources/ContainerResource.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 5faa72e8..23cb7817 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -16,7 +16,6 @@ class ContainerResource extends JsonResource
      */
     public function toArray($request)
     {
-        dd($this->packingLists);
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,

From 0aa1979611dbc2beeb9e78769f656f6fe56b0cbf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 4 Jan 2022 21:32:16 +0800
Subject: [PATCH 155/223] fix yd fetch data

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

diff --git a/routes/web.php b/routes/web.php
index 1e400c3a..5888db3a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -197,8 +197,10 @@ Route::get('/min_cbm', function (){
         });
     })->limit(1)->get();
 
+    $i = 0;
     foreach ($companies as $company) {
-        echo route('customer.profile', $company->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference).'<br>';
+        $marking = $company->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        echo '<a href="'.route('customer.profile', $marking).'" target="_blank">'.$i++.'. '.$marking.'</a><br>';
     }
 });
 Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
\ No newline at end of file

From bb2f75d8371a05983e1f3f30e0e652624255cbea Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 6 Jan 2022 11:18:37 +0800
Subject: [PATCH 156/223] add yiwu warehouse announcement

---
 .../vue/components/orders/forms/OrderFormComponent.vue       | 5 +++++
 .../orders/sections/OrderProfileSectionComponent.vue         | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
index 37734ec5..84368688 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -41,6 +41,11 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row text-center justify-content-center">
+                                <div class="col-8">
+                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 4">浙江北仑疫情爆发， 义乌船期非常不稳定，建议发广州仓库<br>Due to Beilun, Zhejiang pandemic outbreak our Yiwu warehouse might experience unexpected shipping delays, you can select our Guangzhou warehouse as an alternative.</p>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="row justify-content-center">
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 33a69cb6..c301c369 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -1,7 +1,8 @@
 <template>
-    <div class="row flex-wrap" v-if="order">
+    <div class="row flex-wrap" >
         <div class="col">
-            <div class="row m-b-30">
+            <loading-component v-if="isLoading"></loading-component>
+            <div class="row m-b-30" v-if="!isLoading">
                 <div class="col bg-master-lightest padding-25">
                     <div class="row align-items-center">
                         <div class="col-12 col-lg-3">

From 52038cb365c6680eb3cd05f9bd61c0229deb9dc0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 6 Jan 2022 11:22:19 +0800
Subject: [PATCH 157/223] add yiwu warehouse announcement

---
 .../sections/OrderProfileSectionComponent.vue | 706 +++++++++---------
 1 file changed, 355 insertions(+), 351 deletions(-)

diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index c301c369..5006dc51 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -1,335 +1,372 @@
 <template>
-    <div class="row flex-wrap" >
+    <div class="row">
         <div class="col">
             <loading-component v-if="isLoading"></loading-component>
-            <div class="row m-b-30" v-if="!isLoading">
-                <div class="col bg-master-lightest padding-25">
-                    <div class="row align-items-center">
-                        <div class="col-12 col-lg-3">
-                            <div class="row justify-content-center">
-                                <div class="col-10">
-                                    <a :href="route('order.qr.download', order.id)" target="_blank">
-                                        <div class="peelable-corner overflow-hidden relative">
-                                            <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100">
+            <div class="row flex-wrap"  v-if="!isLoading && order">
+                <div class="col">
+                    <div class="row m-b-30">
+                        <div class="col bg-master-lightest padding-25">
+                            <div class="row align-items-center">
+                                <div class="col-12 col-lg-3">
+                                    <div class="row justify-content-center">
+                                        <div class="col-10">
+                                            <a :href="route('order.qr.download', order.id)" target="_blank">
+                                                <div class="peelable-corner overflow-hidden relative">
+                                                    <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100">
+                                                </div>
+                                            </a>
                                         </div>
-                                    </a>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                        <div class="col">
-                            <div class="row m-b-20">
-                                <div class="col-auto">
-                                    <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
-                                </div>
-                                <div class="col d-flex">
-                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isSuperAdmin">Change Order Number</div>
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
-                                        <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
-                                    </modal-component>
-                                </div>
-                            </div>
-                            <div class="row m-b-20">
-                                <div class="col-12">
-                                    <div class="row">
-                                        <div class="col-auto d-flex align-items-center">
-                                            <h6 class="no-margin"><b>Remark:</b></h6>
+                                <div class="col">
+                                    <div class="row m-b-20">
+                                        <div class="col-auto">
+                                            <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                         </div>
-                                        <div class="col-auto p-l-0" v-if="!addComment && order.remarks.length == 0">
-                                            <div class="btn btn-xs btn-outline-info b-rad-none pointer" @click="addComment = !addComment">Add a Remark</div>
-                                        </div>
-                                        <div class="col d-flex align-items-center pl-3 pl-md-0" v-if="order.remarks.length >= 1 && !isEditRemark">
-                                            <h6 class="no-margin">{{order.remarks[0].content}}</h6> 
-                                            <span class="btn btn-md btn-default m-l-10" @click="isEditRemark = !isEditRemark">
-                                                <i class="fa fa-edit"></i>
-                                            </span>
-                                            <span class="btn btn-md btn-default m-l-5 requestModal" data-type="deleteOrderRemark">
-                                                <i class="fa fa-trash"></i>
-                                            </span>
-                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteOrderRemark">
-                                                <delete-order-remark-form-component :section="section" :data="order.remarks[0]" v-on:submit="addComment=false"></delete-order-remark-form-component>
+                                        <div class="col d-flex">
+                                            <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isSuperAdmin">Change Order Number</div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
+                                                <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                             </modal-component>
                                         </div>
-                                        <div class="col pl-2 pl-md-0" v-if="isEditRemark">
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col-12">
                                             <div class="row">
-                                                <div class="col">
-                                                    <order-remark-form-component :section="section" :data="order.remarks[0]" :id="order.id" v-on:submit="isEditRemark=false"></order-remark-form-component>
+                                                <div class="col-auto d-flex align-items-center">
+                                                    <h6 class="no-margin"><b>Remark:</b></h6>
                                                 </div>
-                                                 <div class="col-auto d-flex align-items-center">
-                                                    <div class="row m-l-5">
-                                                        <div class="col b-a btn btn-sm btn-default" @click="isEditRemark = !isEditRemark">
-                                                            Cancel
+                                                <div class="col-auto p-l-0" v-if="!addComment && order.remarks.length == 0">
+                                                    <div class="btn btn-xs btn-outline-info b-rad-none pointer" @click="addComment = !addComment">Add a Remark</div>
+                                                </div>
+                                                <div class="col d-flex align-items-center pl-3 pl-md-0" v-if="order.remarks.length >= 1 && !isEditRemark">
+                                                    <h6 class="no-margin">{{order.remarks[0].content}}</h6>
+                                                    <span class="btn btn-md btn-default m-l-10" @click="isEditRemark = !isEditRemark">
+                                                <i class="fa fa-edit"></i>
+                                            </span>
+                                                    <span class="btn btn-md btn-default m-l-5 requestModal" data-type="deleteOrderRemark">
+                                                <i class="fa fa-trash"></i>
+                                            </span>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteOrderRemark">
+                                                        <delete-order-remark-form-component :section="section" :data="order.remarks[0]" v-on:submit="addComment=false"></delete-order-remark-form-component>
+                                                    </modal-component>
+                                                </div>
+                                                <div class="col pl-2 pl-md-0" v-if="isEditRemark">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <order-remark-form-component :section="section" :data="order.remarks[0]" :id="order.id" v-on:submit="isEditRemark=false"></order-remark-form-component>
+                                                        </div>
+                                                        <div class="col-auto d-flex align-items-center">
+                                                            <div class="row m-l-5">
+                                                                <div class="col b-a btn btn-sm btn-default" @click="isEditRemark = !isEditRemark">
+                                                                    Cancel
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
+                                                <div class="col p-l-0" v-if="order.remarks.length === 0 && addComment">
+                                                    <order-remark-form-component :section="section" :id="order.id"></order-remark-form-component>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="col p-l-0" v-if="order.remarks.length === 0 && addComment">
-                                            <order-remark-form-component :section="section" :id="order.id"></order-remark-form-component>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col-12 col-sm-auto">
+                                            <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
+                                        </div>
+                                        <div class="col-12 col-sm-auto">
+                                            <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.name}}</h6>
+                                        </div>
+                                        <div class="col col-sm" 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>
-                            </div>
-                            <div class="row m-b-20">
-                                <div class="col-12 col-sm-auto">
-                                    <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
-                                </div>
-                                <div class="col-12 col-sm-auto">
-                                    <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.name}}</h6>
-                                </div>
-                                <div class="col col-sm" 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">
-                                        <div class="row">
-                                            <div class="col-12 col-sm-auto pr-sm-0"><b>Delivery Address:</b>&nbsp;</div> 
-                                            <div class="col-12 col-sm-auto pl-sm-0">{{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></div>
+                                    <div class="row m-b-10 align-items-center parentContainer" >
+                                        <div class="col-auto">
+                                            <h6 class="no-margin">
+                                                <div class="row">
+                                                    <div class="col-12 col-sm-auto pr-sm-0"><b>Delivery Address:</b>&nbsp;</div>
+                                                    <div class="col-12 col-sm-auto pl-sm-0">{{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></div>
+                                                </div>
+                                            </h6>
                                         </div>
-                                    </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 m-t-10 mt-sm-0" 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" v-if="!order.address_change_request">
+                                                <div class="col">
+                                                    <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal m-t-10 mt-sm-0" 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 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 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>
+                                            <a :href="route('order.qr.download', order.id)" target="_blank">
+                                                <button class="btn btn-sm btn-success bg-master b-rad-none all-caps">Download QR Code Pdf</button>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-20">
+                                <div class="col">
+                                    <h4 class="bold">Packages</h4>
+                                    <p>You can trace and track all packages associated with this order number.</p>
+                                </div>
+                            </div>
+                            <div class="row tabsContainer">
+                                <div class="col no-padding">
+                                    <div class="row m-l-0 m-r-0 align-items-center overflow-auto flex-nowrap">
+                                        <div class="col flex-fill" style="min-width:125px;">
+                                            <div class="row justify-content-end">
+                                                <div class="col">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="originWarehouse">
+                                                            <div class="row justify-content-center m-b-5">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         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="M86.06719,12.9c-0.25976,-0.00731 -0.5187,0.03252 -0.76426,0.11758l-68.8,23.65c-0.86858,0.29776 -1.45225,1.11422 -1.45293,2.03242v12.9c-0.00043,0.68443 0.325,1.32819 0.8764,1.73365c0.5514,0.40547 1.2629,0.5242 1.91608,0.31977l1.50752,-0.47031v99.46689h19.35h10.75h36.55h2.15h34.4h12.9h17.2v-99.46689l1.50752,0.47031c0.65319,0.20444 1.36468,0.0857 1.91608,-0.31977c0.5514,-0.40547 0.87683,-1.04922 0.8764,-1.73365v-12.9c-0.00068,-0.9182 -0.58435,-1.73466 -1.45293,-2.03242l-68.8,-23.65c-0.20291,-0.07043 -0.41523,-0.11007 -0.62988,-0.11758zM86,17.32178l66.65,22.91094v8.44043l-7.95752,-2.48174c-0.27786,-0.09509 -0.57226,-0.13224 -0.86504,-0.10918l-0.21416,-0.22676l-0.74326,-0.13437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.41094l0.67607,0.11758c0.18673,0.12653 0.3922,0.22289 0.60889,0.28555l4.94248,1.54531v96.51064h-10.75v-86h-103.2v86h-10.75v-96.51484l4.94248,-1.54531c0.75045,-0.21514 1.32533,-0.82012 1.50193,-1.58056c0.1766,-0.76044 -0.07284,-1.55685 -0.65168,-2.08069c-0.57883,-0.52383 -1.39612,-0.69278 -2.13521,-0.44139l-7.95752,2.48594v-8.44043zM85.40791,28.13477l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13437l1.72588,-0.86504l0.33594,-1.89385l-1.31436,-1.40674zM93.61738,30.33096l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM77.20264,30.70049l-1.72588,0.86084l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31856,-1.40674zM101.82686,32.89668l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM68.99316,33.26621l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31855,-1.40674zM110.03633,35.4624l-1.72588,0.86084l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31855,-1.40674zM60.78369,35.83193l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.41094zM118.2416,38.02812l-1.72168,0.86084l-0.34014,1.89805l1.31856,1.40674l0.74326,0.13437l1.72588,-0.86504l0.33594,-1.89385l-1.31436,-1.41094zM52.57422,38.39766l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13438l1.72168,-0.86504l0.34014,-1.89805l-1.31436,-1.40674zM126.45107,40.59385l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13438l1.72168,-0.86504l0.34014,-1.89805l-1.31436,-1.40674zM44.36895,40.95918l-1.72588,0.86504l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31855,-1.40674zM134.66055,43.15537l-1.72168,0.86504l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM36.15947,43.5249l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.41094l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM38.7,66.65h94.6v81.7h-10.75v-34.4h-17.2v-34.4h-38.7v2.15v32.25h-17.2v2.15v32.25h-10.75zM70.95,83.85h30.1v30.1h-12.9h-2.15h-15.05zM53.75,118.25h12.9h17.2v30.1h-30.1zM88.15,118.25h17.2h12.9v30.1h-30.1z"></path></g></g></svg>
                                                                 </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 class="col">
+                                                                    <div class="fs-12 m-t-5">Warehouse (China)</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>
-                                    <a :href="route('order.qr.download', order.id)" target="_blank">
-                                        <button class="btn btn-sm btn-success bg-master b-rad-none all-caps">Download QR Code Pdf</button>
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <div class="row m-b-20">
-                        <div class="col">
-                            <h4 class="bold">Packages</h4>
-                            <p>You can trace and track all packages associated with this order number.</p>
-                        </div>
-                    </div>
-                    <div class="row tabsContainer">
-                        <div class="col no-padding">
-                            <div class="row m-l-0 m-r-0 align-items-center overflow-auto flex-nowrap">
-                                <div class="col flex-fill" style="min-width:125px;">
-                                    <div class="row justify-content-end">
-                                        <div class="col">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="originWarehouse">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                 width="35" height="35"
-                                                                 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="M86.06719,12.9c-0.25976,-0.00731 -0.5187,0.03252 -0.76426,0.11758l-68.8,23.65c-0.86858,0.29776 -1.45225,1.11422 -1.45293,2.03242v12.9c-0.00043,0.68443 0.325,1.32819 0.8764,1.73365c0.5514,0.40547 1.2629,0.5242 1.91608,0.31977l1.50752,-0.47031v99.46689h19.35h10.75h36.55h2.15h34.4h12.9h17.2v-99.46689l1.50752,0.47031c0.65319,0.20444 1.36468,0.0857 1.91608,-0.31977c0.5514,-0.40547 0.87683,-1.04922 0.8764,-1.73365v-12.9c-0.00068,-0.9182 -0.58435,-1.73466 -1.45293,-2.03242l-68.8,-23.65c-0.20291,-0.07043 -0.41523,-0.11007 -0.62988,-0.11758zM86,17.32178l66.65,22.91094v8.44043l-7.95752,-2.48174c-0.27786,-0.09509 -0.57226,-0.13224 -0.86504,-0.10918l-0.21416,-0.22676l-0.74326,-0.13437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.41094l0.67607,0.11758c0.18673,0.12653 0.3922,0.22289 0.60889,0.28555l4.94248,1.54531v96.51064h-10.75v-86h-103.2v86h-10.75v-96.51484l4.94248,-1.54531c0.75045,-0.21514 1.32533,-0.82012 1.50193,-1.58056c0.1766,-0.76044 -0.07284,-1.55685 -0.65168,-2.08069c-0.57883,-0.52383 -1.39612,-0.69278 -2.13521,-0.44139l-7.95752,2.48594v-8.44043zM85.40791,28.13477l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13437l1.72588,-0.86504l0.33594,-1.89385l-1.31436,-1.40674zM93.61738,30.33096l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM77.20264,30.70049l-1.72588,0.86084l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31856,-1.40674zM101.82686,32.89668l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM68.99316,33.26621l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31855,-1.40674zM110.03633,35.4624l-1.72588,0.86084l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31855,-1.40674zM60.78369,35.83193l-1.72168,0.86084l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.41094zM118.2416,38.02812l-1.72168,0.86084l-0.34014,1.89805l1.31856,1.40674l0.74326,0.13437l1.72588,-0.86504l0.33594,-1.89385l-1.31436,-1.41094zM52.57422,38.39766l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13438l1.72168,-0.86504l0.34014,-1.89805l-1.31436,-1.40674zM126.45107,40.59385l-1.72168,0.86084l-0.34014,1.89805l1.31855,1.40674l0.74326,0.13438l1.72168,-0.86504l0.34014,-1.89805l-1.31436,-1.40674zM44.36895,40.95918l-1.72588,0.86504l-0.33594,1.89805l1.31436,1.40674l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31855,-1.40674zM134.66055,43.15537l-1.72168,0.86504l-0.34014,1.89805l1.31436,1.40674l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM36.15947,43.5249l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.41094l0.74746,0.13018l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM38.7,66.65h94.6v81.7h-10.75v-34.4h-17.2v-34.4h-38.7v2.15v32.25h-17.2v2.15v32.25h-10.75zM70.95,83.85h30.1v30.1h-12.9h-2.15h-15.05zM53.75,118.25h12.9h17.2v30.1h-30.1zM88.15,118.25h17.2h12.9v30.1h-30.1z"></path></g></g></svg>
+                                        </div>
+                                        <div class="col-auto d-inline-block">
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                 width="35" height="35"
+                                                 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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
+                                        </div>
+                                        <div class="col flex-fill" style="min-width:125px;">
+                                            <div class="row justify-content-end">
+                                                <div class="col">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="inTransit">
+                                                            <div class="row justify-content-center m-b-5">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         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>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5">In Transit</div>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                     </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5">Warehouse (China)</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-auto d-inline-block" >
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                 width="35" height="35"
+                                                 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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
+                                        </div>
+                                        <div class="col flex-fill" style="min-width:125px;">
+                                            <div class="row justify-content-end">
+                                                <div class="col">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="destinationWarehouse">
+                                                            <div class="row justify-content-center m-b-5">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         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="M86,12.78242l-70.95,24.38066v17.35957l2.78828,-0.87344l1.51172,-0.47031v99.47109h19.35v-64.5h94.6v62.35h19.35v-97.32109l4.3,1.34375v-17.35957zM86,17.31758l66.65,22.91934v7.31504h-3.59453l-63.05547,-19.70274l-66.65,20.82813v-8.44043zM86,32.35078l62.35,19.48438v94.36484h-10.75v-59.83887c0.04199,-0.23516 0.04199,-0.47031 0,-0.69707v-23.31406h-4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v17.2h-94.6v-17.2c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-4.3v23.28887c-0.04199,0.23516 -0.04199,0.47031 0,0.69707v62.01406h-10.75v-96.51484zM47.3,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.15zM55.9,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.15zM64.5,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.15zM73.1,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.15zM81.7,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.15zM90.3,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.15zM98.9,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.15zM107.5,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.15zM116.1,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.15zM124.7,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,75.25c-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.0666z"></path></g></g></svg>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5">Warehouse (Malaysia)</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-auto d-inline-block" >
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                 width="35" height="35"
+                                                 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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
+                                        </div>
+                                        <div class="col flex-fill" style="min-width:125px;">
+                                            <div class="row justify-content-end">
+                                                <div class="col">
+                                                    <div class="row fs-12 text-center">
+                                                        <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery">
+                                                            <div class="row justify-content-center m-b-5">
+                                                                <div class="col-auto">
+                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                         width="35" height="35"
+                                                                         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="M0,19.35v92.45h6.45v27.95h10.87598c1.075,9.6498 9.28867,17.2 19.22402,17.2c9.93535,0 18.14902,-7.5502 19.22402,-17.2h51.85195c1.075,9.6498 9.28867,17.2 19.22402,17.2c9.93535,0 18.14902,-7.5502 19.22402,-17.2h21.62598c2.35156,0 4.3,-1.94844 4.3,-4.3v-8.6c0,-1.52012 -0.94063,-2.63711 -2.15,-3.40137v-29.82285l-14.15976,-36.69277c-2.23399,-5.79492 -7.82734,-9.63301 -14.03379,-9.63301h-40.60645v-27.95zM4.3,23.65h92.45v83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v23.65h-40.97598c-1.075,-9.6498 -9.28867,-17.2 -19.22402,-17.2c-9.93535,0 -18.14902,7.5502 -19.22402,17.2h-6.57598v-23.65c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-6.45zM75.56074,48.10625l-31.58652,30.46113l-16.02422,-16.43574l-4.61914,4.50156l20.50059,21.02129l36.20566,-34.90391zM101.05,51.6h30.1v30.1c0,4.72832 3.87168,8.6 8.6,8.6h2.99824c1.44453,0 2.77988,0.71387 3.57774,1.91484l0.47031,0.70547c1.5957,2.39355 4.2832,3.82969 7.15547,3.82969h11.59824v4.3h-4.3c-4.72832,0 -8.6,3.87168 -8.6,8.6v2.15h0.43672c0.98262,3.67012 4.19922,6.45 8.16328,6.45h4.3v4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h2.15v8.6h-21.62598c-1.075,-9.6498 -9.28867,-17.2 -19.22402,-17.2c-9.93535,0 -18.14902,7.5502 -19.22402,17.2h-6.57598zM135.45,51.6h6.20645c4.44277,0 8.42363,2.72949 10.01934,6.87832l13.10996,33.97168h-10.83398c-1.44453,0 -2.77988,-0.71387 -3.57774,-1.91484l-0.47871,-0.70547c-1.5873,-2.39355 -4.2748,-3.82969 -7.14707,-3.82969h-2.99824c-2.40195,0 -4.3,-1.89805 -4.3,-4.3zM113.95,58.05c-3.53574,0 -6.45,2.91426 -6.45,6.45v19.35c0,3.53574 2.91426,6.45 6.45,6.45h4.3c3.53574,0 6.45,-2.91426 6.45,-6.45v-19.35c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM113.95,62.35h4.3c1.21777,0 2.15,0.93223 2.15,2.15v19.35c0,1.21777 -0.93223,2.15 -2.15,2.15h-4.3c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-19.35c0,-1.21777 0.93223,-2.15 2.15,-2.15zM161.25,105.35h4.3v8.6h-4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM19.35,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.15zM27.95,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.15zM36.55,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.15zM45.15,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.15zM53.75,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.15zM62.35,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.15zM70.95,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.15zM79.55,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.15zM88.15,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.15zM36.55,122.55c8.33965,0 15.05,6.71035 15.05,15.05c0,8.33965 -6.71035,15.05 -15.05,15.05c-8.33965,0 -15.05,-6.71035 -15.05,-15.05c0,-8.33965 6.71035,-15.05 15.05,-15.05zM126.85,122.55c8.33965,0 15.05,6.71035 15.05,15.05c0,8.33965 -6.71035,15.05 -15.05,15.05c-8.33965,0 -15.05,-6.71035 -15.05,-15.05c0,-8.33965 6.71035,-15.05 15.05,-15.05zM148.35,122.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.15zM156.95,122.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.15zM36.55,131.15c-3.53574,0 -6.45,2.91426 -6.45,6.45c0,3.53574 2.91426,6.45 6.45,6.45c3.53574,0 6.45,-2.91426 6.45,-6.45c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM126.85,131.15c-3.53574,0 -6.45,2.91426 -6.45,6.45c0,3.53574 2.91426,6.45 6.45,6.45c3.53574,0 6.45,-2.91426 6.45,-6.45c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM36.55,135.45c1.20938,0 2.15,0.94063 2.15,2.15c0,1.20937 -0.94062,2.15 -2.15,2.15c-1.20938,0 -2.15,-0.94063 -2.15,-2.15c0,-1.20937 0.94062,-2.15 2.15,-2.15zM126.85,135.45c1.20937,0 2.15,0.94063 2.15,2.15c0,1.20937 -0.94063,2.15 -2.15,2.15c-1.20937,0 -2.15,-0.94063 -2.15,-2.15c0,-1.20937 0.94063,-2.15 2.15,-2.15z"></path></g></g></svg>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <div class="fs-12 m-t-5">Delivered</div>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="col-auto d-inline-block">
-                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                         width="35" height="35"
-                                         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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
-                                </div>
-                                 <div class="col flex-fill" style="min-width:125px;">
-                                    <div class="row justify-content-end">
-                                        <div class="col">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="inTransit">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                 width="35" height="35"
-                                                                 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>
+                                    <div class="row no-margin">
+                                        <div class="col bg-master-lightest p-1 p-sm-4">
+                                            <div class="row tabsContainer tabContent active" tab-name="originWarehouse">
+                                                <div class="col-12 col-sm-4">
                                                     <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5">In Transit</div>
+                                                        <div class="col bg-complete-lighter p-b-10 ml-4 mr-4 mt-2 m-sm-0">
+                                                            <div class="row align-item-center p-t-10 p-b-10">
+                                                                <div class="col">
+                                                                    <h6 class="bold no-margin">Received Parcels</h6>
+                                                                    <p class="no-margin ">Parcels received at our warehouse</p>
+                                                                </div>
+                                                                <div class="col-auto">
+                                                                    <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="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-auto" v-if="false">
+                                                                    <div data-type="createWarehousePackageList" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">Add</div>
+                                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createWarehousePackageList" size="large">
+                                                                        <create-warehouse-package-list-form-component :id="order.id" :section="section"></create-warehouse-package-list-form-component>
+                                                                    </modal-component>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col">
+                                                                    <parcel-component v-for="parcel in order.parcels.received_packages.flatMap(packing_list => packing_list.packages)" :data="parcel" :key="parcel.id"></parcel-component>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-auto d-inline-block" >
-                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                         width="35" height="35"
-                                         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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
-                                </div>
-                                <div class="col flex-fill" style="min-width:125px;">
-                                    <div class="row justify-content-end">
-                                        <div class="col">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="destinationWarehouse">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                 width="35" height="35"
-                                                                 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="M86,12.78242l-70.95,24.38066v17.35957l2.78828,-0.87344l1.51172,-0.47031v99.47109h19.35v-64.5h94.6v62.35h19.35v-97.32109l4.3,1.34375v-17.35957zM86,17.31758l66.65,22.91934v7.31504h-3.59453l-63.05547,-19.70274l-66.65,20.82813v-8.44043zM86,32.35078l62.35,19.48438v94.36484h-10.75v-59.83887c0.04199,-0.23516 0.04199,-0.47031 0,-0.69707v-23.31406h-4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v17.2h-94.6v-17.2c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-4.3v23.28887c-0.04199,0.23516 -0.04199,0.47031 0,0.69707v62.01406h-10.75v-96.51484zM47.3,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.15zM55.9,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.15zM64.5,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.15zM73.1,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.15zM81.7,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.15zM90.3,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.15zM98.9,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.15zM107.5,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.15zM116.1,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.15zM124.7,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,75.25c-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.0666z"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
+                                                <div class="col">
                                                     <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5">Warehouse (Malaysia)</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-auto d-inline-block" >
-                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                         width="35" height="35"
-                                         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="M51.6,19.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.15zM83.22012,19.97988l-3.04023,3.04023l62.97988,62.97988l-62.97988,62.97988l3.04023,3.04023l66.02012,-66.02012zM58.05,25.8c-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.15zM64.5,32.25c-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.15zM70.95,38.7c-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.15zM77.4,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.15zM83.85,51.6c-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,58.05c-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.15zM96.75,64.5c-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.15zM103.2,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.15zM109.65,77.4c-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.15zM25.8,83.85c-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.15zM34.4,83.85c-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.15zM43,83.85c-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.15zM51.6,83.85c-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.15zM60.2,83.85c-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.15zM68.8,83.85c-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.15zM77.4,83.85c-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,83.85c-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.15zM94.6,83.85c-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.15zM103.2,83.85c-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.15zM116.1,83.85c-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.15zM109.65,90.3c-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.15zM103.2,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.15zM96.75,103.2c-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,109.65c-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.15zM83.85,116.1c-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.15zM77.4,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.15zM70.95,129c-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.15zM64.5,135.45c-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.15zM58.05,141.9c-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.15zM51.6,148.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.15z"></path></g></g></svg>
-                                </div>
-                                <div class="col flex-fill" style="min-width:125px;">
-                                    <div class="row justify-content-end">
-                                        <div class="col">
-                                            <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="delivery">
-                                                    <div class="row justify-content-center m-b-5">
-                                                        <div class="col-auto">
-                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                 width="35" height="35"
-                                                                 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="M0,19.35v92.45h6.45v27.95h10.87598c1.075,9.6498 9.28867,17.2 19.22402,17.2c9.93535,0 18.14902,-7.5502 19.22402,-17.2h51.85195c1.075,9.6498 9.28867,17.2 19.22402,17.2c9.93535,0 18.14902,-7.5502 19.22402,-17.2h21.62598c2.35156,0 4.3,-1.94844 4.3,-4.3v-8.6c0,-1.52012 -0.94063,-2.63711 -2.15,-3.40137v-29.82285l-14.15976,-36.69277c-2.23399,-5.79492 -7.82734,-9.63301 -14.03379,-9.63301h-40.60645v-27.95zM4.3,23.65h92.45v83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15v23.65h-40.97598c-1.075,-9.6498 -9.28867,-17.2 -19.22402,-17.2c-9.93535,0 -18.14902,7.5502 -19.22402,17.2h-6.57598v-23.65c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15h-6.45zM75.56074,48.10625l-31.58652,30.46113l-16.02422,-16.43574l-4.61914,4.50156l20.50059,21.02129l36.20566,-34.90391zM101.05,51.6h30.1v30.1c0,4.72832 3.87168,8.6 8.6,8.6h2.99824c1.44453,0 2.77988,0.71387 3.57774,1.91484l0.47031,0.70547c1.5957,2.39355 4.2832,3.82969 7.15547,3.82969h11.59824v4.3h-4.3c-4.72832,0 -8.6,3.87168 -8.6,8.6v2.15h0.43672c0.98262,3.67012 4.19922,6.45 8.16328,6.45h4.3v4.3c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h2.15v8.6h-21.62598c-1.075,-9.6498 -9.28867,-17.2 -19.22402,-17.2c-9.93535,0 -18.14902,7.5502 -19.22402,17.2h-6.57598zM135.45,51.6h6.20645c4.44277,0 8.42363,2.72949 10.01934,6.87832l13.10996,33.97168h-10.83398c-1.44453,0 -2.77988,-0.71387 -3.57774,-1.91484l-0.47871,-0.70547c-1.5873,-2.39355 -4.2748,-3.82969 -7.14707,-3.82969h-2.99824c-2.40195,0 -4.3,-1.89805 -4.3,-4.3zM113.95,58.05c-3.53574,0 -6.45,2.91426 -6.45,6.45v19.35c0,3.53574 2.91426,6.45 6.45,6.45h4.3c3.53574,0 6.45,-2.91426 6.45,-6.45v-19.35c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM113.95,62.35h4.3c1.21777,0 2.15,0.93223 2.15,2.15v19.35c0,1.21777 -0.93223,2.15 -2.15,2.15h-4.3c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-19.35c0,-1.21777 0.93223,-2.15 2.15,-2.15zM161.25,105.35h4.3v8.6h-4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM19.35,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.15zM27.95,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.15zM36.55,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.15zM45.15,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.15zM53.75,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.15zM62.35,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.15zM70.95,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.15zM79.55,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.15zM88.15,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.15zM36.55,122.55c8.33965,0 15.05,6.71035 15.05,15.05c0,8.33965 -6.71035,15.05 -15.05,15.05c-8.33965,0 -15.05,-6.71035 -15.05,-15.05c0,-8.33965 6.71035,-15.05 15.05,-15.05zM126.85,122.55c8.33965,0 15.05,6.71035 15.05,15.05c0,8.33965 -6.71035,15.05 -15.05,15.05c-8.33965,0 -15.05,-6.71035 -15.05,-15.05c0,-8.33965 6.71035,-15.05 15.05,-15.05zM148.35,122.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.15zM156.95,122.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.15zM36.55,131.15c-3.53574,0 -6.45,2.91426 -6.45,6.45c0,3.53574 2.91426,6.45 6.45,6.45c3.53574,0 6.45,-2.91426 6.45,-6.45c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM126.85,131.15c-3.53574,0 -6.45,2.91426 -6.45,6.45c0,3.53574 2.91426,6.45 6.45,6.45c3.53574,0 6.45,-2.91426 6.45,-6.45c0,-3.53574 -2.91426,-6.45 -6.45,-6.45zM36.55,135.45c1.20938,0 2.15,0.94063 2.15,2.15c0,1.20937 -0.94062,2.15 -2.15,2.15c-1.20938,0 -2.15,-0.94063 -2.15,-2.15c0,-1.20937 0.94062,-2.15 2.15,-2.15zM126.85,135.45c1.20937,0 2.15,0.94063 2.15,2.15c0,1.20937 -0.94063,2.15 -2.15,2.15c-1.20937,0 -2.15,-0.94063 -2.15,-2.15c0,-1.20937 0.94063,-2.15 2.15,-2.15z"></path></g></g></svg>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row">
-                                                        <div class="col">
-                                                            <div class="fs-12 m-t-5">Delivered</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row no-margin">
-                                <div class="col bg-master-lightest p-1 p-sm-4">
-                                    <div class="row tabsContainer tabContent active" tab-name="originWarehouse">
-                                        <div class="col-12 col-sm-4">
-                                            <div class="row">
-                                                <div class="col bg-complete-lighter p-b-10 ml-4 mr-4 mt-2 m-sm-0">
-                                                    <div class="row align-item-center p-t-10 p-b-10">
-                                                        <div class="col">
-                                                            <h6 class="bold no-margin">Received Parcels</h6>
-                                                            <p class="no-margin ">Parcels received at our warehouse</p>
-                                                        </div>
-                                                        <div class="col-auto">
-                                                            <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="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-auto" v-if="false">
-                                                            <div data-type="createWarehousePackageList" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">Add</div>
-                                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createWarehousePackageList" size="large">
-                                                                <create-warehouse-package-list-form-component :id="order.id" :section="section"></create-warehouse-package-list-form-component>
+                                                        <div class="col-12 mb-2 " v-if="false">
+                                                            <div data-type="createShippingPackageList" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">
+                                                                Add
+                                                            </div>
+                                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createShippingPackageList" size="large">
+                                                                <create-shipping-package-list-form-component :id="order.id" :section="section"></create-shipping-package-list-form-component>
                                                             </modal-component>
                                                         </div>
+                                                        <div class="col">
+                                                            <div class="row" v-if="order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).length">
+                                                                <div class="col">
+                                                                    <div class="row" v-for="group in Math.ceil(order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).length / 2)">
+                                                                        <div class="col-12 p-r-0" :class="'col-md-'+(12/2)" v-for="item in order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 2, group * 2)" v-bind:key="item.id" :data="item">
+                                                                            <package-component :data="item" status="Ready To Ship"></package-component>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.origin_warehouse_packages.length">
+                                                                <div class="col-10">
+                                                                    <div class="row align-items-center justify-content-center  hint-text">
+                                                                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                                    </div>
+                                                                    <div class="row text-center">
+                                                                        <div class="col">
+                                                                            <div class="row m-t-20">
+                                                                                <div class="col">
+                                                                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
                                                     </div>
+                                                </div>
+                                            </div>
+                                            <div class="row tabsContainer tabContent hide" tab-name="inTransit">
+                                                <div class="col">
                                                     <div class="row">
                                                         <div class="col">
-                                                            <parcel-component v-for="parcel in order.parcels.received_packages.flatMap(packing_list => packing_list.packages)" :data="parcel" :key="parcel.id"></parcel-component>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col">
-                                            <div class="row">
-                                                <div class="col-12 mb-2 " v-if="false">
-                                                    <div data-type="createShippingPackageList" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">
-                                                        Add
-                                                    </div>
-                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createShippingPackageList" size="large">
-                                                        <create-shipping-package-list-form-component :id="order.id" :section="section"></create-shipping-package-list-form-component>
-                                                    </modal-component>
-                                                </div>
-                                                <div class="col">
-                                                    <div class="row" v-if="order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).length">
-                                                        <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).length / 2)">
-                                                                <div class="col-12 p-r-0" :class="'col-md-'+(12/2)" v-for="item in order.parcels.origin_warehouse_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 2, group * 2)" v-bind:key="item.id" :data="item">
-                                                                    <package-component :data="item" status="Ready To Ship"></package-component>
+                                                            <div class="row" v-if="order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).length">
+                                                                <div class="col">
+                                                                    <div class="row" v-for="group in Math.ceil(order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).length / 3)">
+                                                                        <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
+                                                                            <package-component :data="item" status="Shipping"></package-component>
+                                                                        </div>
+                                                                    </div>
                                                                 </div>
                                                             </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.origin_warehouse_packages.length">
-                                                        <div class="col-10">
-                                                            <div class="row align-items-center justify-content-center  hint-text">
-                                                                <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
-                                                            </div>
-                                                            <div class="row text-center">
-                                                                <div class="col">
-                                                                    <div class="row m-t-20">
+                                                            <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.in_transit_packages.length">
+                                                                <div class="col-10">
+                                                                    <div class="row align-items-center justify-content-center  hint-text">
+                                                                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                                    </div>
+                                                                    <div class="row text-center">
                                                                         <div class="col">
-                                                                            <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                            <div class="row m-t-20">
+                                                                                <div class="col">
+                                                                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                                </div>
+                                                                            </div>
                                                                         </div>
                                                                     </div>
                                                                 </div>
@@ -338,31 +375,31 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                    <div class="row tabsContainer tabContent hide" tab-name="inTransit">
-                                        <div class="col">
-                                            <div class="row">
+                                            <div class="row tabsContainer tabContent hide" tab-name="destinationWarehouse">
                                                 <div class="col">
-                                                    <div class="row" v-if="order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).length">
+                                                    <div class="row">
                                                         <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).length / 3)">
-                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
-                                                                    <package-component :data="item" status="Shipping"></package-component>
+                                                            <div class="row" v-if="order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).length">
+                                                                <div class="col">
+                                                                    <div class="row" v-for="group in Math.ceil(order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).length / 3)">
+                                                                        <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
+                                                                            <package-component :data="item" status="Preparing Delivery"></package-component>
+                                                                        </div>
+                                                                    </div>
                                                                 </div>
                                                             </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.in_transit_packages.length">
-                                                        <div class="col-10">
-                                                            <div class="row align-items-center justify-content-center  hint-text">
-                                                                <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
-                                                            </div>
-                                                            <div class="row text-center">
-                                                                <div class="col">
-                                                                    <div class="row m-t-20">
+                                                            <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.destination_warehouse_packages.length">
+                                                                <div class="col-10">
+                                                                    <div class="row align-items-center justify-content-center  hint-text">
+                                                                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                                    </div>
+                                                                    <div class="row text-center">
                                                                         <div class="col">
-                                                                            <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                            <div class="row m-t-20">
+                                                                                <div class="col">
+                                                                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                                </div>
+                                                                            </div>
                                                                         </div>
                                                                     </div>
                                                                 </div>
@@ -371,64 +408,31 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                    <div class="row tabsContainer tabContent hide" tab-name="destinationWarehouse">
-                                        <div class="col">
-                                            <div class="row">
+                                            <div class="row tabsContainer tabContent hide" tab-name="delivery">
                                                 <div class="col">
-                                                    <div class="row" v-if="order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).length">
+                                                    <div class="row">
                                                         <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).length / 3)">
-                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
-                                                                    <package-component :data="item" status="Preparing Delivery"></package-component>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.destination_warehouse_packages.length">
-                                                        <div class="col-10">
-                                                            <div class="row align-items-center justify-content-center  hint-text">
-                                                                <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
-                                                            </div>
-                                                            <div class="row text-center">
+                                                            <div class="row" v-if="order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length">
                                                                 <div class="col">
-                                                                    <div class="row m-t-20">
-                                                                        <div class="col">
-                                                                            <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                    <div class="row" v-for="group in Math.ceil(order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length / 3)">
+                                                                        <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
+                                                                            <package-component :data="item" status="Delivered"></package-component>
                                                                         </div>
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="row tabsContainer tabContent hide" tab-name="delivery">
-                                        <div class="col">
-                                            <div class="row">
-                                                <div class="col">
-                                                    <div class="row" v-if="order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length">
-                                                        <div class="col">
-                                                            <div class="row" v-for="group in Math.ceil(order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length / 3)">
-                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).slice((group - 1) * 3, group * 3)" v-bind:key="item.id" :data="item">
-                                                                    <package-component :data="item" status="Delivered"></package-component>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length">
-                                                        <div class="col-10">
-                                                            <div class="row align-items-center justify-content-center  hint-text">
-                                                                <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
-                                                            </div>
-                                                            <div class="row text-center">
-                                                                <div class="col">
-                                                                    <div class="row m-t-20">
+                                                            <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).length">
+                                                                <div class="col-10">
+                                                                    <div class="row align-items-center justify-content-center  hint-text">
+                                                                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                                    </div>
+                                                                    <div class="row text-center">
                                                                         <div class="col">
-                                                                            <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                            <div class="row m-t-20">
+                                                                                <div class="col">
+                                                                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                                </div>
+                                                                            </div>
                                                                         </div>
                                                                     </div>
                                                                 </div>

From 73fdc2c0f421b8d6f1d5e024041c26b80502813b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 6 Jan 2022 11:28:06 +0800
Subject: [PATCH 158/223] add yiwu warehouse announcement

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

diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 5006dc51..b5c57d50 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="row">
         <div class="col">
-            <loading-component v-if="isLoading"></loading-component>
+            <loading-component style="height: 200px; top: 0;" v-if="isLoading"></loading-component>
             <div class="row flex-wrap"  v-if="!isLoading && order">
                 <div class="col">
                     <div class="row m-b-30">

From 99060ffa51e1274a03a8f5c1ceb9f9787b44005f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 6 Jan 2022 22:39:11 +0800
Subject: [PATCH 159/223] add new customer to yd warehouse list

---
 .../Modules/Orders/ControllersLogic/CreateOrderLogic.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
index 97d1293d..0a475411 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -67,7 +67,7 @@ class CreateOrderLogic extends AbstractControllerLogic
         
         if($originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU){
             $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-            if(in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '1905JYW', '1291NSC', '8288MIB'])){
+            if(in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
                 $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]);
             }
         }

From 5dec999cbffd377dfba8a610f92e1545ff146f1b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 7 Jan 2022 15:17:48 +0800
Subject: [PATCH 160/223] fix on hold and release status for packing list

---
 .../Processors/FetchLoadedContainersFromVTPortalProcessor.php   | 2 +-
 .../Processors/FetchOrderListsFromYdPortalProcessor.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 f77c9fe2..6d4f8164 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -202,7 +202,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                         $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);
+                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, $contractReference);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index e2aaebc4..f3f239d3 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -233,7 +233,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                     $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::APPROVED , $contractReference);
+                    $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED , $contractReference);
 
                     /** @var PackingList $packingList */
                     $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);

From d6eda8a11d8e6dbbc959d5d845365d2a70895122 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 8 Jan 2022 10:50:12 +0800
Subject: [PATCH 161/223] fix approve address change bug when doesn't exist on
 vt portal

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

diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
index 55eae21a..ae8ff933 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -138,7 +138,7 @@ class UpdateDoFromVTPortalProcessor
             }
 
         } catch (\Exception $exception){
-            throw new InternalServerErrorException('failed to approve address due to an error related to VT portal');
+            return [];
         }
 
     }

From 6a91da7b69a1b06b5f20566403b41ea55a7ffbce Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 8 Jan 2022 10:51:40 +0800
Subject: [PATCH 162/223] fix approve address change bug when doesn't exist on
 vt portal

---
 .../Orders/Processors/ApproveChangeOrderAddressProcessor.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
index c7d17487..3477131c 100644
--- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -21,6 +21,9 @@ class ApproveChangeOrderAddressProcessor
     /** @var UpdatesOrdersAddress */
     private $updatesOrdersAddress;
 
+    /** @var UpdateDoFromVTPortalProcessor  */
+    private $updateDoFromVTPortalProcessor;
+
     /**
      * ApproveChangeOrderAddressProcessor constructor.
      * @param CanApproveChangeOrderAddress $canApproveChangeOrderAddress

From c0577128aefd41509178398653de64b873f64f04 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 8 Jan 2022 10:53:12 +0800
Subject: [PATCH 163/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index f9335360..9f93a4af 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Reports;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
@@ -38,7 +39,11 @@ class MonthlyReportController
         })->unique();
 
         $packages = $containers->flatMap(function ($container) {
-            return $container->packages;
+            return $container->packages->whereHas('packingList', function ($query){
+                return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
+            }) ?? $container->packages->whereDoesntHave('packingList', function ($query) {
+                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
+            });
         });
 
         $totalCbm = $packages->sum(function($package){

From aaf68b6368608d62d90c1eda9b593e47f6f9c30b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 8 Jan 2022 11:01:32 +0800
Subject: [PATCH 164/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 9f93a4af..aa87a730 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -41,8 +41,10 @@ class MonthlyReportController
         $packages = $containers->flatMap(function ($container) {
             return $container->packages->whereHas('packingList', function ($query){
                 return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
-            }) ?? $container->packages->whereDoesntHave('packingList', function ($query) {
+            })->orWhere(function($query){
+                $query->whereDoesntHave('packingList', function ($query) {
                     return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
+                });
             });
         });
 

From be2b9d8759f95c0c0119d2d35866996cf1338e93 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 10 Jan 2022 15:51:20 +0800
Subject: [PATCH 165/223] update api routes

---
 routes/api.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/routes/api.php b/routes/api.php
index eafbb856..b53b1b95 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -52,7 +52,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/segment.php';
 
-        Route::get('/report/sales', 'Reports\MonthlyReportController@salesReport')->name('report.sales');
         Route::get('/report/customer/{marking}/{from?}/{to?}', 'Reports\MonthlyReportController@customerReport')->name('report.customer');
         Route::get('/report/sales/{from?}/{to?}', 'Reports\MonthlyReportController@salesReport')->name('report.sales');
         Route::get('/report/profit/{model}/{value}/{from?}/{to?}', 'Reports\MonthlyReportController@profitModelReport')->name('report.profit');

From 1e37de379d76fdf75d4b92d43bcec76300956db1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 10 Jan 2022 15:52:51 +0800
Subject: [PATCH 166/223] update api routes

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

diff --git a/routes/web.php b/routes/web.php
index 5888db3a..a4aa61cf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -125,8 +125,6 @@ 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::group(['prefix' => 'template', 'as' => 'template.'], function () {

From fb5c5ad89024055ac10e2067d9879b7ebd719718 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 10 Jan 2022 20:54:47 +0800
Subject: [PATCH 167/223] add yd yiwu warehouse seeder

---
 .../seeders/ModernWarehouseTableSeeder.php    | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/database/seeders/ModernWarehouseTableSeeder.php b/database/seeders/ModernWarehouseTableSeeder.php
index 42058cfd..62973246 100644
--- a/database/seeders/ModernWarehouseTableSeeder.php
+++ b/database/seeders/ModernWarehouseTableSeeder.php
@@ -12,6 +12,7 @@ use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
 use App\Classes\Modules\Companies\Services\CreatesCompany;
 use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
@@ -53,14 +54,14 @@ class ModernWarehouseTableSeeder extends Seeder
     /** @var CreatesAddress */
     private $createsAddress;
 
-    /** @var CreatesCompany */
-    private $createsCompany;
+    /** @var FetchesCompany */
+    private $fetchesCompany;
 
     /** @var CreatesContact */
     private $createsContact;
 
     /**
-     * CompaniesTableSeeder constructor.
+     * ModernWarehouseTableSeeder constructor.
      * @param CreateCompanyProcessor $createCompanyProcessor
      * @param UpdatesCompanyStatus $updatesCompanyStatus
      * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
@@ -69,10 +70,10 @@ class ModernWarehouseTableSeeder extends Seeder
      * @param ApprovesCompanyConnection $approvesCompanyConnection
      * @param CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor
      * @param CreatesAddress $createsAddress
-     * @param CreatesCompany $createsCompany
+     * @param FetchesCompany $fetchesCompany
      * @param CreatesContact $createsContact
      */
-    public function __construct(CreateCompanyProcessor $createCompanyProcessor, UpdatesCompanyStatus $updatesCompanyStatus, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor, CreatesAddress $createsAddress, CreatesCompany $createsCompany, CreatesContact $createsContact)
+    public function __construct(CreateCompanyProcessor $createCompanyProcessor, UpdatesCompanyStatus $updatesCompanyStatus, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor, CreatesAddress $createsAddress, FetchesCompany $fetchesCompany, CreatesContact $createsContact)
     {
         $this->createCompanyProcessor = $createCompanyProcessor;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
@@ -82,7 +83,7 @@ class ModernWarehouseTableSeeder extends Seeder
         $this->approvesCompanyConnection = $approvesCompanyConnection;
         $this->createAddressFromOldAddressProcessor = $createAddressFromOldAddressProcessor;
         $this->createsAddress = $createsAddress;
-        $this->createsCompany = $createsCompany;
+        $this->fetchesCompany = $fetchesCompany;
         $this->createsContact = $createsContact;
     }
 
@@ -99,24 +100,18 @@ class ModernWarehouseTableSeeder extends Seeder
     {
 
         /** @var Company $company */
-        $company = $this->createsCompany->execute(new CompanyObject('Modern', 'MODERN', CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED));
+        $company = $this->fetchesCompany->execute(['reference' => 'MODERN']);
 
         /** @var CompanyModule $companyModule */
-        $this->createCompanyModuleProcessor->execute($company, BusinessType::FREIGHT_FORWARDER);
-
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::WAREHOUSE);
+        $companyModule->update(['name' => 'Yiwu', 'reference' => 'YW-V02']);
+
+        $address = new AddressObject('义乌市 后宅街道 起航路233号百汇科创园园区里面', '（进口处进来第一个路口左转至出口处右手边国际物流仓库)', 2, 27, 532, 322000);
+        $contact = new ContactObject('韩成名', '18058489899 / 18058929899', '', '');
 
-        $companyModule->update(['name' => 'Guangzhou', 'reference' => 'GZ-V02']);
-        $address = new AddressObject('白云区 白云湖街道 大朗北路 大朗生活区 523A', '(公交车总站对面)', 2, 35, 633, 510000);
-        
-        $contact = new ContactObject('郑学钟', '18665696389', '', '');
         $this->createsAddress->execute($companyModule, $address);
         $this->createsContact->execute($companyModule, $contact);
 
-        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::WAREHOUSE);
-        $companyModule->update(['name' => 'Klang', 'reference' => 'KL-V02']);
-
-
     }
 
 }

From b065881715470c249bddd35b0f2feba47b61b913 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 00:55:26 +0800
Subject: [PATCH 168/223] activate yd warehouses as default

---
 .../ControllersLogic/CreateOrderLogic.php     |  14 +-
 .../Processors/CreateOrderRolesProcessor.php  |   3 +-
 .../Constants/WarehouseReferences.php         |   2 +
 .../Orders/DownloadOrderQrPdfController.php   |  14 +-
 .../seeders/ModernWarehouseTableSeeder.php    |   2 +
 .../CustomerProfileSectionComponent.vue       |   2 +-
 .../elements/chineseNewYearMemoComponent.vue  | 125 +++---------------
 .../orders/forms/OrderFormComponent.vue       |  25 +++-
 resources/views/pdfs/qr.blade.php             |   2 +-
 9 files changed, 67 insertions(+), 122 deletions(-)

diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
index 0a475411..5e7064b1 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\Orders\ControllersLogic;
 
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
@@ -64,11 +65,14 @@ class CreateOrderLogic extends AbstractControllerLogic
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
         
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
-        
-        if($originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU){
-            $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-            if(in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
-                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]);
+
+        $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        if(!in_array($marking, ['1290CSW', '769SMC', '1200KJH', '1152AAT'])){
+            $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]);
+
+            if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
+                throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.');
             }
         }
 
diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
index 7ca3603f..82cf1e27 100644
--- a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
@@ -53,7 +53,7 @@ class CreateOrderRolesProcessor
         $importer = $order->companyModule;
 
         /** @var CompanyModule $destinationWarehouse */
-        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::YD_GUANG_ZHOU ? WarehouseReferences::YD_DESTINATION_WAREHOUSE : WarehouseReferences::VT_DESTINATION_WAREHOUSE[$address->state_id]]);
+        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::YD_GUANG_ZHOU || $originWarehouse->reference === WarehouseReferences::YD_YIWU ? WarehouseReferences::YD_DESTINATION_WAREHOUSE : WarehouseReferences::VT_DESTINATION_WAREHOUSE[$address->state_id]]);
 
         /** @var CompanyModule $freightForwarder */
         $freightForwarder = $originWarehouse->company->companyModules()->freightForwarders()->first();
@@ -79,7 +79,6 @@ 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/ValueObjects/Constants/WarehouseReferences.php b/app/Classes/ValueObjects/Constants/WarehouseReferences.php
index 4ab182e0..66ce67e6 100644
--- a/app/Classes/ValueObjects/Constants/WarehouseReferences.php
+++ b/app/Classes/ValueObjects/Constants/WarehouseReferences.php
@@ -10,6 +10,8 @@ final class WarehouseReferences {
 
     public const VT_YIWU = 'YW-V01';
 
+    public const YD_YIWU = 'YW-V02';
+
     public const VT_KLANG = 'KL-V01';
 
     public const YD_KLANG = 'KL-V02';
diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
index ae23bae0..91111939 100644
--- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
+++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Orders;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Models\Order;
 use Illuminate\Http\Request;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;
@@ -20,9 +21,20 @@ class DownloadOrderQrPdfController
         $warehouseAddress = $warehouse->addresses()->first();
         $warehouseContacts = $warehouse->contacts;
 
+        $warehousePrefix = $warehouse->reference === WarehouseReferences::YD_YIWU ? ' KU/': '';
+        $deliveryPrefix = '';
+
+        if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
+            $deliveryPrefix = 'SB/';
+        }
+
+        if(strtolower($deliveryAddress->state->name) === 'sarawak') {
+            $deliveryPrefix = 'SRW/';
+        }
+
         $data = [
             'order' => $order,
-            'marking' => $order->companyModule->connections()->first()->invitee_reference,
+            'marking' => $warehousePrefix.$deliveryPrefix.'CIEF/'.$order->companyModule->connections()->first()->invitee_reference,
             'delivery_address' => $deliveryAddress,
             'warehouse_address' => $warehouseAddress,
             'warehouse_contacts' => $warehouseContacts,
diff --git a/database/seeders/ModernWarehouseTableSeeder.php b/database/seeders/ModernWarehouseTableSeeder.php
index 62973246..7f76fd2e 100644
--- a/database/seeders/ModernWarehouseTableSeeder.php
+++ b/database/seeders/ModernWarehouseTableSeeder.php
@@ -112,6 +112,8 @@ class ModernWarehouseTableSeeder extends Seeder
         $this->createsAddress->execute($companyModule, $address);
         $this->createsContact->execute($companyModule, $contact);
 
+        $this->createsContact->execute($companyModule, $contact);
+
     }
 
 }
diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 055097ed..a9d4b495 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -32,7 +32,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <chinese-new-year-memo-component></chinese-new-year-memo-component>
+                                    <chinese-new-year-memo-component v-if="!['1290CSW', '769SMC', '1200KJH', '1152AAT'].includes(company.company_module.marking)"></chinese-new-year-memo-component>
                                 </div>
                             </div>
                             <div class="row m-b-30 relative">
diff --git a/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue b/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue
index 81e4a875..98feff0c 100644
--- a/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue
+++ b/resources/assets/vue/components/general/elements/chineseNewYearMemoComponent.vue
@@ -3,134 +3,39 @@
         <div class="col">
             <div class="row">
                 <div class="col">
-                    <div class="text-white p-t-25 p-l-25 p-r-25" style="background-image: radial-gradient(rgb(182, 3, 17), rgb(118, 0, 12));">
-                        <div class="row" style="max-width: 650px; margin: 0px auto;">
-                            <div class="col">
-                                <div class="row m-b-25">
-                                    <div class="col text-center">
-                                        <h4 class="text-warning no-margin">2022年农历新春前夕仓库运作通知</h4>
-                                        <h4 class="text-warning no-margin">Chinese New Year Shipping Memo 2022</h4>
-                                    </div>
-                                </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="alert alert-success p-t-25 p-l-25 p-r-25">
                                 <div class="row">
                                     <div class="col">
-                                        <p class="no-margin">尊敬的顾客,</p>
-                                        <p class="m-b-15">Dear Valued Customers,</p>
-                                        <p class="no-margin">为确保您的货物在华人农历新年前收到， 务必提前通知您的供应商安排在以下日期前把货物送到仓库:</p>
-                                        <p>To ensure your goods received before the Chinese New Year Holidays, we advised the customer to inform their suppliers to arrange their goods earlier beforehand to the schedule below:</p>
-                                    </div>
-                                </div>
-                                <div class="row m-t-10">
-                                    <div class="col">
-                                        <div class="tg-wrap"><table class="tg">
-                                            <thead>
-                                            <tr>
-                                                <th class="tg-2bkf" colspan="2">仓库 WAREHOUSE</th>
-                                                <th class="tg-2bkf">入仓日期 RECEIVED DATE</th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-                                            <tr>
-                                                <td class="tg-2bkf" rowspan="2">广州<br>GUANGHZOU<br></td>
-                                                <td class="tg-2bkf">西马<br>WEST MALAYSIA</td>
-                                                <td class="tg-2bkf">25/12/2021</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="tg-2bkf">东马<br>EAST MALAYSIA</td>
-                                                <td class="tg-2bkf">11/12/2021</td>
-                                            </tr>
-                                            <tr v-if="expanded">
-                                                <td class="tg-2bkf" rowspan="2">义乌<br>YIWU</td>
-                                                <td class="tg-2bkf">西马<br>WEST MALAYSIA</td>
-                                                <td class="tg-2bkf">18/12/2021</td>
-                                            </tr>
-                                            <tr v-if="expanded">
-                                                <td class="tg-2bkf">东马<br>EAST MALAYSIA</td>
-                                                <td class="tg-2bkf">04/12/2021</td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row m-t-15" v-if="expanded">
-                                    <div class="col">
-                                        <div class="row m-b-20">
+                                        <div class="row m-b-25">
                                             <div class="col">
-                                                <p class="no-margin">我们建议客户尽早安排送货到中国仓库，以确保货物在恶劣天气、运输延误、海关检查等情况下准时到达目的地。</p>
-                                                <p>Customers are advised to arrange delivery to China warehouse as soon as possible to ensure goods reach their destination on time due to the events of Bad weather, Shipping delay, Custom inspection and etc.</p>
+                                                <h4 class="no-margin">好消息！过年前仓库延长收货通知</h4>
+                                                <h4 class="no-margin">New Year Warehouse Operation Extend Notice</h4>
                                             </div>
                                         </div>
                                         <div class="row">
                                             <div class="col">
-                                                <h6 class="text-warning no-margin bold">仓库运营日期</h6>
-                                                <h6 class="text-warning no-margin bold">Warehouse Operation Date</h6>
-                                            </div>
+                                                <p class="m-b-15">由于今年年前运输需求非常庞大，我们决定投入更多的资源，把仓库收货的日期延长，以便确保更多货可以顺利在过年前把货顺利运出。</p>
+                                                <p class="no-margin bold">广州 - 延长至 25/1/2022</p>
+                                                <p class="bold">义乌 - 延长至 23/1/2022</p>
+                                                <p class="m-b-15">仓库地址将会有所更改，请大家务必要在发货之前留意二维码上的新仓库地址。</p></div>
                                         </div>
-                                        <div class="row m-t-15 m-b-15">
+                                        <div class="row">
                                             <div class="col">
-                                                <div class="tg-wrap"><table class="tg">
-                                                    <thead>
-                                                    <tr>
-                                                        <th class="tg-2bkf">仓库<br>WAREHOUSE</th>
-                                                        <th class="tg-2bkf">仓库截止收货日期<br>LAST DAY RECEIVE GOODS</th>
-                                                        <th class="tg-2bkf">仓库復工日期<br>RESUME OPERATION DATE</th>
-                                                    </tr>
-                                                    </thead>
-                                                    <tbody>
-                                                    <tr>
-                                                        <td class="tg-2bkf" rowspan="2">义乌<br>YIWU</td>
-                                                        <td class="tg-2bkf">18/01/2022<br>西马 WEST MALAYSIA</td>
-                                                        <td class="tg-2bkf" rowspan="2">16/02/2022</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="tg-2bkf">25/12/2021<br>东马 EAST MALAYSIA</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="tg-2bkf" rowspan="2">广州<br>GUANGHZOU</td>
-                                                        <td class="tg-2bkf">18/01/2022<br>西马 WEST MALAYSIA</td>
-                                                        <td class="tg-2bkf" rowspan="2">12/02/2022</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="tg-2bkf">08/01/2022<br>东马 EAST MALAYSIA</td>
-                                                    </tr>
-                                                    </tbody>
-                                                </table>
-                                                </div>
+                                                <p>Due to large traffic for shipment before Chinese New Year, we have decided to invest more resource to extend our warehouse receiving date,<br>to ensure goods are sent out before CNY.</p>
+                                                <p class="no-margin bold">Guangzhou - extend till 25/1/2022</p>
+                                                <p class="bold">Yiwu - extend till 23/1/2022</p>
+                                                <p class="m-b-15">Changes were made to the warehouse address, please change your delivery address according to the QR code.</p>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row" style="margin-top: -1px;">
-                <div class="col text-center">
-                    <div class="btn btn-block btn-danger bg-danger-darker no-border p-t-10 p-b-10" @click="expanded = !expanded"><i class="fa m-r-10" :class="[{'fa-angle-double-down': !expanded}, {'fa-angle-double-up': expanded}]"></i> Click To view {{expanded ? 'less' : 'more'}} details <i class="fa m-l-10" :class="[{'fa-angle-double-down': !expanded}, {'fa-angle-double-up': expanded}]"></i></div>
-                </div>
-            </div>
         </div>
     </div>
 </template>
-
-<script>
-    export default {
-        data(){
-            return {
-                expanded: false
-            }
-        }
-    }
-</script>
-<style scoped>
-    .tg  {border-collapse:collapse;border-spacing:0; width: 650px; margin: 0px auto; }
-    .tg td{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
-        overflow:hidden;padding:8px 20px;word-break:normal;}
-    .tg th{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
-        font-weight:normal;overflow:hidden;padding:8px 20px;word-break:normal;}
-    .tg .tg-2bkf{background-color:#76000c;border-color:#ffffff;color:#ffffff;text-align:center;vertical-align:middle}
-    @media screen and (max-width: 767px) {.tg {width: auto !important;}.tg col {width: auto !important;}.tg-wrap {overflow-x: auto;-webkit-overflow-scrolling: touch;margin: auto 0px;}}
-</style>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
index 84368688..a8949636 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -41,6 +41,20 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row justify-content-center m-t-15 align-items-center" v-if="parameters.warehouse_id">
+                                <div class="col-6">
+                                    <div class="row justify-content-center">
+                                        <div class="col-auto">
+                                            <p class="m-b-0">仓库截止收货日期/LAST DAY RECEIVE GOODS:</p>
+                                        </div>
+                                        <div class="col-auto p-l-0">
+                                            <span class="bold text-success" v-if="!['1290CSW', '769SMC', '1200KJH', '1152AAT'].includes(company.company_module.marking)">{{parameters.warehouse_id === 4 ? '23':'25'}}/01/2022</span>
+                                            <span class="bold text-success" v-if="['1290CSW', '769SMC', '1200KJH', '1152AAT'].includes(company.company_module.marking)">18/01/2022</span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
                             <div class="row text-center justify-content-center">
                                 <div class="col-8">
                                     <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 4">浙江北仑疫情爆发， 义乌船期非常不稳定，建议发广州仓库<br>Due to Beilun, Zhejiang pandemic outbreak our Yiwu warehouse might experience unexpected shipping delays, you can select our Guangzhou warehouse as an alternative.</p>
@@ -71,6 +85,11 @@
                                     <h3>Please select the address where you want to receive this order</h3>
                                 </div>
                             </div>
+                            <div class="row justify-content-center m-b-15" v-if="error">
+                                <div class="col-10">
+                                    <small class="text-danger">{{error}}</small>
+                                </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: company.company_module.id}">
@@ -151,6 +170,7 @@
             return {
                 section: 'createOrderForm',
                 step: 1,
+                error: '',
                 parameters : {
                     warehouse_id: '',
                     address_id: '',
@@ -161,7 +181,7 @@
         methods:{
             createOrder(){
                 this.step++;
-                this.submit((this.route('api.order.create')), 'post', 'orderListSection', true, true)
+                this.submit((this.route('api.order.create')), 'post', 'orderListSection', true, false)
             },
             cancelOrder(){
                 this.parameters.warehouse_id = '';
@@ -175,7 +195,8 @@
                 }, 5000);
 
             },
-            errorHandler(){
+            errorHandler(response){
+                this.error = response.message;
                 this.step--;
             }
         }
diff --git a/resources/views/pdfs/qr.blade.php b/resources/views/pdfs/qr.blade.php
index 1ee3ed19..d9271960 100644
--- a/resources/views/pdfs/qr.blade.php
+++ b/resources/views/pdfs/qr.blade.php
@@ -32,7 +32,7 @@
                         <tbody>
                         <tr>
                             <td style="border-bottom: solid 2px #000000;">
-                                <h1 style="font-size: 50px; line-height: 70px">{{(strtolower($delivery_address->state->name) === 'sabah' || strtolower($delivery_address->state->name) === 'labuan') ? 'SB/' : (strtolower($delivery_address->state->name) === 'sarawak' ? 'SRW/':'')}}CIEF/{{$marking}}/{{$order->reference}}</h1>
+                                <h1 style="font-size: 50px; line-height: 70px">{{$marking}}/{{$order->reference}}</h1>
                             </td>
                         </tr>
                         <tr>

From 845873354fbe1bd53f7d61caf7caffb5be45abc1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 12:47:13 +0800
Subject: [PATCH 169/223] activate yd warehouses as default

---
 .../Orders/DownloadOrderQrPdfController.php   | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
index 91111939..8332c545 100644
--- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
+++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
@@ -21,17 +21,36 @@ class DownloadOrderQrPdfController
         $warehouseAddress = $warehouse->addresses()->first();
         $warehouseContacts = $warehouse->contacts;
 
-        $warehousePrefix = $warehouse->reference === WarehouseReferences::YD_YIWU ? ' KU/': '';
+        $warehousePrefix = '';
         $deliveryPrefix = '';
 
-        if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
-            $deliveryPrefix = 'SB/';
+        if($warehouse->reference === WarehouseReferences::VT_GUANG_ZHOU || $warehouse->reference === WarehouseReferences::VT_YIWU) {
+            if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
+                $deliveryPrefix = 'SB/';
+            }
+
+            if(strtolower($deliveryAddress->state->name) === 'sarawak') {
+                $deliveryPrefix = 'SRW/';
+            }
         }
 
-        if(strtolower($deliveryAddress->state->name) === 'sarawak') {
-            $deliveryPrefix = 'SRW/';
+        if($warehouse->reference === WarehouseReferences::YD_YIWU){
+            $warehousePrefix = 'YW';
         }
 
+        if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){
+            $warehousePrefix = 'YD';
+
+            if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
+                $warehousePrefix = 'KK/';
+            }
+
+            if(strtolower($deliveryAddress->state->name) === 'sarawak') {
+                $deliveryPrefix = 'KU/';
+            }
+        }
+
+
         $data = [
             'order' => $order,
             'marking' => $warehousePrefix.$deliveryPrefix.'CIEF/'.$order->companyModule->connections()->first()->invitee_reference,

From a28ad55508024b9d4f250319750932ef3b990420 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 12:55:05 +0800
Subject: [PATCH 170/223] activate yd warehouses as default

---
 app/Http/Controllers/Orders/DownloadOrderQrPdfController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
index 8332c545..f5f7181f 100644
--- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
+++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
@@ -46,7 +46,7 @@ class DownloadOrderQrPdfController
             }
 
             if(strtolower($deliveryAddress->state->name) === 'sarawak') {
-                $deliveryPrefix = 'KU/';
+                $warehousePrefix = 'KU/';
             }
         }
 

From 7769a27a73bc90d75c33c1b97b7eb46fc67189d5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 12:56:00 +0800
Subject: [PATCH 171/223] activate yd warehouses as default

---
 app/Http/Controllers/Orders/DownloadOrderQrPdfController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
index f5f7181f..b573c52a 100644
--- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
+++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
@@ -39,7 +39,7 @@ class DownloadOrderQrPdfController
         }
 
         if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){
-            $warehousePrefix = 'YD';
+            $warehousePrefix = 'YD/';
 
             if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
                 $warehousePrefix = 'KK/';

From 440271bc276d7c13e176f44ed9e02976f880d9df Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 12:56:16 +0800
Subject: [PATCH 172/223] activate yd warehouses as default

---
 app/Http/Controllers/Orders/DownloadOrderQrPdfController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
index b573c52a..b456d880 100644
--- a/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
+++ b/app/Http/Controllers/Orders/DownloadOrderQrPdfController.php
@@ -35,7 +35,7 @@ class DownloadOrderQrPdfController
         }
 
         if($warehouse->reference === WarehouseReferences::YD_YIWU){
-            $warehousePrefix = 'YW';
+            $warehousePrefix = 'YW/';
         }
 
         if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){

From 394eadf6a245d79a72efff76cb34b959aed6fe8d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 18:03:43 +0800
Subject: [PATCH 173/223] remove the exempted customer list from yd warehouse

---
 .../Orders/ControllersLogic/CreateOrderLogic.php       | 10 +++-------
 .../sections/CustomerProfileSectionComponent.vue       |  2 +-
 .../vue/components/orders/forms/OrderFormComponent.vue |  3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
index 5e7064b1..b43e2997 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -66,14 +66,10 @@ class CreateOrderLogic extends AbstractControllerLogic
         
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]);
 
-        if(!in_array($marking, ['1290CSW', '769SMC', '1200KJH', '1152AAT'])){
-            $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]);
-
-            if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
-                throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.');
-            }
+        if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
+            throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment due to the chinese new year\'s holiday. you can select our Guangzhou warehouse as an alternative.');
         }
 
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index a9d4b495..055097ed 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -32,7 +32,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <chinese-new-year-memo-component v-if="!['1290CSW', '769SMC', '1200KJH', '1152AAT'].includes(company.company_module.marking)"></chinese-new-year-memo-component>
+                                    <chinese-new-year-memo-component></chinese-new-year-memo-component>
                                 </div>
                             </div>
                             <div class="row m-b-30 relative">
diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
index a8949636..e833b05e 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -48,8 +48,7 @@
                                             <p class="m-b-0">仓库截止收货日期/LAST DAY RECEIVE GOODS:</p>
                                         </div>
                                         <div class="col-auto p-l-0">
-                                            <span class="bold text-success" v-if="!['1290CSW', '769SMC', '1200KJH', '1152AAT'].includes(company.company_module.marking)">{{parameters.warehouse_id === 4 ? '23':'25'}}/01/2022</span>
-                                            <span class="bold text-success" v-if="['1290CSW', '769SMC', '1200KJH', '1152AAT'].includes(company.company_module.marking)">18/01/2022</span>
+                                            <span class="bold text-success">{{parameters.warehouse_id === 4 ? '23':'25'}}/01/2022</span>
                                         </div>
                                     </div>
                                 </div>

From 35206ca249c90329e880cd67bbf730e209fc2fcc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:22:39 +0800
Subject: [PATCH 174/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index aa87a730..4f70c953 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -39,13 +39,13 @@ class MonthlyReportController
         })->unique();
 
         $packages = $containers->flatMap(function ($container) {
-            return $container->packages->whereHas('packingList', function ($query){
+            return $container->packages()->whereHas('packingList', function ($query){
                 return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
             })->orWhere(function($query){
                 $query->whereDoesntHave('packingList', function ($query) {
                     return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
                 });
-            });
+            })->get();
         });
 
         $totalCbm = $packages->sum(function($package){

From 67867220edce142923f880c973a09649026037e9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:26:16 +0800
Subject: [PATCH 175/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 4f70c953..83cf0808 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -39,13 +39,7 @@ class MonthlyReportController
         })->unique();
 
         $packages = $containers->flatMap(function ($container) {
-            return $container->packages()->whereHas('packingList', function ($query){
-                return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
-            })->orWhere(function($query){
-                $query->whereDoesntHave('packingList', function ($query) {
-                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
-                });
-            })->get();
+            return $container->packages()->get();
         });
 
         $totalCbm = $packages->sum(function($package){

From 80359cc23b9ee4de3e0e29f00887ad626f3e0ff2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:26:56 +0800
Subject: [PATCH 176/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 83cf0808..aeaf0cad 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -39,7 +39,9 @@ class MonthlyReportController
         })->unique();
 
         $packages = $containers->flatMap(function ($container) {
-            return $container->packages()->get();
+            return $container->packages()->whereHas('packingList', function ($query){
+                return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
+            })->get();
         });
 
         $totalCbm = $packages->sum(function($package){

From ed0db2e3727e9508269b48c3533a40b0573f6655 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:28:20 +0800
Subject: [PATCH 177/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index aeaf0cad..9a770da6 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -39,9 +39,7 @@ class MonthlyReportController
         })->unique();
 
         $packages = $containers->flatMap(function ($container) {
-            return $container->packages()->whereHas('packingList', function ($query){
-                return $query->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA);
-            })->get();
+            return $container->packages->packingList === PackingListType::SHIPPING_PACKING_LIST_REPLICA ? $container->packages : null;
         });
 
         $totalCbm = $packages->sum(function($package){

From a870d259f90c6d96bdf0819ea2b7e663168d9319 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:30:22 +0800
Subject: [PATCH 178/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 9a770da6..4c17261b 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -39,7 +39,9 @@ class MonthlyReportController
         })->unique();
 
         $packages = $containers->flatMap(function ($container) {
-            return $container->packages->packingList === PackingListType::SHIPPING_PACKING_LIST_REPLICA ? $container->packages : null;
+            return $container->packages()->where('packingList', function($query){
+                return $query->type === PackingListType::SHIPPING_PACKING_LIST_REPLICA;
+            });
         });
 
         $totalCbm = $packages->sum(function($package){

From 3e4f627cbe953b3ccc8c3b8ece48df488f46ed48 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:37:05 +0800
Subject: [PATCH 179/223] fix monthly report

---
 .../Controllers/Reports/MonthlyReportController.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 4c17261b..9281b909 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -38,10 +38,15 @@ class MonthlyReportController
             return $container->orders;
         })->unique();
 
-        $packages = $containers->flatMap(function ($container) {
-            return $container->packages()->where('packingList', function($query){
-                return $query->type === PackingListType::SHIPPING_PACKING_LIST_REPLICA;
-            });
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });
+
+        $packages = $packingLists->map(function ($packingList) {
+            $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
         });
 
         $totalCbm = $packages->sum(function($package){

From e8613bd6d9a26f784305ca36ba8553016978f9eb Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:39:43 +0800
Subject: [PATCH 180/223] fix monthly report

---
 .../Controllers/Reports/MonthlyReportController.php   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 9281b909..e0bfae6c 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -91,8 +91,15 @@ class MonthlyReportController
 
         $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
 
-        $packages = $containers->flatMap(function ($container) {
-            return $container->packages;
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });
+
+        $packages = $packingLists->map(function ($packingList) {
+            $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
         });
 
         $totalCbm = $packages->sum(function($package){

From 83fc73acec24f20da12b60c3149800a21b96277d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:42:13 +0800
Subject: [PATCH 181/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index e0bfae6c..6a76d273 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -6,6 +6,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\HttpStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
@@ -96,7 +97,7 @@ class MonthlyReportController
         });
 
         $packages = $packingLists->map(function ($packingList) {
-            $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
             return $replica ? $replica : $packingList;
         })->flatMap(function ($packingList) {
             return $packingList->packages;

From 3a69ce69722a1ab229b596e0b4ab3fc87490a284 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:43:54 +0800
Subject: [PATCH 182/223] fix monthly report

---
 app/Http/Controllers/Reports/MonthlyReportController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 6a76d273..02779e7a 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -44,7 +44,7 @@ class MonthlyReportController
         });
 
         $packages = $packingLists->map(function ($packingList) {
-            $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
             return $replica ? $replica : $packingList;
         })->flatMap(function ($packingList) {
             return $packingList->packages;

From ea34c74f6dbddb7cb0336611152bd72cb7aed4a4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Jan 2022 19:46:18 +0800
Subject: [PATCH 183/223] fix monthly report

---
 .../Controllers/Reports/MonthlyReportController.php   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php
index 02779e7a..20c90e70 100644
--- a/app/Http/Controllers/Reports/MonthlyReportController.php
+++ b/app/Http/Controllers/Reports/MonthlyReportController.php
@@ -144,8 +144,15 @@ class MonthlyReportController
 
         $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
 
-        $packages = $containers->flatMap(function ($container) {
-            return $container->packages;
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });
+
+        $packages = $packingLists->map(function ($packingList) {
+            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
         });
 
         $packages = $packages->filter(function($package) use ($id) {

From c5d5195d2d23680592d02859b2a5d1beee928830 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 14 Jan 2022 15:05:36 +0800
Subject: [PATCH 184/223] fix yd fetch

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

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index f3f239d3..f339626e 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -153,7 +153,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
+dd($rows);
             foreach($rows->data as $row){
 
                 $containerReference = null;

From f876c59a0d0c701d13c48b70394cb6278e070925 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 14 Jan 2022 15:07:00 +0800
Subject: [PATCH 185/223] fix yd fetch

---
 app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php | 1 +
 .../Processors/FetchOrderListsFromYdPortalProcessor.php         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
index 4948ad4f..ab145993 100644
--- a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
@@ -20,6 +20,7 @@ class FetchesDataFromYDPortal
         $client = new \GuzzleHttp\Client();
 
         $body['apicode'] = env('YD_API_CODE');
+        dd(env('YD_API_CODE'));
 
         $request = $client->requestAsync($method, $url, ['query' => $body]);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index f339626e..f3f239d3 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -153,7 +153,7 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-dd($rows);
+
             foreach($rows->data as $row){
 
                 $containerReference = null;

From 77690cb607fc4815ed766a989f208378d57a9088 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 14 Jan 2022 15:08:50 +0800
Subject: [PATCH 186/223] fix yd fetch

---
 app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
index ab145993..4948ad4f 100644
--- a/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
@@ -20,7 +20,6 @@ class FetchesDataFromYDPortal
         $client = new \GuzzleHttp\Client();
 
         $body['apicode'] = env('YD_API_CODE');
-        dd(env('YD_API_CODE'));
 
         $request = $client->requestAsync($method, $url, ['query' => $body]);
 

From f97fc04a2b85e57ae0825bcf5cbc96db2825db76 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 14 Jan 2022 15:12:21 +0800
Subject: [PATCH 187/223] fix yd 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 de764786..7757deb5 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -33,7 +33,7 @@ class Kernel extends ConsoleKernel
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
         $schedule->command('command:curlYdOrderListCommand')
-            ->dailyAt('09:00')
+            ->everyMinute()
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/curlyd.log');
 

From 3fb7bc93d7ce12f7ce4d90230f5a5abcdc4f4438 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 14 Jan 2022 15:17:00 +0800
Subject: [PATCH 188/223] fix yd fetch

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

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 7757deb5..ee06a2d2 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -33,9 +33,7 @@ class Kernel extends ConsoleKernel
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
         $schedule->command('command:curlYdOrderListCommand')
-            ->everyMinute()
-            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+            ->everyMinute();
 
         $schedule->command('command:curlVTCommand')
             ->dailyAt('11:00')

From d6647b488f1ca7a2224702cdc551e3836fa9e7a3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 14 Jan 2022 15:23:00 +0800
Subject: [PATCH 189/223] fix yd fetch

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

diff --git a/app/Console/Commands/CurlYdOrderListCommand.php b/app/Console/Commands/CurlYdOrderListCommand.php
index 318139e8..42f2130c 100644
--- a/app/Console/Commands/CurlYdOrderListCommand.php
+++ b/app/Console/Commands/CurlYdOrderListCommand.php
@@ -41,6 +41,6 @@ class CurlYdOrderListCommand extends Command
      */
     public function handle()
     {
-        return FetchOrdersFromYDPortalJob::dispatch();
+        return FetchOrdersFromYDPortalJob::withChain([])->dispatch();
     }
 }

From 438f7fdff5c7ca7d7344d33e8709fad5f49a3942 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 14 Jan 2022 15:30:05 +0800
Subject: [PATCH 190/223] fix yd fetch

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

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index ee06a2d2..de764786 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -33,7 +33,9 @@ class Kernel extends ConsoleKernel
             ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
         $schedule->command('command:curlYdOrderListCommand')
-            ->everyMinute();
+            ->dailyAt('09:00')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
 
         $schedule->command('command:curlVTCommand')
             ->dailyAt('11:00')

From 5c374e2e1906dc4efdd00fa228768f2ea0bbdcec Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 18 Jan 2022 15:39:14 +0800
Subject: [PATCH 191/223] improve loading speed for container page

---
 app/Http/Resources/ContainerResource.php      | 11 +--
 .../elements/ContainerComponent.vue           | 51 +-------------
 .../elements/PackingListComponent.vue         | 68 +++++++++++++++++++
 resources/views/pages/containers.blade.php    |  6 +-
 4 files changed, 81 insertions(+), 55 deletions(-)
 create mode 100644 resources/assets/vue/components/containers/elements/PackingListComponent.vue

diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index 23cb7817..557ffe74 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ContainerTypes;
 use App\Models\Remark;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\DB;
 
 class ContainerResource extends JsonResource
 {
@@ -24,11 +25,13 @@ class ContainerResource extends JsonResource
             'seal_reference' => $this->seal_reference,
             'loading_date' => $this->loading_date ? $this->loading_date->format('d-m-Y') : $this->loading_date,
             'transport' => new TransportResource($this->transports()->first()),
-            'packing_lists' => PackingListResource::collection($this->whenLoaded('packingLists', function(){
-                return $this->packingLists()->whereHas('packages')->get();
-            })),
+            'packages_count' => $this->packages->sum('quantity'),
+            'total_cbm' => $this->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
             'remarks' => RemarkResource::collection($this->remarks),
-            'status' => $this->status
+            'status' => $this->status,
+            'packing_lists' =>  $this->whenLoaded('packingLists', PackingListResource::collection($this->whenLoaded('packingLists', function(){
+                return $this->packingLists()->whereHas('packages')->get();
+            })))
         ];
     }
 }
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index f894385c..0fa42763 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -28,11 +28,11 @@
                         </div>
                         <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">Packages</p>
-                            <p class="no-margin">{{ item.packing_lists.reduce((total, obj) => total + obj.packages.reduce((total, obj) => obj.quantity + total, 0), 0) }}</p>
+                            <p class="no-margin">{{ item.packages_count }}</p>
                         </div>
                         <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>
+                            <p class="no-margin">{{ (Math.ceil(item.total_cbm * 1000) / 1000).toFixed(3) }}</p>
                         </div>
                         <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">Status</p>
@@ -49,52 +49,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row" v-show="expanded">
-                <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 muted all-caps fs-10">
-                                <div class="col-2">Marking</div>
-                                <div class="col-1 text-center">Quantity</div>
-                                <div class="col-1">CBM</div>
-                                <div class="col-1 text-center">status</div>
-                                <div class="col-3">Delivery Details</div>
-                                <div class="col">Delivery Date</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <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, 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)) * 1000) / 1000).toFixed(3)}}</div>
-                                        <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.transport ? 'Delivery' : packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
-                                        <div class="col-3">{{packingList.order.address.contact ? packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone : ''}}<br>{{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}}<br>{{packingList.order.address.remark ? packingList.order.address.remark.content: ''}}</div>
-                                        <div class="col">
-                                            <p class="no-margin">{{packingList.transport ? packingList.transport.current_schedule.eta : 'n/a'}}</p>
-                                        </div>
-                                        <div class="col-auto text-right" v-if="!packingList.transport">
-                                            <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 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>
-                                            <div class="dropdown-menu">
-                                                <a class="dropdown-item" :href="route('report.customclearance',packingList.order.id)">Origin custom cleared</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <packing-list-component :data="item" v-if="expanded"></packing-list-component>
         </div>
     </div>
 </template>
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
new file mode 100644
index 00000000..62126d44
--- /dev/null
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -0,0 +1,68 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component v-if="isLoading" style="height: 200px; top: 0;"></loading-component>
+            <div class="row" v-show="!isLoading">
+                <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 muted all-caps fs-10">
+                                <div class="col-2">Marking</div>
+                                <div class="col-1 text-center">Quantity</div>
+                                <div class="col-1">CBM</div>
+                                <div class="col-1 text-center">status</div>
+                                <div class="col-3">Delivery Details</div>
+                                <div class="col">Delivery Date</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <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, index) in packingLists">
+                                        <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)) * 1000) / 1000).toFixed(3)}}</div>
+                                        <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.transport ? 'Delivery' : packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
+                                        <div class="col-3">{{packingList.order.address.contact ? packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone : ''}}<br>{{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}}<br>{{packingList.order.address.remark ? packingList.order.address.remark.content: ''}}</div>
+                                        <div class="col">
+                                            <p class="no-margin">{{packingList.transport ? packingList.transport.current_schedule.eta : 'n/a'}}</p>
+                                        </div>
+                                        <div class="col-auto text-right" v-if="!packingList.transport">
+                                            <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>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import LoadingComponent from "../../general/elements/LoadingComponent";
+    export default {
+        components: {LoadingComponent},
+        data(){
+            return {
+                isLoading: true,
+                packingLists: []
+            }
+        },
+        created(){
+            this.submit(route('api.packing_list.container.show', this.item.id), 'get', this.section, false, false);
+        },
+        methods: {
+            successHandler(response){
+                this.packingLists = response.payload.data.packing_lists;
+                this.isLoading = false;
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
index b876abab..b8ab329b 100644
--- a/resources/views/pages/containers.blade.php
+++ b/resources/views/pages/containers.blade.php
@@ -87,7 +87,7 @@
             <div class="col bg-master-lightest p-1 p-sm-4">
                 <div class="row tabsContainer tabContent" tab-name="active">
                     <div class="col">
-                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, 'status_in': [1], order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [1], order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>
@@ -96,7 +96,7 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="arrived">
                     <div class="col">
-                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, 'status_in': [3], 'has_pending_delivery': true, order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': true, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>
@@ -105,7 +105,7 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="complete">
                     <div class="col">
-                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, 'status_in': [3], 'has_pending_delivery': false, order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': false, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>

From 5c780ae0f9a1857214224e878681945aeba1cb5d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 18 Jan 2022 15:40:46 +0800
Subject: [PATCH 192/223] improve loading speed for container page

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

diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
index b8ab329b..81dd9d75 100644
--- a/resources/views/pages/containers.blade.php
+++ b/resources/views/pages/containers.blade.php
@@ -87,7 +87,7 @@
             <div class="col bg-master-lightest p-1 p-sm-4">
                 <div class="row tabsContainer tabContent" tab-name="active">
                     <div class="col">
-                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [1], order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 15, 'status_in': [1], order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>
@@ -96,7 +96,7 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="arrived">
                     <div class="col">
-                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': true, order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 15, 'status_in': [3], 'has_pending_delivery': true, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>
@@ -105,7 +105,7 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="complete">
                     <div class="col">
-                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': false, order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 15, 'status_in': [3], 'has_pending_delivery': false, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>

From d93e6ea25e409439d3010dde84864de4f5e38cbf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 18 Jan 2022 15:42:24 +0800
Subject: [PATCH 193/223] improve loading speed for container page

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

diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
index 81dd9d75..b8ab329b 100644
--- a/resources/views/pages/containers.blade.php
+++ b/resources/views/pages/containers.blade.php
@@ -87,7 +87,7 @@
             <div class="col bg-master-lightest p-1 p-sm-4">
                 <div class="row tabsContainer tabContent" tab-name="active">
                     <div class="col">
-                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 15, 'status_in': [1], order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="activeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [1], order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>
@@ -96,7 +96,7 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="arrived">
                     <div class="col">
-                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 15, 'status_in': [3], 'has_pending_delivery': true, order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="arrivedContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': true, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>
@@ -105,7 +105,7 @@
                 </div>
                 <div class="row tabsContainer tabContent hide" tab-name="complete">
                     <div class="col">
-                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 15, 'status_in': [3], 'has_pending_delivery': false, order_by: {column: 'loading_date', DESC: true}}">
+                        <list-component section="completeContainerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'status_in': [3], 'has_pending_delivery': false, order_by: {column: 'loading_date', DESC: true}}">
                             <template slot="list" slot-scope="{data}">
                                 <container-component :data="data"></container-component>
                             </template>

From 1854ca24de2adcbf91e10d46cb0f0b27177a7a8d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 19 Jan 2022 13:29:26 +0800
Subject: [PATCH 194/223] fix yd order number bug

---
 .../FetchOrderListsFromYdPortalProcessor.php   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index f3f239d3..11ee4454 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -153,7 +153,6 @@ class FetchOrderListsFromYdPortalProcessor
             ]);
 
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
             foreach($rows->data as $row){
 
                 $containerReference = null;
@@ -166,6 +165,7 @@ class FetchOrderListsFromYdPortalProcessor
                     'trakingno' => $row->expressno
                 ]);
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+
                 foreach ($rows->data as $trackingRow) {
                     if($trackingRow->tracking === '货物已送达仓库准备入库中'){
                         $receiveDate = Carbon::parse($trackingRow->trackingtime);
@@ -186,20 +186,16 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
 
-                if (!array_key_exists(2, $customerno)){
-                    if (!array_key_exists(1, $customerno)){
-                        continue;
-                    }
-                    $customerno[2] = substr($customerno[1], -9);
-                }
-
-
-                $orderNumber = $customerno[2];
+                $orderNumber = $customerno[array_key_last($customerno)];
 
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
                 } catch (ResourceNotFoundException $exception) {
-                    continue;
+                    try {
+                        $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
+                    } catch (ResourceNotFoundException $exception) {
+                        continue;
+                    }
                 }
 
                 $packingListReference = $row->expressno;

From 5c4fbe2c52c1911c082f64d16a263a6c217ff331 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 20 Jan 2022 11:16:52 +0800
Subject: [PATCH 195/223] fix release and hold button for packing lists

---
 .../UpdateDoFromVTPortalProcessor.php         |  5 +-
 .../elements/ContainerComponent.vue           | 17 +----
 .../elements/PackingListComponent.vue         | 67 +++++--------------
 .../sections/PackingListSectionComponent.vue  | 60 +++++++++++++++++
 4 files changed, 80 insertions(+), 69 deletions(-)
 create mode 100644 resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue

diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
index ae8ff933..74fb7f62 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php
@@ -46,10 +46,13 @@ class UpdateDoFromVTPortalProcessor
      * @param $address
      * @return array
      * @throws GuzzleException
-     * @throws InternalServerErrorException
      */
     public function execute($address) {
 
+        if(!app()->environment(['production'])){
+            return [];
+        }
+
         try {
             $order = $address->owner()->orderBy('id', 'desc')->first();
             $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index 0fa42763..33a327fb 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -49,7 +49,7 @@
                     </div>
                 </div>
             </div>
-            <packing-list-component :data="item" v-if="expanded"></packing-list-component>
+            <packing-list-section-component :data="item" v-if="expanded"></packing-list-section-component>
         </div>
     </div>
 </template>
@@ -59,21 +59,6 @@
         data(){
             return {
                 expanded: false,
-                index: null,
-            }
-        },
-        methods: {
-            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]
diff --git a/resources/assets/vue/components/containers/elements/PackingListComponent.vue b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
index 62126d44..eb0a87f6 100644
--- a/resources/assets/vue/components/containers/elements/PackingListComponent.vue
+++ b/resources/assets/vue/components/containers/elements/PackingListComponent.vue
@@ -1,66 +1,29 @@
 <template>
     <div class="row">
+        <div class="col-2"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>/<a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
+        <div class="col-1 text-center">{{item.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
+        <div class="col-1">{{ (Math.ceil((item.packages.reduce((total, obj) => obj.cbm + total, 0)) * 1000) / 1000).toFixed(3)}}</div>
+        <div class="col-1 bold text-center" :class="{'text-danger': item.status === 5, 'text-success': item.status !== 5}">{{item.transport ? 'Delivery' : item.status === 5 ? 'On Hold' : 'Release'}}</div>
+        <div class="col-3">{{item.order.address.contact ? item.order.address.contact.reference+' '+item.order.address.contact.phone : ''}}<br>{{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}}<br>{{item.order.address.remark ? item.order.address.remark.content: ''}}</div>
         <div class="col">
-            <loading-component v-if="isLoading" style="height: 200px; top: 0;"></loading-component>
-            <div class="row" v-show="!isLoading">
-                <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 muted all-caps fs-10">
-                                <div class="col-2">Marking</div>
-                                <div class="col-1 text-center">Quantity</div>
-                                <div class="col-1">CBM</div>
-                                <div class="col-1 text-center">status</div>
-                                <div class="col-3">Delivery Details</div>
-                                <div class="col">Delivery Date</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <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, index) in packingLists">
-                                        <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)) * 1000) / 1000).toFixed(3)}}</div>
-                                        <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.transport ? 'Delivery' : packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
-                                        <div class="col-3">{{packingList.order.address.contact ? packingList.order.address.contact.reference+' '+packingList.order.address.contact.phone : ''}}<br>{{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}}<br>{{packingList.order.address.remark ? packingList.order.address.remark.content: ''}}</div>
-                                        <div class="col">
-                                            <p class="no-margin">{{packingList.transport ? packingList.transport.current_schedule.eta : 'n/a'}}</p>
-                                        </div>
-                                        <div class="col-auto text-right" v-if="!packingList.transport">
-                                            <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>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
+        </div>
+        <div class="col-auto text-right" v-if="!item.transport">
+            <div class="btn btn-xs btn-success pointer" v-if="item.status === 5" @click="updateStatus(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="item.status !== 5" @click="updateStatus(5)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
         </div>
     </div>
 </template>
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
-    import LoadingComponent from "../../general/elements/LoadingComponent";
     export default {
-        components: {LoadingComponent},
-        data(){
-            return {
-                isLoading: true,
-                packingLists: []
-            }
-        },
-        created(){
-            this.submit(route('api.packing_list.container.show', this.item.id), 'get', this.section, false, false);
-        },
         methods: {
+            updateStatus(status){
+                this.submit(this.route('api.packing_list.status.update', this.item.id, status), 'put', '', true, true)
+            },
             successHandler(response){
-                this.packingLists = response.payload.data.packing_lists;
-                this.isLoading = false;
+                this.item = response.payload.data;
+                // this.$forceUpdate();
             }
         },
         mixins: [componentHandler]
diff --git a/resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue b/resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue
new file mode 100644
index 00000000..84d91e33
--- /dev/null
+++ b/resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue
@@ -0,0 +1,60 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component v-if="isLoading" style="height: 200px; top: 0;"></loading-component>
+            <div class="row" v-show="!isLoading">
+                <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 muted all-caps fs-10">
+                                <div class="col-2">Marking</div>
+                                <div class="col-1 text-center">Quantity</div>
+                                <div class="col-1">CBM</div>
+                                <div class="col-1 text-center">status</div>
+                                <div class="col-3">Delivery Details</div>
+                                <div class="col">Delivery Date</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <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 packingLists">
+                                        <div class="col">
+                                            <packing-list-component :data="packingList"></packing-list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import LoadingComponent from "../../general/elements/LoadingComponent";
+    import PackingListComponent from "../elements/PackingListComponent";
+    export default {
+        components: {PackingListComponent, LoadingComponent},
+        data(){
+            return {
+                isLoading: true,
+                packingLists: []
+            }
+        },
+        created(){
+            this.submit(route('api.packing_list.container.show', this.item.id), 'get', this.section, false, false);
+        },
+        methods: {
+            successHandler(response){
+                this.packingLists = response.payload.data.packing_lists;
+                this.isLoading = false;
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>

From e6eb05739c8c0277c0b73b11665d5e18d1ac5c9d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 14:25:44 +0800
Subject: [PATCH 196/223] update replica packages logic and over weight price
 announcement

---
 .../Abstracts/AbstractControllerLogic.php     |  2 +-
 app/Http/Resources/PackingListResource.php    |  9 ++----
 app/Models/PackingList.php                    | 29 ++++++++++++++++++-
 .../orders/forms/OrderFormComponent.vue       |  8 ++++-
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index 9f8ba4b5..24a3763b 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -63,7 +63,7 @@ abstract class AbstractControllerLogic
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
-                $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
+                !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
         }
     }
diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 53823417..0403042c 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -16,13 +16,9 @@ class PackingListResource extends JsonResource
      */
     public function toArray($request)
     {
-        $replica = $this->packingLists()->first();
 
-        $packages = $replica ? $replica->packages : $this->packages;
-
-        if(in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919])) {
-            $packages = $this->packages;
-        }
+        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919]);
+        $packages = $this->packingLists()->exists() || $exceptionUsers ? $this->originalPackages : $this->replicatedPackages;
 
         return [
             'id' => $this->id,
@@ -32,7 +28,6 @@ class PackingListResource extends JsonResource
             'transport' => new TransportResource($this->transports()->first()),
             'type' => $this->type,
             'packages' => PackageResource::collection($packages),
-            'packing_list' => new PackingListResource($replica),
             $this->mergeWhen($this->owner instanceof Order, [
                 'order' => New OrderResource($this->owner)
             ])
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index d2594210..4710d006 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -6,6 +6,7 @@ use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
 use App\Classes\General\Interfaces\Packable;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -16,9 +17,11 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 
 class PackingList extends AbstractModel implements Transportable, Steppable, Packable
 {
+    use HasTableAlias;
     use HasRelationships;
     use SoftDeletes;
 
@@ -50,11 +53,19 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
     /**
      * @return HasMany
      */
-    public function packages(): hasMany
+    public function originalPackages(): hasMany
     {
         return $this->hasMany(Package::class, 'packing_list_id');
     }
 
+    /**
+     * @return HasManyDeep
+     */
+    public function replicatedPackages(): HasManyDeep
+    {
+        return $this->hasManyDeep(Package::class, [PackingList::class, PackingList::class.' as alias'], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']);
+    }
+
     /**
      * @return morphMany
      */
@@ -123,4 +134,20 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
             return $transport->where('transport_arrangements.status', ApprovalStatus::COMPLETED);
         });
     }
+
+    /**
+     * @param $query
+     * @return mixed
+     */
+    public function scopePackages($query){
+
+        $exceptionUsers = !in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919]);
+
+        return $query->when($query->has('packingLists') && !$exceptionUsers, function($query){
+            return  $query->replicatedPackages;
+        })->when($query->doesntHave('packingLists') || $exceptionUsers, function($query){
+            return $query->originalPackages;
+        });
+
+    }
 }
diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
index e833b05e..a9e71414 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -51,8 +51,14 @@
                                             <span class="bold text-success">{{parameters.warehouse_id === 4 ? '23':'25'}}/01/2022</span>
                                         </div>
                                     </div>
+                                    <div class="row m-t-20">
+                                        <div class="col">
+                                            <p>请注意!! 由于近期船公司对于重量严格把控，我司对于货物超重的算法也进行了调整。新超重算法将从 2022 年 1 月 20日（货物装箱日期）起实行。</p>
+                                            <p>Attention!! Due to the shipping liner company are strict on checking the weight recently, our company has modified the calculation formula against overweight goods. The new formula will start to be applied on 20th January 2022 (goods loaded date).</p>
+                                            <p>For more details: <a href="https://www.cief-malaysia.com/services-sea-shipping/" target="_blank">https://www.cief-malaysia.com/services-sea-shipping/</a></p>
+                                        </div>
+                                    </div>
                                 </div>
-
                             </div>
                             <div class="row text-center justify-content-center">
                                 <div class="col-8">

From d0a873e06571ea2aa778a795e71e59a096476f50 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 14:39:46 +0800
Subject: [PATCH 197/223] update replica packages logic and over weight price
 announcement

---
 app/Http/Resources/PackingListResource.php |  3 +--
 app/Models/PackingList.php                 | 24 +---------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 0403042c..36824d9f 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -16,9 +16,8 @@ class PackingListResource extends JsonResource
      */
     public function toArray($request)
     {
-
         $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919]);
-        $packages = $this->packingLists()->exists() || $exceptionUsers ? $this->originalPackages : $this->replicatedPackages;
+        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists()->first()->packages;
 
         return [
             'id' => $this->id,
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 4710d006..1e00ccfc 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -53,18 +53,11 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
     /**
      * @return HasMany
      */
-    public function originalPackages(): hasMany
+    public function packages(): hasMany
     {
         return $this->hasMany(Package::class, 'packing_list_id');
     }
 
-    /**
-     * @return HasManyDeep
-     */
-    public function replicatedPackages(): HasManyDeep
-    {
-        return $this->hasManyDeep(Package::class, [PackingList::class, PackingList::class.' as alias'], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']);
-    }
 
     /**
      * @return morphMany
@@ -135,19 +128,4 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
         });
     }
 
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopePackages($query){
-
-        $exceptionUsers = !in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919]);
-
-        return $query->when($query->has('packingLists') && !$exceptionUsers, function($query){
-            return  $query->replicatedPackages;
-        })->when($query->doesntHave('packingLists') || $exceptionUsers, function($query){
-            return $query->originalPackages;
-        });
-
-    }
 }

From 2bb8adf1757dba727084a076322efad46c3dcde7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 15:59:52 +0800
Subject: [PATCH 198/223] update replica packages logic and over weight price
 announcement

---
 app/Models/PackingList.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 1e00ccfc..4d7fbcd2 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -58,6 +58,14 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
         return $this->hasMany(Package::class, 'packing_list_id');
     }
 
+    /**
+     * @return HasManyDeep
+     */
+    public function replicatedPackages(): HasManyDeep
+    {
+        return $this->hasManyDeep(Package::class, [PackingList::class.' as replica', PackingList::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']);
+        return $this->hasManyDeepFromRelations($this->packingLists(), (new PackingList)->setAlias('replica')->packages());
+    }
 
     /**
      * @return morphMany

From ca5879cab0d56e8a964c4d23684b10c888e616e2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:00:38 +0800
Subject: [PATCH 199/223] update replica packages logic and over weight price
 announcement

---
 app/Http/Resources/PackingListResource.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 36824d9f..38c568e7 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -16,8 +16,8 @@ class PackingListResource extends JsonResource
      */
     public function toArray($request)
     {
-        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) || in_array(Auth()->user()->id, [1914, 1919]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists()->first()->packages;
+        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
 
         return [
             'id' => $this->id,

From 8487c6adf3393261a61c724a862e818e51ea7d02 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:00:53 +0800
Subject: [PATCH 200/223] update replica packages logic and over weight price
 announcement

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

diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 4d7fbcd2..4f61c4e4 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -63,7 +63,7 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
      */
     public function replicatedPackages(): HasManyDeep
     {
-        return $this->hasManyDeep(Package::class, [PackingList::class.' as replica', PackingList::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']);
+//        return $this->hasManyDeep(Package::class, [PackingList::class.' as replica', PackingList::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']);
         return $this->hasManyDeepFromRelations($this->packingLists(), (new PackingList)->setAlias('replica')->packages());
     }
 

From 7cc43bcdd91f020d9fb40beb10648d3142451c2c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:20:27 +0800
Subject: [PATCH 201/223] update replica packages logic and over weight price
 announcement

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

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 38c568e7..b4997dae 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -17,7 +17,7 @@ class PackingListResource extends JsonResource
     public function toArray($request)
     {
         $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
+        $packages = !$this->packingLists()->exists() ? $this->packages : $this->packingLists->first()->packages;
 
         return [
             'id' => $this->id,

From 980dd22c4ba3ffcd8b092a20cbb1aa936c22b90f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:21:55 +0800
Subject: [PATCH 202/223] update replica packages logic and over weight price
 announcement

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

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index b4997dae..e1da9351 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -17,7 +17,7 @@ class PackingListResource extends JsonResource
     public function toArray($request)
     {
         $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() ? $this->packages : $this->packingLists->first()->packages;
+        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
 
         return [
             'id' => $this->id,
@@ -27,6 +27,7 @@ class PackingListResource extends JsonResource
             'transport' => new TransportResource($this->transports()->first()),
             'type' => $this->type,
             'packages' => PackageResource::collection($packages),
+            'packing_list' => new PackingListResource($replica),
             $this->mergeWhen($this->owner instanceof Order, [
                 'order' => New OrderResource($this->owner)
             ])

From 3436ed37a167716fcba3d7e58b27489fda33c883 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:22:35 +0800
Subject: [PATCH 203/223] update replica packages logic and over weight price
 announcement

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

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index e1da9351..bd20393a 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -27,7 +27,7 @@ class PackingListResource extends JsonResource
             'transport' => new TransportResource($this->transports()->first()),
             'type' => $this->type,
             'packages' => PackageResource::collection($packages),
-            'packing_list' => new PackingListResource($replica),
+            'packing_list' => new PackingListResource($this->packingLists->first()),
             $this->mergeWhen($this->owner instanceof Order, [
                 'order' => New OrderResource($this->owner)
             ])

From 04650debbb662d5fba985f1c2ab96b4e33f84e3e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:24:54 +0800
Subject: [PATCH 204/223] update replica packages logic and over weight price
 announcement

---
 app/Http/Resources/PackingListResource.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index bd20393a..9a395c7a 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -16,8 +16,9 @@ class PackingListResource extends JsonResource
      */
     public function toArray($request)
     {
+        $replica = $this->packingLists->first();
         $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
+        $packages = !$replica || $exceptionUsers ? $this->packages : $replica->packages;
 
         return [
             'id' => $this->id,
@@ -27,7 +28,7 @@ class PackingListResource extends JsonResource
             'transport' => new TransportResource($this->transports()->first()),
             'type' => $this->type,
             'packages' => PackageResource::collection($packages),
-            'packing_list' => new PackingListResource($this->packingLists->first()),
+            'packing_list' => new PackingListResource($replica),
             $this->mergeWhen($this->owner instanceof Order, [
                 'order' => New OrderResource($this->owner)
             ])

From 412f4cc4b6ec097fb8f5a38194e2e2656f3c7707 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:26:15 +0800
Subject: [PATCH 205/223] update replica packages logic and over weight price
 announcement

---
 app/Models/PackingList.php | 67 +-------------------------------------
 1 file changed, 1 insertion(+), 66 deletions(-)

diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 4f61c4e4..fc775ba2 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -4,25 +4,15 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
-use App\Classes\General\Interfaces\Packable;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
-use Staudenmeir\EloquentHasManyDeep\HasRelationships;
-use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 
-class PackingList extends AbstractModel implements Transportable, Steppable, Packable
+class PackingList extends AbstractModel implements Transportable, Steppable
 {
-    use HasTableAlias;
-    use HasRelationships;
     use SoftDeletes;
 
     protected $table = 'packing_lists';
@@ -58,15 +48,6 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
         return $this->hasMany(Package::class, 'packing_list_id');
     }
 
-    /**
-     * @return HasManyDeep
-     */
-    public function replicatedPackages(): HasManyDeep
-    {
-//        return $this->hasManyDeep(Package::class, [PackingList::class.' as replica', PackingList::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']);
-        return $this->hasManyDeepFromRelations($this->packingLists(), (new PackingList)->setAlias('replica')->packages());
-    }
-
     /**
      * @return morphMany
      */
@@ -90,50 +71,4 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
     {
         return $this->BelongsToMany(PackingList::class, 'packing_list_owner', 'owner_packing_list_id', 'packing_list_id');
     }
-
-    /**
-     * @return MorphMany
-     */
-    public function packingLists(): morphMany
-    {
-        return $this->morphMany(PackingList::class, 'owner');
-    }
-
-    /**
-     * @return hasManyDeep
-     */
-    public function shippingTransports(): hasManyDeep
-    {
-        return $this->hasManyDeep(Transport::class, [ContainerPackingList::class, Container::class], ['packing_list_id', 'id', ['owner_type', 'owner_id']], ['id', 'container_id', null]);
-    }
-
-    /**
-     * @return hasManyDeep
-     */
-    public function shippingSchedules(): hasManyDeep
-    {
-        return $this->hasManyDeep(Schedule::class, [ContainerPackingList::class, Container::class, Transport::class], ['packing_list_id', 'id', ['owner_type', 'owner_id'], ['owner_type', 'owner_id']], ['id', 'container_id', null, null]);
-    }
-
-
-    /**
-     * @return hasManyDeep
-     */
-    public function deliverySchedules(): hasManyDeep
-    {
-        return $this->hasManyDeep(Schedule::class, [Transport::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id']], [null, null]);
-    }
-
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopeShipping($query){
-        return $query->whereHas('shippingSchedules', function($schedule){
-            return $schedule->where('etd', '<', Carbon::now())->where('schedules.status', ApprovalStatus::APPROVED);
-        })->whereDoesntHave('shippingTransports', function($transport){
-            return $transport->where('transport_arrangements.status', ApprovalStatus::COMPLETED);
-        });
-    }
-
 }

From c13d2ce2196a8ecaf89004fde3fdaf9e8990cd92 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:28:30 +0800
Subject: [PATCH 206/223] update replica packages logic and over weight price
 announcement

---
 app/Http/Resources/PackingListResource.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 9a395c7a..0f0c8cb3 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -16,9 +16,10 @@ class PackingListResource extends JsonResource
      */
     public function toArray($request)
     {
-        $replica = $this->packingLists->first();
-        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$replica || $exceptionUsers ? $this->packages : $replica->packages;
+        $replica = $this->packingLists()->first();
+        $exception = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+
+        $packages = (!$replica || $exception) ? $this->packages : $replica->packages;
 
         return [
             'id' => $this->id,

From 4b411ddaf4a3450089830b9d1751a189eb644c57 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:29:15 +0800
Subject: [PATCH 207/223] update replica packages logic and over weight price
 announcement

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

diff --git a/app/Models/Package.php b/app/Models/Package.php
index cb2bf35f..f46b1fb8 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -26,7 +26,7 @@ class Package extends AbstractModel
     /**
      * @return BelongsTo
      */
-    public function packingList(): BelongsTo
+    public function packingLists(): BelongsTo
     {
         return $this->belongsTo(PackingList::class, 'packing_list_id');
     }

From 45acd797da33dc445b189fe0e2c75728e00368b0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:31:13 +0800
Subject: [PATCH 208/223] update replica packages logic and over weight price
 announcement

---
 app/Models/Package.php     |  2 +-
 app/Models/PackingList.php | 50 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/app/Models/Package.php b/app/Models/Package.php
index f46b1fb8..cb2bf35f 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -26,7 +26,7 @@ class Package extends AbstractModel
     /**
      * @return BelongsTo
      */
-    public function packingLists(): BelongsTo
+    public function packingList(): BelongsTo
     {
         return $this->belongsTo(PackingList::class, 'packing_list_id');
     }
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index fc775ba2..77feb7f6 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -4,16 +4,21 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
 class PackingList extends AbstractModel implements Transportable, Steppable
 {
     use SoftDeletes;
+    use HasRelationships;
 
     protected $table = 'packing_lists';
 
@@ -71,4 +76,49 @@ class PackingList extends AbstractModel implements Transportable, Steppable
     {
         return $this->BelongsToMany(PackingList::class, 'packing_list_owner', 'owner_packing_list_id', 'packing_list_id');
     }
+
+    /**
+     * @return MorphMany
+     */
+    public function packingLists(): morphMany
+    {
+        return $this->morphMany(PackingList::class, 'owner');
+    }
+
+    /**
+     * @return hasManyDeep
+     */
+    public function shippingTransports(): hasManyDeep
+    {
+        return $this->hasManyDeep(Transport::class, [ContainerPackingList::class, Container::class], ['packing_list_id', 'id', ['owner_type', 'owner_id']], ['id', 'container_id', null]);
+    }
+
+    /**
+     * @return hasManyDeep
+     */
+    public function shippingSchedules(): hasManyDeep
+    {
+        return $this->hasManyDeep(Schedule::class, [ContainerPackingList::class, Container::class, Transport::class], ['packing_list_id', 'id', ['owner_type', 'owner_id'], ['owner_type', 'owner_id']], ['id', 'container_id', null, null]);
+    }
+
+
+    /**
+     * @return hasManyDeep
+     */
+    public function deliverySchedules(): hasManyDeep
+    {
+        return $this->hasManyDeep(Schedule::class, [Transport::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id']], [null, null]);
+    }
+
+    /**
+     * @param $query
+     * @return mixed
+     */
+    public function scopeShipping($query){
+        return $query->whereHas('shippingSchedules', function($schedule){
+            return $schedule->where('etd', '<', Carbon::now())->where('schedules.status', ApprovalStatus::APPROVED);
+        })->whereDoesntHave('shippingTransports', function($transport){
+            return $transport->where('transport_arrangements.status', ApprovalStatus::COMPLETED);
+        });
+    }
 }

From d4f1184779ae516afb3466e4e0e18abd2005da4a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:42:42 +0800
Subject: [PATCH 209/223] update replica packages logic and over weight price
 announcement

---
 .../FetchOrderListsFromYdPortalProcessor.php  | 20 +++++++++++++------
 app/Models/PackingList.php                    |  3 ++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 11ee4454..2509e263 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -202,7 +202,15 @@ class FetchOrderListsFromYdPortalProcessor
 
                 try{
                     $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-                    $packingList->packages()->withTrashed()->restore();
+
+                    $packingList->packages()->delete();
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
+                    $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
                 } catch (ResourceNotFoundException $exception){
                     $warehouseReceiveObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
                     /** @var PackingList $warehouseReceiveList */
@@ -238,12 +246,12 @@ class FetchOrderListsFromYdPortalProcessor
                         $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
                         $this->createsStep->execute($packingList, $stepObject);
                     }
+                }
 
-                    foreach($row->deliverysize as $package) {
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
+                foreach($row->deliverysize as $package) {
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
                 if($containerReference) {
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 77feb7f6..1ebb2439 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Classes\General\Interfaces\Packable;
 use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -15,7 +16,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
-class PackingList extends AbstractModel implements Transportable, Steppable
+class PackingList extends AbstractModel implements Transportable, Steppable, Packable
 {
     use SoftDeletes;
     use HasRelationships;

From 611adf96e737306593d0b585cc227f2b3241c57a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 16:46:27 +0800
Subject: [PATCH 210/223] update replica packages logic and over weight price
 announcement

---
 app/Http/Resources/PackingListResource.php |  7 ++-----
 app/Models/PackingList.php                 | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 0f0c8cb3..38c568e7 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -16,10 +16,8 @@ class PackingListResource extends JsonResource
      */
     public function toArray($request)
     {
-        $replica = $this->packingLists()->first();
-        $exception = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-
-        $packages = (!$replica || $exception) ? $this->packages : $replica->packages;
+        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
 
         return [
             'id' => $this->id,
@@ -29,7 +27,6 @@ class PackingListResource extends JsonResource
             'transport' => new TransportResource($this->transports()->first()),
             'type' => $this->type,
             'packages' => PackageResource::collection($packages),
-            'packing_list' => new PackingListResource($replica),
             $this->mergeWhen($this->owner instanceof Order, [
                 'order' => New OrderResource($this->owner)
             ])
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 1ebb2439..4f61c4e4 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -2,24 +2,28 @@
 
 namespace App\Models;
 
-use App\Classes\General\Interfaces\Packable;
 use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
+use App\Classes\General\Interfaces\Packable;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 
 class PackingList extends AbstractModel implements Transportable, Steppable, Packable
 {
-    use SoftDeletes;
+    use HasTableAlias;
     use HasRelationships;
+    use SoftDeletes;
 
     protected $table = 'packing_lists';
 
@@ -54,6 +58,15 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
         return $this->hasMany(Package::class, 'packing_list_id');
     }
 
+    /**
+     * @return HasManyDeep
+     */
+    public function replicatedPackages(): HasManyDeep
+    {
+//        return $this->hasManyDeep(Package::class, [PackingList::class.' as replica', PackingList::class], [['owner_type', 'owner_id'], ['owner_type', 'owner_id'], 'packing_list_id'], [null, null, 'id']);
+        return $this->hasManyDeepFromRelations($this->packingLists(), (new PackingList)->setAlias('replica')->packages());
+    }
+
     /**
      * @return morphMany
      */
@@ -122,4 +135,5 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
             return $transport->where('transport_arrangements.status', ApprovalStatus::COMPLETED);
         });
     }
+
 }

From aa681ecd93a97caf8f26caa5dc6dc4168f97a3b8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 17:06:41 +0800
Subject: [PATCH 211/223] update replica packages logic and over weight price
 announcement

---
 .../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 41900336..048864bf 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -26,7 +26,7 @@
                             <p class="no-margin all-caps fs-10 light">Qty</p>
                             <p class="no-margin bold">{{item.quantity}}</p>
                         </div>
-                        <div class="col-auto">
+                        <div class="col-auto" v-if="!$store.getters().isAdmin">
                             <p class="no-margin all-caps fs-10 light">Est. CBM</p>
                             <p class="no-margin">{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}</p>
                         </div>

From 2428fac309cede96e0ee16211a0f238f2a1e4095 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 17:08:16 +0800
Subject: [PATCH 212/223] update replica packages logic and over weight price
 announcement

---
 .../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 048864bf..a09d686c 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -26,7 +26,7 @@
                             <p class="no-margin all-caps fs-10 light">Qty</p>
                             <p class="no-margin bold">{{item.quantity}}</p>
                         </div>
-                        <div class="col-auto" v-if="!$store.getters().isAdmin">
+                        <div class="col-auto" v-if="!$store.getters.isAdmin">
                             <p class="no-margin all-caps fs-10 light">Est. CBM</p>
                             <p class="no-margin">{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}</p>
                         </div>

From e472260db1ba29ce45fc276dc2a65b312727389a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 17:09:15 +0800
Subject: [PATCH 213/223] update replica packages logic and over weight price
 announcement

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

diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 67441c1e..4c72ebe0 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-7">
+        <div class="col-4">
             <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{packing_list_type: 1, packing_list_status: 2, per_page: 20, order_by: {column: 'arrival_date', DESC: true}, with_arrival_date: true}">
                 <template slot="list" slot-scope="{data}">
                     <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>

From 39408e08cab44dc0d435280aefa23b7791a4f7e8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 19:03:49 +0800
Subject: [PATCH 214/223] show warehouse reference to admin

---
 .../assets/vue/components/orders/elements/OrderComponent.vue  | 2 +-
 .../vue/components/orders/elements/PackageComponent.vue       | 2 +-
 .../assets/vue/components/orders/elements/ParcelComponent.vue | 4 ++++
 .../orders/sections/OrderProfileSectionComponent.vue          | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index eae66bac..67ab5693 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -34,7 +34,7 @@
                     <div class="row m-b-5">
                         <div class="col">
                             <small class="fs-10 all-caps muted">Warehouse</small>
-                            <h6 class="no-margin small">{{item.warehouse.name}}</h6>
+                            <h6 class="no-margin small">{{item.warehouse.name}} {{$store.getters.isAdmin ?? order.warehouse.reference}}</h6>
                         </div>
                     </div>
                     <div class="row m-b-5">
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index 99a1a1bb..ac1ba5f2 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -60,7 +60,7 @@
                                     <div class="row">
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Warehouse</small>
-                                            <h6 class="no-margin small">{{item.order.warehouse.name}}</h6>
+                                            <h6 class="no-margin small">{{item.order.warehouse.name}} {{$store.getters.isAdmin ?? order.warehouse.reference}}</h6>
                                         </div>
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Delivery Address</small>
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index a09d686c..1c17f841 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -30,6 +30,10 @@
                             <p class="no-margin all-caps fs-10 light">Est. CBM</p>
                             <p class="no-margin">{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}</p>
                         </div>
+                        <div class="col-auto" v-if="$store.getters.isAdmin">
+                            <p class="no-margin all-caps fs-10 light">Est. CBM</p>
+                            <p class="no-margin">{{item.order.warehouse.reference}}</p>
+                        </div>
                         <div class="col text-right">
                             <div class="btn btn-xs btn-default" @click="expanded = !expanded"><i class="fa" :class="{'fa-angle-up': expanded, 'fa-angle-down': !expanded}"></i></div>
                         </div>
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index b5c57d50..6d3c35d2 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -76,7 +76,7 @@
                                             <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
                                         </div>
                                         <div class="col-12 col-sm-auto">
-                                            <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.name}}</h6>
+                                            <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.name}} {{$store.getters.isAdmin ?? order.warehouse.reference}}</h6>
                                         </div>
                                         <div class="col col-sm" v-if="$store.getters.isAdmin">
                                             <a :href="route('customer.profile', order.company_module.marking)">

From a35cf282f66cbd6931157dc98f078f8c61439537 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 19:06:23 +0800
Subject: [PATCH 215/223] show warehouse reference to admin

---
 .../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 1c17f841..08218b96 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -31,7 +31,7 @@
                             <p class="no-margin">{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}</p>
                         </div>
                         <div class="col-auto" v-if="$store.getters.isAdmin">
-                            <p class="no-margin all-caps fs-10 light">Est. CBM</p>
+                            <p class="no-margin all-caps fs-10 light">Warehouse</p>
                             <p class="no-margin">{{item.order.warehouse.reference}}</p>
                         </div>
                         <div class="col text-right">

From 950b3d168af140bfcb7140608055eb4243bb01fc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 19:07:11 +0800
Subject: [PATCH 216/223] show warehouse reference to admin

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

diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index 67ab5693..27908423 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -34,7 +34,7 @@
                     <div class="row m-b-5">
                         <div class="col">
                             <small class="fs-10 all-caps muted">Warehouse</small>
-                            <h6 class="no-margin small">{{item.warehouse.name}} {{$store.getters.isAdmin ?? order.warehouse.reference}}</h6>
+                            <h6 class="no-margin small">{{item.warehouse.name}} {{$store.getters.isAdmin ?? item.warehouse.reference}}</h6>
                         </div>
                     </div>
                     <div class="row m-b-5">
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index ac1ba5f2..bb978f20 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -60,7 +60,7 @@
                                     <div class="row">
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Warehouse</small>
-                                            <h6 class="no-margin small">{{item.order.warehouse.name}} {{$store.getters.isAdmin ?? order.warehouse.reference}}</h6>
+                                            <h6 class="no-margin small">{{item.order.warehouse.name}} {{$store.getters.isAdmin ?? item.order.warehouse.reference}}</h6>
                                         </div>
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Delivery Address</small>

From a36adc7ca55c62980f717dad156405442494dd42 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 19:09:02 +0800
Subject: [PATCH 217/223] show warehouse reference to admin

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

diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index 27908423..da21cef8 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -34,7 +34,7 @@
                     <div class="row m-b-5">
                         <div class="col">
                             <small class="fs-10 all-caps muted">Warehouse</small>
-                            <h6 class="no-margin small">{{item.warehouse.name}} {{$store.getters.isAdmin ?? item.warehouse.reference}}</h6>
+                            <h6 class="no-margin small">{{item.warehouse.name}} {{$store.getters.isAdmin ? item.warehouse.reference : ''}}</h6>
                         </div>
                     </div>
                     <div class="row m-b-5">
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index bb978f20..11c9386b 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -60,7 +60,7 @@
                                     <div class="row">
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Warehouse</small>
-                                            <h6 class="no-margin small">{{item.order.warehouse.name}} {{$store.getters.isAdmin ?? item.order.warehouse.reference}}</h6>
+                                            <h6 class="no-margin small">{{item.order.warehouse.name}} {{$store.getters.isAdmin ? item.order.warehouse.reference : ''}}</h6>
                                         </div>
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Delivery Address</small>
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 6d3c35d2..3f98964b 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -76,7 +76,7 @@
                                             <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
                                         </div>
                                         <div class="col-12 col-sm-auto">
-                                            <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.name}} {{$store.getters.isAdmin ?? order.warehouse.reference}}</h6>
+                                            <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.name}} {{$store.getters.isAdmin ? order.warehouse.reference : ''}}</h6>
                                         </div>
                                         <div class="col col-sm" v-if="$store.getters.isAdmin">
                                             <a :href="route('customer.profile', order.company_module.marking)">

From 763cc2d38cd41678c925e1e39baad0a5ec75057e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 21 Jan 2022 19:23:15 +0800
Subject: [PATCH 218/223] add vue versions for cache issues

---
 resources/views/vendor/js.blade.php | 2 +-
 webpack.mix.js                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php
index a761d204..9adee26b 100644
--- a/resources/views/vendor/js.blade.php
+++ b/resources/views/vendor/js.blade.php
@@ -7,6 +7,6 @@
 ]) !!};
 </script>
 <script src="{{ asset('js/vendor.js') }}" type="text/javascript"></script>
-<script src="{{asset('vue/app.js')}}"></script>
+<script src="{{mix('vue/app.js')}}"></script>
 <script src="{{ asset('js/site.js') }}" type="text/javascript"></script>
 {{--END VENDOR JS--}}
\ No newline at end of file
diff --git a/webpack.mix.js b/webpack.mix.js
index 71ad8ef5..01dcbd11 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -11,4 +11,4 @@ const mix = require('laravel-mix');
  |
  */
 
-mix.js('./resources/assets/vue/app.js', 'public/vue');
+mix.js('./resources/assets/vue/app.js', 'public/vue').version();

From bd5e89e8320d50f66b522aeeabf0fdf6d68336d8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 25 Jan 2022 12:11:33 +0800
Subject: [PATCH 219/223] confirm yd orders for release in china

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 2509e263..c8958db8 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -254,6 +254,13 @@ class FetchOrderListsFromYdPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
+                $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+                if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
+                    $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
+                        'expressno' => $row->expressno
+                    ]);
+                }
+
                 if($containerReference) {
                     try {
                         $container = $this->fetchesContainer->execute(['reference' => $containerReference]);

From 0a51074064bcab519c5a3e12ab56a8011ffcc009 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 25 Jan 2022 12:15:26 +0800
Subject: [PATCH 220/223] confirm yd orders for release in china

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index c8958db8..12f855b6 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -198,6 +198,8 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
+                DB::beginTransaction();
+
                 $packingListReference = $row->expressno;
 
                 try{
@@ -254,6 +256,8 @@ class FetchOrderListsFromYdPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
+                DB::commit();
+
                 $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
                 if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
                     $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [

From 3c83f91a2724ac196c53d64b7587e56145e6998b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 25 Jan 2022 12:29:58 +0800
Subject: [PATCH 221/223] confirm yd orders for release in china

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

diff --git a/routes/web.php b/routes/web.php
index a4aa61cf..4183c484 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -183,7 +183,7 @@ Route::get('/debug', function (){
 });
 
 Route::get('/yd', function (){
-    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+    FetchOrdersFromYDPortalJob::dispatch();
 });
 
 Route::get('/min_cbm', function (){

From 46b079462a02d6004a3456b4309dcc9a90ffd645 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 25 Jan 2022 12:44:51 +0800
Subject: [PATCH 222/223] confirm yd orders for release in china

---
 .../Processors/FetchOrderListsFromYdPortalProcessor.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
index 12f855b6..0fb1dd8f 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
@@ -210,6 +210,7 @@ class FetchOrderListsFromYdPortalProcessor
                     if($replica) $replica->packages()->delete();
 
                     $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
+                    $warehouseReceiveList->packages()->delete();
                     $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
                     if($replica) $replica->packages()->delete();
 

From 36289a3694743d892d356ef0ce505eed1c83afc5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 26 Jan 2022 13:44:38 +0800
Subject: [PATCH 223/223] minor clean up

---
 .../Containers/FetchContainerLogic.php            | 15 +++++----------
 app/Models/PackingList.php                        |  3 ---
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
index c8c8548d..f1f46eb1 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
@@ -45,21 +45,16 @@ class FetchContainerLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canFetchContainer->passes();
 
-            $this->canFetchContainer->passes();
+        $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
 
-            $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
-
-            return $this->resourceResponse(new ContainerResource($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new ContainerResource($query));
 
     }
 
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index 4f61c4e4..7ef5910a 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -6,12 +6,9 @@ use App\Classes\General\Interfaces\Steppable;
 use App\Classes\General\Interfaces\Transportable;
 use App\Classes\General\Interfaces\Packable;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;