new registration ui flow

Development

See merge request CIEFWorldwideSdnBhd/shipping-portal!116

.env.example

@@ -51,3 +51,7 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 UNITY_APP_URL="https://unity.izyim.com"
+EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
+MIX_EXCHANGE_URL="${EXCHANGE_URL}"
+
+YD_API_CODE=''

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -63,7 +63,7 @@ abstract class AbstractControllerLogic
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
-                $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
+                !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
         }
     }

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

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

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class Delivered implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::COMPLETED);
+            }
+        )->whereHas('deliverySchedules',
+            function($schedule) {
+                return $schedule->where('eta', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class HasPendingDelivery implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $value ? $builder->whereHas('packingLists', function (Builder $query) use($value) {
+            $query->whereDoesntHave('transports');
+        }) : $builder->whereDoesntHave('packingLists', function (Builder $query) use($value) {
+            $query->whereDoesntHave('transports');
+        });
+    }
+
+}

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InDestinationWarehouse implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::COMPLETED);
+            }
+        )->whereDoesntHave('deliverySchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InOriginWarehouse implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereDoesntHave('shippingSchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())
+                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InTransit implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::PENDING_VERIFICATION);
+            }
+        )->whereHas('shippingSchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())
+                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

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

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

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Support\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class PackingListDeliveryStatus implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $value == 1 ? $builder->whereHas('containers', function ($query){
+            $query->where('containers.status', ApprovalStatus::COMPLETED);
+        })->whereDoesntHave('transports') : ($value == 2 ? $builder->whereHas('transports', function (Builder $query) use ($value) {
+            $query->whereDoesntHave('schedules', function (Builder $query) use ($value) {
+                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
+            });
+        }) : $builder->whereHas('transports', function (Builder $query) use ($value) {
+            $query->whereHas('schedules', function (Builder $query) use ($value) {
+                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
+            });
+        }));
+    }
+}

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

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

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

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

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+
+class WarehouseParcels implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function ($query){
+            return $query->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->where('status', ApprovalStatus::APPROVED);
+        });
+    }
+}

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

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
+
+class WithArrivalDate implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->leftJoin('transport_arrangements', function ($join) {
+            $join->on('packing_lists.id', '=', 'transport_arrangements.owner_id')->where('transport_arrangements.owner_type', 'App\Models\PackingList');
+        })->addSelect(['packing_lists.*', DB::raw('transport_arrangements.drop_date as arrival_date')]);
+    }
+}

app/Classes/General/Interfaces/Notifiable.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+interface Notifiable
+{
+    public function subject(): MorphTo;
+
+    public function target(): MorphTo;
+
+    public function causer(): MorphTo;
+}

app/Classes/General/Interfaces/Packable.php

@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 interface Packable
 {
-
     public function packingLists(): morphMany;
 
 }

app/Classes/General/Interfaces/Transactionable.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Transactionable
+{
+
+    public function transactions(): morphMany;
+
+}

app/Classes/Jobs/CurlContainerListJob.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use Carbon\Carbon;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class CurlContainerListJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-
-    private $page;
-
-    public function __construct($page = 1)
-    {
-        $this->page = $page;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function handle()
-    {
-        $cookies = $this->getCookie();
-
-        $headers = [
-            'Content-Type' => 'application/json',
-            'Cookie' => $cookies,
-        ];
-
-        $last_two_month = Carbon::now()->subMonth(2)->format('Y-m-d');
-
-        $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', [\GuzzleHttp\RequestOptions::JSON => json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":' . $this->page . ',"PageSize":10,"PageOffset":0,"SortExpression":"CreatedOn DESC","GroupExpression":"","Filter":["LoadedTime:<=%js%\"' . $last_two_month . 'T00:00:00.000\"\u0000"],"ContextKey":"view1","FilterIsExternal":false,"LookupContextFieldName":null,"LookupContextController":null,"LookupContextView":null,"LookupContext":null,"Inserting":false,"LastCommandName":null,"ExternalFilter":[],"DoesNotRequireData":false,"LastView":"grid1","Tag":null,"RequiresFirstLetters":false,"ViewType":"Grid","SupportsCaching":true,"SystemFilter":null,"RequiresRowCount":true,"QuickFindHint":null,"RequiresPivot":false,"PivotDefinitions":null,"RequiresMetaData":true}}')]);
-
-        $data = json_decode($res->getBody()->getContents());
-
-        if (!empty($data->d->Rows)) {
-            // insert data here
-
-            // next page
-            $this->page = $this->page > 0 ? $this->page + 1 : 1;
-            CurlContainerListJob::dispatch($this->page + 1)
-                ->delay(Carbon::now()->addSeconds(10));
-        }
-    }
-
-    public function getCookie()
-    {
-        // get latest cookies
-        $client = new \GuzzleHttp\Client(['cookies' => true]);
-        $r = $client->request('GET', 'http://portal.vtnation.com.my');
-        $call_cookie = $client->getConfig('cookies');
-        $call_cookie = $call_cookie->toArray();
-        $latest_cookie = [];
-
-        foreach ($call_cookie as $key => $row) {
-            $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
-        }
-        $latest_cookie = implode(';', $latest_cookie);
-
-        // get access token
-        $headers = [
-            'Content-Type' => 'application/json',
-            'Cookie' => $latest_cookie,
-        ];
-        $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
-            "username" => "CIEF",
-            "password" => "0122120880",
-            "createPersistentCookie" => true,
-        ]]);
-
-        $token = json_decode($res->getBody()->getContents());
-        $token = $token->d->AccessToken;
-
-        $latest_cookie = $latest_cookie . ';AppVTCC=' . $token;
-        return $latest_cookie;
-    }
-}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchOrdersFromYDPortalJob 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(FetchOrderListsFromYdPortalProcessor::class))->execute();
+    }
+
+}

app/Classes/Modules/Accounts/ControllersLogic/CrossAuthenticateUserLogic.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Modules\Accounts\Processors\CrossAuthenticationProcessor;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CrossAuthenticateUserLogic extends AbstractControllerLogic
+{
+
+    protected function notification():array {
+        return [
+            'title' => 'Cross Authentication',
+            'message' => 'You have successfully logged in to your account'
+        ];
+    }
+
+    /** @var CrossAuthenticationProcessor */
+    private $crossAuthenticationProcessor;
+
+
+    /**
+     * CrossAuthenticateUserLogic constructor.
+     * @param CrossAuthenticationProcessor $authenticationProcessor
+     */
+    public function __construct(CrossAuthenticationProcessor $crossAuthenticationProcessor)
+    {
+        $this->crossAuthenticationProcessor = $crossAuthenticationProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function logic(Request $request): JsonResponse {
+        return $this->response($this->crossAuthenticationProcessor->execute($request));
+    }
+
+}

app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php

@@ -27,7 +27,6 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken)
     {
-        logger("logout user logic");
         $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
     }
 

app/Classes/Modules/Accounts/DataTransferObjects/CrossAuthenticationCredentialsObject.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class CrossAuthenticationCredentialsObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $access_token;
+
+    /** @var string */
+    private $platform;
+
+    /**
+     * CrossAuthenticationCredentialsObject constructor.
+     * @param string $access_token
+     * @param string $platform
+     */
+    public function __construct(string $access_token, int $platform)
+    {
+        $this->access_token = $access_token;
+        $this->platform = $platform;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAccessToken(): string
+    {
+        return $this->access_token;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPlatform(): int
+    {
+        return $this->platform;
+    }
+}

app/Classes/Modules/Accounts/DataTransferObjects/UserSocialAccountObject.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\User;
+
+class UserSocialAccountObject implements DataTransferObject
+{
+    /** @var String */
+    private $app_id;
+
+    /** @var User */
+    private $user;
+
+    /** @var integer */
+    private $platform;
+
+    /**
+     * UserSocialAccountObject constructor.
+     * @param String $token
+     * @param String $app_id
+     */
+    public function __construct(String $app_id, User $user, int $platform)
+    {
+        $this->app_id = $app_id;
+        $this->user = $user;
+        $this->platform = $platform;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAppId(): String
+    {
+        return $this->app_id;
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPlatform(): int
+    {
+        return $this->platform;
+    }
+}

app/Classes/Modules/Accounts/Processors/CrossAuthenticationProcessor.php

@@ -0,0 +1,211 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Processors;
+
+use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserSocialAccountObject;
+
+use App\Classes\Modules\Accounts\Services\CrossAuthenticatesUser;
+use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
+use App\Classes\Modules\Accounts\Standards\Rules\CanCrossAuthenticateUser;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
+use App\Classes\Modules\Accounts\Services\CreatesUserSocialAccount;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+use Illuminate\Http\Request;
+use App\Models\UserSocialAccount;
+
+class CrossAuthenticationProcessor
+{
+
+    /** @var CanCrossAuthenticateUser */
+    private $canCrossAuthenticateUser;
+
+    /** @var CrossAuthenticatesUser */
+    private $authenticatesUser;
+
+    /** @var GeneratesAuthenticationToken */
+    private $generatesAuthenticationToken;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /** @var AuthenticationRedirect */
+    private $authenticationRedirect;
+
+    /** @var CreateUserProcessor */
+    private $createUserProcessor;
+
+    /** @var CreateCompanyProcessor */
+    private $createCompanyProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateCompanyModuleProcessor */
+    private $createCompanyModuleProcessor;
+
+    /** @var CreatesCompanyConnection */
+    private $createsCompanyConnection;
+
+    /** @var ApprovesCompanyConnection */
+    private $approvesCompanyConnection;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var UploadIdentityDocumentProcessor */
+    private $uploadIdentityDocumentProcessor;
+
+    /** @var CreatesUserSocialAccount */
+    private $createsUserSocialAccount;
+
+    /**
+     * CrossAuthenticationProcessor constructor.
+     * @param CanCrossAuthenticateUser $canCrossAuthenticateUser
+     * @param CrossAuthenticatesUser $crossAuthenticatesUser
+     * @param GeneratesAuthenticationToken $generatesAuthenticationToken
+     * @param FetchesUser $fetchesUser
+     * @param AuthenticationRedirect $authenticationRedirect
+     * @param CreateUserProcessor $createUserProcessor
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
+     * @param CreatesCompanyConnection $createsCompanyConnection
+     * @param ApprovesCompanyConnection $approvesCompanyConnection
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
+     * @param CreatesUserSocialAccount $createsUserSocialAccount
+     */
+    public function __construct(
+        CanCrossAuthenticateUser $canCrossAuthenticateUser, 
+        CrossAuthenticatesUser $crossAuthenticatesUser, 
+        GeneratesAuthenticationToken $generatesAuthenticationToken, 
+        FetchesUser $fetchesUser, 
+        AuthenticationRedirect $authenticationRedirect,
+        CreateUserProcessor $createUserProcessor,
+        CreateCompanyProcessor $createCompanyProcessor,
+        CreateContactProcessor $createContactProcessor,
+        CreateCompanyModuleProcessor $createCompanyModuleProcessor,
+        CreatesCompanyConnection $createsCompanyConnection,
+        ApprovesCompanyConnection $approvesCompanyConnection,
+        AssignEmployeeProcessor $assignEmployeeProcessor,
+        UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor,
+        CreatesUserSocialAccount $createsUserSocialAccount
+    )
+    {
+        $this->canCrossAuthenticateUser = $canCrossAuthenticateUser;
+        $this->crossAuthenticatesUser = $crossAuthenticatesUser;
+        $this->generatesAuthenticationToken = $generatesAuthenticationToken;
+        $this->fetchesUser = $fetchesUser;
+        $this->authenticationRedirect = $authenticationRedirect;
+        $this->createUserProcessor = $createUserProcessor;
+        $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->approvesCompanyConnection = $approvesCompanyConnection;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
+        $this->createsUserSocialAccount = $createsUserSocialAccount;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return array
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request): array {
+
+        $object = new CrossAuthenticationCredentialsObject($request->input('access_token'), $request->input('platform'));
+
+        $this->canCrossAuthenticateUser->passes($object);
+
+        $cross = $this->crossAuthenticatesUser->execute($object);
+
+        $user_social_account = UserSocialAccount::where('app_id', $cross->token->user->id)->first();
+        if (!$user_social_account) {
+
+            $request->request->add([
+                'name' => $cross->token->user->name,
+                'email' => $cross->token->user->email,
+                'password' => 'pass123',
+                'password_confirmation' => 'pass123',
+            ]);
+
+            $user = $this->createUserProcessor->execute(
+                $request, 
+                RoleTypes::USER, 
+                env('APP_ENV') != 'production' ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION
+            );
+
+            $company = $this->createCompanyProcessor->execute(
+                $cross->payload->data->name,
+                CompanyType::COMPANY_BUSINESS, 
+                ApprovalStatus::PENDING_SUBMISSION
+            );
+
+            $contactObject = new ContactObject(
+                $cross->payload->data->contact->reference, 
+                $cross->payload->data->contact->phone, 
+                $cross->payload->data->contact->email, 
+                $cross->payload->data->contact->wechat_id
+            );
+            $contact = $this->createContactProcessor->execute($contactObject, $company);
+
+            $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
+
+            $connectionObject = new CompanyConnectionObject(
+                $companyModule, 'CIEF', 
+                mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate()
+            );
+            $connection = $this->createsCompanyConnection->execute($connectionObject);
+
+            $this->approvesCompanyConnection->execute($connection);
+
+            $object = new EmploymentObject($companyModule, $user);
+            $this->assignEmployeeProcessor->execute($object);
+
+            $request->request->add([
+                'files' => [$cross->document->src],
+                'identification_no' => $cross->payload->data->identification->reference,
+            ]);
+
+            $this->uploadIdentityDocumentProcessor->execute($request, $company);
+
+            $object = new UserSocialAccountObject(
+                $cross->token->user->id, 
+                $user,
+                $request->input('platform')
+            );
+            $this->createsUserSocialAccount->execute($object);
+        }
+        else {
+            $user = $user_social_account->user()->first();
+        }
+
+        return ['access_token' => $this->generatesAuthenticationToken->execute($user), 'redirect_url' => $this->authenticationRedirect->url($user)];
+    }
+}

app/Classes/Modules/Accounts/Processors/GenerateEmailVerificationAttemptProcessor.php

@@ -56,4 +56,4 @@ class GenerateEmailVerificationAttemptProcessor
 
     }
 
-}
+}

app/Classes/Modules/Accounts/Services/CreatesUserSocialAccount.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserSocialAccountObject;
+use App\Models\UserSocialAccount;
+
+class CreatesUserSocialAccount extends AbstractUpdateRecord
+{
+    /**
+     * @param UserSocialAccountObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(UserSocialAccountObject $object) {
+        $model = new UserSocialAccount();
+        $model->user_id = $object->getUser()->id;
+        $model->app_id = $object->getAppId();
+        $model->platform = $object->getPlatform();
+        return $this->handler($model);
+
+    }
+}

app/Classes/Modules/Accounts/Services/CrossAuthenticatesUser.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\AccessUnauthorisedException;
+use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
+use App\Classes\ValueObjects\Constants\PlatformType;
+
+class CrossAuthenticatesUser
+{
+
+    /**
+     * @param CrossAuthenticationCredentialsObject $object
+     * @return false|string
+     * @throws AccessUnauthorisedException
+     */
+
+    public function execute(CrossAuthenticationCredentialsObject $object){
+
+        if ($object->getPlatform() == PlatformType::EXCHANGE) {
+
+            $token = $object->getAccessToken();
+
+            $tokenParts = explode(".", $token);  
+            $tokenPayload = base64_decode($tokenParts[1]);
+            $jwtPayload = json_decode($tokenPayload);
+
+            $response = Http::withToken($object->getAccessToken())->get(env('EXCHANGE_URL') . 'api/v1/company/' .  $jwtPayload->user->company_id . '/show')->object();
+
+            $response_document = Http::withToken($object->getAccessToken())->get(env('EXCHANGE_URL') . 'api/v1/storage/' .  $response->payload->data->identification->files[0]->file->file_info[0]->original->file . '/fetch')->object();
+            $response->token = $jwtPayload;
+            $response->document = $response_document->payload;
+        }
+
+        return $response;
+
+    }
+
+}

app/Classes/Modules/Accounts/Services/FetchesUserSocialAccount.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\UserSocialAccount;
+
+class FetchesUserSocialAccount extends AbstractFetchRecord
+{
+
+    /** @var UserSocialAccount */
+    private $repository;
+
+    /**
+     * FetchesUser constructor.
+     * @param UserSocialAccount $repository
+     */
+    public function __construct(UserSocialAccount $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Accounts/Standards/Rules/CanCrossAuthenticateUser.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
+use App\Classes\Modules\Accounts\Standards\Validators\UserCrossAuthenticationValidation;
+
+class CanCrossAuthenticateUser extends AbstractRule
+{
+
+    /** @var UserCrossAuthenticationValidation */
+    private $userCrossAuthenticationValidation;
+
+    /**
+     * CanCrossAuthenticateUser constructor.
+     * @param UserCrossAuthenticationValidation $userCrossAuthenticationValidation
+     */
+    public function __construct(UserCrossAuthenticationValidation $userCrossAuthenticationValidation)
+    {
+        $this->userCrossAuthenticationValidation = $userCrossAuthenticationValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param AuthenticationCredentialsObject $object
+     * @return bool
+     * @throws RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->userCrossAuthenticationValidation->validate($object);
+    }
+
+    /**
+     * @param AuthenticationCredentialsObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}

app/Classes/Modules/Accounts/Standards/Validators/UserCrossAuthenticationValidation.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
+
+class UserCrossAuthenticationValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param CrossAuthenticationCredentialsObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'access_token' => $object->getAccesstoken(),
+            'platform' => $object->getPlatform()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'access_token' => 'required',
+            'platform' => 'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+
+
+
+}

app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php

@@ -4,12 +4,18 @@ namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Http\Resources\AddressResource;
+use App\Models\Address;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -39,19 +45,29 @@ class CreateAddressLogic extends AbstractControllerLogic
     /** @var CreatesAddress */
     private $createsAddress;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param FetchesDistrict $fetchesDistrict
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param CreatesAddress $createsAddress
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->canCreateAddress = $canCreateAddress;
         $this->fetchesDistrict = $fetchesDistrict;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsAddress = $createsAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
     /**
@@ -70,8 +86,19 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $this->canCreateAddress->passes($object);
 
+        /** @var Address $address */
         $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
+        if($request->input('phone')){
+            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
+            $this->createContactProcessor->execute($contactObject, $address);
+        }
+
+        if($request->input('remark')){
+            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
+            $this->createRemarkProcessor->execute($address, $remarkObject);
+        }
+
         return $this->resourceResponse(new AddressResource($address));
 
     }

app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\ListsAddresses;
+use App\Classes\Modules\Addresses\Services\ListsStates;
+use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
+use App\Http\Resources\AddressResource;
+use App\Http\Resources\StateResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListStatesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Addresses',
+            'message' => 'You have successfully retrieved a list of Addresses'
+        ];
+    }
+
+    /** @var ListsStates */
+    private $listStates;
+
+    /**
+     * ListStatesLogic constructor.
+     * @param ListsStates $listStates
+     */
+    public function __construct(ListsStates $listStates)
+    {
+        $this->listStates = $listStates;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listStates->execute($this->listStates->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(StateResource::collection($query));
+
+    }
+
+}

app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php

@@ -9,7 +9,12 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Http\Resources\AddressResource;
+use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -38,22 +43,31 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateAddress $canUpdateAddress
      * @param UpdatesAddress $updatesAddress
      * @param FetchesAddress $fetchesAddress
      * @param FetchesDistrict $fetchesDistrict
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->canUpdateAddress = $canUpdateAddress;
         $this->updatesAddress = $updatesAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->fetchesDistrict = $fetchesDistrict;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
@@ -71,8 +85,21 @@ class UpdateAddressLogic extends AbstractControllerLogic
 
         $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
+        /** @var Address $address */
         $address = $this->updatesAddress->execute($address, $object);
 
+        $address->contacts()->delete(); $address->remarks()->delete();
+
+        if($request->input('phone')){
+            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
+            $this->createContactProcessor->execute($contactObject, $address);
+        }
+
+        if($request->input('remark')){
+            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
+            $this->createRemarkProcessor->execute($address, $remarkObject);
+        }
+
         return $this->resourceResponse(new AddressResource($address));
 
     }

app/Classes/Modules/Addresses/Services/ListsStates.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use App\Models\State;
+use Illuminate\Database\Eloquent\Builder;
+
+class ListsStates extends AbstractListRecord
+{
+
+    /** @var State */
+    private $repository;
+
+    /**
+     * ListsStates constructor.
+     * @param State $repository
+     */
+    public function __construct(State $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Announcements\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
-
 class AnnouncementObject implements DataTransferObject
 {
 

app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\ControllersLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Http\Resources\TransactionResource;
+use App\Models\Booking;
+use App\Models\User;
+use App\Models\Wallet;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
+use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+class CallbackBillplzLogic
+{
+    /** @var GetBillplzBill */
+    private $getBillplzBill;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /**
+     * CallbackBillplzLogic constructor.
+     * @param GetBillplzBill $getBillplzBill
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     */
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->getBillplzBill = $getBillplzBill;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws MalformedRequestException
+     * @throws ResourceNotFoundException
+     */
+    public function execute(Request $request)
+    {
+        $billplzXSignatureObject = new BillplzXSignatureObject($request);
+
+        if(!$billplzXSignatureObject->isValidSignature()){
+            throw new MalformedRequestException('Billplz Payment validation failed.');
+        }
+
+        $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
+
+        if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
+
+        $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
+
+        if($billPlz->state === 'paid') {
+            $status = ApprovalStatus::APPROVED;
+        }
+
+        if($billPlz->state === 'due') {
+            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
+        }
+
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+
+        $marking = $transaction->owner()->first()->owner()->first();
+
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking->reference, 'transaction' => $transaction, 'status' => $status]);
+    }
+}

app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+
+use ErrorException;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillplzBillLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Billplz Bill',
+            'message' => 'You have successfully created a new Bill'
+        ];
+    }
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /**
+     * CreateBookingLogic constructor.
+     * @param CreatesBillplzBill $createsBillplzBill
+     */
+    public function __construct(CreatesBillplzBill $createsBillplzBill)
+    {
+        $this->createsBillplzBill = $createsBillplzBill;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $billPlz = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, $request->input('description'), 200, $request->input('bankName'));
+
+        if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.');
+        
+        return $this->response(['data' => $billPlz]);
+
+    }
+}

app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+use function PHPSTORM_META\map;
+
+class BillplzXSignatureObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $billPlzId;
+
+    /** @var string */
+    private $status;
+
+    /** @var array */
+    private $billPlzConstructArray;
+
+    /** @var string */
+    private $billPlzConstructString;
+
+    /** @var string  */
+    private $billPlzComputedXSignature;
+
+    /** @var string */
+    private $type;
+
+    /** @var Request  */
+    private $request;
+
+    /** @var string  */
+    private $requestXSignature;
+
+    public function __construct(Request $request)
+    {
+
+        $this->type = $request->exists('billplz') ? 'redirect' : 'callback';
+
+        $this->request = $this->type === 'redirect' ? $request->input('billplz') : $request;
+
+        $this->billPlzId = $this->request['id'];
+
+        $this->status = $this->request['transaction_status'];
+
+        $this->requestXSignature = $this->request['x_signature'];
+
+        $this->_constructBillplzArray()->_natSortBillplzArray()->_constructBillplzString()->_computeBillplzXSignature();
+    }
+
+    private function _constructBillplzArray(){
+
+        $this->billPlzConstructArray = collect($this->request)->forget('x_signature')->map(function($item, $key){
+            return $this->type === 'redirect' ? 'billplz'.$key.$item : $key.$item;
+        })->toArray();
+
+        return $this;
+    }
+
+    private function _natCaseSortBillplzArray(){
+        natcasesort($this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _natSortBillplzArray(){
+        natsort($this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _constructBillplzString(){
+        $this->billPlzConstructString = implode('|', $this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _computeBillplzXSignature(){
+        $this->billPlzComputedXSignature = hash_hmac('sha256', $this->billPlzConstructString, config('billplz.x_signature_key'));
+        return $this;
+    }
+
+    public function getBillPlzId(): string
+    {
+        return $this->billPlzId;
+    }
+
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBillPlzConstructArray(): array
+    {
+        return $this->billPlzConstructArray;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillPlzConstructString(): string
+    {
+        return $this->billPlzConstructString;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillPlzComputedXSignature(): string
+    {
+        return $this->billPlzComputedXSignature;
+    }
+
+    public function isValidSignature(): bool
+    {
+        return $this->billPlzComputedXSignature === $this->requestXSignature ? true : false;
+    }
+
+}

app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+
+class CreatesBillplzBill
+{
+
+    /**
+     * @param string $name
+     * @param string $email
+     * @param string $description
+     * @param float $amount
+     * @param string $billNumber
+     * @param null|string $bankCode
+     * @param null|Boolean $wallet
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?bool $wallet = null) {
+        try{
+//            config('billplz.maybank')
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
+                'collection_id' => $wallet ? config('billplz.wallet_collection_id') : config('billplz.collection_id'),
+                'name' => $name,
+                'email' => $email,
+                'description' => $description,
+                'amount' => $this->finalizeAmount($amount),
+                'redirect_url' => route('online_payment.redirect'),
+                'callback_url' => route('api.online_payment.callback'),
+                'reference_1_label' => 'Bank Code',
+                'reference_1' => $bankCode ? $bankCode : '',
+                'reference_2_label' => 'Bill Number',
+                'reference_2' => $billNumber
+            ]);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server' . $exception->getMessage());
+        }
+    }
+
+    protected function finalizeAmount($amount){
+        $number = round($amount, 2) * 100;
+        return (string) $number;
+    }
+}

app/Classes/Modules/Billplzs/Services/GetBillplzBill.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Http;
+
+class GetBillplzBill
+{
+
+    /**
+     * @param string $billPlzId
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billPlzId) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$billPlzId);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server');
+        }
+    }
+}

app/Classes/Modules/Companies/ControllersLogic/AssignCompanyConnectionToConnectionSegmentLogic.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Processors\AssignConnectionSegmentProcessor;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
+use App\Http\Resources\CompanyResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Assign Company Connection To Connection Segment',
+            'message' => 'You have successfully assigned Company Connection to Connection segment'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var FetchesCompanyConnection */
+    private $fetchesCompanyConnection;
+
+    /** @var AssignConnectionSegmentProcessor */
+    private $assignCompanyConnectionToConnectionSegmentProcessor;
+
+    /**
+     * AssignCompanyToSegmentLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesCompanyConnection $fetchesCompanyConnection
+     * @param AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesCompanyConnection = $fetchesCompanyConnection;
+        $this->assignCompanyConnectionToConnectionSegmentProcessor = $assignCompanyConnectionToConnectionSegmentProcessor;
+    }
+
+    /**
+     * @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
+    {
+
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $companyConnection = $this->fetchesCompanyConnection->execute(['id' => $request->route('company_connection_id')]);
+
+        $this->assignCompanyConnectionToConnectionSegmentProcessor->execute($companyConnection, $request->input('segment_id'));
+
+        return $this->resourceResponse(new CompanyResource($company));
+    }
+}

app/Classes/Modules/Companies/ControllersLogic/ListCompanyModulesLogic.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\ListsCompanyModules;
+use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
+use App\Http\Resources\CompanyModuleResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListCompanyModulesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Company Moduels',
+            'message' => 'You have successfully retrieved a list of Companies'
+        ];
+    }
+
+    /** @var CanListCompanies */
+    private $canListCompanies;
+
+    /** @var ListsCompanyModules */
+    private $listsCompanyModules;
+
+    /**
+     * ListCompaniesControllersLogic constructor.
+     * @param CanListCompanies $canListCompanies
+     * @param ListsCompanyModules $listsCompanyModules
+     */
+    public function __construct(CanListCompanies $canListCompanies, ListsCompanyModules $listsCompanyModules)
+    {
+        $this->canListCompanies = $canListCompanies;
+        $this->listsCompanyModules = $listsCompanyModules;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canListCompanies->passes();
+
+        $query = $this->listsCompanyModules->execute($this->listsCompanyModules->deserializeFilters($request->input('filters')));
+        return $this->collectionResponse(CompanyModuleResource::collection($query));
+
+    }
+
+}

app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyConnectionFromConnectionSegmentLogic.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
+use App\Classes\Modules\Companies\Services\RemovesCompanyConnectionFromConnectionSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Http\Resources\CompanyResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RemoveCompanyConnectionFromConnectionSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Detach Company Connection From Connection Segment',
+            'message' => 'You have successfully detached Company Connection from Connection segment'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var FetchesCompanyConnection */
+    private $fetchesCompanyConnection;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var RemovesCompanyConnectionFromConnectionSegment */
+    private $removesCompanyConnectionFromConnectionSegment;
+
+    /**
+     * RemoveCompanyFromSegmentLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesCompanyConnection $fetchesCompanyConnection
+     * @param FetchesSegment $fetchesSegment
+     * @param RemovesCompanyConnectionFromConnectionSegment $removesCompanyConnectionFromConnectionSegment
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, FetchesSegment $fetchesSegment, RemovesCompanyConnectionFromConnectionSegment $removesCompanyConnectionFromConnectionSegment)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesCompanyConnection = $fetchesCompanyConnection;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->removesCompanyConnectionFromConnectionSegment = $removesCompanyConnectionFromConnectionSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $companyConnection = $this->fetchesCompanyConnection->execute(['id' => $request->route('company_connection_id')]);
+
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
+
+        $this->removesCompanyConnectionFromConnectionSegment->execute($companyConnection, $segment);
+
+        return $this->resourceResponse(new CompanyResource($company));
+    }
+}

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
@@ -35,17 +36,22 @@ class UpdateCompanyLogic extends AbstractControllerLogic
     /** @var FetchesCompany */
     private $fetchesCompany;
 
+    /** @var UpdatesCompanyModuleName */
+    private $updatesCompanyModuleName;
+
     /**
      * UpdateCompanyControllersLogic constructor.
      * @param CanUpdateCompany $canUpdateCompany
      * @param UpdatesCompany $updatesCompany
      * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
      */
-    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany)
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany, UpdatesCompanyModuleName $updatesCompanyModuleName)
     {
         $this->canUpdateCompany = $canUpdateCompany;
         $this->updatesCompany = $updatesCompany;
         $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
     }
 
 
@@ -56,23 +62,17 @@ class UpdateCompanyLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
 
-            $object = new CompanyObject($request->input('reference_no'), $request->input('name'), $request->input('type'));
+        $this->canUpdateCompany->passes($object);
 
-            $this->canUpdateCompany->passes($object);
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
 
-            $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $query = $this->updatesCompany->execute($query, $object);
 
-            $query = $this->updatesCompany->execute($query, $object);
-
-            return $this->resourceResponse(new CompanyResource($query));
-
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
 
+        return $this->resourceResponse(new CompanyResource($query));
     }
 
 }

app/Classes/Modules/Companies/Processors/AssignConnectionSegmentProcessor.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Processors;
+
+use App\Classes\Modules\Companies\Services\AssignsCompanyConnectionToConnectionSegment;
+use App\Classes\Modules\Companies\Standards\Rules\CanAssignSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\CompanyConnection;
+use Illuminate\Database\Eloquent\Model;
+
+class AssignConnectionSegmentProcessor
+{
+
+    /** @var CanAssignSegment */
+    private $canAssignSegment;
+
+    /** @var AssignsCompanyConnectionToConnectionSegment */
+    private $assignsCompanyConnectionToConnectionSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /**
+     * AssignCompanyToSegmentProcessor constructor.
+     * @param CanAssignSegment $canAssignSegment
+     * @param AssignsCompanyConnectionToConnectionSegment $assignsCompanyConnectionToConnectionSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(CanAssignSegment $canAssignSegment, AssignsCompanyConnectionToConnectionSegment $assignsCompanyConnectionToConnectionSegment, FetchesSegment $fetchesSegment)
+    {
+        $this->canAssignSegment = $canAssignSegment;
+        $this->assignsCompanyConnectionToConnectionSegment = $assignsCompanyConnectionToConnectionSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+
+    /**
+     * @param CompanyConnection $companyConnection
+     * @param int|null $segmentId
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(CompanyConnection $companyConnection, ?int $segmentId = SegmentConstants::STANDARD_SEGMENT): Model {
+
+        $segment = $this->fetchesSegment->execute(['id' => $segmentId]);
+
+        $this->canAssignSegment->passes();
+
+        return $this->assignsCompanyConnectionToConnectionSegment->execute($companyConnection, $segment);
+
+    }
+
+}

app/Classes/Modules/Companies/Services/AssignsCompanyConnectionToConnectionSegment.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\CompanyConnection;
+use App\Models\Segment;
+use Illuminate\Database\QueryException;
+
+class AssignsCompanyConnectionToConnectionSegment extends AbstractUpdateRecord
+{
+    /**
+     * @param CompanyConnection $companyConnection
+     * @param Segment $segment
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(CompanyConnection $companyConnection, Segment $segment)
+    {
+        try {
+
+            $companyConnection->segments()->attach($segment);
+
+            return $companyConnection;
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+
+
+    }
+}

app/Classes/Modules/Companies/Services/FetchesCompanyConnection.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\CompanyConnection;
+
+class FetchesCompanyConnection extends AbstractFetchRecord
+{
+
+    /** @var CompanyConnection */
+    private $repository;
+
+
+    /**
+     * FetchesCompanyConnection constructor.
+     * @param CompanyConnection $repository
+     */
+    public function __construct(CompanyConnection $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Companies/Services/ListsCompanyModules.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\CompanyModule;
+
+class ListsCompanyModules extends AbstractListRecord
+{
+
+    /** @var CompanyModule */
+    private $repository;
+
+    /**
+     * ListsCompanyModules constructor.
+     * @param CompanyModule $repository
+     */
+    public function __construct(CompanyModule $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}

app/Classes/Modules/Companies/Services/RemovesCompanyConnectionFromConnectionSegment.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\CompanyConnection;
+use App\Models\Segment;
+use Illuminate\Database\QueryException;
+
+class RemovesCompanyConnectionFromConnectionSegment extends AbstractUpdateRecord
+{
+    /**
+     * @param CompanyConnection $companyConnection
+     * @param Segment $segment
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(CompanyConnection $companyConnection, Segment $segment)
+    {
+        try {
+
+            $companyConnection->segments()->detach($segment);
+
+            return $companyConnection;
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+
+
+    }
+}

app/Classes/Modules/Companies/Services/UpdatesCompany.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Models\Company;
+
+class UpdatesCompany extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param CompanyObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, CompanyObject $object) 
+    {
+        $model->name = $object->getName();
+        $model->reference = $object->getReference();
+        $model->type = $object->getType();
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Companies/Services/UpdatesCompanyModuleName.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyModuleObject;
+use App\Models\CompanyModule;
+
+class UpdatesCompanyModuleName extends AbstractUpdateRecord
+{
+
+    /**
+     * @param CompanyModule $model
+     * @param CompanyModuleObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(CompanyModule $model, string $name) 
+    {
+        $model->name = $name;
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompany.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Standards\Validators\CompanyValidation;
+
+class CanUpdateCompany extends AbstractRule
+{
+    /** @var CompanyValidation */
+    private $companyValidation;
+
+
+    /**
+     * CanUpdateCompany constructor.
+     * @param CompanyValidation $companyValidation
+     */
+    public function __construct(CompanyValidation $companyValidation)
+    {
+        $this->companyValidation = $companyValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->companyValidation->validate($object, 'PUT');
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}

app/Classes/Modules/Companies/Standards/Validators/CompanyValidation.php

@@ -15,7 +15,8 @@ class CompanyValidation extends AbstractValidation
     {
         return [
             'company_name' => $object->getName(),
-            'company_reference' => $object->getReference()
+            'company_reference' => $object->getReference(),
+            'type' => $object->getType()
         ];
     }
 

app/Classes/Modules/Contacts/Processors/CreateContactProcessor.php

@@ -2,11 +2,10 @@
 
 namespace App\Classes\Modules\Contacts\Processors;
 
+use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Services\CreatesContact;
 use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
-use App\Models\Company;
-use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateContactProcessor
@@ -15,6 +14,9 @@ class CreateContactProcessor
     /** @var CanCreateContact */
     private $canCreateContact;
 
+    /** @var CreatesContact */
+    private $createsContact;
+
     /**
      * CreateContactProcessor constructor.
      * @param CanCreateContact $canCreateContact
@@ -28,17 +30,17 @@ class CreateContactProcessor
 
     /**
      * @param ContactObject $object
-     * @param Company $company
+     * @param Contactable $contactable
      * @return Model
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(ContactObject $object, Company $company): Model
+    public function execute(ContactObject $object, Contactable $contactable): Model
     {
 
         $this->canCreateContact->passes($object);
 
-        return $this->createsContact->execute($company,$object);
+        return $this->createsContact->execute($contactable,$object);
     }
 }

app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php

@@ -54,7 +54,7 @@ class ListDocumentLogic extends AbstractControllerLogic
 
         $this->canListDocuments->passes();
 
-        $query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($request->input('filters')));
+        $query = $this->listsDocuments->execute(array_merge($this->listsDocuments->deserializeFilters($request->input('filters')), ['with_owner' => true]));
 
         return $this->collectionResponse(DocumentResource::collection($query));
 

app/Classes/Modules/Documents/ControllersLogic/UpdateDocumentReferenceLogic.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Documents\ControllersLogic;
+
+use App\Classes\Modules\Documents\Standards\Rules\CanUpdateDocumentReference;
+use App\Http\Resources\DocumentResource;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\Services\FetchesDocument;
+use App\Classes\Modules\Documents\Services\UpdatesDocumentReference;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateDocumentReferenceLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Document Reference',
+            'message' => 'You have successfully updated the Document Reference'
+        ];
+    }
+
+    /** @var CanUpdateDocumentReference*/
+    private $canUpdateDocumentReference;
+
+    /** @var UpdatesDocumentReference */
+    private $updatesDocumentReference;
+
+    /** @var FetchesDocument */
+    private $fetchesDocument;
+
+
+    /**
+     * RejectDocumentLogic constructor.
+     * @param CanApproveDocument $canApproveDocument
+     * @param ApprovesDocument $approvesDocument
+     * @param FetchesDocument $fetchesDocument
+     */
+    public function __construct(CanUpdateDocumentReference $canUpdateDocumentReference, UpdatesDocumentReference $updatesDocumentReference, FetchesDocument $fetchesDocument)
+    {
+        $this->canUpdateDocumentReference = $canUpdateDocumentReference;
+        $this->updatesDocumentReference = $updatesDocumentReference;
+        $this->fetchesDocument = $fetchesDocument;
+    }
+
+    /**
+     * @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
+    {
+        $document = $this->fetchesDocument->execute(['id' => $request->route('id')]);
+
+        $this->canUpdateDocumentReference->passes();
+
+        $document_query = $this->updatesDocumentReference->execute($document, $request->input('identification_number'));
+
+        return $this->resourceResponse(new DocumentResource($document_query));
+
+    }
+
+}

app/Classes/Modules/Documents/Services/UpdatesDocumentReference.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Document;
+
+class UpdatesDocumentReference extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Document $model
+     * @return mixed
+     */
+    public function execute(Document $model, string $reference) {
+        $model->reference = $reference;
+        return $this->handler($model);
+    }
+
+}

app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocumentReference.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\Documents\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+
+class CanUpdateDocumentReference extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param DocumentObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param DocumentObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}

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

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Container;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+
+class ExportsContainerPackingList implements FromQuery, WithHeadingRow, WithMapping
+{
+    use Exportable;
+
+    protected $id;
+
+    public function headings(): array
+    {
+        return [
+            'Marking',
+            'Refrence',
+            'Quantity',
+            'CBM',
+            'Status',
+            'Delivery Phone',
+            'Delivery Refrence',
+            'Delivery Address',
+            'Remark',
+            'Delivery Date'
+        ];
+    }
+
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {   
+        return Container::find($this->id)->packingLists();
+    }
+
+    /**
+     * @param Company $container
+     *
+     * @return array
+     */
+    public function map($packing_list): array
+    {
+        $order = $packing_list->owner()->first();
+        $address = $order->addresses()->first();
+        $company = $order->companyModule()->first();
+        $connection = $company->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $quantity = 0;
+        $cbm = 0;
+        foreach ($packing_list->packages()->get() as $key => $row) {
+            $quantity += $row->quantity;
+            $cbm += (($row->width / 100) * ($row->height / 100) * ($row->length / 100)) * $row->quantity;
+        }
+
+        $status = '';
+        if ($packing_list->transports()->count() > 0) {
+            $status = 'Delivery';
+        }
+        elseif ($packing_list->status == ApprovalStatus::SUSPENDED) {
+            $status = 'On Hold';
+        }
+        elseif ($packing_list->status != ApprovalStatus::SUSPENDED) {
+            $status = 'Release';
+        }
+
+        return [
+            $marking,
+            $order->reference,
+            $quantity,
+            $cbm,
+            $status,
+            $address->contacts()->first() ? $address->contacts()->first()->phone : 'n/a',
+            $address->contacts()->first() ? $address->contacts()->first()->reference : 'n/a',
+            $address->street_one . ' ' . $address->street_two . ' ' . $address->district->name . ' ' . $address->post_code . ' ' . $address->state->name . ' ' . $address->country->name,
+            $address->remarks()->first() ? $address->remarks()->first()->content : 'n/a',
+            $packing_list->transports()->first() ?  $packing_list->transports()->current_schedule->eta : 'n/a'
+        ];
+    }
+}

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\CompanyModule;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+
+class ExportsCustomersOrderLatestDate implements FromQuery, WithHeadingRow, WithMapping
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Marking',
+            'Name',
+            'Email',
+            'Latest Order'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return CompanyModule::where('type', '=', 1);
+    }
+
+    /**
+     * @param Company $company
+     *
+     * @return array
+     */
+    public function map($company): array
+    {
+        $connection = $company->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $employees = $company->employees()->first();
+
+        $order = $company->orders()
+            ->join('packing_lists', 'packing_lists.owner_id', '=', 'orders.id')
+            ->join('transport_arrangements', 'transport_arrangements.owner_id', '=', 'packing_lists.id')
+            ->orderBy('drop_date', 'desc')
+            ->first();
+
+        return [
+            $marking,
+            $employees ? $employees->name : '',
+            $employees ? $employees->email : '',
+            $order ? $order->drop_date : ''
+        ];
+    }
+}

app/Classes/Modules/Notifications/DataTransferObjects/NotificationObject.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\DataTransferObjects;
+
+use App\Classes\General\Interfaces\Notifiable;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+class NotificationObject  implements DataTransferObject
+{
+    /** @var string */
+    private $title;
+
+    /** @var string  */
+    private $description;
+
+    /** @var Notifiable  */
+    private $subject;
+
+    /** @var Notifiable  */
+    private $target;
+
+    /** @var Notifiable  */
+    private $causer;
+
+    /** @var int|null  */
+    private $status;
+
+    /**
+     * OrderObject constructor.
+     * @param string $reference
+     * @param int $type
+     * @param int|null $status
+     */
+    public function __construct(
+        string $title, 
+        string $description, 
+        Notifiable $subject, 
+        Notifiable $target, 
+        Notifiable $causer, 
+        ?int $status = ApprovalStatus::PENDING_VERIFICATION
+    )
+    {
+        $this->title = $title;
+        $this->description = $description;
+        $this->subject = $subject;
+        $this->target = $target;
+        $this->causer = $causer;
+        $this->status = $status;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * @return int
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return Notifiable
+     */
+    public function getSubject(): Notifiable
+    {
+        return $this->subject;
+    }
+
+    /**
+     * @return Notifiable
+     */
+    public function getTarget(): Notifiable
+    {
+        return $this->target;
+    }
+
+    /**
+     * @return Notifiable
+     */
+    public function getCauser(): Notifiable
+    {
+        return $this->causer;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+
+}

app/Classes/Modules/Notifications/Processors/CreateNotificationProcessor.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\Processors;
+
+use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
+use App\Classes\Modules\Notifications\Services\CreatesNotification;
+
+class CreateNotificationProcessor
+{
+    /** @var CreatesNotification */
+    private $createsNotification;
+
+    /**
+     * CreateNotificationProcessor constructor.
+     * @param CreatesNotification $createsNotification
+     */
+    public function __construct(CreatesNotification $createsNotification)
+    {
+        $this->createsNotification = $createsNotification;
+    }
+   
+    public function execute(NotificationObject $object)
+    {
+        $notification = $this->createsNotification->execute($object);
+        return $notification;
+    }
+}

app/Classes/Modules/Notifications/Services/CreatesNotification.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Notifications\Services;
+
+use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
+use App\Models\Notification;
+
+class CreatesNotification
+{
+    /**
+     * @param NotificationObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(NotificationObject $object) {
+        $model = new Notification();
+        $model->title = $object->getTitle();
+        $model->description = $object->getDescription();
+        $model->status = $object->getStatus();
+        $model->subject_type = get_class($object->getSubject());
+        $model->subject_id = $object->getSubject()->id;
+        $model->target_type = get_class($object->getTarget());
+        $model->target_id = $object->getTarget()->id;
+        $model->causer_type = get_class($object->getCauser());
+        $model->causer_id = $object->getCauser()->id;
+        $model->save();
+
+        return $model;
+    }
+}

app/Classes/Modules/Orders/ControllersLogic/AssignOrderRemarkLogic.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\CreatesOrderRemark;
+use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Http\Resources\RemarkResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignOrderRemarkLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Order Remark',
+            'message' => 'You have successfully created a new Order Remark'
+        ];
+    }
+
+    /** @var CanCreateRemark */
+    private $canCreateRemark;
+
+    /** @var CreatesOrderRemark */
+    private $createsOrderRemark;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * CreateRemarkLogic constructor.
+     * @param CanCreateRemark $canCreateRemark
+     * @param CreatesOrderRemark $createsOrderRemark
+     */
+    public function __construct(CanCreateRemark $canCreateRemark, CreatesOrderRemark $createsOrderRemark, FetchesOrder $fetchesOrder)
+    {
+        $this->canCreateRemark = $canCreateRemark;
+        $this->createsOrderRemark = $createsOrderRemark;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @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
+    {
+        $object = new RemarkObject(
+            $request->input('content'), 
+            $request->route('id')
+        );
+
+        $this->canCreateRemark->passes($object);
+        $query = $this->createsOrderRemark->execute($this->fetchesOrder->execute(['id' => $request->route('id')]), $object);
+        return $this->resourceResponse( new RemarkResource($query));
+    }
+}

app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php

@@ -2,12 +2,14 @@
 
 namespace App\Classes\Modules\Orders\ControllersLogic;
 
+use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
@@ -57,12 +59,21 @@ class CreateOrderLogic extends AbstractControllerLogic
 
     public function logic(Request $request) : JsonResponse {
 
+        
         $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')]);
 
+        if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+        }
+
+        if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
+            throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');
+        }
+
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
         return $this->resourceResponse(new OrderResource($order));

app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php

@@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 
 use App\Http\Resources\PackingListResource;
+use App\Models\PackingList;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Carbon\Carbon;
@@ -80,6 +81,9 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic
     /**
      * @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
     {
@@ -93,6 +97,8 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic
             PackingListType::SHIPPING_PACKING_LIST, 
             ApprovalStatus::PENDING_SUBMISSION
         );
+
+        /** @var PackingList $packingList */
         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
         $packages = $request->input('packages');

app/Classes/Modules/Orders/ControllersLogic/ShippingCostLogic.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\CalculatesCBM;
+use App\Classes\Modules\Orders\Services\CalculatesBaseRate;
+use App\Classes\Modules\Orders\Services\CalculatesSegmentRate;
+use App\Classes\Modules\Orders\Services\CalculatesStateRate;
+use App\Classes\Modules\Orders\Services\CalculatesWarehouseRate;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Transactions\Processors\CreateShippingCostTransactionProcessor;
+
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Http\Resources\OrderResource;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ShippingCostLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Order Shipping Cost',
+            'message' => 'Order shipping cost calculation done'
+        ];
+    }
+
+    /** @var CalculateCBM */
+    private $calculateCBM;
+
+    /** @var CalculatesBaseRate */
+    private $calculateBaseRate;
+
+    /** @var CalculatesSegmentRate */
+    private $calculateSegmentRate;
+
+    /** @var CalculatesStateRate */
+    private $calculateStateRate;
+
+    /** @var CalculatesWarehouse */
+    private $calculateWarehouseRate;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var ShippingCostTransactionProcessor */
+    private $shippingCostTransactionProcessor;
+
+    /**
+     * ShippingCostLogic constructor.
+     * @param CalculateCBM $calculateCBM
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(FetchesOrder $fetchesOrder, CalculatesCBM $calculateCBM, CalculatesBaseRate $calculateBaseRate, CalculatesSegmentRate $calculateSegmentRate, CalculatesStateRate $calculateStateRate, CalculatesWarehouseRate $calculateWarehouseRate, CreateShippingCostTransactionProcessor $shippingCostTransactionProcessor)
+    {
+        $this->fetchesOrder = $fetchesOrder;
+        $this->calculateCBM = $calculateCBM;
+        $this->calculatesBaseRate = $calculateBaseRate;
+        $this->calculatesSegmentRate = $calculateSegmentRate;
+        $this->calculatesStateRate = $calculateStateRate;
+        $this->calculateWarehouseRate = $calculateWarehouseRate;
+        $this->shippingCostTransactionProcessor = $shippingCostTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $order = $this->fetchesOrder->getRepository()->where(['id' => $request->route('id')])->first();
+
+        $baseRate = $this->calculatesBaseRate->execute($order);
+        $segmentRate = $this->calculatesSegmentRate->execute($order, SegmentConstants::STANDARD_SEGMENT) + $this->calculatesSegmentRate->execute($order, SegmentConstants::CUSTOM_SEGMENT);
+        $stateRate = $this->calculatesStateRate->execute($order, false) + $this->calculatesStateRate->execute($order, true);
+        $warehouseRate = $this->calculateWarehouseRate->execute($order);
+
+        $totalShippingCost = 0;
+        $totalCBM = 0;
+        $quantity = 0;
+        foreach($order->parcels as $parcel){
+            $cbm = $this->calculateCBM->execute($order, $parcel);
+
+            if($cbm > 0){
+                $totalCBM += $cbm;
+                $quantity ++;
+                $totalShippingCost += (($segmentRate + $stateRate + $warehouseRate) * $cbm);
+            }
+        }
+
+        $this->shippingCostTransactionProcessor->execute($order, $quantity, round($totalCBM,2), round($totalShippingCost,2));
+        return $this->resourceResponse(new OrderResource($order));
+    }
+
+}

app/Classes/Modules/Orders/ControllersLogic/UpdateOrderLogic.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\Exceptions\ErrorException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Orders\Services\UpdateOrderReference;
+use App\Http\Resources\OrderResource;
+use App\Models\Company;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateOrderLogic extends AbstractControllerLogic
+{
+
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Update Order',
+            'message' => 'You have successfully update the order'
+        ];
+    }
+
+    private $updateOrderReference;
+    private $fetchesOrder;
+
+    public function __construct(UpdateOrderReference $updateOrderReference, FetchesOrder $fetchesOrder)
+    {
+        $this->updateOrderReference = $updateOrderReference;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    protected function logic(Request $request): JsonResponse
+    {
+        $reference_id = $request->input('reference_id');
+
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
+
+        $order = $this->updateOrderReference->execute($order, $reference_id);
+
+        return $this->resourceResponse(new OrderResource($order));
+
+    }
+}

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

@@ -6,7 +6,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use Illuminate\Http\Request;
 
 class ApproveChangeOrderAddressProcessor
@@ -20,17 +20,27 @@ class ApproveChangeOrderAddressProcessor
     /** @var UpdatesOrdersAddress */
     private $updatesOrdersAddress;
 
+    /** @var UpdateDoFromVTPortalProcessor  */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
     /**
      * ApproveChangeOrderAddressProcessor constructor.
      * @param CanApproveChangeOrderAddress $canApproveChangeOrderAddress
      * @param FetchesAddress $fetchesAddress
      * @param UpdatesOrdersAddress $updatesOrdersAddress
+     * @param \App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      */
-    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
+    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress, \App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
     {
         $this->canApproveChangeOrderAddress = $canApproveChangeOrderAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->updatesOrdersAddress = $updatesOrdersAddress;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
     }
 
 
@@ -38,12 +48,13 @@ class ApproveChangeOrderAddressProcessor
      * @param Request $request
      * @return mixed
      * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(Request $request)
     {
-
         $status = (int) $request->route('status');
 
         $this->canApproveChangeOrderAddress->passes();
@@ -52,9 +63,13 @@ class ApproveChangeOrderAddressProcessor
 
         if($status === ApprovalStatus::APPROVED){
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
+
+            $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+            $appointee === 2  ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address);
+
         }
 
-        $this->updatesOrdersAddress->execute($address, $status);
+        $address = $this->updatesOrdersAddress->execute($address, $status);
 
         return $address;
     }

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

@@ -8,6 +8,11 @@ use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+
 use App\Classes\Modules\Orders\Services\CreatesOrder;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
@@ -33,6 +38,12 @@ class CreateOrderProcessor
     /** @var CreateOrderRolesProcessor */
     private $createOrderRolesProcessor;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * CreateOrderProcessor constructor.
      * @param CanCreateOrder $canCreateOrder
@@ -40,12 +51,14 @@ class CreateOrderProcessor
      * @param CreatesAddress $createAddress
      * @param CreateOrderRolesProcessor $createOrderRolesProcessor
      */
-    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, CreatesAddress $createAddress, CreateOrderRolesProcessor $createOrderRolesProcessor)
+    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, CreatesAddress $createAddress, CreateOrderRolesProcessor $createOrderRolesProcessor, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->canCreateOrder = $canCreateOrder;
         $this->createsOrder = $createsOrder;
         $this->createAddress = $createAddress;
         $this->createOrderRolesProcessor = $createOrderRolesProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
 
@@ -73,7 +86,37 @@ class CreateOrderProcessor
 
         $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);
+        /** @var Address $order_address */
+        $order_address = $this->createAddress->execute($order, $addressObject);
+
+        $contact = $address->contacts()->first();
+
+        if ($contact) {
+            $contactObject = new ContactObject(
+                $contact->reference,
+                $contact->phone,
+                '',
+                ''
+            );
+
+            if($contactObject->getPhone()){
+                $order_remark =  $this->createContactProcessor->execute($contactObject, $order_address);
+            }
+        }
+
+        $remark = $address->remarks()->first();
+
+        if ($remark){
+            $remarkObject = new RemarkObject(
+                $remark->content,
+                Auth()->user()->id
+            );
+
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($order_address, $remarkObject);
+            }
+        }
+
 
         $this->createOrderRolesProcessor->execute($originWarehouse, $order);
 

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

@@ -53,7 +53,7 @@ class CreateOrderRolesProcessor
         $importer = $order->companyModule;
 
         /** @var CompanyModule $destinationWarehouse */
-        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::DESTINATION_WAREHOUSE[$address->state_id ]]);
+        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::YD_GUANG_ZHOU || $originWarehouse->reference === WarehouseReferences::YD_YIWU ? WarehouseReferences::YD_DESTINATION_WAREHOUSE : WarehouseReferences::VT_DESTINATION_WAREHOUSE[$address->state_id]]);
 
         /** @var CompanyModule $freightForwarder */
         $freightForwarder = $originWarehouse->company->companyModules()->freightForwarders()->first();
@@ -79,33 +79,9 @@ class CreateOrderRolesProcessor
         $roleObject = new OrderRoleObject($order, $destinationWarehouse, OrderRoleTypes::DESTINATION_WAREHOUSE);
         $this->createsOrderRole->execute($roleObject);
 
-
         $roleObject = new OrderRoleObject($order, $freightForwarder, OrderRoleTypes::LAST_MILE_DELIVERY_DRIVER);
         $this->createsOrderRole->execute($roleObject);
 
         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;
     }
 }

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

@@ -9,6 +9,10 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\DeletesAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 
 use Illuminate\Http\Request;
 
@@ -29,6 +33,12 @@ class RequestChangeOrderAddressProcessor
     /** @var DeletesAddress */
     private $deletesAddress;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * ChangeOrderAddressProcessor constructor.
      * @param FetchesOrder $fetchesOrder
@@ -36,7 +46,7 @@ class RequestChangeOrderAddressProcessor
      * @param FetchesAddress $fetchesAddress
      * @param DeletesAddress $deletesAddress
      */
-    public function __construct(CanChangeOrderAddress $canChangeOrderAddress, FetchesOrder $fetchesOrder, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress, DeletesAddress $deletesAddress)
+    public function __construct(CanChangeOrderAddress $canChangeOrderAddress, FetchesOrder $fetchesOrder, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress, DeletesAddress $deletesAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
 
         $this->canChangeOrderAddress = $canChangeOrderAddress;
@@ -44,12 +54,20 @@ class RequestChangeOrderAddressProcessor
         $this->createsAddress = $createsAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->deletesAddress = $deletesAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
 
+    /**
+     * @param Request $request
+     * @return mixed
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
     public function execute(Request $request)
     {
-
         $this->canChangeOrderAddress->passes();
 
         $order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
@@ -59,7 +77,32 @@ class RequestChangeOrderAddressProcessor
 
         $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
         $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->reference, ApprovalStatus::PENDING_VERIFICATION);
-        $this->createsAddress->execute($order, $addressObject);
+        $order_address = $this->createsAddress->execute($order, $addressObject);
+
+        $contact = $address->contacts()->first();
+        if($contact){
+            $contactObject = new ContactObject(
+                $contact->reference,
+                $contact->phone,
+                '',
+                ''
+            );
+
+            $this->createContactProcessor->execute($contactObject, $order_address);
+
+        }
+
+        $remark = $address->remarks()->first();
+
+        if($remark){
+            $remarkObject = new RemarkObject(
+                $remark->content,
+                Auth()->user()->id
+            );
+
+            $this->createRemarkProcessor->execute($order_address, $remarkObject);
+        }
+
 
         return $order;
     }

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

@@ -0,0 +1,148 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\PackingList;
+use App\Models\Transport;
+use Carbon\Carbon;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\Log;
+
+use Illuminate\Http\Request;
+
+class UpdateDoFromVTPortalProcessor
+{
+    /** @var FetchesDataFromVTPortal */
+    private $fetchesDataFRomVTPortal;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /**
+     * FetchDeliveryListFromVTPortalProcessor constructor.
+     * @param FetchesDataFromVTPortal $fetchesDataFRomVTPortal
+     * @param FetchesAddress $fetchesAddress
+     */
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, FetchesAddress $fetchesAddress)
+    {
+        $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
+        $this->fetchesAddress = $fetchesAddress;
+    }
+
+    /**
+     * @param $address
+     * @return array
+     * @throws GuzzleException
+     */
+    public function execute($address) {
+
+        if(!app()->environment(['production'])){
+            return [];
+        }
+
+        try {
+            $order = $address->owner()->orderBy('id', 'desc')->first();
+            $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
+
+            if ($packing_list) {
+                $contact = $address->contacts()->first();
+                $remark = $address->remarks()->first();
+
+                $remark = $remark ? $remark->content : 'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
+                $phone = $contact ? $contact->phone : null;
+                $reference = $contact ? $contact->reference : null;
+
+                $status = 'On Hold';
+
+                if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                    $status = 'Release';
+                }
+
+                $vt_do = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Do","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"Filter": ["FullMarking:$contains$%js%\"' . $order->reference . '\"\u0000"]}}'), '');
+
+                $vt_do = $this->fetchesDataFRomVTPortal->getResponseBody($vt_do);
+
+                if ($vt_do) {
+                    foreach ($vt_do->Rows as $key => $row) {
+                        $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
+                        'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
+                        'POST', 
+                        json_decode('{
+                            "controller": "Do",
+                            "view": "editForm1",
+                            "args": {
+                                "CommandName": "Update",
+                                "CommandArgument": "Save",
+                                "Path": "ag2/a4",
+                                "LastCommandName": "Edit",
+                                "Values": [
+                                    {
+                                        "Name": "ShippingAddress",
+                                        "NewValue": "' . $address->street_one . ' ' . $address->street_two  . ' '. $address->district->name.' '. $address->postcode.' '.$address->state->name.' '.$address->country->name.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Attn",
+                                        "NewValue": "'.$reference.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Tel",
+                                        "NewValue": "'.$phone.'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Status",
+                                        "NewValue": "' . $status . '",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "Doremarks",
+                                        "NewValue": "'. $remark .'",
+                                        "Modified": true,
+                                        "ReadOnly": false,
+                                        "Error": null
+                                    },
+                                    {
+                                        "Name": "DoID",
+                                        "OldValue": '.$row[0].',
+                                        "NewValue": '.$row[0].',
+                                        "Modified": false,
+                                        "ReadOnly": true,
+                                        "Error": null
+                                    }
+                                ],
+                                "Controller": "Do"
+                            }
+                        }'), '');
+                    }
+                }
+            }
+
+        } catch (\Exception $exception){
+            return [];
+        }
+
+    }
+}

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

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Support\Facades\Log;
+
+class UpdateDoFromYDPortalProcessor
+{
+    /** @var FetchesDataFromYDPortal */
+    private $fetchesDataFRomYDPortal;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /**
+     * FetchDeliveryListFromVTPortalProcessor constructor.
+     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
+     * @param FetchesAddress $fetchesAddress
+     */
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, FetchesAddress $fetchesAddress)
+    {
+        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+        $this->fetchesAddress = $fetchesAddress;
+    }
+
+    /**
+     * @param $address
+     * @return void
+     * @throws InternalServerErrorException
+     */
+    public function execute($address) {
+        try {
+            $order = $address->owner()->orderBy('id', 'desc')->first();
+            $packing_lists = $order->packingLists()
+                ->where('type', PackingListType::SHIPPING_PACKING_LIST)
+                ->where('status', '!=', ApprovalStatus::SUSPENDED)
+                ->orderBy('id', 'desc')->get();
+
+
+            foreach ($packing_lists as $key => $row) {
+                if ($row->status === ApprovalStatus::SUSPENDED) {
+                    continue;
+                }
+
+                $contact = $address->contacts()->first();
+                $remark = $address->remarks()->first();
+
+                $phone = $contact ? $contact->phone : null;
+                $reference = $contact ? $contact->reference : null;
+                $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
+
+                $this->fetchesDataFRomYDPortal->clientRequest(
+                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 
+                'POST', 
+                [
+                    'expressno' => $row->reference,
+                    'customers_name' => $reference,
+                    'cellphone' => $phone,
+                    'postcode' => $address->postcode,
+                    'streetAddress' => $address->street_one . ' ' . $address->street_two  . ' '. $address->district->name.' '. $address->post_code.' '.$address->state->name.' '.$address->country->name.' '.$address->postcode.' || '.$remark
+
+                ]);
+
+
+            }
+
+        } catch (\Exception $exception){
+            throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
+        }
+    }
+}

app/Classes/Modules/Orders/Services/CalculatesBaseRate.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use Carbon\Carbon;
+
+class CalculatesBaseRate
+{
+
+    public function execute(Order $order){
+        return 300;
+    }
+
+}

app/Classes/Modules/Orders/Services/CalculatesCBM.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use App\Models\Package;
+use Carbon\Carbon;
+
+class CalculatesCBM
+{
+
+    public function execute(Order $order, Package $parcel){
+        return $parcel->length * $parcel->width * $parcel->height;
+    }
+
+}

app/Classes/Modules/Orders/Services/CalculatesSegmentRate.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\Order;
+use Carbon\Carbon;
+
+class CalculatesSegmentRate
+{
+
+    public function execute(Order $order, int $segmentRates){
+        return ($segmentRates == SegmentConstants::STANDARD_SEGMENT) ? 300 : (
+            (($segmentRates == SegmentConstants::CUSTOM_SEGMENT) ? -20 : 0)
+        );
+    }
+
+}

app/Classes/Modules/Orders/Services/CalculatesStateRate.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use Carbon\Carbon;
+
+class CalculatesStateRate
+{
+
+    public function execute(Order $order, $isOutskirt=false){
+        return ($isOutskirt) ? 20 : 40;
+    }
+
+}

app/Classes/Modules/Orders/Services/CalculatesWarehouseRate.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use Carbon\Carbon;
+
+class CalculatesWarehouseRate
+{
+
+    public function execute(Order $order){
+        return 0;
+    }
+
+}

app/Classes/Modules/Orders/Services/CreatesOrderRemark.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Models\Remark;
+use App\Models\Order;
+
+class CreatesOrderRemark extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param Company $company
+     * @param RemarkObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Order $order, RemarkObject $object) {
+        $model = new Remark();
+
+        $model->commenter_id = $object->getCommenterId();
+        $model->content = $object->getContent();
+
+        return $this->handler($order->remarks(), $model);
+
+    }
+}

app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use Psr\Http\Message\ResponseInterface;
+
+class FetchesDataFromYDPortal
+{
+
+    /**
+     * @param string $url
+     * @param string $method
+     * @param $body
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function clientRequest(string $url, string $method, $body){
+        
+        $client = new \GuzzleHttp\Client();
+
+        $body['apicode'] = env('YD_API_CODE');
+
+        $request = $client->requestAsync($method, $url, ['query' => $body]);
+
+        return $request->wait();
+    }
+
+    /**
+     * @param ResponseInterface $request
+     * @return mixed
+     */
+    public function getResponseBody(ResponseInterface $request){
+        $content = $request->getBody()->getContents();
+        $content =  str_replace("\r",'', $content);
+        $content =  str_replace("\n",'', $content);
+        return json_decode($content);
+    }
+}

app/Classes/Modules/Orders/Services/UpdateOrderReference.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Order;
+use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+
+class UpdateOrderReference extends AbstractUpdateRecord
+{
+    public function execute(Order $model, string $reference)
+    {
+        $model->reference = $reference;
+
+        return $this->handler($model);
+    }
+}

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

@@ -0,0 +1,153 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingListOwner;
+use App\Classes\Modules\Transports\Services\UpdatesTransportStatus;
+use App\Classes\Modules\Unity\Services\CreatesContract;
+use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
+use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
+use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingListContractReference;
+use App\Classes\Modules\Steps\Services\CreatesStep;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+
+use App\Http\Resources\PackingListResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignPackingListOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Assign Packing List Order',
+            'message' => 'You have successfully created a Packing List Order'
+        ];
+    }
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesPackingListOwner */
+    private $updatesPackingListOwner;
+
+    /** @var UpdatesTransportStatus */
+    private $updatesTransportStatus;
+
+    /** @var CreatesContract */
+    private $unityCreateContract;
+
+    /** @var ActivateContractProcessor */
+    private $unityActivateContract;
+
+    /** @var CreateContractEntityProcessor */
+    private $unityCreateContractEntity;
+
+    /** @var AssignContractEntityProcessor */
+    private $unityAssignContractEntity;
+
+    /** @var UpdatesPackingListContractReference */
+    private $updatesPackingListContractReference;
+
+    /** @var CreatesStep */
+    private $createsStep;
+
+    /**
+     * CreateRemarkLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesOrder $fetchesOrder
+     * @param UpdatesPackingListOwner $updatesPackingListOwner
+     * @param UpdatesTransportStatus $updatesTransportStatus
+     * @param CreatesContract $unityCreateContract
+     * @param ActivateContractProcessor $unityActivateContract
+     * @param CreateContractEntityProcessor $unityCreateContractEntity
+     * @param AssignContractEntityProcessor $unityAssignContractEntity
+     * @param UpdatesPackingListContractReference $updatesPackingListContractReference
+     * @param CreatesStep $createsStep
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, FetchesOrder $fetchesOrder, UpdatesPackingListOwner $updatesPackingListOwner, UpdatesTransportStatus $updatesTransportStatus, CreatesContract $unityCreateContract,  ActivateContractProcessor $unityActivateContract, CreateContractEntityProcessor $unityCreateContractEntity, AssignContractEntityProcessor $unityAssignContractEntity, UpdatesPackingListContractReference $updatesPackingListContractReference, CreatesStep $createsStep)
+    {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->updatesPackingListOwner = $updatesPackingListOwner;
+        $this->updatesTransportStatus = $updatesTransportStatus;
+
+        $this->unityCreateContract = $unityCreateContract;
+        $this->unityActivateContract = $unityActivateContract;
+        $this->unityCreateContractEntity = $unityCreateContractEntity;
+        $this->unityAssignContractEntity = $unityAssignContractEntity;
+
+        $this->updatesPackingListContractReference = $updatesPackingListContractReference;
+        $this->createsStep = $createsStep;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $warehouse_packing_list = $this->fetchesPackingList->execute([
+            'id' => $request->route('id'), 
+            'type' => PackingListType::WAREHOUSE_RECEIVE_LIST
+        ]);
+
+        $order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]);
+
+        $warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order);
+
+
+        $transport = $warehouse_packing_list->transports()->first();
+        $transport = $this->updatesTransportStatus->execute($transport, ApprovalStatus::APPROVED);
+
+        $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);
+
+        $packing_list = $this->fetchesPackingList->execute([
+            'reference' => $warehouse_packing_list->reference, 
+            'type' => PackingListType::SHIPPING_PACKING_LIST
+        ]);
+
+        $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order);
+        
+        $this->updatesPackingListContractReference->execute($packing_list, $contractReference);
+
+        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($packing_list, $stepObject);
+        }
+
+        return $this->resourceResponse(new PackingListResource($warehouse_packing_list));
+    }
+}

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

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\CreatesPackingListRemark;
+use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Http\Resources\RemarkResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignPackingListRemarkLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Packing List Remark',
+            'message' => 'You have successfully created a new Packing List Remark'
+        ];
+    }
+
+    /** @var CanCreateRemark */
+    private $canCreateRemark;
+
+    /** @var CreatesPackingListRemark */
+    private $createsPackingListRemark;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /**
+     * CreateRemarkLogic constructor.
+     * @param CanCreateRemark $canCreateRemark
+     * @param CreatesPackingListRemark $createsPackingListRemark
+     */
+    public function __construct(CanCreateRemark $canCreateRemark, CreatesPackingListRemark $createsPackingListRemark, FetchesPackingList $fetchesPackingList)
+    {
+        $this->canCreateRemark = $canCreateRemark;
+        $this->createsPackingListRemark = $createsPackingListRemark;
+        $this->fetchesPackingList = $fetchesPackingList;
+    }
+
+    /**
+     * @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
+    {
+        $object = new RemarkObject(
+            $request->input('content'), 
+            $request->route('id')
+        );
+
+        $this->canCreateRemark->passes($object);
+        $query = $this->createsPackingListRemark->execute($this->fetchesPackingList->execute(['id' => $request->route('id')]), $object);
+        return $this->resourceResponse( new RemarkResource($query));
+    }
+}

app/Classes/Modules/PackingLists/ControllersLogic/Containers/AssignContainerRemarkLogic.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainerRemark;
+use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
+
+use App\Http\Resources\RemarkResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignContainerRemarkLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Order Remark',
+            'message' => 'You have successfully created a new Order Remark'
+        ];
+    }
+
+    /** @var CanCreateRemark */
+    private $canCreateRemark;
+
+    /** @var CreatesContainerRemark */
+    private $createsContainerRemark;
+
+    /** @var FetchesContainer */
+    private $fetchesContainer;
+
+    /**
+     * CreateRemarkLogic constructor.
+     * @param CanCreateRemark $canCreateRemark
+     * @param CreatesContainerRemark $createsContainerRemark
+     */
+    public function __construct(CanCreateRemark $canCreateRemark, CreatesContainerRemark $createsContainerRemark, FetchesContainer $fetchesContainer)
+    {
+        $this->canCreateRemark = $canCreateRemark;
+        $this->createsContainerRemark = $createsContainerRemark;
+        $this->fetchesContainer = $fetchesContainer;
+    }
+
+    /**
+     * @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
+    {
+        $object = new RemarkObject(
+            $request->input('content'), 
+            $request->route('id')
+        );
+
+        $this->canCreateRemark->passes($object);
+        $query = $this->createsContainerRemark->execute($this->fetchesContainer->execute(['id' => $request->route('id')]), $object);
+        return $this->resourceResponse( new RemarkResource($query));
+    }
+}

app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php

@@ -4,55 +4,62 @@ 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\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Services\CreatesRemark;
-use App\Models\Container;
-use App\Models\Remark;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Http\Resources\ContainerResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class CreateContainerRemarkLogic extends AbstractControllerLogic
 {
 
+
     /**
      * @return array
      */
     protected function notification():array {
         return [
-            'title' => 'Created Container',
-            'message' => 'You have successfully created a new Container'
+            'title' => 'Created Container Remark',
+            'message' => 'You have successfully created a new Container Remark'
         ];
     }
 
-    /** @var CreatesRemark */
-    private $createsRemark;
+
+    /** @var FetchesContainer */
+    private $fetchesContainer;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
 
     /**
      * CreateContainerRemarkLogic constructor.
-     * @param CreatesRemark $createsRemark
+     * @param FetchesContainer $fetchesContainer
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CreatesRemark $createsRemark)
+    public function __construct(FetchesContainer $fetchesContainer, CreateRemarkProcessor $createRemarkProcessor)
     {
-        $this->createsRemark = $createsRemark;
+        $this->fetchesContainer = $fetchesContainer;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
 
-        // get the container
-        $container = Container::findOrFail($request->input('container_id'));
+        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
 
-        $object = new RemarkObject($request->input('content'), 1);
+        $object = new RemarkObject($request->input('content'), auth()->user()->id);
 
-        $remark = $this->createsRemark->execute($container, $object);
+        $this->createRemarkProcessor->execute($container, $object);
 
-        return $remark;
+        return $this->resourceResponse(new ContainerResource($container));
 
     }
 

app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php

@@ -45,21 +45,16 @@ class FetchContainerLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canFetchContainer->passes();
 
-            $this->canFetchContainer->passes();
+        $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
 
-            $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
-
-            return $this->resourceResponse(new ContainerResource($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new ContainerResource($query));
 
     }
 

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

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+
+use App\Http\Resources\DeliverPackingListResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliverPackingListLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Deliver PackingList',
+            'message' => 'You have successfully created a new Deliver PackingList'
+        ];
+    }
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var GeneratesPackingListReferenceNumber */
+    private $generatesPackingListReferenceNumber;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /**
+     * CreateDeliverPackingListLogic constructor.
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     */
+    public function __construct(CreatePackingListProcessor $createPackingListProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber, FetchesPackingList $fetchesPackingList)
+    {
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
+        $this->fetchesPackingList = $fetchesPackingList;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $company_module = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
+        $packing_list_id = $request->input('packing_list_id');
+
+        $reference_number = $this->generatesPackingListReferenceNumber->execute();
+
+        $packingListObject = new PackingListObject(
+            $reference_number, 
+            null, 
+            PackingListType::DELIVERY_PACKING_LIST, 
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+
+        $deliverPackingList = $this->createPackingListProcessor->execute($packingListObject, $company_module);
+
+        foreach ($packing_list_id as $key => $row) {
+            $this->fetchesPackingList->execute(['id' => $row]);
+        }
+
+        $deliverPackingList->packing_list_owner()->sync($packing_list_id);
+
+        return $this->resourceResponse(new DeliverPackingListResource($deliverPackingList));
+    }
+
+}

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

@@ -6,6 +6,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
+use App\Http\Resources\PackingListNullOrderResource;
 use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -49,18 +50,11 @@ class ListPackingListsLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canListPackingLists->passes();
 
-            $this->canListPackingLists->passes();
-
-            $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
-
-            return $this->collectionResponse(PackingListResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
 
+        return $this->collectionResponse(PackingListResource::collection($query));
     }
 
 }

app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php

@@ -45,21 +45,17 @@ class ListPackagesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canListPackages->passes();
 
-            $this->canListPackages->passes();
+        $query = $this->listsPackages->execute($this->listsPackages->deserializeFilters($request->input('filters')));
 
-            $query = $this->listsPackages->execute($this->listsPackages->deserializeFilters($request->input('filters')));
-
-            return $this->collectionResponse(PackageResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->collectionResponse(PackageResource::collection($query));
 
     }
 

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

@@ -4,11 +4,15 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\PackingLists\Services\UpdatesPackingList;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\PackingLists\Services\UpdatesPackingListStatus;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanUpdatePackingList;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -34,29 +38,48 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     /** @var UpdatesPackingListStatus */
     private $updatesPackingListStatus;
 
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor ;
+
     /**
      * UpdatePackingListStatusLogic constructor.
      * @param FetchesPackingList $fetchesPackingList
      * @param UpdatesPackingListStatus $updatesPackingListStatus
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesPackingListStatus $updatesPackingListStatus)
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesPackingListStatus $updatesPackingListStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
     {
         $this->fetchesPackingList = $fetchesPackingList;
         $this->updatesPackingListStatus = $updatesPackingListStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
     }
 
     /**
      * @param Request $request
      * @return JsonResponse
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function logic(Request $request) : JsonResponse
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $query = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+        $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+        $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first();
 
-        return $this->resourceResponse(new PackingListResource($query));
+
+//        $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+
+        $this->updateDoFromVTPortalProcessor->execute($address);
+        $this->updateDoFromYDPortalProcessor->execute($address);
+
+        return $this->resourceResponse(new PackingListResource($packing_list));
     }
 
 }

app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php

@@ -30,7 +30,7 @@ class PackingListObject implements DataTransferObject
      * @param int $status
      * @param null|string $contractReference
      */
-    public function __construct(string $reference, int $claimantId, int $type, int $status, ?string $contractReference = null)
+    public function __construct(string $reference, ?int $claimantId, int $type, int $status, ?string $contractReference = null)
     {
         $this->reference = $reference;
         $this->claimantId = $claimantId;
@@ -50,7 +50,7 @@ class PackingListObject implements DataTransferObject
     /**
      * @return int
      */
-    public function getClaimantId(): int
+    public function getClaimantId(): ?int
     {
         return $this->claimantId;
     }

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

@@ -33,7 +33,7 @@ class CreatePackageProcessor
     /**
      * @param PackageObject $object
      * @param PackingList $packingList
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return void
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
@@ -41,7 +41,18 @@ class CreatePackageProcessor
 
         $this->canCreatePackage->passes($object);
 
-        return $this->createsPackage->execute($object, $packingList);
+        $this->createsPackage->execute($object, $packingList);
+
+        /** @var PackingList $replica */
+        $replica = $packingList->packingLists()->first();
+
+        if($replica) {
+            $modificationValue = 1;
+            $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
+            $package = $this->createsPackage->execute($packageObject, $replica);
+        }
+
+        return ;
 
     }
 

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

@@ -7,6 +7,10 @@ use App\Classes\General\Interfaces\Packable;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 
 class CreatePackingListProcessor
 {
@@ -41,7 +45,17 @@ class CreatePackingListProcessor
     public function execute(PackingListObject $object, Packable $packable){
 
         $this->canCreatePackingList->passes($object);
-        return $this->createsPackingList->execute($object, $packable);
+        /** @var PackingList $packingList */
+        $packingList = $this->createsPackingList->execute($object, $packable);
+
+        $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+
+        $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
+        /** create packing list replica */
+        $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
+        $this->createsPackingList->execute($object, $packingList);
+        
+        return $packingList;
     }
 
 }

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

@@ -80,6 +80,10 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
 
                     $containerDetails = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailsRequest);
 
+                    if(!$containerDetails->Rows){
+                        continue;
+                    }
+
                     $containerDetails = $containerDetails->Rows[0];
 
                     if(!$eta = $containerDetails[3]){

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

@@ -66,6 +66,10 @@ class FetchDeliveryListFromVTPortalProcessor
 
                     $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
+                    if(!array_key_exists(0, $shippingPackingLists->Rows)){
+                        continue;
+                    }
+
                     $shippingPackingList = $shippingPackingLists->Rows[0];
 
                     if(!$shippingPackingList[9] && !$shippingPackingList[10]) {
@@ -87,6 +91,7 @@ class FetchDeliveryListFromVTPortalProcessor
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
 
                 } catch (GuzzleException $exception) {
+                    dd($exception);
                     continue;
                 }
 

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

@@ -21,6 +21,7 @@ use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\ContainerTypes;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\Order;
 use App\Models\PackingList;
@@ -141,7 +142,6 @@ class FetchLoadedContainersFromVTPortalProcessor
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
 
             foreach ($containers->Rows as $container){
-
                 $filter = '["ContainerID:=%js%'.$container[11].'"]';
                 $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
@@ -158,13 +158,9 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 foreach($containerDetail->Rows as $packingList){
-                    $marking = explode('/', explode('CIEF/', $packingList[13])[1]);
+                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13]));
 
-                    if(!array_key_exists(1, $marking)){
-                        continue;
-                    }
-
-                    $orderNumber = $marking[1];
+                    $orderNumber = $marking[array_key_last($marking)];
 
                     if(!$packingList[22]){
                         continue;
@@ -201,7 +197,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                         $connection = $order->companyModule->connections()->first();
                         $marking = $connection->invitee_reference;
 
-                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, (int) filter_var($marking, FILTER_SANITIZE_NUMBER_INT) <= 1000 ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::SUSPENDED, $contractReference);
+                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, $contractReference);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
@@ -212,7 +208,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                             $this->createsStep->execute($packingList, $stepObject);
                         }
 
-
                     }
 
                 }

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

@@ -0,0 +1,424 @@
+<?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\FetchesDataFromYDPortal;
+
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
+use App\Classes\Modules\Steps\Services\CreatesStep;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
+use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
+use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
+use App\Classes\Modules\Unity\Services\CreatesContract;
+use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\ContainerTypes;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\Container;
+use App\Models\Order;
+use App\Models\PackingList;
+use App\Models\Transport;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class FetchOrderListsFromYdPortalProcessor
+{
+    /** @var FetchesDataFromYDPortal */
+    private $fetchesDataFRomYDPortal;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var FetchesContainer */
+    private $fetchesContainer;
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreateContainerProcessor */
+    private $createContainerProcessor;
+
+    /** @var CreatesContract */
+    private $unityCreateContract;
+
+    /** @var AssignContractEntityProcessor */
+    private $unityAssignContractEntity;
+
+    /** @var CreateContractEntityProcessor */
+    private $unityCreateContractEntity;
+
+    /** @var CreatesStep */
+    private $createsStep;
+
+    /** @var ActivateContractProcessor */
+    private $unityActivateContract;
+
+    /**
+     * FetchOrderListsFromYdPortalProcessor constructor.
+     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
+     * @param FetchesOrder $fetchesOrder
+     * @param UpdatesContractObligation $updatesContractObligations
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param CreatePackageProcessor $createPackageProcessor
+     * @param CreatesTransport $createsTransport
+     * @param CreatesSchedule $createsSchedule
+     * @param FetchesContainer $fetchesContainer
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreateContainerProcessor $createContainerProcessor
+     * @param CreatesContract $unityCreateContract
+     * @param AssignContractEntityProcessor $unityAssignContractEntity
+     * @param CreateContractEntityProcessor $unityCreateContractEntity
+     * @param CreatesStep $createsStep
+     * @param ActivateContractProcessor $unityActivateContract
+     */
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, FetchesOrder $fetchesOrder, UpdatesContractObligation $updatesContractObligations, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreateContainerProcessor $createContainerProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
+    {
+        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->updatesContractObligations = $updatesContractObligations;
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->fetchesContainer = $fetchesContainer;
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createContainerProcessor = $createContainerProcessor;
+        $this->unityCreateContract = $unityCreateContract;
+        $this->unityAssignContractEntity = $unityAssignContractEntity;
+        $this->unityCreateContractEntity = $unityCreateContractEntity;
+        $this->createsStep = $createsStep;
+        $this->unityActivateContract = $unityActivateContract;
+    }
+
+
+    /**
+     * @param Carbon|null $start
+     * @param Carbon|null $end
+     * @return void
+     */
+    public function execute(?Carbon $start = null, ?Carbon $end = null)
+    {
+        try {
+            $start = $start ? $start : Carbon::now()->subMonths(2);
+
+            $startLimit = Carbon::parse('01-12-2021');
+
+            if($start->isBefore($startLimit)){
+                $start = $startLimit;
+            }
+
+            $end = $end ? $end : Carbon::now();
+
+            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                'begintime' => $start->timestamp,
+                'endtime' => $end->timestamp,
+            ]);
+
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+
+            foreach($rows->data as $row){
+
+                $containerReference = null;
+                $loadingDate = null;
+                $unstuffingDate = null;
+                $deliveryDate = null;
+                $etd = null;
+                $eta = null;
+                $delayDate = null;
+
+                $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                    'trakingno' => $row->expressno
+                ]);
+
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+
+                foreach (array_reverse($rows->data) as $trackingRow) {
+                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
+                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                        $tracking = explode(':', $trackingRow->tracking);
+                        $containerReference = explode('预计到港时间', $tracking[1])[0];
+                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                        $etd = Carbon::parse($tracking[2])->subDays(5);
+                        $eta = Carbon::parse($tracking[2]);
+                    }
+
+                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
+                    $rescheduleETA = strpos($trackingRow->remark, '到港');
+                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
+                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
+                        $dates = collect();
+
+                        foreach($matches[0] as $date){
+                            try {
+                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
+                            } catch (\Exception $exception) {
+                                continue;
+                            }
+
+                        }
+
+                        $rescheduleDate = $dates->sortDesc()->first();
+                        if(!$delayDate || $rescheduleDate > $delayDate){
+                            /** @var Carbon $delayDate */
+                            $delayDate = $rescheduleDate;
+
+                            if($rescheduleETA === false && $delayDate) {
+                                $delayDate = $delayDate->addDays('5');
+                            }
+                        }
+
+                    }
+
+                    if ($trackingRow->tracking === '已开船') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
+                    }
+
+
+                    if ($trackingRow->tracking === '货物已进目的港仓库') {
+                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if ($trackingRow->tracking === '货物已派送完成') {
+                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+                }
+
+                $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+
+                $orderNumber = $customerno[array_key_last($customerno)];
+                $allow_contract = true;
+
+                try {
+                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                } catch (ResourceNotFoundException $exception) {
+                    try {
+                        $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
+                    } catch (ResourceNotFoundException $exception) {
+                        $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                        $allow_contract = false;
+                    }
+
+                }
+
+                DB::beginTransaction();
+
+                $packingListReference = $row->expressno;
+
+                try{
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+
+                    $packingList->packages()->delete();
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
+                    $warehouseReceiveList->packages()->delete();
+                    $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                } catch (ResourceNotFoundException $exception) {
+
+                    if (!$allow_contract) {
+                        $appointee_id = 2037;
+                    } else {
+                        $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+                    }
+
+                    $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
+                    /** @var PackingList $warehouseReceiveList */
+                    $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+
+                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+                    $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+
+                    if ($allow_contract) {
+
+                        $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, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
+
+                    /** @var PackingList $packingList */
+                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+                    if ($allow_contract) {
+                        foreach ($contractObligations as $obligation) {
+                            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                            $this->createsStep->execute($packingList, $stepObject);
+                        }
+                    }
+                }
+
+                foreach($row->deliverysize as $package) {
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                $weightCbm = (float) $row->weight / 500;
+                $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
+
+                if($overWeightCbm > 0){
+                    $measurement = round($overWeightCbm ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                if($order instanceof Order){
+                    $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
+                        $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
+                            'expressno' => $row->expressno
+                        ]);
+                    }
+                }
+
+
+                if($containerReference) {
+                    try {
+                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+                    } catch (ResourceNotFoundException $exception){
+
+                        if (!$allow_contract) {
+                            $appointee_id = 2037;
+                        }
+                        else {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
+                        }
+
+                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
+
+                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                        /** @var Container $container */
+                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+
+                        $transport = $container->transports()->first();
+
+                        if(!$transport){
+                            $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
+                            /** @var Transport $transport */
+                            $transport = $this->createsTransport->execute($transportObject, $container);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
+                        }
+                    }
+
+                    if($delayDate){
+
+                        $transport = $container->transports()->first();
+
+                        if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
+                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
+                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                        }
+
+                    }
+
+                    if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                        /** @var PackingList $packingList */
+                        foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
+                            $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                            foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
+                                $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
+                                $step->update(['status' => ApprovalStatus::COMPLETED]);
+                            }
+                        }
+                    }
+                }
+
+                if($deliveryDate && !$packingList->transports){
+                    $packingList->status = ApprovalStatus::COMPLETED;
+                    $packingList->save();
+
+                    $deliveryDate = Carbon::parse($deliveryDate);
+                    $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]);
+                }
+
+                DB::commit();
+                echo 'successful';
+
+            }
+        } catch (\Exception $exception) {
+            Log::debug($exception);
+        }
+
+
+    }
+}

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

@@ -50,34 +50,38 @@ class FetchPackingListFromVTPortalProcessor
             $query->where('status', '=', ApprovalStatus::COMPLETED);
         })->get();
 
+        DB::beginTransaction();
         foreach($packingLists as $packingList){
-
             try {
-                DB::beginTransaction();
+
 
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
                 $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
+                if(count($shippingPackingLists->Rows)) {
+                    $packingList->packages()->delete();
 
-                $packingList->packages()->delete();
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
 
-                foreach($shippingPackingLists->Rows as $shippingPackingList){
-                    if(!$shippingPackingList[22]) {
-                        continue;
+                    foreach($shippingPackingLists->Rows as $shippingPackingList){
+                        if(!$shippingPackingList[22]) {
+                            continue;
+                        }
+
+                        $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
+                        $this->createPackageProcessor->execute($packageObject, $packingList);
                     }
-
-                    $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
-                    $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
-                DB::commit();
             } catch (GuzzleException $exception) {
                 continue;
             }
 
         }
+        DB::commit();
 
         return [];
 

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

@@ -134,19 +134,13 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             foreach ($response->Rows as $parcel){
 
-                $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
-
-                if(!array_key_exists(1, $marking)){
-                    continue;
-                }
-
-                $orderNumber = $marking[1];
+                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5]));
+                $orderNumber = $marking[array_key_last($marking)];
 
                 if(!$parcel[9]){
                     continue;
                 }
 
-
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
                 } catch (ResourceNotFoundException $exception) {
@@ -206,10 +200,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
                 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);
                 }
 
@@ -220,14 +211,14 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
                 $this->createsSchedule->execute($transport, new ScheduleObject(Carbon::parse($receiveDate), Carbon::parse($receiveDate), ApprovalStatus::APPROVED));
 
+                /** @var PackingList $replica */
+                $replica = $packingList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
                 $packingList->packages()->delete();
+                if($replica) $replica->packages()->delete();
 
                 $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement, $measurement, $measurement, 0, $quantity, ApprovalStatus::APPROVED);
                 $this->createPackageProcessor->execute($packageObject, $packingList);
-
             }
-
-
         } catch (\Exception $exception){
             Log::error($exception->getMessage());
         }