diff --git a/app/Classes/General/Eloquent/Filters/WithParcels.php b/app/Classes/General/Eloquent/Filters/WithParcels.php
new file mode 100644
index 00000000..fa83f829
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithParcels.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithParcels implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('parcels');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Interfaces/ContainerOwner.php b/app/Classes/General/Interfaces/ContainerOwner.php
new file mode 100644
index 00000000..b7153136
--- /dev/null
+++ b/app/Classes/General/Interfaces/ContainerOwner.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface ContainerOwner
+{
+
+    public function containers(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Interfaces/Packable.php b/app/Classes/General/Interfaces/Packable.php
new file mode 100644
index 00000000..e46e5341
--- /dev/null
+++ b/app/Classes/General/Interfaces/Packable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Packable
+{
+
+    public function packingLists(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Interfaces/Steppable.php b/app/Classes/General/Interfaces/Steppable.php
new file mode 100644
index 00000000..38517f4f
--- /dev/null
+++ b/app/Classes/General/Interfaces/Steppable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Steppable
+{
+
+    public function steps(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Interfaces/Transportable.php b/app/Classes/General/Interfaces/Transportable.php
new file mode 100644
index 00000000..0b1f55c5
--- /dev/null
+++ b/app/Classes/General/Interfaces/Transportable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Transportable
+{
+
+    public function transports(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/Jobs/CurlWarehouseListJob.php b/app/Classes/Jobs/CurlWarehouseListJob.php
deleted file mode 100644
index 6d8703c5..00000000
--- a/app/Classes/Jobs/CurlWarehouseListJob.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 CurlWarehouseListJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-
-    private $page;
-
-    public function __construct($page = -2)
-    {
-        $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,
-        ];
-
-        $yesterday = Carbon::now()->subDays(1)->format('Y-m-d');
-
-        $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', [\GuzzleHttp\RequestOptions::JSON => json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":' . $this->page . ',"PageSize":100,"PageOffset":0,"SortExpression":"ParcelDate DESC,FullMarking DESC","GroupExpression":"","Filter":["ParcelDate:=%js%\"' . $yesterday . '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->Row)) {
-            // insert data here
-
-            // next page
-            $this->page = $this->page > 0 ? $this->page + 1 : 1;
-            CurlWarehouseListJob::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', 'https://portalvt.azurewebsites.net');
-        $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('https://portalvt.azurewebsites.net/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/FetchContainersStatusUpdateFromVTPortalJob.php b/app/Classes/Jobs/FetchContainersStatusUpdateFromVTPortalJob.php
new file mode 100644
index 00000000..296d3f52
--- /dev/null
+++ b/app/Classes/Jobs/FetchContainersStatusUpdateFromVTPortalJob.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchContainersStatusUpdateFromVTPortalProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchContainersStatusUpdateFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchContainersStatusUpdateFromVTPortalProcessor::class))->execute();
+    }
+}
diff --git a/app/Classes/Jobs/FetchDeliveryListFromVTPortalJob.php b/app/Classes/Jobs/FetchDeliveryListFromVTPortalJob.php
new file mode 100644
index 00000000..49005f3e
--- /dev/null
+++ b/app/Classes/Jobs/FetchDeliveryListFromVTPortalJob.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchDeliveryListFromVTPortalProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchDeliveryListFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+
+        (App()->make(FetchDeliveryListFromVTPortalProcessor::class))->execute();
+    }
+}
diff --git a/app/Classes/Jobs/FetchLoadedContainersFromVTPortalJob.php b/app/Classes/Jobs/FetchLoadedContainersFromVTPortalJob.php
new file mode 100644
index 00000000..952d3c7a
--- /dev/null
+++ b/app/Classes/Jobs/FetchLoadedContainersFromVTPortalJob.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
+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 FetchLoadedContainersFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute();
+    }
+}
diff --git a/app/Classes/Jobs/FetchPackingListFromVTPortalJob.php b/app/Classes/Jobs/FetchPackingListFromVTPortalJob.php
new file mode 100644
index 00000000..17bf1394
--- /dev/null
+++ b/app/Classes/Jobs/FetchPackingListFromVTPortalJob.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchPackingListFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 1800;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
+    }
+}
diff --git a/app/Classes/Jobs/FetchWarehouseReceiveListFromVTPortalJob.php b/app/Classes/Jobs/FetchWarehouseReceiveListFromVTPortalJob.php
new file mode 100644
index 00000000..ced445a2
--- /dev/null
+++ b/app/Classes/Jobs/FetchWarehouseReceiveListFromVTPortalJob.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor;
+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 FetchWarehouseReceiveListFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute();
+    }
+}
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
index 5a166ae4..9cb48b0f 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
@@ -138,7 +138,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
-        $this->generateEmailVerificationAttemptProcessor->execute($user);
+//        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));
     }
diff --git a/app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php b/app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php
new file mode 100644
index 00000000..7cd04d1f
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Processors;
+
+use App\Classes\General\Interfaces\Addressable;
+use App\Classes\Modules\Addresses\Services\CleansOldAddress;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Models\OldAddress;
+use Illuminate\Database\Eloquent\Model;
+
+class CreateAddressFromOldAddressProcessor
+{
+
+    /** @var CleansOldAddress */
+    private $cleansOldAddress;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+
+    /**
+     * CreateAddressFromOldAddressProcessor constructor.
+     * @param CleansOldAddress $cleansOldAddress
+     * @param CreatesAddress $createsAddress
+     */
+    public function __construct(CleansOldAddress $cleansOldAddress, CreatesAddress $createsAddress)
+    {
+        $this->cleansOldAddress = $cleansOldAddress;
+        $this->createsAddress = $createsAddress;
+    }
+
+
+    /**
+     * @param OldAddress $address
+     * @param Addressable $addressable
+     * @return Model|null
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(OldAddress $address, Addressable $addressable): ?Model {
+
+        if(!$object = $this->cleansOldAddress->execute($address)){
+            return null;
+        }
+
+
+        if($address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()){
+           return $address;
+        }
+
+        return $this->createsAddress->execute($addressable, $object);
+
+    }
+
+}
diff --git a/app/Classes/Modules/Addresses/Services/CleansOldAddress.php b/app/Classes/Modules/Addresses/Services/CleansOldAddress.php
new file mode 100644
index 00000000..90fad41c
--- /dev/null
+++ b/app/Classes/Modules/Addresses/Services/CleansOldAddress.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Omair Saleh
+ * Date: 20/8/2021
+ * Time: 1:05 AM
+ */
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Models\District;
+use App\Models\OldAddress;
+
+class CleansOldAddress
+{
+
+    public function execute(OldAddress $address){
+        if($address->street_one === '' && $address->street_two === ''){
+            return null;
+        }
+
+        if(!$address->post_code){
+            return null;
+        }
+
+        $district = District::where('postcode', 'like', '%'. $address->post_code .'%')->first();
+
+        if(!$district) {
+            return null;
+        }
+
+        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Delivery Address');
+
+    }
+
+    public function cleanAddress($address, $district, $postcode){
+        $address = str_replace('Malaysia', '', str_replace('malaysia', '', str_replace('MALAYSIA', '', $address)));
+        $address = str_replace($district->state->name, '',str_replace($district->name, '', $address));
+        $address = str_replace(strtolower($district->state->name), '',str_replace(strtolower($district->name), '', $address));
+        $address = str_replace(strtoupper($district->state->name), '',str_replace(strtoupper($district->name), '', $address));
+        $address = str_replace($postcode, '', $address);
+        $address = str_replace(', ,', ',', str_replace(', ,', ',', str_replace(', ,', ',', $address)));
+        $address = str_replace(',', ', ', $address);
+        $address = preg_replace('!\s+!', ' ', $address);
+        $address = preg_replace("/,+/", ",", $address);
+        return rtrim(rtrim(rtrim(rtrim($address, '.')), ','));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
index e060ddc7..80b15c1c 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php
@@ -53,10 +53,6 @@ class ListCompaniesLogic extends AbstractControllerLogic
     {
         $this->canListCompanies->passes();
 
-        logger("llogic");
-
-        logger($request->input('filters'));
-
         $query = $this->listsCompanies->execute($this->listsCompanies->deserializeFilters($request->input('filters')));
         return $this->collectionResponse(CompanyResource::collection($query));
 
diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
index c7262717..97506974 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
@@ -3,7 +3,11 @@
 namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
+use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Http\Resources\OrderResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
@@ -11,13 +15,6 @@ use Illuminate\Http\JsonResponse;
 class CreateOrderLogic extends AbstractControllerLogic
 {
 
-    private $createOrderProcessor;
-
-    public function __construct( CreateOrderProcessor $createsOrderProcessor)
-    {
-        $this->createOrderProcessor = $createsOrderProcessor;
-    }
-
     protected function notification():array {
         return [
             'title' => 'Created Order',
@@ -25,9 +22,48 @@ class CreateOrderLogic extends AbstractControllerLogic
         ];
     }
 
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var fetchesAddress */
+    private $fetchesAddress;
+
+    /** @var CreateOrderProcessor  */
+    private $createOrderProcessor;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var GeneratesOrderNumber */
+    private $generatesOrderNumber;
+
+    /**
+     * CreateOrderLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesAddress $fetchesAddress
+     * @param CreateOrderProcessor $createOrderProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param GeneratesOrderNumber $generatesOrderNumber
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->createOrderProcessor = $createOrderProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->generatesOrderNumber = $generatesOrderNumber;
+    }
+
+
     public function logic(Request $request) : JsonResponse {
 
-        $order = $this->createOrderProcessor->execute($request);
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
+
+        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
+
+        $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
         return $this->resourceResponse(new OrderResource($order));
     }
diff --git a/app/Classes/Modules/Orders/ControllersLogic/FetchOrderLogic.php b/app/Classes/Modules/Orders/ControllersLogic/FetchOrderLogic.php
index 8dc9a5cb..c58b14a5 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/FetchOrderLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/FetchOrderLogic.php
@@ -52,7 +52,7 @@ class FetchOrderLogic extends AbstractControllerLogic
 
         $this->canFetchOrder->passes();
 
-        $query = $this->fetchesOrder->execute(['reference' => $request->route('id')]);
+        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_parcels' => true]);
 
         return $this->resourceResponse(new OrderResource($query));
 
diff --git a/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
index bf960049..da0eb033 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
@@ -44,7 +44,7 @@ class ListOrdersLogic extends AbstractControllerLogic
     {
         $this->canListOrders->passes();
 
-        $query = $this->listsOrders->execute($this->listsOrders->deserializeFilters($request->input('filters')));
+        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true]));
 
         return $this->collectionResponse(OrderResource::collection($query));
 
diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php b/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
index 61d988af..53350d59 100644
--- a/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
@@ -13,83 +13,69 @@ use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderType;
+use App\Models\Address;
+use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\Order;
-use Illuminate\Http\Request;
 
 class CreateOrderProcessor
 {
 
-    /** @var GeneratesOrderNumber */
-    private $generatesOrderNumber;
-
     /** @var CanCreateOrder */
     private $canCreateOrder;
 
     /** @var CreatesOrder */
     private $createsOrder;
 
-    /** @var fetchesAddress */
-    private $fetchesAddress;
-
     /** @var CreatesAddress */
     private $createAddress;
 
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
     /** @var CreateOrderRolesProcessor */
     private $createOrderRolesProcessor;
 
     /**
      * CreateOrderProcessor constructor.
-     * @param GeneratesOrderNumber $generatesOrderNumber
      * @param CanCreateOrder $canCreateOrder
      * @param CreatesOrder $createsOrder
-     * @param FetchesAddress $fetchesAddress
      * @param CreatesAddress $createAddress
-     * @param FetchesCompany $fetchesCompany
      * @param CreateOrderRolesProcessor $createOrderRolesProcessor
      */
-    public function __construct(GeneratesOrderNumber $generatesOrderNumber, CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, FetchesAddress $fetchesAddress, CreatesAddress $createAddress, FetchesCompany $fetchesCompany, CreateOrderRolesProcessor $createOrderRolesProcessor)
+    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, CreatesAddress $createAddress, CreateOrderRolesProcessor $createOrderRolesProcessor)
     {
-        $this->generatesOrderNumber = $generatesOrderNumber;
         $this->canCreateOrder = $canCreateOrder;
         $this->createsOrder = $createsOrder;
-        $this->fetchesAddress = $fetchesAddress;
         $this->createAddress = $createAddress;
-        $this->fetchesCompany = $fetchesCompany;
         $this->createOrderRolesProcessor = $createOrderRolesProcessor;
     }
 
 
     /**
-     * @param Request $request
+     * @param Company $company
+     * @param CompanyModule $originWarehouse
+     * @param Address $address
+     * @param int|null $orderNumber
      * @return Addressable
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(Request $request){
-
-        $company = $this->fetchesCompany->execute(['id' => $request->get('company_id')]);
+    public function execute(Company $company, CompanyModule $originWarehouse, Address $address, int $orderNumber){
 
         /** @var CompanyModule $importer */
-        $importer = $this->fetchesCompany->execute(['id' => $request->get('company_id')])->companyModules()->importers()->first();
+        $importer = $company->companyModules()->importers()->first();
 
-        $orderObject = new OrderObject($this->generatesOrderNumber->execute(), OrderType::SHARED_CONTAINER, $company->status === ApprovalStatus::APPROVED ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+        $orderObject = new OrderObject($orderNumber, OrderType::SHARED_CONTAINER, $company->status === ApprovalStatus::APPROVED ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
 
         $this->canCreateOrder->passes($orderObject);
 
         /** @var Order $order */
         $order = $this->createsOrder->execute($importer, $orderObject);
 
-        $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);
 
         $this->createAddress->execute($order, $addressObject);
 
-        $this->createOrderRolesProcessor->execute($request, $order);
+        $this->createOrderRolesProcessor->execute($originWarehouse, $order);
 
         return $order;
     }
diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderProcessorOld.php b/app/Classes/Modules/Orders/Processors/CreateOrderProcessorOld.php
index ccb638ef..bdab0601 100644
--- a/app/Classes/Modules/Orders/Processors/CreateOrderProcessorOld.php
+++ b/app/Classes/Modules/Orders/Processors/CreateOrderProcessorOld.php
@@ -10,6 +10,7 @@ use App\Classes\Modules\Orders\Services\CreatesOrder;
 use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
 use App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor;
 use App\Classes\Modules\OrderSteps\Processors\CreateOrderStepsProcessor;
+use App\Classes\Modules\Steps\Processors\CreateStepsProcessor;
 use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\ValueObjects\Constants\OrderStatus;
 use App\Classes\ValueObjects\Constants\OrderSteps;
@@ -33,8 +34,8 @@ class CreateOrderProcessorOld
     /** @var ConfirmOrderProcessor */
     private $confirmOrderProcessor;
 
-    /** @var CreateOrderStepsProcessor */
-    private $createOrderStepsProcessor;
+    /** @var CreateStepsProcessor */
+    private $createStepsProcessor;
 
     /** @var CreatesContract */
     private $unityCreateContract;
@@ -58,11 +59,11 @@ class CreateOrderProcessorOld
     private $fetchesAddress;
 
     /**
-     * CreateOrderProcessor constructor.
+     * CreateOrderProcessorOld constructor.
      * @param CanCreateOrder $canCreateOrder
      * @param CreatesOrder $createsOrder
      * @param \App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor $confirmOrderProcessor
-     * @param CreateOrderStepsProcessor $createOrderStepsProcessor
+     * @param CreateStepsProcessor $createStepsProcessor
      * @param CreatesContract $unityCreateContract
      * @param AssignContractEntityProcessor $unityAssignContractEntity
      * @param CreateContractEntityProcessor $unityCreateContractEntity
@@ -71,12 +72,12 @@ class CreateOrderProcessorOld
      * @param CreatesAddress $createAddress
      * @param FetchesAddress $fetchesAddress
      */
-    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, \App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor $confirmOrderProcessor, CreateOrderStepsProcessor $createOrderStepsProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, ActivateContractProcessor $unityActivateContract, \App\Classes\Modules\Orders\Processors\CreateOrderRolesProcessor $createOrderRoleProcessor, CreatesAddress $createAddress, FetchesAddress $fetchesAddress)
+    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, \App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor $confirmOrderProcessor, CreateStepsProcessor $createStepsProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, ActivateContractProcessor $unityActivateContract, \App\Classes\Modules\Orders\Processors\CreateOrderRolesProcessor $createOrderRoleProcessor, CreatesAddress $createAddress, FetchesAddress $fetchesAddress)
     {
         $this->canCreateOrder = $canCreateOrder;
         $this->createsOrder = $createsOrder;
         $this->confirmOrderProcessor = $confirmOrderProcessor;
-        $this->createOrderStepsProcessor = $createOrderStepsProcessor;
+        $this->createStepsProcessor = $createStepsProcessor;
         $this->unityCreateContract = $unityCreateContract;
         $this->unityAssignContractEntity = $unityAssignContractEntity;
         $this->unityCreateContractEntity = $unityCreateContractEntity;
@@ -120,7 +121,7 @@ class CreateOrderProcessorOld
 
         //Add processing to order step
         //Note: For processing apointee_id is CIEF Freight Forward , id is 1, reserved in company table
-        $this->createOrderStepsProcessor->execute($order, OrderSteps::PROCESSING, 1);
+        $this->createStepsProcessor->execute($order, OrderSteps::PROCESSING, 1);
 
         //Pre-approved order, no need Admin to process it
         //This processor then calls Generate Order Steps
diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
index 4b8f0bb8..0d4b1860 100644
--- a/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/CreateOrderRolesProcessor.php
@@ -40,17 +40,20 @@ class CreateOrderRolesProcessor
     }
 
 
-    public function execute(Request $request, Order $order){
+    /**
+     * @param CompanyModule $originWarehouse
+     * @param Order $order
+     * @return bool
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(CompanyModule $originWarehouse, Order $order){
 
         $address = $order->addresses()->first();
 
         $importer = $order->companyModule;
 
-        /** @var CompanyModule $originWarehouse */
-        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->get('warehouse_id')]);
-
         /** @var CompanyModule $destinationWarehouse */
-        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $address->state_id = 13 ? WarehouseReferences::SABAH : ($address->state_id === 14 ? WarehouseReferences::SARAWAK : WarehouseReferences::KLANG)]);
+        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::DESTINATION_WAREHOUSE[$address->state_id ]]);
 
         /** @var CompanyModule $freightForwarder */
         $freightForwarder = $originWarehouse->company->companyModules()->freightForwarders()->first();
@@ -80,5 +83,28 @@ class CreateOrderRolesProcessor
         $this->createsOrderRole->execute($roleObject);
 
         return true;
+
+        $companies = $this->fetchesCompany->getRepository()->whereIn('id',[1, $request->get('warehouse_id')])->get();
+
+        $cief_company = $companies[0]->id == 1 ?  $companies[0] :  $companies[1];
+        $warehouse_company =  $companies[0]->id != 1 ?  $companies[0] :  $companies[1];
+
+        $cief_company_module = $cief_company->companyModule()->first();
+        $contractEntities[] = $this->unityCreateContractEntity->execute( $contract_reference_no, [$cief_company_module->unity_hash_id]);
+        $contractEntities[0]->{"company_module_id"} = $cief_company_module->id;
+
+        $warehouse_company_module = $warehouse_company->companyModule()->first();
+        $contractEntities[] = $this->unityCreateContractEntity->execute( $contract_reference_no, [$warehouse_company_module->unity_hash_id]);
+        $contractEntities[1]->{"company_module_id"} = $warehouse_company_module->id;
+
+        foreach($contractEntities as $entity){
+            $order_role_object = new OrderRoleObject($orderId, $entity->company_module_id, $entity->hash_id, $entity->entity_signature_hash_id);
+
+            $this->canCreateOrderRole->passes($order_role_object);
+
+            $this->createsOrderRole->execute($order_role_object);
+        }
+
+        return $contractEntities;
     }
 }
diff --git a/app/Classes/Modules/Orders/Services/FetchesDataFromVTPortal.php b/app/Classes/Modules/Orders/Services/FetchesDataFromVTPortal.php
new file mode 100644
index 00000000..6d77abce
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/FetchesDataFromVTPortal.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use Psr\Http\Message\ResponseInterface;
+
+class FetchesDataFromVTPortal
+{
+
+    /** @var string|null */
+    private $cookies;
+
+    /**
+     * @param string $cookies
+     */
+    public function setCookies(string $cookies): void
+    {
+        $this->cookies = $cookies;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getCookies(): ?string
+    {
+        return $this->cookies;
+    }
+
+
+    /**
+     * @param string $url
+     * @param string $method
+     * @param $body
+     * @param string $cookie
+     * @param bool $requiresAuthentication
+     * @return \Psr\Http\Message\ResponseInterface
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function clientRequest(string $url, string $method, $body, string $cookie, $requiresAuthentication = true){
+
+        if($requiresAuthentication) {
+            if(!$this->getCookies()){
+                $this->remoteLogin();
+            }
+        }
+
+        $client = new \GuzzleHttp\Client(
+            [
+                'cookies' => true,
+                'headers' => [
+                    'Content-Type' => 'application/json',
+                    'Cookie' => $this->getCookies() ? $this->getCookies() : $cookie
+                ]
+            ]
+        );
+
+        $request = $client->requestAsync($method, $url, [\GuzzleHttp\RequestOptions::JSON => $body, 'timeout' => 1200]);
+
+        return $request->wait();
+
+    }
+
+    /**
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    private function remoteLogin(){
+
+        $latest_cookie = [];
+        $cookieRequest = new \GuzzleHttp\Client(['cookies' => true]);
+
+        $cookieRequest->get('https://portalvt.azurewebsites.net');
+        foreach ($cookieRequest->getConfig('cookies')->toArray() as $key => $row) {
+            $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
+        }
+
+        $latest_cookie = implode(';', $latest_cookie);
+
+
+        /** @var  $loginRequest */
+        $loginRequest = $this->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/Login', 'POST', [
+            "username" => "CIEF",
+            "password" => "0122120880",
+            "createPersistentCookie" => true,
+        ], $latest_cookie, false);
+
+        $this->setCookies($latest_cookie.';AppVTCC='.$this->getResponseBody($loginRequest)->AccessToken);
+
+    }
+
+    public function getResponseBody(ResponseInterface $request){
+        return json_decode($request->getBody()->getContents())->d;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
index 30184f62..cff8cbb6 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainer;
-use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanCreateContainer;
+use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanCreateContainer;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Http\Resources\ContainerResource;
@@ -52,9 +52,7 @@ class CreateContainerLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
-        $packingList = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
-
-        $object = new ContainerObject( $packingList->id , $request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
+        $object = new ContainerObject($request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
 
         $this->canCreateContainer->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/DeleteContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/DeleteContainerLogic.php
index e25f4748..d8969d0b 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/DeleteContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/DeleteContainerLogic.php
@@ -6,7 +6,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\DeletesContainer;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanDeleteContainer;
+use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanDeleteContainer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
index 2a6f670a..8969126c 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanFetchContainer;
+use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanFetchContainer;
 use App\Http\Resources\ContainerResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/ListContainersLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/ListContainersLogic.php
index f5422224..fb3f64af 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/ListContainersLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/ListContainersLogic.php
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\ListsContainers;
-use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanListContainers;
+use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanListContainers;
 use App\Http\Resources\ContainerResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
index 8d739bed..3d1516f0 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
@@ -6,7 +6,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\UpdatesContainer;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanUpdateContainer;
+use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanUpdateContainer;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Http\Resources\ContainerResource;
 use ErrorException;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
index 3774a025..a06a6842 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
@@ -2,6 +2,10 @@
 
 namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
@@ -9,16 +13,14 @@ use App\Classes\Modules\PackingLists\Services\CreatesPackingListPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingListPackage;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListPackageObject;
-use App\Classes\Modules\Packages\Services\FetchesPackage;
 use App\Http\Resources\PackingListResource;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class CreatePackingListLogic extends AbstractControllerLogic
 {
 
+
     /**
      * @return array
      */
@@ -29,62 +31,28 @@ class CreatePackingListLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var CanCreatePackingList */
-    private $canCreatePackingList;
-
-    private $canCreatePackingListPackage;
-
-    /** @var FetchesCompany */
-    private $fetchesPackage;
-
-    /** @var CreatesPackingList */
-    private $createsPackingList;
-
-    private $createsPackingListPackage;
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
 
     /**
      * CreatePackingListLogic constructor.
-     * @param CanCreatePackingList $canCreatePackingList
-     * @param FetchesCompany $fetchesCompany
-     * @param CreatesPackingList $createsPackingList
+     * @param CreatePackingListProcessor $createPackingListProcessor
      */
-    public function __construct(CanCreatePackingList $canCreatePackingList, CanCreatePackingListPackage $canCreatePackingListPackage, FetchesPackage $fetchesPackage, CreatesPackingList $createsPackingList, CreatesPackingListPackage $createsPackingListPackage)
+    public function __construct(CreatePackingListProcessor $createPackingListProcessor)
     {
-        $this->canCreatePackingList = $canCreatePackingList;
-        $this->canCreatePackingListPackage = $canCreatePackingListPackage;
-        $this->fetchesPackage = $fetchesPackage;
-        $this->createsPackingList = $createsPackingList;
-        $this->createsPackingListPackage = $createsPackingListPackage;
+        $this->createPackingListProcessor = $createPackingListProcessor;
     }
 
     /**
      * @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
     {
 
-        $package = $this->fetchesPackage->execute(['id'=>$request->input('package_id')]);
-
-        $reference_no = rand(1000000, 9999999);
-
-
-        $object = new PackingListObject($reference_no, ApprovalStatus::PENDING_SUBMISSION);
-
-        $this->canCreatePackingList->passes($object);
-
-        $packageList = $this->createsPackingList->execute( $object);
-
-
-        $object = new PackingListPackageObject($packageList->id, $package->id);
-
-        $this->canCreatePackingListPackage->passes($object);
-
-        $query = $this->createsPackingListPackage->execute($object);
+        $object = new PackingListObject($request->input('reference_number'), ApprovalStatus::PENDING_SUBMISSION);
 
+        $query = $this->createPackingListProcessor->execute($object);
 
         return $this->resourceResponse(new PackingListResource($query));
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
index 28e77a8c..c9eebc15 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
@@ -65,7 +65,6 @@ class CreatePackageLogic extends AbstractControllerLogic
         $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
 
         $object = new PackageObject(
-            $order->id,
             null,
             $request->input('type'),
             $request->input('description'),
@@ -74,7 +73,7 @@ class CreatePackageLogic extends AbstractControllerLogic
             $request->input('length'),
             $request->input('weight'),
             $request->input('quantity'),
-            ApprovalStatus::PENDING_SUBMISSION);
+            ApprovalStatus::PENDING_VERIFICATION);
 
         $this->canCreatePackage->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
index 25dec4a1..92b0effa 100644
--- a/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
@@ -7,39 +7,76 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class ContainerObject implements DataTransferObject
 {
 
-    private $packingListId;
+    /** @var string */
+    private $reference;
 
-    private $containerReference;
+    /** @var string */
+    private $containerNumber;
 
+    /** @var string */
+    private $sealNumber;
+
+    /** @var int  */
     private $containerType;
 
-    private $sealReference;
+    /** @var int */
+    private $status;
 
-    public function __construct(int $packingListId, ?string $containerReference, int $containerType, ?String $sealReference)
+    /**
+     * ContainerObject constructor.
+     * @param string $reference
+     * @param string $containerNumber
+     * @param string $sealNumber
+     * @param int $containerType
+     * @param int $status
+     */
+    public function __construct(string $reference, string $containerNumber, string $sealNumber, int $containerType, int $status)
     {
-        $this->packingListId = $packingListId;
-        $this->containerReference = $containerReference;
+        $this->reference = $reference;
+        $this->containerNumber = $containerNumber;
+        $this->sealNumber = $sealNumber;
         $this->containerType = $containerType;
-        $this->sealReference = $sealReference;
+        $this->status = $status;
     }
 
-    public function getPackingListId(): int
+    /**
+     * @return string
+     */
+    public function getReference(): string
     {
-        return $this->packingListId;
+        return $this->reference;
     }
 
-    public function getContainerReference(): ?string
+    /**
+     * @return string
+     */
+    public function getContainerNumber(): string
     {
-        return $this->containerReference;
+        return $this->containerNumber;
     }
 
+    /**
+     * @return string
+     */
+    public function getSealNumber(): string
+    {
+        return $this->sealNumber;
+    }
+
+    /**
+     * @return int
+     */
     public function getContainerType(): int
     {
         return $this->containerType;
     }
 
-    public function getSealReference(): ?string
+    /**
+     * @return int
+     */
+    public function getStatus(): int
     {
-        return $this->sealReference;
+        return $this->status;
     }
+
 }
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/PackageObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/PackageObject.php
index 8eb9b466..0c825ee2 100644
--- a/app/Classes/Modules/PackingLists/DataTransferObjects/PackageObject.php
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/PackageObject.php
@@ -7,30 +7,47 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class PackageObject implements DataTransferObject
 {
 
-    private $orderId;
-
-    private $claimantId;
-
+    /** @var int  */
     private $type;
 
+    /** @var null|string  */
     private $description;
 
+    /** @var float  */
     private $width;
 
+    /** @var float  */
     private $height;
 
+    /** @var float  */
     private $length;
 
+    /** @var float  */
     private $weight;
 
+    /** @var int  */
     private $quantity;
 
+    /** @var int  */
     private $status;
 
-    public function __construct(int $orderId, ?int $claimantId, int $type, ?string $description, float $width, float $height, float $length, float $weight, int $quantity, int $status)
+    /** @var string|null */
+    private $reference;
+
+    /**
+     * PackageObject constructor.
+     * @param int $type
+     * @param null|string $description
+     * @param float $width
+     * @param float $height
+     * @param float $length
+     * @param float $weight
+     * @param int $quantity
+     * @param int $status
+     * @param null|string $reference
+     */
+    public function __construct(int $type, ?string $description, float $width, float $height, float $length, float $weight, int $quantity, int $status, ?string $reference=null)
     {
-        $this->orderId = $orderId;
-        $this->claimantId = $claimantId;
         $this->type = $type;
         $this->description = $description;
         $this->width = $width;
@@ -39,55 +56,80 @@ class PackageObject implements DataTransferObject
         $this->weight = $weight;
         $this->quantity = $quantity;
         $this->status = $status;
+        $this->reference = $reference;
     }
 
-    public function getOrderId(): int
-    {
-        return $this->orderId;
-    }
-
-    public function getClaimantId(): ?int
-    {
-        return $this->claimantId;
-    }
-
+    /**
+     * @return int
+     */
     public function getType(): int
     {
         return $this->type;
     }
 
+    /**
+     * @return null|string
+     */
     public function getDescription(): ?string
     {
         return $this->description;
     }
 
+    /**
+     * @return float
+     */
     public function getWidth(): float
     {
         return $this->width;
     }
 
+    /**
+     * @return float
+     */
     public function getHeight(): float
     {
         return $this->height;
     }
 
+    /**
+     * @return float
+     */
     public function getLength(): float
     {
         return $this->length;
     }
 
+    /**
+     * @return float
+     */
     public function getWeight(): float
     {
         return $this->weight;
     }
 
+    /**
+     * @return int
+     */
     public function getQuantity(): int
     {
         return $this->quantity;
     }
 
+    /**
+     * @return int
+     */
     public function getStatus(): int
     {
         return $this->status;
     }
+
+    /**
+     * @return null|string
+     */
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+
+
 }
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php
index 77ab79f3..c6e1cbd0 100644
--- a/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php
@@ -7,31 +7,62 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class PackingListObject implements DataTransferObject
 {
 
-    /** @var null|string  */
+    /** @var string  */
     private $reference;
 
+    /** @var int */
+    private $claimantId;
+
+    /** @var int */
+    private $type;
+
     /** @var int  */
     private $status;
 
+    /** @var string|null */
+    private $contractReference;
+
     /**
      * PackingListObject constructor.
-     * @param null|string $reference
+     * @param string $reference
+     * @param int $claimantId
+     * @param int $type
      * @param int $status
+     * @param null|string $contractReference
      */
-    public function __construct(?string $reference, int $status)
+    public function __construct(string $reference, int $claimantId, int $type, int $status, ?string $contractReference = null)
     {
         $this->reference = $reference;
+        $this->claimantId = $claimantId;
+        $this->type = $type;
         $this->status = $status;
+        $this->contractReference = $contractReference;
     }
 
     /**
-     * @return null|string
+     * @return string
      */
-    public function getReference(): ?string
+    public function getReference(): string
     {
         return $this->reference;
     }
 
+    /**
+     * @return int
+     */
+    public function getClaimantId(): int
+    {
+        return $this->claimantId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
     /**
      * @return int
      */
@@ -40,5 +71,13 @@ class PackingListObject implements DataTransferObject
         return $this->status;
     }
 
+    /**
+     * @return null|string
+     */
+    public function getContractReference(): ?string
+    {
+        return $this->contractReference;
+    }
+
 
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/CreateContainerProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreateContainerProcessor.php
new file mode 100644
index 00000000..6b0d5a0e
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/CreateContainerProcessor.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+
+use App\Classes\General\Interfaces\ContainerOwner;
+use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
+use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainer;
+use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanCreateContainer;
+
+class CreateContainerProcessor
+{
+    /** @var CanCreateContainer */
+    private $canCreateContainer;
+
+    /** @var CreatesContainer */
+    private $createsContainer;
+
+    /**
+     * CreateContainerProcessor constructor.
+     * @param CanCreateContainer $canCreateContainer
+     * @param CreatesContainer $createsContainer
+     */
+    public function __construct(CanCreateContainer $canCreateContainer, CreatesContainer $createsContainer)
+    {
+        $this->canCreateContainer = $canCreateContainer;
+        $this->createsContainer = $createsContainer;
+    }
+
+
+    /**
+     * @param ContainerObject $object
+     * @param ContainerOwner $owner
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(ContainerObject $object, ContainerOwner $owner){
+
+        $this->canCreateContainer->passes($object);
+        return $this->createsContainer->execute($object, $owner);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
new file mode 100644
index 00000000..500a4550
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackageProcessor.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanCreatePackage;
+use App\Models\PackingList;
+
+class CreatePackageProcessor
+{
+
+
+    /** @var CanCreatePackage */
+    private $canCreatePackage;
+
+    /** @var CreatesPackage */
+    private $createsPackage;
+
+    /**
+     * CreatePackageProcessor constructor.
+     * @param CanCreatePackage $canCreatePackage
+     * @param CreatesPackage $createsPackage
+     */
+    public function __construct(CanCreatePackage $canCreatePackage, CreatesPackage $createsPackage)
+    {
+        $this->canCreatePackage = $canCreatePackage;
+        $this->createsPackage = $createsPackage;
+    }
+
+
+    /**
+     * @param PackageObject $object
+     * @param PackingList $packingList
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(PackageObject $object, PackingList $packingList){
+
+        $this->canCreatePackage->passes($object);
+
+        return $this->createsPackage->execute($object, $packingList);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
new file mode 100644
index 00000000..7b5a86d1
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/CreatePackingListProcessor.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+
+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;
+
+class CreatePackingListProcessor
+{
+
+
+    /** @var CanCreatePackingList */
+    private $canCreatePackingList;
+
+    /** @var CreatesPackingList */
+    private $createsPackingList;
+
+
+    /**
+     * CreatePackingListLogic constructor.
+     * @param CanCreatePackingList $canCreatePackingList
+     * @param CreatesPackingList $createsPackingList
+     */
+    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList)
+    {
+        $this->canCreatePackingList = $canCreatePackingList;
+        $this->createsPackingList = $createsPackingList;
+    }
+
+    /**
+     * @param PackingListObject $object
+     * @param Packable $packable
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(PackingListObject $object, Packable $packable){
+
+        $this->canCreatePackingList->passes($object);
+        return $this->createsPackingList->execute($object, $packable);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
new file mode 100644
index 00000000..a50bbfdf
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+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\PackingLists\Services\ListsPackingLists;
+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\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 GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class FetchContainersStatusUpdateFromVTPortalProcessor
+{
+
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /**
+     * FetchContainersStatusUpdateFromVTPortalProcessor constructor.
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param UpdatesContractObligation $updatesContractObligations
+     */
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, UpdatesContractObligation $updatesContractObligations)
+    {
+        $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->updatesContractObligations = $updatesContractObligations;
+    }
+
+
+    /**
+     * @return array
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(){
+
+        try {
+            $containers = Container::where('status', '=', ApprovalStatus::PENDING_VERIFICATION)->get();
+
+            /** @var Container $container */
+            foreach($containers as $container){
+                try {
+                    $filter = '["RefNo:=%js%\"'.$container->reference.'\"\u0000"]';
+
+                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+
+                    $containerDetails = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailsRequest);
+
+                    $containerDetails = $containerDetails->Rows[0];
+
+                    if(!$eta = $containerDetails[3]){
+                        continue;
+                    }
+
+                    $eta = Carbon::parse($eta);
+
+                    $delayDate = $containerDetails[6];
+
+                    $containerStatus = $containerDetails[9];
+
+                    $unstuffingDate = $containerDetails[7];
+
+                    $transport = $container->transports()->first();
+
+                    if(!$transport){
+                        $transportObject = new TransportObject(TransportType::SEA, null, null,  $eta, null, ApprovalStatus::APPROVED);
+                        /** @var Transport $transport */
+                        $transport = $this->createsTransport->execute($transportObject, $container);
+                        $this->createsSchedule->execute($transport, new ScheduleObject($eta->subDays(5), $eta, ApprovalStatus::APPROVED));
+                    }
+
+                    if($delayDate){
+                        $delayDate = Carbon::parse($delayDate);
+                        $transport = $container->transports()->first();
+                        $schedule = $transport->schedules()->where('eta', '=', $delayDate)->first();
+                        $etd = $delayDate->subDays(5);
+                        if(!$schedule){
+                            $etd = $schedule->etd;
+                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                        }
+
+                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                    }
+
+                    if($containerStatus === 'Unstuffing'){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
+                        $container->packingLists()->update(['status' => ApprovalStatus::APPROVED]);
+                        /** @var PackingList $packingList */
+                        foreach($container->packingLists as $packingList){
+                            $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]);
+                            }
+                        }
+                    }
+
+                } catch (GuzzleException $exception) {
+                    continue;
+                }
+
+            }
+        } catch (\Exception $exception) {
+            Log::error($exception);
+        }
+
+        return [];
+
+    }
+
+
+}
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
new file mode 100644
index 00000000..6714472b
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
+use App\Classes\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\PackageType;
+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;
+
+class FetchDeliveryListFromVTPortalProcessor
+{
+
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /**
+     * FetchDeliveryListFromVTPortalProcessor constructor.
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param UpdatesContractObligation $updatesContractObligations
+     */
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, UpdatesContractObligation $updatesContractObligations)
+    {
+        $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->updatesContractObligations = $updatesContractObligations;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function execute(){
+
+        try {
+            $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('status', '=', ApprovalStatus::APPROVED)->get();
+
+            /** @var PackingList $packingList */
+            foreach($packingLists as $packingList){
+                try {
+                    $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
+
+                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+
+                    $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
+
+                    foreach($shippingPackingLists->Rows as $shippingPackingList){
+                        if(!$shippingPackingList[9] && !$shippingPackingList[10]) {
+                            continue;
+                        }
+
+                        $deliveryDate = Carbon::parse($shippingPackingList[9] ? $shippingPackingList[9]:$shippingPackingList[10]);
+                        $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
+                        /** @var Transport $transport */
+                        $transport = $this->createsTransport->execute($transportObject, $packingList);
+                        $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+
+                        $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                        $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                        $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                        $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+
+
+                    }
+
+                } catch (GuzzleException $exception) {
+                    continue;
+                }
+
+            }
+        } catch (\Exception $exception){
+            Log::error($exception);
+        }
+
+        return [];
+
+    }
+
+
+}
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
new file mode 100644
index 00000000..2776124d
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -0,0 +1,230 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\PackingList\Processors\GenerateShippingOrderStepsProcessor;
+use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
+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\Services\CreatesSchedule;
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+use App\Classes\Modules\Steps\Services\CreatesStep;
+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\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\ContainerTypes;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\Order;
+use App\Models\PackingList;
+use Carbon\Carbon;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class FetchLoadedContainersFromVTPortalProcessor
+{
+
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @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;
+
+    /**
+     * FetchLoadedContainersFromVTPortalProcessor constructor.
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param FetchesOrder $fetchesOrder
+     * @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(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, FetchesOrder $fetchesOrder, 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->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->fetchesOrder = $fetchesOrder;
+        $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
+     */
+    public function execute(?Carbon $start = null, ?Carbon $end = null){
+
+        DB::beginTransaction();
+        try {
+            $start = $start ? $start : Carbon::now()->subMonth();
+
+            $startLimit = Carbon::parse('11-08-2021');
+
+            if($start->isBefore($startLimit)){
+                $start = $startLimit;
+            }
+
+            $end = $end ? $end : Carbon::now();
+            $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
+
+            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+
+            $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
+
+            foreach ($containers->Rows as $container){
+
+                $filter = '["ContainerID:=%js%'.$container[11].'"]';
+                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+
+                $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
+
+                $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[15]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, ApprovalStatus::PENDING_VERIFICATION);
+
+                try {
+                    $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
+                } catch (ResourceNotFoundException $exception){
+                    $warehouseId = $container[12];
+                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
+                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+                }
+
+                foreach($containerDetail->Rows as $packingList){
+                    $marking = explode('/', explode('CIEF/', $packingList[13])[1]);
+
+                    if(!array_key_exists(1, $marking)){
+                        continue;
+                    }
+
+                    $orderNumber = $marking[1];
+
+                    if(!$packingList[22]){
+                        continue;
+                    }
+
+                    try {
+                        /** @var Order $order */
+                        $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                    } catch (ResourceNotFoundException $exception){
+                        continue;
+                    }
+
+                    $packingListReference = $packingList[16];
+
+                    try{
+                        $this->fetchesPackingList->execute(['reference' => $packingListReference]);
+                    } catch (ResourceNotFoundException $exception){
+                        $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);
+                        $container->packingLists()->attach($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);
+                        }
+
+
+                    }
+
+                }
+
+            }
+        } catch (\Exception $exception){
+            Log::error($exception);
+        }
+
+
+        DB::commit();
+        return [];
+
+    }
+
+
+}
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
new file mode 100644
index 00000000..715c61ba
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Processors;
+
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class FetchPackingListFromVTPortalProcessor
+{
+
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
+
+    /** @var ListsPackingLists */
+    private $listsPackingLists;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /**
+     * FetchPackingListFromVTPortalProcessor constructor.
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param ListsPackingLists $listsPackingLists
+     * @param CreatePackageProcessor $createPackageProcessor
+     */
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, ListsPackingLists $listsPackingLists, CreatePackageProcessor $createPackageProcessor)
+    {
+        $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->listsPackingLists = $listsPackingLists;
+        $this->createPackageProcessor = $createPackageProcessor;
+    }
+
+
+    /**
+     * @return array
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(){
+
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('status', '=', ApprovalStatus::PENDING_VERIFICATION)->get();
+
+        foreach($packingLists as $packingList){
+
+            try {
+                DB::beginTransaction();
+
+                $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
+
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+
+                $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
+
+                $packingList->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);
+                }
+
+                DB::commit();
+            } catch (GuzzleException $exception) {
+                continue;
+            }
+
+        }
+
+        return [];
+
+    }
+
+
+}
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 4340b99e..862fdb60 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -2,275 +2,230 @@
 
 namespace App\Classes\Modules\PackingLists\Processors;
 
-use App\Classes\General\Services\GeneratesInitials;
-use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Addresses\Services\CreatesAddress;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
-use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
-use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
-use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
-use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
-use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Addresses\Processors\CreateAddressFromOldAddressProcessor;
+use App\Classes\Modules\Addresses\Services\CleansOldAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageLogic;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+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\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\CompanyType;
-use App\Models\Company;
+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\Address;
 use App\Models\CompanyModule;
-use App\Models\District;
-use App\Models\OldAddress;
-use App\Models\OldCompany;
+use App\Models\OldOrders;
+use App\Models\PackingList;
+use App\Models\Transport;
 use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Cache;
-use Psr\Http\Message\ResponseInterface;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class FetchWarehouseReceiveListFromVTPortalProcessor
 {
 
-    /** @var CreateUserProcessor */
-    private $createUserProcessor;
 
-    /** @var CreateCompanyProcessor */
-    private $createCompanyProcessor;
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
 
-    /** @var UpdatesCompanyStatus*/
-    private $updatesCompanyStatus;
+    /** @var CleansOldAddress */
+    private $cleansOldAddress;
 
-    /** @var CreateCompanyModuleProcessor */
-    private $createCompanyModuleProcessor;
+    /** @var CreateAddressFromOldAddressProcessor */
+    private $createAddressFromOldAddressProcessor;
 
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
 
-    /** @var CreatesCompanyConnection */
-    private $createsCompanyConnection;
+    /** @var FetchesOrder */
+    private $fetchesOrder;
 
-    /** @var ApprovesCompanyConnection */
-    private $approvesCompanyConnection;
+    /** @var CreateOrderProcessor */
+    private $createOrderProcessor;
 
-    /** @var CreatesAddress */
-    private $createsAddress;
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var CreatePackageLogic */
+    private $createPackage;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
 
     /**
      * FetchWarehouseReceiveListFromVTPortalProcessor constructor.
-     * @param CreateUserProcessor $createUserProcessor
-     * @param CreateCompanyProcessor $createCompanyProcessor
-     * @param UpdatesCompanyStatus $updatesCompanyStatus
-     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
-     * @param CreateContactProcessor $createContactProcessor
-     * @param CreatesCompanyConnection $createsCompanyConnection
-     * @param ApprovesCompanyConnection $approvesCompanyConnection
-     * @param CreatesAddress $createsAddress
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param CleansOldAddress $cleansOldAddress
+     * @param CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param FetchesOrder $fetchesOrder
+     * @param CreateOrderProcessor $createOrderProcessor
+     * @param FetchesPackingList $fetchesPakcingList
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param CreatePackageLogic $createPackage
+     * @param CreatePackageProcessor $createPackageProcessor
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, UpdatesCompanyStatus $updatesCompanyStatus, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, CreatesAddress $createsAddress)
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, CleansOldAddress $cleansOldAddress, CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor, FetchesCompanyModule $fetchesCompanyModule, FetchesOrder $fetchesOrder, CreateOrderProcessor $createOrderProcessor, FetchesPackingList $fetchesPakcingList, CreatePackingListProcessor $createPackingListProcessor, CreatePackageLogic $createPackage, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
     {
-        $this->createUserProcessor = $createUserProcessor;
-        $this->createCompanyProcessor = $createCompanyProcessor;
-        $this->updatesCompanyStatus = $updatesCompanyStatus;
-        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->createsCompanyConnection = $createsCompanyConnection;
-        $this->approvesCompanyConnection = $approvesCompanyConnection;
-        $this->createsAddress = $createsAddress;
+        $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->cleansOldAddress = $cleansOldAddress;
+        $this->createAddressFromOldAddressProcessor = $createAddressFromOldAddressProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->createOrderProcessor = $createOrderProcessor;
+        $this->fetchesPackingList = $fetchesPakcingList;
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createPackage = $createPackage;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
     }
 
 
     /**
-     * @return string
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     * @return array
      * @throws GuzzleException
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(){
+    public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-//        $addresses = OldAddress::whereIn('id', [2, 3, 4, 9, 11, 12, 17, 18, 19, 22, 23, 27, 28, 30, 31, 33, 36, 38, 40, 42, 45, 50, 51, 52, 53, 54, 58, 59, 61, 67, 68, 70, 72, 78, 80, 82, 83, 85, 86, 89, 93, 94, 97, 100, 102, 103, 104, 106, 107, 111, 115, 120, 125, 126, 128, 130, 131, 132, 133, 134, 135, 136, 137, 140, 142, 144, 145, 155, 156, 159, 170, 172, 173, 175, 177, 178, 180, 181, 182, 183, 185, 186, 187, 190, 199, 200, 202, 204, 207, 210, 213, 214, 215, 217, 218, 220, 222, 228, 231, 232, 234, 237, 242, 244, 245, 251, 252, 255, 258, 259, 261, 262, 266, 268, 273, 274, 275, 278, 281, 282, 285, 287, 292, 294, 295, 296, 297, 299, 303, 306, 307, 308, 311, 315, 316, 317, 319, 320, 321, 328, 329, 330, 332, 333, 334, 336, 339, 341]);
-        $companies = OldCompany::has('orders')->get();
+        DB::beginTransaction();
 
-        foreach($companies as $company){
+        try {
 
-            $marking = explode("CIEF/", $company->marking);
-            if(count($marking) < 2){
-                continue;
+            $start = $start ? $start : Carbon::now()->subMonth();
+
+            $startLimit = Carbon::parse('11-08-2021');
+
+            if($start->isBefore($startLimit)){
+                $start = $startLimit;
             }
 
-            /** @var Company $newCompany */
-            $newCompany = $this->createCompanyProcessor->execute($company->name, CompanyType::COMPANY_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
+            $end = $end ? $end : Carbon::now();
+            $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $this->updatesCompanyStatus->execute($newCompany, ApprovalStatus::APPROVED);
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
 
-            /** @var CompanyModule $companyModule */
-            $companyModule = $this->createCompanyModuleProcessor->execute($newCompany, BusinessType::IMPORTER);
+            $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
-            $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', $marking[1]);
+            foreach ($response->Rows as $parcel){
+                $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
 
-            $connection = $this->createsCompanyConnection->execute($connectionObject);
-            $this->approvesCompanyConnection->execute($connection);
-
-            $i = 0;
-            foreach($company->addresses as $address){
-                if($address->street_one === '' && $address->street_two === ''){
-                    continue;
-                }
-
-                if(!$address->post_code){
-                    continue;
-                }
-
-                $district = District::where('postcode', 'like', '%'. $address->post_code .'%')->first();
-
-                if(!$district) {
-                    continue;
-                }
-
-                $street_one = str_replace($district->name, '',str_replace($district->state->name, '', $address->street_one));
-                $street_two = str_replace($district->name, '',str_replace($district->state->name, '', $address->street_two));
-
-                $object = new AddressObject($street_one, $street_two, $district->country_id, $district->state_id, $district->id, $address->post_code, 'Business Address');
-                $this->createsAddress->execute($companyModule, $object);
-
-                if($address->contact){
-                    $i++;
-                    if($i === 1) {
-                        $contactObject = new ContactObject('', $address->contact, $company->email, '',);
-                        $this->createContactProcessor->execute($contactObject, $newCompany);
-                    }
-                }
-
-
-            }
-
-
-
-        }
-        dd('done');
-
-return '';
-        Cache::forget('VT_COOKIE_CACHE');
-        $loginRequest = $this->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC"}}'), '');
-        $response = $this->getResponseBody($loginRequest);
-        $orders = [];
-        $unknown = 0;
-
-
-        foreach ($response->Rows as $parcel){
-            $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
-            $customerMarking = $marking[0];
-            if($customerMarking === '2752CHG'){
                 if(!array_key_exists(1, $marking)){
-                    $unknown++;
-                    echo "found and order without order number";
                     continue;
                 }
+
                 $orderNumber = $marking[1];
-                $ctn = $parcel[9];
-                if(!array_key_exists($customerMarking, $orders)){
-                    $orders[$customerMarking] = [
-                        $orderNumber => [
-                            'ctn' => $ctn,
-                            'cbm' => $parcel[10],
-                        ]
-                    ];
+
+                if(!$parcel[9]){
                     continue;
                 }
-//
 
-                if(!array_key_exists($orderNumber, $orders[$customerMarking])){
-                    $orders[$customerMarking][$orderNumber]['ctn'] = 0;
-                    $orders[$customerMarking][$orderNumber]['cbm'] = 0;
+                try {
+                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                } catch (ResourceNotFoundException $exception) {
+
+                    $oldOrder = OldOrders::where('marking', '=', $orderNumber)->first();
+
+                    if(!$oldOrder){
+                        continue;
+                    }
+
+                    $customerMarking = str_replace(' ', '', str_replace('/', '', str_replace('CIEF/', '', $oldOrder->company->marking)));
+
+                    $companyModule = CompanyModule::whereHas('inviters', function($query) use ($customerMarking) {
+                        return $query->where('invitee_reference', '=', $customerMarking);
+                    })->first();
+
+                    if(!$companyModule) {
+                        continue;
+                    }
+
+                    if(!$oldOrder->address) {
+                        continue;
+                    }
+
+                    /** @var Address $address */
+                    $address = $this->createAddressFromOldAddressProcessor->execute($oldOrder->address, $companyModule);
+
+                    if(!$address){
+                        continue;
+                    }
+
+
+                    $warehouseId = $parcel[0];
+                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
+
+                    $order = $this->createOrderProcessor->execute($companyModule->company, $originWarehouse, $address, $orderNumber);
                 }
 
-                $orders[$customerMarking][$orderNumber]['ctn'] += $ctn;
-                $orders[$customerMarking][$orderNumber]['cbm'] += $parcel[10];
+                $packingListReference = $parcel[17];
+                $quantity = $parcel[9];
+                $measurement = round(($parcel[10]/$quantity) ** (1/3) * 100, 2);
+                $description = $parcel[7];
+                $tracking = $parcel[6];
+                $receiveDate = $parcel[1];
+
+                $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
+
+                /** @var PackingList $packingList */
+                $packingList = $order->packingLists()->where('reference', '=', $packingListReference)->first();
+
+                if(!$packingList) {
+                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+                    $transportObject = new TransportObject(TransportType::LAND, null, $tracking, Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED);
+
+
+                    $this->createsTransport->execute($transportObject, $packingList);
+                }
+
+                /** @var Transport $transport */
+                $transport = $packingList->transports()->first();
+
+                $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+
+                $this->createsSchedule->execute($transport, new ScheduleObject(Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED));
+
+                $packingList->packages()->delete();
+
+                $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement, $measurement, $measurement, 0, $quantity, ApprovalStatus::APPROVED);
+                $this->createPackageProcessor->execute($packageObject, $packingList);
+
             }
 
-//            $orders[$customerMarking][$orderNumber]['cbm'] += $parcel[10];
-//            $orders[$customerMarking][$orderNumber]['ctn'] += $ctn;
-//            if(!$orders->contains($customerMarking)){
-//                $orders->push(collect([
-//                    $customerMarking => collect()
-//                ]));
-//            }
-//            dd($orders);
-//
-//            if(!$orders[$customerMarking]->contains($orderNumber)){
-//                $orders[$customerMarking]->push(collect([
-//                    $orderNumber => [
-//                        'ctn' => $ctn,
-//                        'cbm' => $parcel[10]
-//                    ]
-//                ]));
-//            } else {
-//                $orders[$customerMarking][$orderNumber]['ctn'] += $ctn;
-//                $orders[$customerMarking][$orderNumber]['cbm'] += $parcel[10];
-//            }
-        }
-        dd($orders, $unknown);
-
-    }
-
-    /**
-     * @throws GuzzleException
-     */
-    private function remoteLogin(){
-
-        $latest_cookie = [];
-        $cookieRequest = new \GuzzleHttp\Client(['cookies' => true]);
-        $cookieRequest->get('https://portalvt.azurewebsites.net');
-        foreach ($cookieRequest->getConfig('cookies')->toArray() as $key => $row) {
-            $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
+            return [];
+        } catch (\Exception $exception){
+            Log::error($exception->getMessage());
         }
 
-        $latest_cookie = implode(';', $latest_cookie);
+        DB::commit();
 
 
-        /** @var  $loginRequest */
-        $loginRequest = $this->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/Login', 'POST', [
-            "username" => "CIEF",
-            "password" => "0122120880",
-            "createPersistentCookie" => true,
-        ], $latest_cookie, false);
-
-        Cache::store('file')->put('VT_COOKIE_CACHE', $latest_cookie.';AppVTCC='.$this->getResponseBody($loginRequest)->AccessToken, 3000);
-
     }
 
-    /**
-     * @param string $url
-     * @param string $method
-     * @param $body
-     * @param string $cookie
-     * @param bool $requiresAuthentication
-     * @return ResponseInterface
-     * @throws GuzzleException
-     */
-    private function clientRequest(string $url, string $method, $body, string $cookie, $requiresAuthentication = true){
 
-        if($requiresAuthentication) {
-            if(!Cache::has('VT_COOKIE_CACHE')){
-                $this->remoteLogin();
-            }
-        }
-
-        $client = new \GuzzleHttp\Client(
-            [
-                'cookies' => true,
-                'headers' => [
-                    'Content-Type' => 'application/json',
-                    'Cookie' => Cache::has('VT_COOKIE_CACHE') ? Cache::get('VT_COOKIE_CACHE'):$cookie
-                ]
-            ]
-        );
-
-        $request = $client->request($method, $url, [\GuzzleHttp\RequestOptions::JSON => $body]);
-
-        return $request;
-    }
-
-    private function getResponseBody(ResponseInterface $request){
-        return json_decode($request->getBody()->getContents())->d;
-    }
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/GenerateShippingOrderStepsProcessor.php b/app/Classes/Modules/PackingLists/Processors/GenerateShippingOrderStepsProcessor.php
new file mode 100644
index 00000000..50ad28b5
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Processors/GenerateShippingOrderStepsProcessor.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\PackingList\Processors;
+
+use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+use App\Classes\Modules\Orders\Processors\UpdatesOrderCurrentStepProcessor;
+use App\Classes\Modules\Steps\Processors\UpdateStepsProcessor;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Steps\Services\FetchesSteps;
+use App\Classes\Modules\Orders\Services\UpdatesCurrentStep;
+use App\Classes\Modules\Orders\Standards\Rules\CanUpdateCurrentStep;
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+use App\Classes\Modules\Steps\Services\CreatesManySteps;
+use App\Classes\ValueObjects\Constants\OrderStatus;
+use App\Classes\ValueObjects\Constants\OrderSteps;
+use App\Classes\ValueObjects\Constants\Steps;
+use App\Classes\Modules\Unity\Processors\GetContractObligationsProcessor;
+use App\Models\CompanyModule;
+use App\Models\Order;
+use App\Models\Step;
+use App\Classes\Jobs\UnityLogin;
+use Config;
+use Illuminate\Support\Facades\Http;
+use function PHPSTORM_META\map;
+
+
+class GenerateShippingOrderStepsProcessor
+{
+    /** @var CreatesManySteps  */
+    private $createsManyStep;
+
+    /** @var UpdateStepsProcessor  */
+    private $updateStepProcessors;
+
+    /**
+     * GenerateShippingOrderStepsProcessor constructor.
+     * @param CreatesManySteps $createsManyStep
+     * @param UpdateStepsProcessor $updateStepProcessors
+     */
+    public function __construct(CreatesManySteps $createsManyStep, UpdateStepsProcessor $updateStepProcessors)
+    {
+        $this->createsManyStep = $createsManyStep;
+        $this->updateStepProcessors = $updateStepProcessors;
+    }
+
+
+    public function execute(Steppable $owner, CompanyModule $appointee, array $contract_obligation_list = []){
+
+        $obligations = $contract_obligation_list;
+
+        $this->createsManyStep->execute($owner, array_map(function($obligation) use ($appointee) {
+            return new StepsObject($appointee->id, $obligation->name,true, $step->sequence??0, 0,0, null,0, $step->hash_id);
+            }, $obligations));
+
+        $this->updateStepProcessors->execute(OrderSteps::PROCESSING);
+
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php b/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
index f4172753..d8d733b2 100644
--- a/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
+++ b/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
@@ -2,26 +2,29 @@
 
 namespace App\Classes\Modules\PackingLists\Services\Containers;
 
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\ContainerOwner;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Models\Container;
 
-class CreatesContainer extends AbstractUpdateRecord
+class CreatesContainer extends AbstractUpdateRelationshipRecord
 {
 
     /**
      * @param ContainerObject $object
+     * @param ContainerOwner $owner
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(ContainerObject $object) {
+    public function execute(ContainerObject $object, ContainerOwner $owner) {
         $model = new Container();
 
-        $model->packing_list_id = $object->getPackingListId();
-        $model->container_reference = $object->getContainerReference();
+        $model->reference = $object->getReference();
+        $model->container_number = $object->getContainerNumber();
         $model->container_type = $object->getContainerType();
-        $model->seal_reference = $object->getSealReference();
+        $model->seal_reference = $object->getSealNumber();
+        $model->status = $object->getStatus();
 
-        return $this->handler($model);
+        return $this->handler($owner->containers(), $model);
     }
 }
diff --git a/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php b/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php
index 2cb151c5..0654557f 100644
--- a/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php
+++ b/app/Classes/Modules/PackingLists/Services/CreatesPackingList.php
@@ -3,17 +3,27 @@
 namespace App\Classes\Modules\PackingLists\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Packable;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Models\PackingList;
 
-class CreatesPackingList extends AbstractUpdateRecord
+class CreatesPackingList extends AbstractUpdateRelationshipRecord
 {
-    public function execute(PackingListObject $object) {
+    /**
+     * @param PackingListObject $object
+     * @param Packable $packable
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingListObject $object, Packable $packable) {
         $model = new PackingList();
 
         $model->reference = $object->getReference();
+        $model->claimant_id = $object->getClaimantId();
+        $model->type = $object->getType();
         $model->status = $object->getStatus();
 
-        return $this->handler($model);
+        return $this->handler($packable->packingLists(), $model);
     }
 }
diff --git a/app/Classes/Modules/PackingLists/Services/Packages/CreatesPackage.php b/app/Classes/Modules/PackingLists/Services/Packages/CreatesPackage.php
index ef9f7623..e6fea2be 100644
--- a/app/Classes/Modules/PackingLists/Services/Packages/CreatesPackage.php
+++ b/app/Classes/Modules/PackingLists/Services/Packages/CreatesPackage.php
@@ -3,15 +3,15 @@
 namespace App\Classes\Modules\PackingLists\Services\Packages;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Models\Package;
+use App\Models\PackingList;
 
-class CreatesPackage extends AbstractUpdateRecord
+class CreatesPackage extends AbstractUpdateRelationshipRecord
 {
-    public function execute(PackageObject $object) {
+    public function execute(PackageObject $object, PackingList $packingList) {
         $model = new Package();
-        $model->order_id = $object->getOrderId();
-        $model->claimant_id = $object->getClaimantId();
         $model->type = $object->getType();
         $model->description = $object->getDescription();
         $model->width = $object->getWidth();
@@ -21,7 +21,7 @@ class CreatesPackage extends AbstractUpdateRecord
         $model->quantity = $object->getQuantity();
         $model->status = $object->getStatus();
 
-        return $this->handler($model);
+        return $this->handler($packingList->packages(), $model);
 
     }
 }
diff --git a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanCreateContainer.php b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanCreateContainer.php
index 7163461d..f899e7a7 100644
--- a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanCreateContainer.php
+++ b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanCreateContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes\Modules\PackingLists\Standards\Containers\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
@@ -10,16 +10,16 @@ use App\Classes\Modules\PackingLists\Standards\Validators\ContainerValidation;
 class CanCreateContainer extends AbstractRule
 {
 
-    /** @var PackingListValidation */
-    private $containerPackingListValidation;
+    /** @var ContainerValidation */
+    private $containerValidation;
 
     /**
-     * CanCreatePackingList constructor.
-     * @param PackingListValidation $PackingListValidation
+     * CanCreateContainer constructor.
+     * @param ContainerValidation $containerValidation
      */
-    public function __construct(ContainerValidation $containerPackingListValidation)
+    public function __construct(ContainerValidation $containerValidation)
     {
-        $this->containerPackingListValidation = $containerPackingListValidation;
+        $this->containerValidation = $containerValidation;
     }
 
 
@@ -34,19 +34,19 @@ class CanCreateContainer extends AbstractRule
     }
 
     /**
-     * @param PackingListObject $object
+     * @param ContainerObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function validators($object): bool
     {
-        return $this->containerPackingListValidation->validate($object);
+        return $this->containerValidation->validate($object);
 
     }
 
 
     /**
-     * @param PackingListObject $object
+     * @param ContainerObject $object
      * @return bool
      */
     protected function criteria($object): bool
diff --git a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanDeleteContainer.php b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanDeleteContainer.php
index 3c4df10e..d585ecaf 100644
--- a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanDeleteContainer.php
+++ b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanDeleteContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes\Modules\PackingLists\Standards\Containers\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
diff --git a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanFetchContainer.php b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanFetchContainer.php
index 963e7bf7..b9d3392f 100644
--- a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanFetchContainer.php
+++ b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanFetchContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes\Modules\PackingLists\Standards\Containers\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
diff --git a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanListContainers.php b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanListContainers.php
index 755ff5db..73d5ac15 100644
--- a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanListContainers.php
+++ b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanListContainers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes\Modules\PackingLists\Standards\Containers\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
diff --git a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanUpdateContainer.php b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanUpdateContainer.php
index 8f9eb6f9..2b119e0f 100644
--- a/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanUpdateContainer.php
+++ b/app/Classes/Modules/PackingLists/Standards/Rules/Containers/CanUpdateContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Classes\Modules\PackingLists\Standards\Containers\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
diff --git a/app/Classes/Modules/PackingLists/Standards/Validators/ContainerValidation.php b/app/Classes/Modules/PackingLists/Standards/Validators/ContainerValidation.php
index f965e331..865da0e4 100644
--- a/app/Classes/Modules/PackingLists/Standards/Validators/ContainerValidation.php
+++ b/app/Classes/Modules/PackingLists/Standards/Validators/ContainerValidation.php
@@ -15,10 +15,7 @@ class ContainerValidation extends AbstractValidation
      */
     protected function data($object): array {
         return [
-            'packing_list_id' => $object->getPackingListId(),
-            'container_reference' => $object->getContainerReference(),
-            'container_type' => $object->getContainerType(),
-            'seal_reference' => $object->getSealReference(),
+            'reference' => $object->getReference()
         ];
     }
 
@@ -27,8 +24,7 @@ class ContainerValidation extends AbstractValidation
      */
     protected function rules(): array {
         return [
-            'packing_list_id' => 'required',
-            'container_reference' => 'required',
+            'reference' => 'required'
         ];
     }
 
diff --git a/app/Classes/Modules/PackingLists/Standards/Validators/PackageValidation.php b/app/Classes/Modules/PackingLists/Standards/Validators/PackageValidation.php
index 6730c8ba..17d35e72 100644
--- a/app/Classes/Modules/PackingLists/Standards/Validators/PackageValidation.php
+++ b/app/Classes/Modules/PackingLists/Standards/Validators/PackageValidation.php
@@ -16,7 +16,6 @@ class PackageValidation extends AbstractValidation
      */
     protected function data($object): array {
         return [
-            'order_id' => $object->getOrderId(),
             'type' => $object->getType(),
             'width' => $object->getWidth(),
             'height' => $object->getHeight(),
@@ -31,7 +30,6 @@ class PackageValidation extends AbstractValidation
      */
     protected function rules(): array {
         return [
-            'order_id' => 'required',
             'type' => 'required',
             'width' =>  'required',
             'height' =>  'required',
diff --git a/app/Classes/Modules/Schedules/DataTransferObjects/ScheduleObject.php b/app/Classes/Modules/Schedules/DataTransferObjects/ScheduleObject.php
index 026e10d2..efca110a 100644
--- a/app/Classes/Modules/Schedules/DataTransferObjects/ScheduleObject.php
+++ b/app/Classes/Modules/Schedules/DataTransferObjects/ScheduleObject.php
@@ -8,54 +8,42 @@ use Carbon\Carbon;
 class ScheduleObject implements DataTransferObject
 {
 
-    /** @var Carbonn date */
+    /** @var Carbon */
     private $etd;
 
-    /** @var Carbon date */
+    /** @var Carbon */
     private $eta;
 
-    /** @var int */
-    private $transport_id;
-
     /** @var int */
     private $status;
 
     /**
-     * ScheduleObject constructor
-     * @param int $etd
-     * @param int $eta
-     * @param int $transport_id
+     * ScheduleObject constructor.
+     * @param Carbon $etd
+     * @param Carbon $eta
+     * @param int $status
      */
-    public function __construct(string $etd, string $eta, int $transport_id, int $status)
+    public function __construct(Carbon $etd, Carbon $eta, int $status)
     {
         $this->etd = $etd;
         $this->eta = $eta;
-        $this->transport_id = $transport_id;
         $this->status = $status;
     }
 
     /**
-     * @return string
+     * @return Carbon
      */
-    public function getETD(): Carbon
+    public function getEtd(): Carbon
     {
-        return Carbon::parse($this->etd);
+        return $this->etd;
     }
 
     /**
-     * @return string
+     * @return Carbon
      */
-    public function getETA(): Carbon
+    public function getEta(): Carbon
     {
-        return Carbon::parse($this->eta);
-    }
-
-    /**
-     * @return int
-     */
-    public function getTransportId(): int
-    {
-        return $this->transport_id;
+        return $this->eta;
     }
 
     /**
@@ -65,4 +53,6 @@ class ScheduleObject implements DataTransferObject
     {
         return $this->status;
     }
+
+
 }
diff --git a/app/Classes/Modules/Schedules/Services/CreatesSchedule.php b/app/Classes/Modules/Schedules/Services/CreatesSchedule.php
index 7dad5210..71336853 100644
--- a/app/Classes/Modules/Schedules/Services/CreatesSchedule.php
+++ b/app/Classes/Modules/Schedules/Services/CreatesSchedule.php
@@ -22,6 +22,7 @@ class CreatesSchedule extends AbstractUpdateRelationshipRecord
 
         $model->etd = $object->getETD();
         $model->eta = $object->getETA();
+        $model->status = $object->getStatus();
 
         return $this->handler($transport->schedules(), $model);
 
diff --git a/app/Classes/Modules/Steps/DataTransferObjects/StepsObject.php b/app/Classes/Modules/Steps/DataTransferObjects/StepsObject.php
index 1c75079a..d9a58071 100644
--- a/app/Classes/Modules/Steps/DataTransferObjects/StepsObject.php
+++ b/app/Classes/Modules/Steps/DataTransferObjects/StepsObject.php
@@ -7,81 +7,64 @@ use Carbon\Carbon;
 
 class StepsObject implements DataTransferObject
 {
-    private $id;
-
-    private $appointee_id;
+    /** @var int */
+    private $appointeeId;
 
+    /** @var string  */
     private $reference;
 
-    private $primary;
-
+    /** @var float  */
     private $sequence;
 
-    private $status;
+    /** @var string */
+    private $obligationId;
 
-    private $contract_status;
-
-    private $completed_date;
-
-    private $hash_id;
-
-    public function __construct(int $appointee_id, string $reference, bool $primary, float $sequence, int $status, int $contract_status, ?string $completed_date, int $id=0, ?string $hash_id)
+    /**
+     * StepsObject constructor.
+     * @param int $appointeeId
+     * @param string $reference
+     * @param float $sequence
+     * @param string $obligationId
+     */
+    public function __construct(int $appointeeId, string $reference, float $sequence, string $obligationId)
     {
-        $this->appointee_id = $appointee_id;
+        $this->appointeeId = $appointeeId;
         $this->reference = $reference;
-        $this->primary = $primary;
-
         $this->sequence = $sequence;
-        $this->status = $status;
-        $this->contract_status = $contract_status;
-        $this->completed_date = $completed_date;
-
-        $this->id = $id;
-        $this->hash_id = $hash_id;
+        $this->obligationId = $obligationId;
     }
 
+    /**
+     * @return int
+     */
     public function getAppointeeId(): int
     {
-        return $this->appointee_id;
+        return $this->appointeeId;
     }
 
+    /**
+     * @return string
+     */
     public function getReference(): string
     {
         return $this->reference;
     }
 
-    public function getPrimary(): bool
-    {
-        return $this->primary;
-    }
-
+    /**
+     * @return float
+     */
     public function getSequence(): float
     {
         return $this->sequence;
     }
 
-    public function getStatus(): int
+    /**
+     * @return string
+     */
+    public function getObligationId(): string
     {
-        return $this->status;
+        return $this->obligationId;
     }
 
-    public function getContractStatus(): int
-    {
-        return $this->contract_status;
-    }
 
-    public function getCompletedDate():  Carbon
-    {
-        return $this->completed_date ? Carbon::parse($this->completed_date) : Carbon::now();
-    }
-
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    public function getHashId(): ?string
-    {
-        return $this->hash_id;
-    }
 }
diff --git a/app/Classes/Modules/Steps/Processors/CreateStepsProcessor.php b/app/Classes/Modules/Steps/Processors/CreateStepsProcessor.php
index d7b4e95e..81067f03 100644
--- a/app/Classes/Modules/Steps/Processors/CreateStepsProcessor.php
+++ b/app/Classes/Modules/Steps/Processors/CreateStepsProcessor.php
@@ -35,11 +35,20 @@ class CreateStepsProcessor
         $this->fetchesSteps = $fetchesSteps;
     }
 
-    public function execute(Model $order, string $currentStep, $appointee_id){
+    /**
+     * @param Order $order
+     * @param string $currentStep
+     * @param $appointee_id
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Order $order, string $currentStep, $appointee_id){
 
-        $order_steps_object = new StepsObject( $appointee_id, $currentStep, true, 0, OrderStatus::PROCESSING, 0, null, 0, null);
+        $stepObject = new StepsObject( $appointee_id, $currentStep, true, 0, OrderStatus::PROCESSING, 0, null, 0, null);
 
-        $this->canCreateStep->passes($order_steps_object);
+        $this->canCreateStep->passes($stepObject);
 
         return $this->createsSteps->execute($order, $order_steps_object);
 
diff --git a/app/Classes/Modules/Steps/Services/CreatesManySteps.php b/app/Classes/Modules/Steps/Services/CreatesManySteps.php
index a2f4099f..9c87c0dd 100644
--- a/app/Classes/Modules/Steps/Services/CreatesManySteps.php
+++ b/app/Classes/Modules/Steps/Services/CreatesManySteps.php
@@ -8,10 +8,10 @@ use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
 use App\Models\Step;
 use App\Models\Order;
 
-class CreatesManySteps extends AbstractUpdateRecord
+class CreatesManySteps extends AbstractUpdateRelationshipRecord
 {
 
-    public function execute(Order $order, array $orderSteps) {
+    public function execute(Steppable $owner, array $orderSteps) {
 
         $orderStepsModel=[];
         foreach($orderSteps as $step){
diff --git a/app/Classes/Modules/Steps/Services/CreatesStep.php b/app/Classes/Modules/Steps/Services/CreatesStep.php
new file mode 100644
index 00000000..8c6ea6c5
--- /dev/null
+++ b/app/Classes/Modules/Steps/Services/CreatesStep.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Steps\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Steppable;
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+use App\Models\Step;
+use App\Models\Order;
+
+class CreatesStep extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param Steppable $owner
+     * @param StepsObject $orderSteps
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Steppable $owner, StepsObject $orderSteps) {
+
+        $model = new Step();
+
+        $model->appointee_id = $orderSteps->getAppointeeId();
+        $model->reference = $orderSteps->getReference();
+        $model->sequence = $orderSteps->getSequence();
+        $model->obligation_hash_id = $orderSteps->getObligationId();
+
+        return $this->handler($owner->steps(), $model);
+
+    }
+}
diff --git a/app/Classes/Modules/Steps/Services/CreatesSteps.php b/app/Classes/Modules/Steps/Services/CreatesSteps.php
deleted file mode 100644
index 0cadbe55..00000000
--- a/app/Classes/Modules/Steps/Services/CreatesSteps.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Steps\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
-use App\Models\Step;
-use App\Models\Order;
-
-class CreatesSteps extends AbstractUpdateRelationshipRecord
-{
-
-    /**
-     * @param Order $order
-     * @param StepsObject $orderSteps
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Order $order, StepsObject $orderSteps) {
-
-        $orderStepsModel = new Step();
-
-        $orderStepsModel->appointee_id = $orderSteps->getAppointeeId();
-        $orderStepsModel->reference = $orderSteps->getReference();
-        $orderStepsModel->primary = $orderSteps->getPrimary();
-        $orderStepsModel->sequence = $orderSteps->getSequence();
-        $orderStepsModel->status = 0;
-        $orderStepsModel->contract_status = 0;
-        $orderStepsModel->complete_date = null;
-
-        return $this->handler($order->orderSteps(), $orderStepsModel);
-
-    }
-}
diff --git a/app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php b/app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php
index c391ac72..9bde2ec5 100644
--- a/app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php
+++ b/app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php
@@ -11,44 +11,44 @@ class TransportObject implements DataTransferObject
     /** @var string */
     private $type;
 
-    /** @var string|null */
+    /** @var null|string */
     private $courier;
 
-    /** @var int */
-    private $tracking_number;
+    /** @var null|string */
+    private $trackingNumber;
 
-    /** @var int */
-    private $dispacth_date;
+    /** @var Carbon|null */
+    private $dispatchDate;
 
-    /** @var int */
-    private $drop_date;
+    /** @var Carbon|null */
+    private $dropDate;
 
     /** @var int */
     private $status;
 
     /**
      * TransportObject constructor.
-     * @param int $type
+     * @param string $type
      * @param null|string $courier
-     * @param string $tracking_number
-     * @param int $dispatch_date
-     * @param int $drop_date
+     * @param null|string $trackingNumber
+     * @param Carbon|null $dispatchDate
+     * @param Carbon|null $dropDate
      * @param int $status
      */
-    public function __construct(int $type, string $courier, string $tracking_number, ?string $dispatch_date, ?string $drop_date, int $status)
+    public function __construct(string $type, ?string $courier, ?string $trackingNumber, ?Carbon $dispatchDate, ?Carbon $dropDate, int $status)
     {
         $this->type = $type;
         $this->courier = $courier;
-        $this->tracking_number = $tracking_number;
-        $this->dispatch_date = $dispatch_date;
-        $this->drop_date = $drop_date;
+        $this->trackingNumber = $trackingNumber;
+        $this->dispatchDate = $dispatchDate;
+        $this->dropDate = $dropDate;
         $this->status = $status;
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getType(): int
+    public function getType(): string
     {
         return $this->type;
     }
@@ -62,27 +62,27 @@ class TransportObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return null|string
      */
-    public function getTrackingNumber(): string
+    public function getTrackingNumber(): ?string
     {
-        return $this->tracking_number;
+        return $this->trackingNumber;
     }
 
     /**
-     * @return int
+     * @return Carbon|null
      */
     public function getDispatchDate(): ?Carbon
     {
-        return $this->dispatch_date ? Carbon::parse($this->dispatch_date) : null;
+        return $this->dispatchDate;
     }
 
     /**
-     * @return int
+     * @return Carbon|null
      */
     public function getDropDate(): ?Carbon
     {
-        return $this->drop_date ? Carbon::parse($this->drop_date) : null;
+        return $this->dropDate;
     }
 
     /**
diff --git a/app/Classes/Modules/Transports/Services/CreatesTransport.php b/app/Classes/Modules/Transports/Services/CreatesTransport.php
index 1011e139..fa071c37 100644
--- a/app/Classes/Modules/Transports/Services/CreatesTransport.php
+++ b/app/Classes/Modules/Transports/Services/CreatesTransport.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Transports\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Transportable;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
 use App\Models\Transport;
 use App\Models\Container;
@@ -12,12 +13,12 @@ class CreatesTransport extends AbstractUpdateRelationshipRecord
 {
 
     /**
-     * @param Container $containerPackingList
      * @param TransportObject $object
+     * @param Transportable $transportable
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Container $containerPackingList, TransportObject $object) {
+    public function execute(TransportObject $object, Transportable $transportable) {
         $model = new Transport();
 
         $model->type = $object->getType();
@@ -27,7 +28,7 @@ class CreatesTransport extends AbstractUpdateRelationshipRecord
         $model->drop_date = $object->getDropDate();
         $model->status = $object->getStatus();
 
-        return $this->handler($containerPackingList->transports(), $model);
+        return $this->handler($transportable->transports(), $model);
 
     }
 }
diff --git a/app/Classes/Modules/Unity/Processors/AssignContractEntityProcessor.php b/app/Classes/Modules/Unity/Processors/AssignContractEntityProcessor.php
index c5308ab1..bf4936d6 100644
--- a/app/Classes/Modules/Unity/Processors/AssignContractEntityProcessor.php
+++ b/app/Classes/Modules/Unity/Processors/AssignContractEntityProcessor.php
@@ -20,15 +20,12 @@ class AssignContractEntityProcessor
         $this->fetchesCompany = $fetchesCompany;
     }
 
-    public function execute(Request $request, array $contractEntities, array $obligations){
+    public function execute(string $contractEntities, array $obligations){
 
         $responses = [];
 
-        //CIEF Contract Entity Hash ID
-        $contract_entity_hash_id = $contractEntities[0]->hash_id;
-
         foreach($obligations as $obligation){
-            $responses[] = $this->updatesContractEntity->execute($obligation->hash_id, [$contract_entity_hash_id]);
+            $responses[] = $this->updatesContractEntity->execute($obligation->hash_id, [$contractEntities]);
         }
 
         return $responses;
diff --git a/app/Classes/Modules/Unity/Processors/CreateContractEntityProcessor.php b/app/Classes/Modules/Unity/Processors/CreateContractEntityProcessor.php
index 7cf14a08..33a4ce27 100644
--- a/app/Classes/Modules/Unity/Processors/CreateContractEntityProcessor.php
+++ b/app/Classes/Modules/Unity/Processors/CreateContractEntityProcessor.php
@@ -20,7 +20,7 @@ class CreateContractEntityProcessor
         $this->fetchesCompany = $fetchesCompany;
     }
 
-    public function execute(string $new_contract_id, array $entity_hash_ids){
+    public function execute(string $new_contract_id, string $entity_hash_ids){
         return $this->createsContractEntity->execute($new_contract_id, $entity_hash_ids);
     }
 }
diff --git a/app/Classes/Modules/Unity/Services/CreatesContractEntity.php b/app/Classes/Modules/Unity/Services/CreatesContractEntity.php
index f722ee5f..dd0bb135 100644
--- a/app/Classes/Modules/Unity/Services/CreatesContractEntity.php
+++ b/app/Classes/Modules/Unity/Services/CreatesContractEntity.php
@@ -21,12 +21,10 @@ class CreatesContractEntity
         $this->contract_hash_id = Config::get('unity.contract_template_hash_id');
     }
 
-    public function execute(string $new_contract_id, array $entity_hash_ids){
+    public function execute(string $new_contract_id, string $entity_hash_ids){
 
         $accesToken=$this->getAccessToken->execute();
-
         $response = Http::withToken($accesToken)->post($this->createContractEntityEndpoint,['contract_id'=>[$new_contract_id],'entity_id'=>$entity_hash_ids])->object();
-
         return (isset($response->data)) ? $response->data : null;
 
     }
diff --git a/app/Classes/ValueObjects/Constants/PackageType.php b/app/Classes/ValueObjects/Constants/PackageType.php
new file mode 100644
index 00000000..797c178e
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/PackageType.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PackageType {
+
+    public const CARTON = 0;
+
+    public const PALLET = 1;
+
+}
diff --git a/app/Classes/ValueObjects/Constants/PackingListType.php b/app/Classes/ValueObjects/Constants/PackingListType.php
new file mode 100644
index 00000000..56f29244
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/PackingListType.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PackingListType {
+
+    public const SUPPLIER_PACKING_LIST = 0;
+
+    public const WAREHOUSE_RECEIVE_LIST = 1;
+
+    public const SHIPPING_PACKING_LIST = 2;
+
+    public const TRANSPORT_PACKING_LIST = 3;
+
+    public const DELIVERY_PACKING_LIST = 4;
+
+
+}
diff --git a/app/Classes/ValueObjects/Constants/TransportType.php b/app/Classes/ValueObjects/Constants/TransportType.php
new file mode 100644
index 00000000..fc22f693
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/TransportType.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class TransportType {
+
+    public const AIR = 0;
+
+    public const SEA = 1;
+
+    public const LAND = 2;
+
+
+
+}
diff --git a/app/Classes/ValueObjects/Constants/WarehouseReferences.php b/app/Classes/ValueObjects/Constants/WarehouseReferences.php
index 6f21840d..f06bd644 100644
--- a/app/Classes/ValueObjects/Constants/WarehouseReferences.php
+++ b/app/Classes/ValueObjects/Constants/WarehouseReferences.php
@@ -14,5 +14,24 @@ final class WarehouseReferences {
 
     public const SARAWAK = 'SRW-V01';
 
+    public const DESTINATION_WAREHOUSE = [
+        1 => self::KLANG,
+        2 => self::KLANG,
+        3 => self::KLANG,
+        4 => self::KLANG,
+        5 => self::SABAH,
+        6 => self::KLANG,
+        7 => self::KLANG,
+        8 => self::KLANG,
+        9 => self::KLANG,
+        10 => self::KLANG,
+        11 => self::KLANG,
+        12 => self::KLANG,
+        13 => self::SABAH,
+        14 => self::KLANG,
+        15 => self::KLANG,
+        16 => self::KLANG,
+    ];
+
 
 }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 69914e99..bec96f83 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -2,6 +2,11 @@
 
 namespace App\Console;
 
+use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
+use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
+use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
+use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
+use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -24,7 +29,11 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')->hourly();
+         $schedule->job(FetchWarehouseReceiveListFromVTPortalJob::class)->dailyAt('21:00');
+         $schedule->job(FetchLoadedContainersFromVTPortalJob::class)->dailyAt('21:15');
+         $schedule->job(FetchPackingListFromVTPortalJob::class)->dailyAt('21:30');
+         $schedule->job(FetchContainersStatusUpdateFromVTPortalJob::class)->dailyAt('21:45');
+         $schedule->job(FetchDeliveryListFromVTPortalJob::class)->dailyAt('22:00');
     }
 
     /**
diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index e47e44db..59c60916 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -16,10 +16,10 @@ class ContainerResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'container_reference' => $this->container_reference,
+            'container_reference' => $this->reference,
             'container_type' => $this->container_type,
+            'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
-            'packing_list' => PackingListResource::collection($this->packingLists),
             'transport' => TransportResource::collection($this->transports),
         ];
     }
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 1a31578f..183536e3 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -2,7 +2,11 @@
 
 namespace App\Http\Resources;
 
+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 Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class OrderResource extends JsonResource
@@ -24,6 +28,55 @@ class OrderResource extends JsonResource
             'company_module' => new CompanyModuleResource($this->companyModule),
             'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
             'address' => new AddressResource($this->addresses()->first()),
+            $this->mergeWhen($this->relationLoaded('parcels'), [
+                'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('containers', function($query) {
+                        return $query->whereHas('transports', function($query){
+                            return $query->whereHas('schedules', function($query){
+                                return $query->where('etd', '<', Carbon::now());
+                            });
+                        });
+                    });
+                })->get()),
+                'in_transit_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
+                        return $query->whereHas('transports', function($query){
+                            return $query->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
+                                return $query->where('etd', '<', Carbon::now());
+                            });
+                        });
+                    });
+                })->get()),
+                'destination_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
+                        return $query->whereHas('transports', function($query){
+                            return $query->where('type', '=', TransportType::SEA)->where('status', '=', ApprovalStatus::COMPLETED)->whereHas('schedules', function($query){
+                                return $query->where('etd', '<', Carbon::now());
+                            });
+                        });
+                    })->whereDoesntHave('transports', function($query){
+                        return $query->where('type', '=', TransportType::LAND)->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
+                            return $query->where('etd', '<', Carbon::now());
+                        });
+                    });
+                })->get()),
+                'delivered_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                    return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
+                        return $query->whereHas('transports', function($query){
+                            return $query->where('type', '=', TransportType::SEA)->where('status', '=', ApprovalStatus::COMPLETED)->whereHas('schedules', function($query){
+                                return $query->where('etd', '<', Carbon::now());
+                            });
+                        });
+                    })->whereHas('transports', function($query){
+                        return $query->where('type', '=', TransportType::LAND)->where('status', '=', ApprovalStatus::APPROVED)->whereHas('schedules', function($query){
+                            return $query->where('etd', '<', Carbon::now());
+                        });
+                    });
+                })->get()),
+                'parcels' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
+                    return $query->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST);
+                })->get()),
+            ]),
             'created_at' => $this->created_at->format('d-m-Y')
         ];
     }
diff --git a/app/Http/Resources/PackageResource.php b/app/Http/Resources/PackageResource.php
index fb011ad3..7a3209d1 100644
--- a/app/Http/Resources/PackageResource.php
+++ b/app/Http/Resources/PackageResource.php
@@ -16,15 +16,18 @@ class PackageResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'packing_list_id' => $this->packing_list_id,
             'type' => $this->type,
             'description' => $this->description,
-            'width' => $this->width,
-            'height' => $this->height,
-            'length' => $this->length,
+            'width' => floatval($this->width),
+            'height' => floatval($this->height),
+            'length' => floatval($this->length),
             'weight' => $this->weight,
             'quantity' => $this->quantity,
+            'cbm' => (($this->width / 100) * ($this->width / 100) * ($this->width / 100)) * $this->quantity,
             'status' => $this->status,
+            'order' => new OrderResource($this->packingList->owner),
+            'container' => new ContainerResource($this->packingList->containers()->first()),
+            'transport' => new TransportResource($this->packingList->transports()->first())
         ];
     }
 }
diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 43730ea5..e75ce164 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -19,6 +19,8 @@ class PackingListResource extends JsonResource
             'claimant_id' => $this->claimant_id,
             'reference' => $this->reference,
             'status' => $this->status,
+            'transport' => new TransportResource($this->transports()->first()),
+            'packages' => PackageResource::collection($this->packages),
         ];
     }
 }
diff --git a/app/Http/Resources/ScheduleResource.php b/app/Http/Resources/ScheduleResource.php
index 702fb642..6f7209d6 100644
--- a/app/Http/Resources/ScheduleResource.php
+++ b/app/Http/Resources/ScheduleResource.php
@@ -16,8 +16,8 @@ class ScheduleResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'etd' => $this->etd,
-            'eta' => $this->eta,
+            'etd' => $this->etd->format('d-m-Y'),
+            'eta' => $this->eta->format('d-m-Y'),
             'status' => $this->status,
         ];
     }
diff --git a/app/Http/Resources/TransportResource.php b/app/Http/Resources/TransportResource.php
index 86e894cf..6656721a 100644
--- a/app/Http/Resources/TransportResource.php
+++ b/app/Http/Resources/TransportResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class TransportResource extends JsonResource
@@ -19,9 +20,11 @@ class TransportResource extends JsonResource
             'type' => $this->type,
             'courier' => $this->courier,
             'tracking_number' => $this->tracking_number,
-            'dispatch_date' => $this->dispatch_date,
-            'drop_date' => $this->drop_date,
+            'dispatch_date' => $this->dispatch_date ? $this->dispatch_date->format('d-m-Y') : $this->dispatch_date,
+            'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
             'status' => $this->status,
+            'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
+            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '!=', ApprovalStatus::APPROVED)->get())
         ];
     }
 }
diff --git a/app/Models/Address.php b/app/Models/Address.php
index 43784f8d..bbd60d70 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -11,10 +11,10 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
  * Class Address
  * @package App\Models
  *
- * @property \App\Models\Country country_id
- * @property \App\Models\Company company_id
- * @property \App\Models\State state_id
- * @property \App\Models\District district_id
+ * @property int country_id
+ * @property int company_id
+ * @property int state_id
+ * @property int district_id
  * @property string postcode
  * @property string street_one
  * @property string street_two
diff --git a/app/Models/CompanyModule.php b/app/Models/CompanyModule.php
index 9b21263f..eecc0118 100644
--- a/app/Models/CompanyModule.php
+++ b/app/Models/CompanyModule.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Addressable;
 use App\Classes\General\Interfaces\Contactable;
+use App\Classes\General\Interfaces\ContainerOwner;
 use App\Classes\General\Interfaces\Documentable;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
@@ -27,7 +28,7 @@ use PhpParser\Node\Expr\AssignOp\Mod;
  * @property integer type
  * @property integer status
  */
-class CompanyModule extends AbstractModel implements Addressable, Documentable, Contactable
+class CompanyModule extends AbstractModel implements Addressable, Documentable, Contactable, ContainerOwner
 {
     use SoftDeletes;
 
@@ -120,6 +121,14 @@ class CompanyModule extends AbstractModel implements Addressable, Documentable,
          return $this->HasMany(Bank::class, 'company_id');
      }
 
+    /**
+     * @return MorphMany
+     */
+    public function containers(): morphMany
+    {
+        return $this->morphMany(Container::class, 'owner');
+    }
+
     /**
      * @param Builder $query
      * @return Builder
@@ -147,4 +156,6 @@ class CompanyModule extends AbstractModel implements Addressable, Documentable,
         return $query->where('type', '=', BusinessType::WAREHOUSE);
     }
 
+
+
 }
diff --git a/app/Models/Container.php b/app/Models/Container.php
index 043806ac..9ff4fde8 100644
--- a/app/Models/Container.php
+++ b/app/Models/Container.php
@@ -2,19 +2,22 @@
 
 namespace App\Models;
 
+use App\Classes\General\Interfaces\Transportable;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
-class Container extends AbstractModel
+class Container extends AbstractModel implements Transportable
 {
     use SoftDeletes;
 
     protected $table = 'containers';
 
+    protected $fillable = ['status'];
+
     public function packingLists(): belongsToMany
     {
-        return $this->belongsToMany(PackingList::class, Container::class, 'container_id', 'packing_list_id');
+        return $this->belongsToMany(PackingList::class, ContainerPackingList::class, 'container_id', 'packing_list_id');
     }
 
     /**
diff --git a/app/Models/ContainerPackingList.php b/app/Models/ContainerPackingList.php
index 0aecbbee..54622536 100644
--- a/app/Models/ContainerPackingList.php
+++ b/app/Models/ContainerPackingList.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
-class Container extends AbstractModel
+class ContainerPackingList extends AbstractModel
 {
     use SoftDeletes;
 
diff --git a/app/Models/OldAddress.php b/app/Models/OldAddress.php
index 54c56bb8..5a2b3a3c 100644
--- a/app/Models/OldAddress.php
+++ b/app/Models/OldAddress.php
@@ -2,12 +2,7 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class OldAddress extends Model
 {
diff --git a/app/Models/OldCompany.php b/app/Models/OldCompany.php
index 97f354cc..2ca5b482 100644
--- a/app/Models/OldCompany.php
+++ b/app/Models/OldCompany.php
@@ -2,21 +2,9 @@
 
 namespace App\Models;
 
-use App\Classes\General\Interfaces\Documentable;
-use App\Classes\General\Interfaces\Contactable;
-use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceConfigurationsObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-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\SoftDeletes;
-use Illuminate\Support\Collection;
 
 
 class OldCompany extends Model
diff --git a/app/Models/OldOrders.php b/app/Models/OldOrders.php
index 48b39b83..81041fab 100644
--- a/app/Models/OldOrders.php
+++ b/app/Models/OldOrders.php
@@ -2,12 +2,9 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class OldOrders extends Model
 {
@@ -15,4 +12,20 @@ class OldOrders extends Model
 
     protected $table = 'orders';
 
+    /**
+     * @return hasOne
+     */
+    public function address(): hasOne
+    {
+        return $this->hasOne(OldAddress::class,  'reference_id', 'address_id')->where('type', '=', 1);
+    }
+
+    /**
+     * @return belongsTo
+     */
+    public function company(): belongsTo
+    {
+        return $this->belongsTo(OldCompany::class,  'company_id');
+    }
+
 }
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 58f64dc8..4d537646 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -3,14 +3,17 @@
 namespace App\Models;
 
 use App\Classes\General\Interfaces\Addressable;
+use App\Classes\General\Interfaces\Contactable;
+use App\Classes\General\Interfaces\Packable;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Scopes\CustomerOrdersScope;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
-class Order extends AbstractModel implements Addressable
+class Order extends AbstractModel implements Addressable, Packable
 {
     use SoftDeletes;
 
@@ -43,6 +46,22 @@ class Order extends AbstractModel implements Addressable
         return $this->morphMany(Address::class, 'owner');
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function packingLists(): morphMany
+    {
+        return $this->morphMany(PackingList::class, 'owner');
+    }
+
+    /**
+     * @return HasManyThrough
+     */
+    public function parcels(): HasManyThrough
+    {
+        return $this->HasManyThrough(Package::class, PackingList::class, 'owner_id', 'packing_list_id')->where('owner_type', Order::class);
+    }
+
     /**
      * @return HasMany
      */
@@ -51,6 +70,7 @@ class Order extends AbstractModel implements Addressable
         return $this->HasMany(OrderRole::class, 'order_id');
     }
 
+
     protected static function booted()
     {
 //        if (auth()->user()->type === RoleTypes::USER) {
diff --git a/app/Models/OrderRole.php b/app/Models/OrderRole.php
index 1d80603c..b1682daa 100644
--- a/app/Models/OrderRole.php
+++ b/app/Models/OrderRole.php
@@ -10,6 +10,8 @@ class OrderRole extends Model
 {
     use HasFactory;
 
+    protected $fillable = ['entity_hash_id', 'entity_signature'];
+
     /**
      * @return BelongsTo
      */
diff --git a/app/Models/Package.php b/app/Models/Package.php
index 39c39488..2c987764 100644
--- a/app/Models/Package.php
+++ b/app/Models/Package.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -12,14 +13,12 @@ class Package extends AbstractModel
 
     protected $table = 'packages';
 
-    public function order(): BelongsTo
+    /**
+     * @return BelongsTo
+     */
+    public function packingList(): BelongsTo
     {
-        return $this->BelongsTo(Order::class, 'order_id', 'id');
-    }
-
-    public function owner(): morphTo
-    {
-        return $this->morphTo();
+        return $this->belongsTo(PackingList::class, 'packing_list_id');
     }
 
 }
diff --git a/app/Models/PackingList.php b/app/Models/PackingList.php
index d67e3931..1bbfa6ac 100644
--- a/app/Models/PackingList.php
+++ b/app/Models/PackingList.php
@@ -2,17 +2,58 @@
 
 namespace App\Models;
 
+use App\Classes\General\Interfaces\Steppable;
+use App\Classes\General\Interfaces\Transportable;
+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;
 
-class PackingList extends AbstractModel
+class PackingList extends AbstractModel implements Transportable, Steppable
 {
     use SoftDeletes;
 
     protected $table = 'packing_lists';
 
-    public function orderSteps(): morphMany
+    protected $fillable = ['status'];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+
+    public function containers(): BelongsToMany
+    {
+        return $this->BelongsToMany(Container::class, ContainerPackingList::class);
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function steps(): morphMany
     {
         return $this->morphMany(Step::class, 'owner');
     }
+
+    /**
+     * @return HasMany
+     */
+    public function packages(): hasMany
+    {
+        return $this->hasMany(Package::class, 'packing_list_id');
+    }
+
+    /**
+     * @return morphMany
+     */
+    public function transports(): morphMany
+    {
+        return $this->morphMany(Transport::class, 'owner');
+    }
+
 }
diff --git a/app/Models/Schedule.php b/app/Models/Schedule.php
index 8d8f1f95..bc7022a9 100644
--- a/app/Models/Schedule.php
+++ b/app/Models/Schedule.php
@@ -12,6 +12,8 @@ class Schedule extends AbstractModel
 
     protected $table = 'schedules';
 
+    protected $dates = ['etd', 'eta'];
+
     public function owner(): morphTo
     {
         return $this->morphTo();
diff --git a/app/Models/Step.php b/app/Models/Step.php
index 0f924e1d..55603045 100644
--- a/app/Models/Step.php
+++ b/app/Models/Step.php
@@ -10,22 +10,12 @@ class Step  extends AbstractModel
 {
     use SoftDeletes;
 
-    protected $table = 'order_steps';
+    protected $table = 'steps';
+
+    protected $fillable = ['status'];
 
     protected $dates = ['deleted_at'];
 
-    protected $fillable = ['order_id','appointee_id','reference','primary','sequence','status','contract_status','complete_date','unity_hash_id'];
-
-    public function companyModule(): belongsTo
-    {
-        return $this->belongsTo(CompanyModule::class, 'appointee_id', 'id');
-    }
-
-    public function orderRole(): belongsTo
-    {
-        return $this->belongsTo(OrderRole::class, 'appointee_id', 'company_module_id');
-    }
-
     public function owner(): morphTo
     {
         return $this->morphTo();
diff --git a/app/Models/Transport.php b/app/Models/Transport.php
index ce83dc56..1d817097 100644
--- a/app/Models/Transport.php
+++ b/app/Models/Transport.php
@@ -13,6 +13,10 @@ class Transport extends AbstractModel
 
     protected $table = 'transport_arrangements';
 
+    protected $fillable = ['status', 'drop_date'];
+
+    protected $dates = ['dispatch_date', 'drop_date'];
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
diff --git a/config/database.php b/config/database.php
index 6faebed6..4e8bc250 100644
--- a/config/database.php
+++ b/config/database.php
@@ -65,12 +65,12 @@ return [
 
         'old_izyim_db' => [
             'driver' => 'mysql',
-            'url' => env('DATABASE_URL_IZYIM'),
-            'host' => env('DB_HOST_IZYIM', '127.0.0.1'),
-            'port' => env('DB_PORT_IZYIM', '3306'),
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE_IZYIM', 'forge'),
-            'username' => env('DB_USERNAME_IZYIM', 'forge'),
-            'password' => env('DB_PASSWORD_IZYIM', ''),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET_IZYIM', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
diff --git a/config/queue.php b/config/queue.php
index 25ea5a81..0f221cb6 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -38,7 +38,7 @@ return [
             'driver' => 'database',
             'table' => 'jobs',
             'queue' => 'default',
-            'retry_after' => 90,
+            'retry_after' => 3600,
             'after_commit' => false,
         ],
 
diff --git a/config/unity.php b/config/unity.php
index aa66ce8c..49eceaf1 100644
--- a/config/unity.php
+++ b/config/unity.php
@@ -41,9 +41,7 @@ return [
 
     'on_error_email' => env('UNITY_ON_ERROR_EMAIL','dev@shipping.com,dev@unity.com'),
 
-    'contract_template_id' => env('UNITY_CONTRACT_TEMPLATE_ID', 105),
-
-    'contract_template_hash_id' => env('UNITY_CONTRACT_TEMPLATE_HASH_ID', 'zDMkNBK3dpej1Zpg7yv9'),
+    'contract_template_hash_id' => env('UNITY_CONTRACT_TEMPLATE_HASH_ID', 'Kp3qzMV82m5R2PZg6eX0'),
 
     'contract_template_cache' => env('UNITY_CONTRACT_TEMPLATE_CACHE','60'),
 
@@ -51,8 +49,4 @@ return [
         'PACKING' => Constant\OrderSteps::PACKING,
     ],
 
-    'step_processors' => [
-        Constant\OrderSteps::PACKING => Step\Packing::class,
-    ],
-
 ];
diff --git a/database/migrations/2021_07_07_174624_create_steps_table.php b/database/migrations/2021_07_07_174624_create_steps_table.php
index 90b97903..9a9a0b67 100644
--- a/database/migrations/2021_07_07_174624_create_steps_table.php
+++ b/database/migrations/2021_07_07_174624_create_steps_table.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -19,9 +20,9 @@ class CreateStepsTable extends Migration
             $table->bigInteger('appointee_id')->unsigned()->index();
             $table->string('obligation_hash_id',200)->nullable();
             $table->string('reference');
-            $table->integer('primary')->default(0);
+            $table->integer('primary')->default(false);
             $table->decimal('sequence', 4, 2);
-            $table->integer('status')->default(0);
+            $table->integer('status')->default(ApprovalStatus::PENDING_SUBMISSION);
             $table->date('complete_date')->nullable();
             $table->softDeletes();
             $table->timestamps();
diff --git a/database/migrations/2021_07_21_110049_create_packing_lists_table.php b/database/migrations/2021_07_21_110049_create_packing_lists_table.php
index 0516b539..0e375d64 100644
--- a/database/migrations/2021_07_21_110049_create_packing_lists_table.php
+++ b/database/migrations/2021_07_21_110049_create_packing_lists_table.php
@@ -16,7 +16,8 @@ class CreatePackingListsTable extends Migration
         Schema::create('packing_lists', function (Blueprint $table) {
             $table->id();
             $table->morphs('owner');
-            $table->bigInteger('claimant_id')->unsigned()->index()->nullable(true);
+            $table->bigInteger('claimant_id')->unsigned()->index()->nullable();
+            $table->string('reference_contract')->nullable();
             $table->string('reference',200);
             $table->integer('type')->default(0);
             $table->integer('status')->default(0);
diff --git a/database/migrations/2021_07_21_110051_create_packages_table.php b/database/migrations/2021_07_21_110051_create_packages_table.php
index 4ec1c00d..9c09f5e9 100644
--- a/database/migrations/2021_07_21_110051_create_packages_table.php
+++ b/database/migrations/2021_07_21_110051_create_packages_table.php
@@ -20,7 +20,7 @@ class CreatePackagesTable extends Migration
             $table->integer('type')->default(0);
             $table->string('reference')->nullable();
 
-            $table->string('description',45)->nullable();
+            $table->string('description')->nullable();
 
             $table->decimal('width', 8, 2);
             $table->decimal('height', 8, 2);
diff --git a/database/migrations/2021_07_21_110190_create_containers_table.php b/database/migrations/2021_07_21_110190_create_containers_table.php
index 773bba5b..59ede968 100644
--- a/database/migrations/2021_07_21_110190_create_containers_table.php
+++ b/database/migrations/2021_07_21_110190_create_containers_table.php
@@ -17,10 +17,11 @@ class CreateContainersTable extends Migration
     {
         Schema::create('containers', function (Blueprint $table) {
             $table->id();
-            $table->string('reference',45);
-            $table->string('container_number',45);
+            $table->morphs('owner');
+            $table->string('reference');
+            $table->string('container_number')->nullable();
             $table->integer('container_type')->default(ContainerTypes::FORTY_FEET_DRY_CONTAINER);
-            $table->string('seal_reference',45);
+            $table->string('seal_reference')->nullable();
             $table->integer('status')->default(ApprovalStatus::PENDING_SUBMISSION);
             $table->softDeletes();
             $table->timestamps();
diff --git a/database/migrations/2021_07_21_110434_create_transport_arrangements_table.php b/database/migrations/2021_07_21_110434_create_transport_arrangements_table.php
index c01bbe62..4f3cf60a 100644
--- a/database/migrations/2021_07_21_110434_create_transport_arrangements_table.php
+++ b/database/migrations/2021_07_21_110434_create_transport_arrangements_table.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransportType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -16,15 +18,15 @@ class CreateTransportArrangementsTable extends Migration
         Schema::create('transport_arrangements', function (Blueprint $table) {
             $table->id();
             $table->morphs('owner');
-            $table->integer('type')->default(0);
+            $table->integer('type')->default(TransportType::SEA);
 
-            $table->string('courier',45);
-            $table->string('tracking_number',45);
+            $table->string('courier')->nullable();
+            $table->string('tracking_number')->nullable();
 
             $table->timestamp('dispatch_date')->nullable();
             $table->timestamp('drop_date')->nullable();
 
-            $table->integer('status')->default(0);
+            $table->integer('status')->default(ApprovalStatus::PENDING_VERIFICATION);
             $table->softDeletes();
             $table->timestamps();
         });
diff --git a/database/seeders/CompaniesTableSeeder.php b/database/seeders/CompaniesTableSeeder.php
index 6e50c868..01bb3801 100644
--- a/database/seeders/CompaniesTableSeeder.php
+++ b/database/seeders/CompaniesTableSeeder.php
@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Processors\CreateAddressFromOldAddressProcessor;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
@@ -20,12 +21,10 @@ use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\BusinessType;
 
 use App\Models\CompanyModule;
-use App\Models\District;
 use App\Models\OldCompany;
 use Illuminate\Database\Seeder;
 
 use App\Models\Company;
-use Illuminate\Support\Facades\App;
 
 class CompaniesTableSeeder extends Seeder
 {
@@ -48,6 +47,9 @@ class CompaniesTableSeeder extends Seeder
     /** @var ApprovesCompanyConnection */
     private $approvesCompanyConnection;
 
+    /** @var CreateAddressFromOldAddressProcessor */
+    private $createAddressFromOldAddressProcessor;
+
     /** @var CreatesAddress */
     private $createsAddress;
 
@@ -65,11 +67,12 @@ class CompaniesTableSeeder extends Seeder
      * @param CreateContactProcessor $createContactProcessor
      * @param CreatesCompanyConnection $createsCompanyConnection
      * @param ApprovesCompanyConnection $approvesCompanyConnection
+     * @param CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor
      * @param CreatesAddress $createsAddress
      * @param CreatesCompany $createsCompany
      * @param CreatesContact $createsContact
      */
-    public function __construct(CreateCompanyProcessor $createCompanyProcessor, UpdatesCompanyStatus $updatesCompanyStatus, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, 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, CreatesCompany $createsCompany, CreatesContact $createsContact)
     {
         $this->createCompanyProcessor = $createCompanyProcessor;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
@@ -77,6 +80,7 @@ class CompaniesTableSeeder extends Seeder
         $this->createContactProcessor = $createContactProcessor;
         $this->createsCompanyConnection = $createsCompanyConnection;
         $this->approvesCompanyConnection = $approvesCompanyConnection;
+        $this->createAddressFromOldAddressProcessor = $createAddressFromOldAddressProcessor;
         $this->createsAddress = $createsAddress;
         $this->createsCompany = $createsCompany;
         $this->createsContact = $createsContact;
@@ -168,16 +172,20 @@ class CompaniesTableSeeder extends Seeder
 
         }
 
-        if(App::environment(['production'])){
+        if(true){
             $companies = OldCompany::all();
 
             foreach($companies as $company){
 
                 $marking = explode("CIEF/", $company->marking);
+
                 if(count($marking) < 2){
                     continue;
                 }
 
+                $marking = str_replace(' ', '', str_replace('/', '', $marking[1]));
+
+
                 /** @var Company $newCompany */
                 $newCompany = $this->createCompanyProcessor->execute($company->name, CompanyType::COMPANY_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
 
@@ -186,33 +194,14 @@ class CompaniesTableSeeder extends Seeder
                 /** @var CompanyModule $companyModule */
                 $companyModule = $this->createCompanyModuleProcessor->execute($newCompany, BusinessType::IMPORTER);
 
-                $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', $marking[1]);
+                $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', $marking);
 
                 $connection = $this->createsCompanyConnection->execute($connectionObject);
                 $this->approvesCompanyConnection->execute($connection);
 
                 $i = 0;
                 foreach($company->addresses as $address){
-                    if($address->street_one === '' && $address->street_two === ''){
-                        continue;
-                    }
-
-                    if(!$address->post_code){
-                        continue;
-                    }
-
-                    $district = District::where('postcode', 'like', '%'. $address->post_code .'%')->first();
-
-                    if(!$district) {
-                        continue;
-                    }
-
-                    $street_one = str_replace($district->state->name, '',str_replace($district->name, '', $address->street_one));
-                    $street_two = str_replace($district->state->name, '',str_replace($district->name, '', $address->street_two));
-
-                    $object = new AddressObject(str_replace(', ,', ',', str_replace(', ,', ',', $street_one)), str_replace(', ,', ',', str_replace(', ,', ',', $street_two)), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Business Address');
-                    $this->createsAddress->execute($companyModule, $object);
-
+                    $this->createAddressFromOldAddressProcessor->execute($address, $companyModule);
                     $contact = preg_replace("/[^0-9.]/", "", $address->contact);
                     if($contact){
                         $i++;
@@ -224,20 +213,10 @@ class CompaniesTableSeeder extends Seeder
 
 
                 }
-
-
-
             }
         }
 
 
     }
 
-    private function cleanAddress($address){
-        $address = str_replace('Malaysia', '', str_replace('malaysia', '', $address));
-        $address = str_replace(', ,', ',', str_replace(', ,', ',', str_replace(', ,', ',', $address)));
-        $address = str_replace('  ', ' ', str_replace('  ', ' ', str_replace('  ', ' ', $address)));
-        return str_replace(', ,', ',', str_replace(', ,', ',', $address));
-
-    }
 }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 6f13aff8..bba317e6 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -24,5 +24,6 @@ class DatabaseSeeder extends Seeder
         $this->call(CurrenciesTableSeeder::class);
 
         $this->call(CompaniesTableSeeder::class);
+        $this->call(OrdersTableSeeder::class);
     }
 }
\ No newline at end of file
diff --git a/database/seeders/OrdersTableSeeder.php b/database/seeders/OrdersTableSeeder.php
new file mode 100644
index 00000000..60caa71c
--- /dev/null
+++ b/database/seeders/OrdersTableSeeder.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
+use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
+use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
+use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
+use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
+use App\Classes\Modules\PackingLists\Processors\FetchContainersStatusUpdateFromVTPortalProcessor;
+use Illuminate\Database\Seeder;
+
+class OrdersTableSeeder extends Seeder
+{
+
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+
+        FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            new FetchLoadedContainersFromVTPortalJob,
+            new FetchPackingListFromVTPortalJob,
+            new FetchContainersStatusUpdateFromVTPortalJob,
+            new FetchDeliveryListFromVTPortalJob
+        ])->dispatch();
+    }
+
+}
diff --git a/resources/assets/vue/components/general/elements/ValidationErrorComponent.vue b/resources/assets/vue/components/general/elements/ValidationErrorComponent.vue
deleted file mode 100644
index 737e67c7..00000000
--- a/resources/assets/vue/components/general/elements/ValidationErrorComponent.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-    <div v-if="validator.$error" class="text-danger">
-        <small class="bold" v-for="(object, param) in validator.$params">
-            <span v-if="object.type === 'minLength'">{{object.min}} characters</span>
-            <span v-if="object.type === 'minValue'">{{object.min}}</span>
-            <span v-if="object.type === 'sameAs'">{{object.eq}} field</span>
-            <span v-if="object.type === 'numeric'">this field only accepts numbers</span>
-        </small>
-    </div>
-</template>
-
-<script>
-    export default {
-        props: {
-            validator: {
-                required: true
-            }
-        },
-        data(){
-            return {
-                errorMessages:{
-                    required: 'this field is required',
-                    email: 'enter a valid email address',
-                    minLength: 'this field must have at least',
-                    sameAs: 'this field must match the',
-                    minValue: 'this field must at least be',
-                    numeric: 'this field only accepts numbers',
-                },
-            }
-        },
-        computed: {
-            Validation(){
-                return this.validator;
-            }
-        }
-    }
-</script>
diff --git a/resources/assets/vue/components/general/forms/FileUploadComponent.vue b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
index 033c7c5c..3eaf28b8 100644
--- a/resources/assets/vue/components/general/forms/FileUploadComponent.vue
+++ b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="dropzone no-border no-padding text-center" style="min-height: auto;">
+    <div class="no-border no-padding text-center" style="min-height: auto;">
         <div class="dz-message hide"></div>
         <div class="dragzone row m-l-0 m-r-0 bg-master-lightest" :class="[{'m-b-15': hasFile}]" style="border-width: 1px;">
             <div class="col">
diff --git a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
index 3c5f6bb0..8780f760 100644
--- a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
+++ b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
@@ -4,6 +4,7 @@
             {{errorMessages[param]}}
             <span v-if="object.type === 'minLength'">{{object.min}} characters</span>
             <span v-if="object.type === 'sameAs'">{{object.eq}} field</span>
+            <span v-if="object.type === 'minValue'">{{object.min}}</span>
         </small>
     </div>
 </template>
@@ -21,7 +22,9 @@
                     required: 'this field is required',
                     email: 'enter a valid email address',
                     minLength: 'this field must have at least',
-                    sameAs: 'this field must match the'
+                    minValue: 'this field must at least be',
+                    sameAs: 'this field must match the',
+                    numeric: 'this field can only contain numbers'
                 },
             }
         },
diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index d87533f1..907f3d73 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -39,15 +39,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">0</h6>
+                            <h6 class="bold no-margin text-info">{{item.parcels.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">0</h6>
+                            <h6 class="bold no-margin text-primary">{{item.in_transit_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">0</h6>
+                            <h6 class="bold no-margin text-success">{{item.delivered_packages.reduce((total, obj) => obj.quantity + total, 0)}}</h6>
                         </div>
                     </div>
                 </div>
@@ -67,7 +67,7 @@
                         </div>
                         <div class="col-auto text-right">
                             <small class="fs-10 all-caps muted">Total CBM</small>
-                            <h6 class="no-margin semi-bold">0.00</h6>
+                            <h6 class="no-margin semi-bold">{{(Math.round((item.origin_warehouse_packages.reduce((total, obj) => obj.cbm + total, 0) + item.in_transit_packages.reduce((total, obj) => obj.cbm + total, 0) + item.delivered_packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</h6>
                         </div>
                     </div>
                 </div>
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
new file mode 100644
index 00000000..f9a1da89
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -0,0 +1,135 @@
+<template>
+    <div class="row m-b-15">
+        <div class="col">
+            <div class="row bg-white no-margin">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col b-t b-primary" style="border-top-width: 5px;"></div>
+                        <div class="col"></div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-10 align-items-center">
+                                <div class="col-auto">
+                                    <p class="no-margin all-caps fs-10 lh-10 light">QTY</p>
+                                    <h5 class="no-margin text-primary bold">{{item.quantity}}</h5>
+                                </div>
+                                <div class="col">
+                                    <p class="no-margin all-caps fs-10 lh-18 light">Description</p>
+                                    <p class="bold m-b-5 fs-12">{{item.description}}</p>
+                                </div>
+                            </div>
+                            <div class="row b-t b-b b-grey m-b-15">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col-auto b-r b-grey p-t-10 p-b-10">
+                                            <p class="no-margin text-info bold">{{item.width}} <sup>CM</sup></p>
+                                            <p class="no-margin all-caps fs-10 light">Width</p>
+                                        </div>
+                                        <div class="col-auto b-r b-grey p-t-10 p-b-10">
+                                            <p class="no-margin text-info bold">{{item.quantity}} <sup>CM</sup></p>
+                                            <p class="no-margin all-caps fs-10 light">Height</p>
+                                        </div>
+                                        <div class="col-auto b-r b-grey p-t-10 p-b-10">
+                                            <p class="no-margin text-info bold">{{item.length}} <sup>CM</sup></p>
+                                            <p class="no-margin all-caps fs-10 light">Length</p>
+                                        </div>
+                                        <div class="col text-right p-t-10 p-b-10">
+                                            <p class="no-margin all-caps fs-10 lh-15 light">Total CBM</p>
+                                            <h5 class="no-margin text-primary bold">{{parseFloat((item.cbm * 100) / 100).toFixed(3)}}</h5>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row b-b b-grey p-b-20 align-items-center">
+                                <div class="col">
+                                    <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>
+                                        </div>
+                                        <div class="col-auto">
+                                            <small class="fs-10 all-caps muted">Status</small>
+                                            <p class="no-margin bold">{{status}}</p>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-auto">
+                                            <small class="fs-10 all-caps muted">Warehouse</small>
+                                            <h6 class="no-margin small">{{item.order.warehouse.id === 3 ? 'Guang Zhou' : 'Yiwu'}}</h6>
+                                        </div>
+                                        <div class="col-auto">
+                                            <small class="fs-10 all-caps muted">Delivery Address</small>
+                                            <h6 class="no-margin small">{{item.order.address.reference}} <i class="fa fa-info-circle m-l-5" v-tooltip:right="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" ></i></h6>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row p-t-10 p-b-10">
+                                <div class="col-auto p-r-0">
+                                    <div class="row justify-content-center">
+                                        <div class="col-auto">
+                                            <i class="fa fa-check fs-15 p-t-15" :class="{'text-primary': status !== 'Ready To Ship', 'muted': status === 'Ready To Ship'}"></i>
+                                        </div>
+                                    </div>
+                                    <div class="row justify-content-center">
+                                        <div class="col-auto">
+                                            <div class="b-l b-dashed " style="height: 40px;" :class="{'b-primary': status === 'Preparing Delivery' || status === 'Delivered', 'b-grey': status !== 'Preparing Delivery' || status !== 'Delivered'}"></div>
+                                        </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">
+                                        <div class="col">
+                                            <div class="col-auto">
+                                                <small class="fs-10 all-caps muted">Shipping Date</small>
+                                                <h6 class="no-margin small">{{item.container ? item.container.transport[0].current_schedule.etd : 'n/a'}}</h6>
+                                            </div>
+                                        </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>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-t-25">
+                        <div class="col"></div>
+                        <div class="col b-t b-primary" style="border-top-width: 5px;"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+          status: {
+              required: true,
+              type: String
+          }
+        },
+        created(){
+            $('[data-toggle="tooltip"]').tooltip()
+        },
+        data(){
+            return {
+                expanded: false
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ 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
new file mode 100644
index 00000000..6c037efc
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -0,0 +1,72 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row align-items-center p-t-5 p-b-5">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 lh-25 btn-rounded bg-white" v-if="item.type === 0">
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                             width="30" height="30"
+                             viewBox="0 0 172 172"
+                             style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M21.5,21.5v129h129v-129zM25.8,25.8h45.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15h21.5c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15h45.15v120.4h-45.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.18418,0 -2.15,0.96582 -2.15,2.15h-21.5c0,-1.18418 -0.96582,-2.15 -2.15,-2.15c-1.18418,0 -2.15,0.96582 -2.15,2.15h-45.15zM73.1,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,30.1c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,36.55c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM72.025,49.45c-1.15898,-0.0168 -2.24238,0.59629 -2.83027,1.5957c-0.58789,1.00781 -0.58789,2.25078 0,3.25859c0.58789,0.99941 1.67129,1.6125 2.83027,1.5957h27.95c1.15899,0.0168 2.24238,-0.59629 2.83027,-1.5957c0.58789,-1.00781 0.58789,-2.25078 0,-3.25859c-0.58789,-0.99941 -1.67129,-1.6125 -2.83027,-1.5957zM73.1,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM79.55,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,131.15c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,137.6c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                    </div>
+                    <div class="icon-thumbnail padding-5 lh-25 btn-rounded bg-master-lightest m-r-0" v-if="item.type === 1">
+                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                             width="30" height="30"
+                             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="M60.2252,36.52061c-0.12239,-0.00062 -0.24461,0.00922 -0.36533,0.02939h-25.45986c-0.98721,-0.00039 -1.84785,0.6715 -2.08701,1.6293c-5.73407,22.93414 -11.46597,45.86604 -17.2,68.8c-0.00627,0.03067 -0.01187,0.06147 -0.0168,0.09238c-0.00768,0.03064 -0.01468,0.06144 -0.021,0.09238c-0.00324,0.02514 -0.00604,0.05034 -0.0084,0.07559c-0.00628,0.05441 -0.01049,0.10904 -0.0126,0.16377c-0.00212,0.03216 -0.00352,0.06436 -0.0042,0.09658v27.95c0.00012,1.18736 0.96264,2.14988 2.15,2.15h17.2c0.0056,0.00002 0.0112,0.00002 0.0168,0c0.06595,-0.00117 0.1318,-0.00537 0.19736,-0.0126c0.06192,-0.00572 0.12357,-0.01413 0.18477,-0.0252c0.00981,-0.00133 0.01961,-0.00273 0.02939,-0.0042c0.0056,-0.00138 0.0112,-0.00278 0.0168,-0.0042c0.06372,-0.01392 0.12677,-0.03074 0.18897,-0.05039c0.06684,-0.01919 0.1327,-0.04161 0.19736,-0.06719c0.0014,-0.0014 0.0028,-0.0028 0.0042,-0.0042c0.0014,0 0.0028,0 0.0042,0c0.06454,-0.02906 0.12761,-0.0613 0.18897,-0.09658c0.05014,-0.02743 0.09917,-0.05685 0.14697,-0.08818c0.01267,-0.00687 0.02527,-0.01387 0.03779,-0.021c0.01839,-0.01232 0.03659,-0.02491 0.05459,-0.03779c0.04025,-0.02942 0.07947,-0.06024 0.11758,-0.09238c0.00422,-0.00418 0.00842,-0.00838 0.0126,-0.0126c0.04961,-0.0426 0.09725,-0.08744 0.14277,-0.13438c0.05032,-0.05215 0.09797,-0.10681 0.14277,-0.16377c0.03382,-0.04216 0.06604,-0.08559 0.09658,-0.13018c0.00996,-0.01388 0.01976,-0.02788 0.02939,-0.04199c0.01147,-0.01803 0.02267,-0.03623 0.03359,-0.05459c0.02537,-0.04394 0.04918,-0.08876 0.07139,-0.13438c0.00282,-0.00559 0.00562,-0.01119 0.0084,-0.0168c0.02935,-0.05894 0.05597,-0.11919 0.07979,-0.18057c0.02213,-0.05791 0.04174,-0.11676 0.05879,-0.17637c0.00285,-0.00838 0.00565,-0.01678 0.0084,-0.0252c0.00592,-0.02091 0.01152,-0.04191 0.0168,-0.06299c0.00762,-0.02924 0.01462,-0.05864 0.021,-0.08818l0.0126,-0.05879c0.00001,-0.0028 0.00001,-0.0056 0,-0.0084l2.6707,-13.25693h93.61738l2.6833,13.31572c-0.00001,0.0042 -0.00001,0.0084 0,0.0126c0.02839,0.13961 0.07059,0.27606 0.12598,0.40732c0.05578,0.13254 0.12471,0.25915 0.20576,0.37793c0.0406,0.0581 0.08404,0.11416 0.13018,0.16797c0,0.0014 0,0.0028 0,0.0042c0.09202,0.10932 0.19471,0.2092 0.30654,0.29814c0.0014,0 0.0028,0 0.0042,0c0.11106,0.08859 0.23062,0.16595 0.35693,0.23096c0.0014,0 0.0028,0 0.0042,0c0.0629,0.03256 0.12736,0.06199 0.19316,0.08818c0.0014,0 0.0028,0 0.0042,0c0.06466,0.02557 0.13053,0.048 0.19736,0.06719c0.0014,0 0.0028,0 0.0042,0c0.06772,0.02017 0.13639,0.03698 0.20576,0.05039c0.0014,0 0.0028,0 0.0042,0c0.06953,0.01184 0.1396,0.02025 0.20996,0.0252c0.0014,0 0.0028,0 0.0042,0c0.0028,0.00001 0.0056,0.00001 0.0084,0c0.04753,0.00298 0.09515,0.00438 0.14277,0.0042c0.0196,0.00027 0.03919,0.00027 0.05879,0h17.14121c1.18736,-0.00012 2.14988,-0.96264 2.15,-2.15v-27.95c0.00002,-0.0056 0.00002,-0.0112 0,-0.0168c-0.00117,-0.06595 -0.00537,-0.1318 -0.0126,-0.19736c-0.00479,-0.05624 -0.0118,-0.11228 -0.021,-0.16797c-0.00263,-0.01543 -0.00543,-0.03083 -0.0084,-0.04619c-0.00135,-0.00841 -0.00275,-0.01681 -0.0042,-0.0252c-0.00524,-0.02248 -0.01084,-0.04488 -0.0168,-0.06719c-5.73403,-22.93396 -11.46593,-45.86586 -17.2,-68.8c-0.23916,-0.9578 -1.09981,-1.62969 -2.08701,-1.6293h-25.43887c-0.14971,-0.02579 -0.30173,-0.03564 -0.45352,-0.02939c-0.0873,0.0045 -0.17424,0.01431 -0.26035,0.02939h-25.11553c-0.12072,-0.02018 -0.24294,-0.03001 -0.36533,-0.02939c-0.10416,0.00226 -0.20801,0.01208 -0.31074,0.02939h-25.11133c-0.1055,-0.01772 -0.21218,-0.02755 -0.31914,-0.02939zM36.07969,40.85h21.68057l-0.50811,4.03125l-0.5417,4.3c-0.04143,0.31452 -0.01274,0.6343 0.08399,0.93643l-0.06299,0.34434l1.31855,1.40674l0.74326,0.13437l1.72168,-0.86084l0.07559,-0.42412c0.21105,-0.2952 0.34395,-0.63901 0.38633,-0.99941l0.5417,-4.3l0.57529,-4.56875h21.75615v4.3v4.3c-0.01097,0.77537 0.39641,1.49657 1.06613,1.88746c0.66972,0.39088 1.49803,0.39088 2.16775,0c0.66972,-0.39088 1.07709,-1.11209 1.06613,-1.88746v-4.3v-4.3h21.75615l0.55849,4.41758c0.00381,0.05057 0.00942,0.10099 0.0168,0.15117l0.5417,4.3c0.02311,0.19927 0.074,0.39433 0.15117,0.57949l-0.02939,0.16377l0.37793,0.40732c0.05013,0.05882 0.1034,0.11489 0.15957,0.16797l0.77686,0.83145l0.74746,0.13437l1.72168,-0.86084l0.11338,-0.62988c0.22378,-0.40546 0.31068,-0.87233 0.24776,-1.33115l-0.5417,-4.3l-0.50811,-4.03125h21.68057c5.37556,21.5005 10.74946,42.9994 16.125,64.5h-29.68428l-0.57529,-4.56875c-0.12489,-1.12257 -1.09704,-1.95716 -2.22559,-1.91064c-0.60664,0.02496 -1.17444,0.30523 -1.56321,0.77158c-0.38877,0.46636 -0.56225,1.07534 -0.47761,1.67656l0.50811,4.03125h-29.87744v-4.3c0.00796,-0.58115 -0.21968,-1.14076 -0.63105,-1.55134c-0.41137,-0.41057 -0.97142,-0.63714 -1.55255,-0.62806c-1.18576,0.01854 -2.13264,0.9936 -2.11641,2.17939v4.3h-29.87744l0.50811,-4.03125c0.08573,-0.61255 -0.09647,-1.23235 -0.50006,-1.70106c-0.40359,-0.46871 -0.98946,-0.74092 -1.60795,-0.74709c-1.10305,-0.01106 -2.03555,0.8144 -2.1584,1.91064l-0.57529,4.56875h-29.68428c5.37554,-21.5006 10.74944,-42.9995 16.125,-64.5zM86,55.9l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM57.71826,56.23594l-1.72168,0.86504l-0.34014,1.89385l1.31855,1.40674l0.74326,0.13437l1.72588,-0.86084l0.33594,-1.89805l-1.31436,-1.40674zM114.28174,56.23594l-1.72588,0.86504l-0.33594,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31855,-1.40674zM86,64.5l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM56.64746,64.76875l-1.72588,0.86504l-0.33594,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM115.35254,64.76875l-1.72168,0.86504l-0.34014,1.89385l1.31856,1.40674l0.74326,0.13437l1.72588,-0.86084l0.33594,-1.89805l-1.31436,-1.40674zM86,73.1l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM55.57246,73.30156l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31856,-1.40674zM116.42754,73.30156l-1.72168,0.86504l-0.34014,1.89385l1.31856,1.40674l0.74326,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM86,81.7l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM54.49746,81.83437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM117.50254,81.83437l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM86,90.3l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13437l1.72168,-0.86504l0.34014,-1.89385l-1.31436,-1.40674zM53.42246,90.36719l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM118.57754,90.36719l-1.72168,0.86504l-0.34014,1.89385l1.31436,1.40674l0.74746,0.13438l1.72168,-0.86084l0.34014,-1.89805l-1.31436,-1.40674zM19.35,109.65h133.3v23.65h-12.9v-12.9c-0.00012,-1.18736 -0.96264,-2.14988 -2.15,-2.15h-103.2c-1.18736,0.00012 -2.14988,0.96264 -2.15,2.15v12.9h-12.9z"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col">
+                    <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>
+                        </div>
+                        <div class="col-auto text-center">
+                            <p class="no-margin all-caps fs-10 light">Qty</p>
+                            <p class="no-margin bold">{{item.quantity}}</p>
+                        </div>
+                        <div class="col-auto">
+                            <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 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>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="expanded" >
+                <div class="col bg-white p-t-15 p-b-15">
+                    <div class="row m-b-5" v-if="item.transport.tracking_number">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Description</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12">{{item.description}}</p>
+                        </div>
+                    </div>
+                    <div class="row" v-if="item.transport.tracking_number">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Tracking Number:</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12">{{item.transport.tracking_number}}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index a90125ce..84525c41 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -95,7 +95,7 @@
                                     <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="originWarehouse">
+                                                <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"
@@ -124,7 +124,7 @@
                                     <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="originWarehouse">
+                                                <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"
@@ -153,7 +153,7 @@
                                     <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="originWarehouse">
+                                                <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"
@@ -176,23 +176,150 @@
                             <div class="row no-margin">
                                 <div class="col bg-master-lightest padding-30">
                                     <div class="row tabsContainer tabContent active" tab-name="originWarehouse">
+                                        <div class="col-4">
+                                            <div class="row">
+                                                <div class="col bg-complete-lighter p-b-10">
+                                                    <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>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <parcel-component v-for="parcel in order.parcels" :data="parcel" :key="parcel.id"></parcel-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                         <div class="col">
                                             <div class="row">
                                                 <div class="col">
-                                                    <div class="row">
+                                                    <div class="row" v-if="order.origin_warehouse_packages.length">
                                                         <div class="col">
-                                                            <div class="row align-items-center justify-content-center p-t-50 p-b-50" >
-                                                                <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-for="group in Math.ceil(order.origin_warehouse_packages.length / 2)">
+                                                                <div class="col-12 p-r-0" :class="'col-md-'+(12/2)" v-for="item in order.origin_warehouse_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.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">
-                                                                            <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>
+                                                                            <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">
+                                                    <div class="row" v-if="order.in_transit_packages.length">
+                                                        <div class="col">
+                                                            <div class="row" v-for="group in Math.ceil(order.in_transit_packages.length / 3)">
+                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.in_transit_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 class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!order.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="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="destinationWarehouse">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row" v-if="order.destination_warehouse_packages.length">
+                                                        <div class="col">
+                                                            <div class="row" v-for="group in Math.ceil(order.destination_warehouse_packages.length / 3)">
+                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.destination_warehouse_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.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">
+                                                                    <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="delivery">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row" v-if="order.delivered_packages.length">
+                                                        <div class="col">
+                                                            <div class="row" v-for="group in Math.ceil(order.delivered_packages.length / 3)">
+                                                                <div class="col-12" :class="'col-md-'+(12/3)" v-for="item in order.delivered_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.delivered_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>
diff --git a/resources/views/pages/accounts/login.blade.php b/resources/views/pages/accounts/login.blade.php
index 863e7523..bc31ecc4 100644
--- a/resources/views/pages/accounts/login.blade.php
+++ b/resources/views/pages/accounts/login.blade.php
@@ -62,7 +62,7 @@
                     <loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
                     <div class="row justify-content-center" v-show="!$store.getters.isLoading('loginSection')">
                         <div class="col">
-                            <registration-form-component section="registrationSection"></registration-form-component>
+                            <registration-form-component section="loginSection"></registration-form-component>
                         </div>
                     </div>
                 </div>
diff --git a/routes/web.php b/routes/web.php
index 6781c3f3..0281ac90 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,10 @@
 <?php
 
+use App\Classes\General\Services\GeneratesInitials;
 use App\Models\CompanyConnection;
+use App\Models\OldCompany;
 use App\Models\Order;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -64,4 +67,13 @@ Route::get('/customer/{marking}', function ($marking) {
     return view('pages.customers.profile', ['id' => $id]);
 })->name('customer.profile');
 
-Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
\ No newline at end of file
+Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
+
+Route::get('/test', function(){
+    $addresses = \App\Models\Address::all();
+    foreach ($addresses as $address){
+        $address->street_one = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_one, $address->district, $address->postcode);
+        $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode);
+        $address->save();
+    }
+})->name('test');
\ No newline at end of file