order details responsive

.env.example

@@ -51,5 +51,3 @@ 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}"

.gitignore

@@ -24,5 +24,4 @@ db/*
 docker-compose.yml
 package-lock.json
 public/*
-/public/*
-storage/framework/laravel-excel/*
+/public/*

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -43,4 +43,4 @@ abstract class AbstractListRecord extends AbstractGetRecord
 
     }
 
-}
+}

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

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

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

@@ -1,24 +0,0 @@
-<?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/PackingListStatus.php

@@ -1,20 +0,0 @@
-<?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

@@ -1,20 +0,0 @@
-<?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/Reference.php

@@ -14,7 +14,7 @@ class Reference implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('reference', '=', $value);
+        return $builder->where('Reference', '=', $value);
     }
 
 }

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

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

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

@@ -1,22 +0,0 @@
-<?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/Eloquent/Filters/WithConfirmedOrders.php

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

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

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

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

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

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

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

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

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

app/Classes/General/Interfaces/ContainerOwner.php

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

app/Classes/General/Interfaces/Packable.php

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

app/Classes/General/Interfaces/Remarkable.php

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

app/Classes/General/Interfaces/Steppable.php

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

app/Classes/General/Interfaces/Transportable.php

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

app/Classes/Jobs/CurlContainerListJob.php

@@ -45,7 +45,7 @@ class CurlContainerListJob implements ShouldQueue
         $last_two_month = Carbon::now()->subMonth(2)->format('Y-m-d');
 
         $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('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}}')]);
+        $res = $client->post('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', [\GuzzleHttp\RequestOptions::JSON => json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":' . $this->page . ',"PageSize":10,"PageOffset":0,"SortExpression":"CreatedOn DESC","GroupExpression":"","Filter":["LoadedTime:<=%js%\"' . $last_two_month . 'T00:00:00.000\"\u0000"],"ContextKey":"view1","FilterIsExternal":false,"LookupContextFieldName":null,"LookupContextController":null,"LookupContextView":null,"LookupContext":null,"Inserting":false,"LastCommandName":null,"ExternalFilter":[],"DoesNotRequireData":false,"LastView":"grid1","Tag":null,"RequiresFirstLetters":false,"ViewType":"Grid","SupportsCaching":true,"SystemFilter":null,"RequiresRowCount":true,"QuickFindHint":null,"RequiresPivot":false,"PivotDefinitions":null,"RequiresMetaData":true}}')]);
 
         $data = json_decode($res->getBody()->getContents());
 
@@ -63,7 +63,7 @@ class CurlContainerListJob implements ShouldQueue
     {
         // get latest cookies
         $client = new \GuzzleHttp\Client(['cookies' => true]);
-        $r = $client->request('GET', 'http://portal.vtnation.com.my');
+        $r = $client->request('GET', 'https://portalvt.azurewebsites.net');
         $call_cookie = $client->getConfig('cookies');
         $call_cookie = $call_cookie->toArray();
         $latest_cookie = [];
@@ -79,7 +79,7 @@ class CurlContainerListJob implements ShouldQueue
             'Cookie' => $latest_cookie,
         ];
         $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
+        $res = $client->post('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
             "username" => "CIEF",
             "password" => "0122120880",
             "createPersistentCookie" => true,

app/Classes/Jobs/CurlWarehouseListJob.php

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

app/Classes/Jobs/FetchContainersStatusUpdateFromVTPortalJob.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchContainersStatusUpdateFromVTPortalProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchContainersStatusUpdateFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchContainersStatusUpdateFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchDeliveryListFromVTPortalJob.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryListFromVTPortalProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchDeliveryListFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-
-        (App()->make(FetchDeliveryListFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchLoadedContainersFromVTPortalJob.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchLoadedContainersFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchPackingListFromVTPortalJob.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchPackingListFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 1800;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchWarehouseReceiveListFromVTPortalJob.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchWarehouseReceiveListFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute();
-    }
-}

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

@@ -138,7 +138,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
-//        $this->generateEmailVerificationAttemptProcessor->execute($user);
+        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));
     }

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

@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Exceptions\AccessForbiddenException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
-use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
-use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\Company;
-use App\Models\CompanyModule;
-use App\Models\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
-
-class CreateInvitedCustomerLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Created User',
-            'message' => 'You have successfully created a new User'
-        ];
-    }
-
-    /** @var CreateUserProcessor */
-    private $createUserProcessor;
-
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var AssignEmployeeProcessor */
-    private $assignEmployeeProcessor;
-
-    /** @var AuthenticationProcessor */
-    private $authenticationProcessor;
-
-
-    /**
-     * CreateInvitedCustomerLogic constructor.
-     * @param CreateUserProcessor $createUserProcessor
-     * @param CreateContactProcessor $createContactProcessor
-     * @param FetchesCompany $fetchesCompany
-     * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param AuthenticationProcessor $authenticationProcessor
-     */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateContactProcessor $createContactProcessor, FetchesCompany $fetchesCompany, AssignEmployeeProcessor $assignEmployeeProcessor, AuthenticationProcessor $authenticationProcessor)
-    {
-        $this->createUserProcessor = $createUserProcessor;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->fetchesCompany = $fetchesCompany;
-        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->authenticationProcessor = $authenticationProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        /** @var Company $company */
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        /** @var CompanyModule $companyModule */
-        $companyModule = $company->companyModules()->first();
-
-        if($companyModule->employees()->exists()){
-            throw new AccessForbiddenException('This company\'s account has been claimed by another user already!');
-        }
-
-        /** @var User $user */
-        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
-
-        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
-
-        $this->createContactProcessor->execute($contactObject, $company);
-
-        $Object = new EmploymentObject($companyModule, $user);
-
-        $this->assignEmployeeProcessor->execute($Object);
-
-        return $this->response($this->authenticationProcessor->execute($request));
-    }
-}

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

@@ -1,44 +0,0 @@
-<?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,6 +27,7 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken)
     {
+        logger("logout user logic");
         $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
     }
 
@@ -36,6 +37,7 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     protected function logic(Request $request): JsonResponse {
 
+        logger("logout");
         $this->invalidatesAuthenticationToken->execute();
 
         return $this->response();

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

@@ -1,43 +0,0 @@
-<?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

@@ -1,54 +0,0 @@
-<?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

@@ -1,211 +0,0 @@
-<?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

@@ -1,24 +0,0 @@
-<?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

@@ -1,40 +0,0 @@
-<?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

@@ -1,33 +0,0 @@
-<?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

@@ -1,54 +0,0 @@
-<?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

@@ -1,43 +0,0 @@
-<?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/DataTransferObjects/AddressObject.php

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Addresses\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 class AddressObject implements DataTransferObject
 {
@@ -39,7 +38,7 @@ class AddressObject implements DataTransferObject
      * @param int $postCode
      * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -48,7 +47,6 @@ class AddressObject implements DataTransferObject
         $this->districtId = $districtId;
         $this->postCode = $postCode;
         $this->reference = $reference;
-        $this->status = $status;
     }
 
     /**
@@ -107,13 +105,5 @@ class AddressObject implements DataTransferObject
         return $this->reference;
     }
 
-    /**
-     * @return int
-     */
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-
 
 }

app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Addresses\Processors;
-
-use App\Classes\General\Interfaces\Addressable;
-use App\Classes\Modules\Addresses\Services\CleansOldAddress;
-use App\Classes\Modules\Addresses\Services\CreatesAddress;
-use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Models\OldAddress;
-use App\Models\Order;
-use Illuminate\Database\Eloquent\Model;
-
-class CreateAddressFromOldAddressProcessor
-{
-
-    /** @var CleansOldAddress */
-    private $cleansOldAddress;
-
-    /** @var CreatesAddress */
-    private $createsAddress;
-
-
-    /**
-     * CreateAddressFromOldAddressProcessor constructor.
-     * @param CleansOldAddress $cleansOldAddress
-     * @param CreatesAddress $createsAddress
-     */
-    public function __construct(CleansOldAddress $cleansOldAddress, CreatesAddress $createsAddress)
-    {
-        $this->cleansOldAddress = $cleansOldAddress;
-        $this->createsAddress = $createsAddress;
-    }
-
-
-    /**
-     * @param OldAddress $address
-     * @param Addressable $addressable
-     * @return Model|null
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(OldAddress $address, Addressable $addressable): ?Model {
-
-        if(!$object = $this->cleansOldAddress->execute($address)){
-            return null;
-        }
-
-
-        if(!$addressable instanceof Order && $address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()) {
-            return $address;
-        }
-
-        return $this->createsAddress->execute($addressable, $object);
-
-    }
-
-}

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

@@ -1,52 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Omair Saleh
- * Date: 20/8/2021
- * Time: 1:05 AM
- */
-
-namespace App\Classes\Modules\Addresses\Services;
-
-
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Models\District;
-use App\Models\OldAddress;
-
-class CleansOldAddress
-{
-
-    public function execute(OldAddress $address){
-        if($address->street_one === '' && $address->street_two === ''){
-            return null;
-        }
-
-        if(!$address->post_code){
-            return null;
-        }
-
-        $district = District::where('postcode', 'like', '%'. $address->post_code .'%')->first();
-
-        if(!$district) {
-            return null;
-        }
-
-        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Delivery Address');
-
-    }
-
-    public function cleanAddress($address, $district, $postcode){
-        $address = str_replace('Malaysia', '', str_replace('malaysia', '', str_replace('MALAYSIA', '', $address)));
-        $address = str_replace($district->state->name, '',str_replace($district->name, '', $address));
-        $address = str_replace(strtolower($district->state->name), '',str_replace(strtolower($district->name), '', $address));
-        $address = str_replace(strtoupper($district->state->name), '',str_replace(strtoupper($district->name), '', $address));
-        $address = str_replace($postcode, '', $address);
-        $address = str_replace(', ,', ',', str_replace(', ,', ',', str_replace(', ,', ',', $address)));
-        $address = str_replace(',', ', ', $address);
-        $address = preg_replace('!\s+!', ' ', $address);
-        $address = preg_replace("/,+/", ",", $address);
-        return rtrim(rtrim(rtrim(rtrim($address, '.')), ','));
-
-    }
-
-}

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

@@ -28,7 +28,6 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
         $model->state_id = $object->getStateId();
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
-        $model->status = $object->getStatus();
 
         return $this->handler($addressable->addresses(), $model);
 

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

@@ -1,67 +0,0 @@
-<?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/ListCompaniesLogic.php

@@ -53,6 +53,10 @@ class ListCompaniesLogic extends AbstractControllerLogic
     {
         $this->canListCompanies->passes();
 
+        logger("llogic");
+
+        logger($request->input('filters'));
+
         $query = $this->listsCompanies->execute($this->listsCompanies->deserializeFilters($request->input('filters')));
         return $this->collectionResponse(CompanyResource::collection($query));
 

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

@@ -1,73 +0,0 @@
-<?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/Processors/AssignConnectionSegmentProcessor.php

@@ -1,56 +0,0 @@
-<?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

@@ -1,33 +0,0 @@
-<?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

@@ -1,34 +0,0 @@
-<?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/RemovesCompanyConnectionFromConnectionSegment.php

@@ -1,33 +0,0 @@
-<?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/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Processors\ApproveChangeOrderAddressProcessor;
-use App\Http\Resources\AddressResource;
-use App\Http\Resources\OrderResource;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
-class ApproveChangeOrderAddressLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Change Order Address Approval',
-            'message' => 'You have successfully change the order address'
-        ];
-    }
-
-    /** @var ApproveChangeOrderAddressProcessor */
-    private $approveChangeOrderAddressProcessor;
-
-    /**
-     * ApproveChangeOrderAddressLogic constructor.
-     * @param ApproveChangeOrderAddressProcessor $approveChangeOrderAddressProcessor
-     */
-
-    public function __construct(ApproveChangeOrderAddressProcessor $approveChangeOrderAddressProcessor)
-    {
-        $this->approveChangeOrderAddressProcessor = $approveChangeOrderAddressProcessor;
-    }
-
-    public function logic(Request $request): JsonResponse
-    {
-        $address = $this->approveChangeOrderAddressProcessor->execute($request);
-
-        return $this->resourceResponse(new AddressResource($address));
-    }
-}

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

@@ -1,67 +0,0 @@
-<?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

@@ -3,12 +3,7 @@
 namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
-use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
-use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
@@ -16,6 +11,13 @@ use Illuminate\Http\JsonResponse;
 class CreateOrderLogic extends AbstractControllerLogic
 {
 
+    private $createOrderProcessor;
+
+    public function __construct( CreateOrderProcessor $createsOrderProcessor)
+    {
+        $this->createOrderProcessor = $createsOrderProcessor;
+    }
+
     protected function notification():array {
         return [
             'title' => 'Created Order',
@@ -23,55 +25,9 @@ class CreateOrderLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var fetchesAddress */
-    private $fetchesAddress;
-
-    /** @var CreateOrderProcessor  */
-    private $createOrderProcessor;
-
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var GeneratesOrderNumber */
-    private $generatesOrderNumber;
-
-    /**
-     * CreateOrderLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param FetchesAddress $fetchesAddress
-     * @param CreateOrderProcessor $createOrderProcessor
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param GeneratesOrderNumber $generatesOrderNumber
-     */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->fetchesAddress = $fetchesAddress;
-        $this->createOrderProcessor = $createOrderProcessor;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->generatesOrderNumber = $generatesOrderNumber;
-    }
-
-
     public function logic(Request $request) : JsonResponse {
 
-        $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($originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU){
-            $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-            if(in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '1905JYW', '1291NSC', '8288MIB'])){
-                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]);
-            }
-        }
-
-        $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
+        $order = $this->createOrderProcessor->execute($request);
 
         return $this->resourceResponse(new OrderResource($order));
     }

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

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
-use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-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\Http\Resources\PackingListResource;
-use App\Models\PackingList;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class CreateShippingPackingListLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created PackingList',
-            'message' => 'You have successfully created a new PackingList'
-        ];
-    }
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-     /** @var GeneratesPackingListReferenceNumber */
-    private $generatesPackingListReferenceNumber;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /**
-     * CreatePackingListLogic constructor.
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param FetchesOrder $fetchesOrder
-     */
-    public function __construct(
-        CreatePackingListProcessor $createPackingListProcessor, 
-        CreatesTransport $createsTransport, 
-        CreatesSchedule $createsSchedule,
-        CreatePackageProcessor $createPackageProcessor,
-        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber, 
-        FetchesOrder $fetchesOrder
-    )
-    {
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
-        $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
-    {
-        $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
-
-        $reference_number = $this->generatesPackingListReferenceNumber->execute();
-
-        $packingListObject = new PackingListObject(
-            $reference_number, 
-            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, 
-            PackingListType::SHIPPING_PACKING_LIST, 
-            ApprovalStatus::PENDING_SUBMISSION
-        );
-
-        /** @var PackingList $packingList */
-        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-        $packages = $request->input('packages');
-
-        foreach ($packages as $key => $row) {
-            $packageObject = new PackageObject(
-                $row['type'], 
-                $row['description'], 
-                $row['width'], 
-                $row['height'], 
-                $row['length'], 
-                $row['weight'], 
-                $row['quantity'], 
-                ApprovalStatus::APPROVED,
-                $row['reference'], 
-            );
-            $this->createPackageProcessor->execute($packageObject, $packingList);
-        }
-
-        return $this->resourceResponse(new PackingListResource($packingList));
-    }
-
-}

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

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
-use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-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\Http\Resources\PackingListResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class CreateWarehousePackingListLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Warehouse PackingList',
-            'message' => 'You have successfully created a new Warehouse PackingList'
-        ];
-    }
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-     /** @var GeneratesPackingListReferenceNumber */
-    private $generatesPackingListReferenceNumber;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /**
-     * CreatePackingListLogic constructor.
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param FetchesOrder $fetchesOrder
-     */
-    public function __construct(
-        CreatePackingListProcessor $createPackingListProcessor, 
-        CreatesTransport $createsTransport, 
-        CreatesSchedule $createsSchedule,
-        CreatePackageProcessor $createPackageProcessor,
-        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber, 
-        FetchesOrder $fetchesOrder
-    )
-    {
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
-        $this->fetchesOrder = $fetchesOrder;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
-
-        $reference_number = $this->generatesPackingListReferenceNumber->execute();
-
-        $packingListObject = new PackingListObject(
-            $reference_number, 
-            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, 
-            PackingListType::WAREHOUSE_RECEIVE_LIST, 
-            ApprovalStatus::PENDING_SUBMISSION
-        );
-        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-        $transportObject = new TransportObject(TransportType::LAND, null, $request->input('tracking'), Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
-        $transport = $this->createsTransport->execute($transportObject, $packingList);
-
-        $scheduleObject = new ScheduleObject(Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
-        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-        $packages = $request->input('packages');
-
-        foreach ($packages as $key => $row) {
-            $packageObject = new PackageObject(
-                $row['type'], 
-                $row['description'], 
-                $row['width'], 
-                $row['height'], 
-                $row['length'], 
-                $row['weight'], 
-                $row['quantity'], 
-                ApprovalStatus::APPROVED,
-                $row['reference'], 
-            );
-            $this->createPackageProcessor->execute($packageObject, $packingList);
-        }
-
-        return $this->resourceResponse(new PackingListResource($packingList));
-    }
-
-}

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

@@ -52,7 +52,7 @@ class FetchOrderLogic extends AbstractControllerLogic
 
         $this->canFetchOrder->passes();
 
-        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
+        $query = $this->fetchesOrder->execute(['reference' => $request->route('id')]);
 
         return $this->resourceResponse(new OrderResource($query));
 

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

@@ -44,7 +44,7 @@ class ListOrdersLogic extends AbstractControllerLogic
     {
         $this->canListOrders->passes();
 
-        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true]));
+        $query = $this->listsOrders->execute($this->listsOrders->deserializeFilters($request->input('filters')));
 
         return $this->collectionResponse(OrderResource::collection($query));
 

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

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Processors\RequestChangeOrderAddressProcessor;
-use App\Http\Resources\OrderResource;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
-class RequestChangeOrderAddressLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Request To Change Order Address',
-            'message' => 'You have successfully request to change order address'
-        ];
-    }
-
-    /** @var RequestChangeOrderAddressProcessor */
-    private $requestChangeOrderAddressProcessor;
-
-    /**
-     * RequestChangeOrderAddressLogic constructor.
-     * @param RequestChangeOrderAddressProcessor $requestChangeOrderAddressProcessor
-     */
-
-    public function __construct(RequestChangeOrderAddressProcessor $requestChangeOrderAddressProcessor)
-    {
-        $this->requestChangeOrderAddressProcessor = $requestChangeOrderAddressProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-
-    public function logic(Request $request): JsonResponse
-    {
-        $order = $this->requestChangeOrderAddressProcessor->execute($request);
-
-        return $this->resourceResponse(new OrderResource($order));
-    }
-}

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

@@ -1,103 +0,0 @@
-<?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/Processors/ApproveChangeOrderAddressProcessor.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Processors;
-
-use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
-use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use Illuminate\Http\Request;
-
-class ApproveChangeOrderAddressProcessor
-{
-    /** @var CanApproveChangeOrderAddress */
-    private $canApproveChangeOrderAddress;
-
-    /** @var FetchesAddress */
-    private $fetchesAddress;
-
-    /** @var UpdatesOrdersAddress */
-    private $updatesOrdersAddress;
-
-    /**
-     * ApproveChangeOrderAddressProcessor constructor.
-     * @param CanApproveChangeOrderAddress $canApproveChangeOrderAddress
-     * @param FetchesAddress $fetchesAddress
-     * @param UpdatesOrdersAddress $updatesOrdersAddress
-     */
-    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
-    {
-        $this->canApproveChangeOrderAddress = $canApproveChangeOrderAddress;
-        $this->fetchesAddress = $fetchesAddress;
-        $this->updatesOrdersAddress = $updatesOrdersAddress;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return mixed
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(Request $request)
-    {
-
-        $status = (int) $request->route('status');
-
-        $this->canApproveChangeOrderAddress->passes();
-
-        $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
-
-        if($status === ApprovalStatus::APPROVED){
-            $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
-        }
-
-        $this->updatesOrdersAddress->execute($address, $status);
-
-        return $address;
-    }
-}

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

@@ -13,69 +13,83 @@ use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderType;
-use App\Models\Address;
-use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\Order;
+use Illuminate\Http\Request;
 
 class CreateOrderProcessor
 {
 
+    /** @var GeneratesOrderNumber */
+    private $generatesOrderNumber;
+
     /** @var CanCreateOrder */
     private $canCreateOrder;
 
     /** @var CreatesOrder */
     private $createsOrder;
 
+    /** @var fetchesAddress */
+    private $fetchesAddress;
+
     /** @var CreatesAddress */
     private $createAddress;
 
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
     /** @var CreateOrderRolesProcessor */
     private $createOrderRolesProcessor;
 
     /**
      * CreateOrderProcessor constructor.
+     * @param GeneratesOrderNumber $generatesOrderNumber
      * @param CanCreateOrder $canCreateOrder
      * @param CreatesOrder $createsOrder
+     * @param FetchesAddress $fetchesAddress
      * @param CreatesAddress $createAddress
+     * @param FetchesCompany $fetchesCompany
      * @param CreateOrderRolesProcessor $createOrderRolesProcessor
      */
-    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, CreatesAddress $createAddress, CreateOrderRolesProcessor $createOrderRolesProcessor)
+    public function __construct(GeneratesOrderNumber $generatesOrderNumber, CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, FetchesAddress $fetchesAddress, CreatesAddress $createAddress, FetchesCompany $fetchesCompany, CreateOrderRolesProcessor $createOrderRolesProcessor)
     {
+        $this->generatesOrderNumber = $generatesOrderNumber;
         $this->canCreateOrder = $canCreateOrder;
         $this->createsOrder = $createsOrder;
+        $this->fetchesAddress = $fetchesAddress;
         $this->createAddress = $createAddress;
+        $this->fetchesCompany = $fetchesCompany;
         $this->createOrderRolesProcessor = $createOrderRolesProcessor;
     }
 
 
     /**
-     * @param Company $company
-     * @param CompanyModule $originWarehouse
-     * @param Address $address
-     * @param int|null $orderNumber
+     * @param Request $request
      * @return Addressable
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(Company $company, CompanyModule $originWarehouse, Address $address, int $orderNumber){
+    public function execute(Request $request){
+
+        $company = $this->fetchesCompany->execute(['id' => $request->get('company_id')]);
 
         /** @var CompanyModule $importer */
-        $importer = $company->companyModules()->importers()->first();
+        $importer = $this->fetchesCompany->execute(['id' => $request->get('company_id')])->companyModules()->importers()->first();
 
-        $orderObject = new OrderObject($orderNumber, OrderType::SHARED_CONTAINER, $company->status === ApprovalStatus::APPROVED ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+        $orderObject = new OrderObject($this->generatesOrderNumber->execute(), OrderType::SHARED_CONTAINER, $company->status === ApprovalStatus::APPROVED ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
 
         $this->canCreateOrder->passes($orderObject);
 
         /** @var Order $order */
         $order = $this->createsOrder->execute($importer, $orderObject);
 
+        $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
         $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode,$address->reference);
 
         $this->createAddress->execute($order, $addressObject);
 
-        $this->createOrderRolesProcessor->execute($originWarehouse, $order);
+        $this->createOrderRolesProcessor->execute($request, $order);
 
         return $order;
     }

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

@@ -10,7 +10,6 @@ use App\Classes\Modules\Orders\Services\CreatesOrder;
 use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
 use App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor;
 use App\Classes\Modules\OrderSteps\Processors\CreateOrderStepsProcessor;
-use App\Classes\Modules\Steps\Processors\CreateStepsProcessor;
 use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\ValueObjects\Constants\OrderStatus;
 use App\Classes\ValueObjects\Constants\OrderSteps;
@@ -34,8 +33,8 @@ class CreateOrderProcessorOld
     /** @var ConfirmOrderProcessor */
     private $confirmOrderProcessor;
 
-    /** @var CreateStepsProcessor */
-    private $createStepsProcessor;
+    /** @var CreateOrderStepsProcessor */
+    private $createOrderStepsProcessor;
 
     /** @var CreatesContract */
     private $unityCreateContract;
@@ -59,11 +58,11 @@ class CreateOrderProcessorOld
     private $fetchesAddress;
 
     /**
-     * CreateOrderProcessorOld constructor.
+     * CreateOrderProcessor constructor.
      * @param CanCreateOrder $canCreateOrder
      * @param CreatesOrder $createsOrder
      * @param \App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor $confirmOrderProcessor
-     * @param CreateStepsProcessor $createStepsProcessor
+     * @param CreateOrderStepsProcessor $createOrderStepsProcessor
      * @param CreatesContract $unityCreateContract
      * @param AssignContractEntityProcessor $unityAssignContractEntity
      * @param CreateContractEntityProcessor $unityCreateContractEntity
@@ -72,12 +71,12 @@ class CreateOrderProcessorOld
      * @param CreatesAddress $createAddress
      * @param FetchesAddress $fetchesAddress
      */
-    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, \App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor $confirmOrderProcessor, CreateStepsProcessor $createStepsProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, ActivateContractProcessor $unityActivateContract, \App\Classes\Modules\Orders\Processors\CreateOrderRolesProcessor $createOrderRoleProcessor, CreatesAddress $createAddress, FetchesAddress $fetchesAddress)
+    public function __construct(CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, \App\Classes\Modules\Orders\Processors\ConfirmOrderProcessor $confirmOrderProcessor, CreateOrderStepsProcessor $createOrderStepsProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, ActivateContractProcessor $unityActivateContract, \App\Classes\Modules\Orders\Processors\CreateOrderRolesProcessor $createOrderRoleProcessor, CreatesAddress $createAddress, FetchesAddress $fetchesAddress)
     {
         $this->canCreateOrder = $canCreateOrder;
         $this->createsOrder = $createsOrder;
         $this->confirmOrderProcessor = $confirmOrderProcessor;
-        $this->createStepsProcessor = $createStepsProcessor;
+        $this->createOrderStepsProcessor = $createOrderStepsProcessor;
         $this->unityCreateContract = $unityCreateContract;
         $this->unityAssignContractEntity = $unityAssignContractEntity;
         $this->unityCreateContractEntity = $unityCreateContractEntity;
@@ -121,7 +120,7 @@ class CreateOrderProcessorOld
 
         //Add processing to order step
         //Note: For processing apointee_id is CIEF Freight Forward , id is 1, reserved in company table
-        $this->createStepsProcessor->execute($order, OrderSteps::PROCESSING, 1);
+        $this->createOrderStepsProcessor->execute($order, OrderSteps::PROCESSING, 1);
 
         //Pre-approved order, no need Admin to process it
         //This processor then calls Generate Order Steps

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

@@ -40,20 +40,17 @@ class CreateOrderRolesProcessor
     }
 
 
-    /**
-     * @param CompanyModule $originWarehouse
-     * @param Order $order
-     * @return bool
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CompanyModule $originWarehouse, Order $order){
+    public function execute(Request $request, Order $order){
 
         $address = $order->addresses()->first();
 
         $importer = $order->companyModule;
 
+        /** @var CompanyModule $originWarehouse */
+        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->get('warehouse_id')]);
+
         /** @var CompanyModule $destinationWarehouse */
-        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::YD_GUANG_ZHOU ? WarehouseReferences::YD_DESTINATION_WAREHOUSE : WarehouseReferences::VT_DESTINATION_WAREHOUSE[$address->state_id]]);
+        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $address->state_id = 13 ? WarehouseReferences::SABAH : ($address->state_id === 14 ? WarehouseReferences::SARAWAK : WarehouseReferences::KLANG)]);
 
         /** @var CompanyModule $freightForwarder */
         $freightForwarder = $originWarehouse->company->companyModules()->freightForwarders()->first();
@@ -79,7 +76,6 @@ class CreateOrderRolesProcessor
         $roleObject = new OrderRoleObject($order, $destinationWarehouse, OrderRoleTypes::DESTINATION_WAREHOUSE);
         $this->createsOrderRole->execute($roleObject);
 
-
         $roleObject = new OrderRoleObject($order, $freightForwarder, OrderRoleTypes::LAST_MILE_DELIVERY_DRIVER);
         $this->createsOrderRole->execute($roleObject);
 

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

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Processors;
-
-use App\Classes\Modules\Orders\Standards\Rules\CanChangeOrderAddress;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Addresses\Services\CreatesAddress;
-use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Classes\Modules\Addresses\Services\DeletesAddress;
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use Illuminate\Http\Request;
-
-class RequestChangeOrderAddressProcessor
-{
-    /** @var CanChangeOrderAddress */
-    private $canChangeOrderAddress;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var FetchesAddress */
-    private $fetchesAddress;
-
-    /** @var CreatesAddress */
-    private $createsAddress;
-
-    /** @var DeletesAddress */
-    private $deletesAddress;
-
-    /**
-     * ChangeOrderAddressProcessor constructor.
-     * @param FetchesOrder $fetchesOrder
-     * @param CreatesAddress $createsAddress
-     * @param FetchesAddress $fetchesAddress
-     * @param DeletesAddress $deletesAddress
-     */
-    public function __construct(CanChangeOrderAddress $canChangeOrderAddress, FetchesOrder $fetchesOrder, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress, DeletesAddress $deletesAddress)
-    {
-
-        $this->canChangeOrderAddress = $canChangeOrderAddress;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->createsAddress = $createsAddress;
-        $this->fetchesAddress = $fetchesAddress;
-        $this->deletesAddress = $deletesAddress;
-    }
-
-
-    public function execute(Request $request)
-    {
-
-        $this->canChangeOrderAddress->passes();
-
-        $order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
-        foreach ($order->addressesPendingVerification as $address) {
-            $this->deletesAddress->execute($address);
-        }
-
-        $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
-        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->reference, ApprovalStatus::PENDING_VERIFICATION);
-        $this->createsAddress->execute($order, $addressObject);
-
-        return $order;
-    }
-}

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

@@ -1,18 +0,0 @@
-<?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

@@ -1,19 +0,0 @@
-<?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

@@ -1,20 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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/FetchesDataFromVTPortal.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-use Psr\Http\Message\ResponseInterface;
-
-class FetchesDataFromVTPortal
-{
-
-    /** @var string|null */
-    private $cookies;
-
-    /**
-     * @param string $cookies
-     */
-    public function setCookies(string $cookies): void
-    {
-        $this->cookies = $cookies;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getCookies(): ?string
-    {
-        return $this->cookies;
-    }
-
-
-    /**
-     * @param string $url
-     * @param string $method
-     * @param $body
-     * @param string $cookie
-     * @param bool $requiresAuthentication
-     * @return \Psr\Http\Message\ResponseInterface
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function clientRequest(string $url, string $method, $body, string $cookie, $requiresAuthentication = true){
-
-        if($requiresAuthentication) {
-            if(!$this->getCookies()){
-                $this->remoteLogin();
-            }
-        }
-
-        $client = new \GuzzleHttp\Client(
-            [
-                'cookies' => true,
-                'headers' => [
-                    'Content-Type' => 'application/json',
-                    'Cookie' => $this->getCookies() ? $this->getCookies() : $cookie
-                ]
-            ]
-        );
-
-        $request = $client->requestAsync($method, $url, [\GuzzleHttp\RequestOptions::JSON => $body, 'timeout' => 1200]);
-
-        return $request->wait();
-
-    }
-
-    /**
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    private function remoteLogin(){
-
-        $latest_cookie = [];
-        $cookieRequest = new \GuzzleHttp\Client(['cookies' => true]);
-
-        $cookieRequest->get('http://portal.vtnation.com.my');
-        foreach ($cookieRequest->getConfig('cookies')->toArray() as $key => $row) {
-            $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
-        }
-
-        $latest_cookie = implode(';', $latest_cookie);
-
-
-        /** @var  $loginRequest */
-        $loginRequest = $this->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', 'POST', [
-            "username" => "CIEF",
-            "password" => "0122120880",
-            "createPersistentCookie" => true,
-        ], $latest_cookie, false);
-
-        $this->setCookies($latest_cookie.';AppVTCC='.$this->getResponseBody($loginRequest)->AccessToken);
-
-    }
-
-    public function getResponseBody(ResponseInterface $request){
-        return json_decode($request->getBody()->getContents())->d;
-    }
-
-}

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

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\Address;
-
-class UpdatesOrdersAddress extends AbstractUpdateRecord
-{
-    /**
-     * @param Address $address
-     * @param int $type
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Address $address, int $type)
-    {
-        $address->status = $type;
-        return $this->handler($address);
-    }
-}

app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php

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

app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php

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

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

@@ -1,67 +0,0 @@
-<?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/CompletePackingListLogic.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\UpdatesPackingListStatus;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use App\Http\Resources\PackingListResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class CompletePackingListLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated PackingList',
-            'message' => 'You have successfully updated the PackingList'
-        ];
-    }
-
-
-    /** @var UpdatesPackingListStatus */
-    private $updatesPackingListStatus;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /**
-     * CompletePackingListLogic constructor.
-     * @param CanUpdatePackingList $canUpdatePackingList
-     * @param UpdatesPackingListStatus $updatesPackingListStatus
-     * @param FetchesPackingList $fetchesPackingList
-     */
-    public function __construct(UpdatesPackingListStatus $updatesPackingListStatus, FetchesPackingList $fetchesPackingList)
-    {
-        $this->updatesPackingListStatus = $updatesPackingListStatus;
-        $this->fetchesPackingList = $fetchesPackingList;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-        $query = $this->updatesPackingListStatus->execute($packing_list, ApprovalStatus::COMPLETED);
-        return $this->resourceResponse(new PackingListResource($packing_list));
-    }
-
-}

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

@@ -1,68 +0,0 @@
-<?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/AssignPackingListContainerLogic.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Http\Resources\ContainerResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class AssignPackingListContainerLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Assign Packing List Container',
-            'message' => 'You have successfully assign Packing List to Container'
-        ];
-    }
-
-    /** @var FetchesContainer */
-        private $fetchesContainer;
-
-    /** @var FetchesPackingList */
-        private $fetchesPackingList;
-
-    /**
-     * DeleteContainerControllersLogic constructor.
-     * @param FetchesContainer $fetchesContainer
-     * @param FetchesPackingList $fetchesPackingList
-     */
-    public function __construct(FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList)
-    {
-        $this->fetchesContainer = $fetchesContainer;
-        $this->fetchesPackingList = $fetchesPackingList;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-            $packing_list = $request->input('packing_list_id');
-
-            foreach ($packing_list as $key => $row) {
-                $packing_list_item = $this->fetchesPackingList->execute(['id' => $row]);
-                $container->packingLists()->attach($packing_list_item);
-            }
-
-            return $this->resourceResponse(new ContainerResource($container));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-
-}

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

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Containers\UpdatesContainerStatus;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use App\Http\Resources\ContainerResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class CompleteContainerLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Container',
-            'message' => 'You have successfully updated the Container'
-        ];
-    }
-
-
-    /** @var UpdatesContainerStatus */
-    private $updatesContainerStatus;
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /**
-     * CompleteContainerLogic constructor.
-     * @param CanUpdateContainer $canUpdateContainer
-     * @param UpdatesContainerStatus $updatesContainerStatus
-     * @param FetchesContainer $fetchesContainer
-     */
-    public function __construct(UpdatesContainerStatus $updatesContainerStatus, FetchesContainer $fetchesContainer)
-    {
-        $this->updatesContainerStatus = $updatesContainerStatus;
-        $this->fetchesContainer = $fetchesContainer;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-        $query = $this->updatesContainerStatus->execute($container, ApprovalStatus::COMPLETED);
-        return $this->resourceResponse(new ContainerResource($container));
-    }
-
-}

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

@@ -4,12 +4,10 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainer;
-use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanCreateContainer;
+use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanCreateContainer;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-
 use App\Http\Resources\ContainerResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -23,8 +21,8 @@ class CreateContainerLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Created Container',
-            'message' => 'You have successfully created a new Container'
+            'title' => 'Created PackingList',
+            'message' => 'You have successfully created a new PackingList'
         ];
     }
 
@@ -34,17 +32,13 @@ class CreateContainerLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-     /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
     /** @var CreatesPackingList */
     private $createsContainer;
 
-    public function __construct(CanCreateContainer $canCreateContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreatesContainer $createsContainer)
+    public function __construct(CanCreateContainer $canCreateContainer, FetchesPackingList $fetchesPackingList, CreatesContainer $createsContainer)
     {
         $this->canCreateContainer = $canCreateContainer;
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsContainer = $createsContainer;
     }
 
@@ -57,20 +51,17 @@ class CreateContainerLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $object = new ContainerObject(
-            $request->input('container_reference'), 
-            $request->input('container_number'), 
-            $request->input('seal_reference'),
-            $request->input('container_type'),
-            $request->input('loading_date'),
-            $request->input('status')
-        );
+
+        $packingList = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
+
+        $object = new ContainerObject( $packingList->id , $request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
 
         $this->canCreateContainer->passes($object);
 
-        $query = $this->createsContainer->execute($object, $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]));
+        $query = $this->createsContainer->execute($object);
 
         return $this->resourceResponse(new ContainerResource($query));
+
     }
 
 }

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

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-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'
-        ];
-    }
-
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /** @var CreateRemarkProcessor */
-    private $createRemarkProcessor;
-
-    /**
-     * CreateContainerRemarkLogic constructor.
-     * @param FetchesContainer $fetchesContainer
-     * @param CreateRemarkProcessor $createRemarkProcessor
-     */
-    public function __construct(FetchesContainer $fetchesContainer, CreateRemarkProcessor $createRemarkProcessor)
-    {
-        $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
-    {
-
-        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-
-        $object = new RemarkObject($request->input('content'), auth()->user()->id);
-
-        $this->createRemarkProcessor->execute($container, $object);
-
-        return $this->resourceResponse(new ContainerResource($container));
-
-    }
-
-}

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

@@ -1,113 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainer;
-use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanCreateContainer;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\ValueObjects\Constants\TransportType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use App\Http\Resources\ContainerResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class CreateLoadContainerLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Container',
-            'message' => 'You have successfully created a new Container'
-        ];
-    }
-
-    /** @var CanCreateContainer */
-    private $canCreateContainer;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-     /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var CreatesPackingList */
-    private $createsContainer;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    public function __construct(
-        CanCreateContainer $canCreateContainer, 
-        FetchesPackingList $fetchesPackingList, 
-        FetchesCompanyModule $fetchesCompanyModule, 
-        CreatesContainer $createsContainer,
-        CreatesTransport $createsTransport, 
-        CreatesSchedule $createsSchedule
-    )
-    {
-        $this->canCreateContainer = $canCreateContainer;
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createsContainer = $createsContainer;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-    }
-
-    /**
-     * @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 ContainerObject(
-            $request->input('container_reference'), 
-            $request->input('container_number'), 
-            $request->input('seal_reference'),
-            $request->input('container_type'),
-            ApprovalStatus::APPROVED
-        );
-
-        $this->canCreateContainer->passes($object);
-
-        $container = $this->createsContainer->execute($object, $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]));
-
-        $transportObject = new TransportObject(
-            TransportType::LAND, null, 
-            $request->input('tracking'), 
-            Carbon::parse($request->input('etd')), 
-            Carbon::parse($request->input('eta')), 
-            ApprovalStatus::APPROVED
-        );
-        $transport = $this->createsTransport->execute($transportObject, $container);
-
-        $scheduleObject = new ScheduleObject(
-            Carbon::parse($request->input('etd')), 
-            Carbon::parse($request->input('eta')),
-            ApprovalStatus::APPROVED
-         );
-        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-        return $this->resourceResponse(new ContainerResource($container));
-    }
-
-}

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

@@ -6,7 +6,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\DeletesContainer;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanDeleteContainer;
+use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanDeleteContainer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

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

@@ -5,7 +5,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanFetchContainer;
+use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanFetchContainer;
 use App\Http\Resources\ContainerResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -53,7 +53,7 @@ class FetchContainerLogic extends AbstractControllerLogic
 
             $this->canFetchContainer->passes();
 
-            $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
+            $query = $this->fetchesContainer->execute(['id' => $request->route('id')]);
 
             return $this->resourceResponse(new ContainerResource($query));
 

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

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Containers\ListsContainers;
-use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanListContainers;
-use App\Classes\Modules\PackingLists\Processors\FetchInboundCustomClearedProcessor;
-
-use App\Http\Resources\ContainerResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class InboundCustomClearedLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Containers',
-            'message' => 'You have successfully retrieved a list of Containers'
-        ];
-    }
-
-    /** @var CanListContainers */
-    private $canListContainers;
-
-    /** @var ListsContainers */
-    private $listsContainers;
-
-    private $fetchInboundCustomCleared;
-
-    /**
-     * ListContainersLogic constructor.
-     * @param CanListContainers $canListContainers
-     * @param ListsContainers $listsContainers
-     */
-    public function __construct(CanListContainers $canListContainers, ListsContainers $listsContainers, FetchInboundCustomClearedProcessor $fetchInboundCustomCleared)
-    {
-        $this->canListContainers = $canListContainers;
-        $this->listsContainers = $listsContainers;
-        $this->fetchInboundCustomCleared = $fetchInboundCustomCleared;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $query = $this->fetchInboundCustomCleared->execute();
-
-        return $this->collectionResponse(ContainerResource::collection($query));
-
-    }
-}

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

@@ -5,7 +5,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\ListsContainers;
-use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanListContainers;
+use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanListContainers;
 use App\Http\Resources\ContainerResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -45,17 +45,21 @@ class ListContainersLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
-        $this->canListContainers->passes();
+        try {
 
-        $query = $this->listsContainers->execute($this->listsContainers->deserializeFilters($request->input('filters')));
+            $this->canListContainers->passes();
 
-        return $this->collectionResponse(ContainerResource::collection($query));
+            $query = $this->listsContainers->execute($this->listsContainers->deserializeFilters($request->input('filters')));
+
+            return $this->collectionResponse(ContainerResource::collection($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
     }
 

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

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Schedules\Services\UpdatesScheduleStatus;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use App\Http\Resources\ContainerResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class RescheduleContainerLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Reschedule Container',
-            'message' => 'You have successfully Reschedule Container'
-        ];
-    }
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /** @var UpdatesScheduleStatus */
-    private $updatesScheduleStatus;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /**
-     * DeleteContainerControllersLogic constructor.
-     * @param FetchesContainer $fetchesContainer
-     * @param CreatesSchedule $createsSchedule
-     */
-    public function __construct(FetchesContainer $fetchesContainer, UpdatesScheduleStatus $updatesScheduleStatus, CreatesSchedule $createsSchedule)
-    {
-        $this->fetchesContainer = $fetchesContainer;
-        $this->updatesScheduleStatus = $updatesScheduleStatus;
-        $this->createsSchedule = $createsSchedule;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-            $transport = $container->transports()->first();
-
-            $old_sechedule = $transport->schedules()->first();
-
-            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
-
-            $scheduleObject = new ScheduleObject(
-                Carbon::parse($request->input('etd')), 
-                Carbon::parse($request->input('eta')), 
-                ApprovalStatus::APPROVED
-             );
-            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-            return $this->resourceResponse(new ContainerResource($container));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-
-}

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

@@ -6,7 +6,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\UpdatesContainer;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanUpdateContainer;
+use App\Classes\Modules\PackingLists\Standards\Containers\Rules\CanUpdateContainer;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Http\Resources\ContainerResource;
 use ErrorException;
@@ -52,23 +52,14 @@ class UpdateContainerLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
 
         $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-        
-        $object = new ContainerObject( 
-            $request->input('container_reference'), 
-            $container->container_number, 
-            $request->input('container_type'), 
-            $request->input('seal_reference'),
-            $request->input('loading_date'),
-            $container->status,
-        );
+
+        $object = new ContainerObject( $container->packing_list_id , $request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
 
         $this->canUpdateContainer->passes($object);
 

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

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transports\Services\UpdatesDispatchDateTransport;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Http\Resources\ContainerResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class UpdateDispatchDateContainerLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Dispatch Date Container',
-            'message' => 'You have successfully updated the Dispatch Date Container'
-        ];
-    }
-
-
-    /** @var UpdatesDispatchDateTransport */
-    private $updatesDispatchDateTransport;
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /**
-     * UpdateDispatchDateContainerLogic constructor.
-     * @param CanUpdateContainer $canUpdateContainer
-     * @param UpdatesDispatchDateTransport $updatesDispatchDateTransport
-     * @param FetchesContainer $fetchesContainer
-     */
-    public function __construct(UpdatesDispatchDateTransport $updatesDispatchDateTransport, FetchesContainer $fetchesContainer)
-    {
-        $this->updatesDispatchDateTransport = $updatesDispatchDateTransport;
-        $this->fetchesContainer = $fetchesContainer;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-        $transport = $container->transports()->first();
-        $query = $this->updatesDispatchDateTransport->execute($transport, Carbon::parse($request->input('dispatch_date')));
-        return $this->resourceResponse(new ContainerResource($container));
-    }
-
-}

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

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transports\Services\UpdatesDropDateTransport;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Http\Resources\ContainerResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class UpdateDropDateContainerLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Drop Date Container',
-            'message' => 'You have successfully updated the Drop Date Container'
-        ];
-    }
-
-
-    /** @var UpdatesDropDateTransport */
-    private $updatesDropDateTransport;
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /**
-     * UpdateDropDateContainerLogic constructor.
-     * @param CanUpdateContainer $canUpdateContainer
-     * @param UpdatesDropDateTransport $updatesDropDateTransport
-     * @param FetchesContainer $fetchesContainer
-     */
-    public function __construct(UpdatesDropDateTransport $updatesDropDateTransport, FetchesContainer $fetchesContainer)
-    {
-        $this->updatesDropDateTransport = $updatesDropDateTransport;
-        $this->fetchesContainer = $fetchesContainer;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-        $transport = $container->transports()->first();
-        $query = $this->updatesDropDateTransport->execute($transport, Carbon::parse($request->input('drop_date')));
-        return $this->resourceResponse(new ContainerResource($container));
-    }
-
-}

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

@@ -1,88 +0,0 @@
-<?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/CreatePackingListLogic.php

@@ -2,11 +2,6 @@
 
 namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
@@ -14,17 +9,16 @@ use App\Classes\Modules\PackingLists\Services\CreatesPackingListPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingListPackage;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
-
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListPackageObject;
+use App\Classes\Modules\Packages\Services\FetchesPackage;
 use App\Http\Resources\PackingListResource;
+use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class CreatePackingListLogic extends AbstractControllerLogic
 {
 
-
     /**
      * @return array
      */
@@ -35,37 +29,64 @@ class CreatePackingListLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
+    /** @var CanCreatePackingList */
+    private $canCreatePackingList;
 
-    /** @var FetchesOrder */
-    private $fetchesOrder;
+    private $canCreatePackingListPackage;
+
+    /** @var FetchesCompany */
+    private $fetchesPackage;
+
+    /** @var CreatesPackingList */
+    private $createsPackingList;
+
+    private $createsPackingListPackage;
 
     /**
      * CreatePackingListLogic constructor.
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param FetchesOrder $fetchesOrder
+     * @param CanCreatePackingList $canCreatePackingList
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesPackingList $createsPackingList
      */
-    public function __construct(CreatePackingListProcessor $createPackingListProcessor, FetchesOrder $fetchesOrder)
+    public function __construct(CanCreatePackingList $canCreatePackingList, CanCreatePackingListPackage $canCreatePackingListPackage, FetchesPackage $fetchesPackage, CreatesPackingList $createsPackingList, CreatesPackingListPackage $createsPackingListPackage)
     {
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->fetchesOrder = $fetchesOrder;
+        $this->canCreatePackingList = $canCreatePackingList;
+        $this->canCreatePackingListPackage = $canCreatePackingListPackage;
+        $this->fetchesPackage = $fetchesPackage;
+        $this->createsPackingList = $createsPackingList;
+        $this->createsPackingListPackage = $createsPackingListPackage;
     }
 
     /**
      * @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
     {
 
-        $order = $this->fetchesOrder->execute(['reference' => $request->input('reference_number')]);
+        $package = $this->fetchesPackage->execute(['id'=>$request->input('package_id')]);
 
-        $packingListObject = new PackingListObject($request->input('reference_number'), $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::PENDING_SUBMISSION);
+        $reference_no = rand(1000000, 9999999);
 
-        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
-        return $this->resourceResponse(new PackingListResource($packingList));
+        $object = new PackingListObject($reference_no, ApprovalStatus::PENDING_SUBMISSION);
+
+        $this->canCreatePackingList->passes($object);
+
+        $packageList = $this->createsPackingList->execute( $object);
+
+
+        $object = new PackingListPackageObject($packageList->id, $package->id);
+
+        $this->canCreatePackingListPackage->passes($object);
+
+        $query = $this->createsPackingListPackage->execute($object);
+
+
+        return $this->resourceResponse(new PackingListResource($query));
 
     }
 

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

@@ -12,7 +12,6 @@ use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Http\Resources\PackageResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Classes\ValueObjects\Constants\PackageType;
 
 class CreatePackageLogic extends AbstractControllerLogic
 {
@@ -62,10 +61,12 @@ class CreatePackageLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        
+
         $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
 
         $object = new PackageObject(
+            $order->id,
+            null,
             $request->input('type'),
             $request->input('description'),
             $request->input('width'),
@@ -73,11 +74,11 @@ class CreatePackageLogic extends AbstractControllerLogic
             $request->input('length'),
             $request->input('weight'),
             $request->input('quantity'),
-            ApprovalStatus::PENDING_VERIFICATION);
+            ApprovalStatus::PENDING_SUBMISSION);
 
         $this->canCreatePackage->passes($object);
 
-        $query = $this->createsPackage->execute($object, $order->packingLists()->first());
+        $query = $this->createsPackage->execute($object);
 
         return $this->resourceResponse(new PackageResource($query));
 

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

@@ -4,8 +4,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
-use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanFetchPackage;
+use App\Classes\Modules\Packages\Services\FetchesPackage;
+use App\Classes\Modules\Packages\Standards\Rules\CanFetchPackage;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;

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

@@ -4,8 +4,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Packages\ListsPackages;
-use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanListPackages;
+use App\Classes\Modules\Packages\Services\ListsPackages;
+use App\Classes\Modules\Packages\Standards\Rules\CanListPackages;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;

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

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Packages\SwitchesPackagePackingList;
-use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Http\Resources\PackageResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class SwitchPackagePackingListLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Switched Package Packing List',
-            'message' => 'You have successfully switched the Package Packing List'
-        ];
-    }
-
-    /** @var SwitchesPackagePackingList */
-    private $switchesPackagePackingList;
-
-    /** @var FetchesPackage */
-    private $fetchesPackage;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /**
-     * UpdatePackageLogic constructor.
-     * @param SwitchesPackagePackingList $switchesPackagePackingList
-     * @param FetchesPackage $fetchesPackage
-     * @param FetchesPackingList $fetchesPackingList
-     */
-    public function __construct(SwitchesPackagePackingList $switchesPackagePackingList, FetchesPackage $fetchesPackage, FetchesPackingList $fetchesPackingList)
-    {
-        $this->switchesPackagePackingList = $switchesPackagePackingList;
-        $this->fetchesPackage = $fetchesPackage;
-        $this->fetchesPackingList = $fetchesPackingList;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
-
-        $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
-
-        $query = $this->switchesPackagePackingList->execute($package, $packing_list);
-
-        return $this->resourceResponse(new PackageResource($query));
-    }
-
-}

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

@@ -4,10 +4,10 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Packages\UpdatesPackage;
-use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
-use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanUpdatePackage;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\Packages\Services\UpdatesPackage;
+use App\Classes\Modules\Packages\Services\FetchesPackage;
+use App\Classes\Modules\Packages\Standards\Rules\CanUpdatePackage;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -60,6 +60,8 @@ class UpdatePackageLogic extends AbstractControllerLogic
         $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
 
         $object = new PackageObject(
+            $package->order_id,
+            null,
             $request->input('type'),
             $request->input('description'),
             $request->input('width'),
@@ -67,9 +69,7 @@ class UpdatePackageLogic extends AbstractControllerLogic
             $request->input('length'),
             $request->input('weight'),
             $request->input('quantity'),
-            $request->input('status'),
-            $package->reference
-        );
+            $request->input('status'));
 
         $this->canUpdatePackage->passes($object);
 

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

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Schedules\Services\UpdatesScheduleStatus;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use App\Http\Resources\PackingListResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class ReschedulePackingListLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Reschedule Packing List',
-            'message' => 'You have successfully Reschedule Packing List'
-        ];
-    }
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var UpdatesScheduleStatus */
-    private $updatesScheduleStatus;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /**
-     * DeleteContainerControllersLogic constructor.
-     * @param FetchesPackingList $fetchesPackingList
-     * @param CreatesSchedule $createsSchedule
-     */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesScheduleStatus $updatesScheduleStatus, CreatesSchedule $createsSchedule)
-    {
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->updatesScheduleStatus = $updatesScheduleStatus;
-        $this->createsSchedule = $createsSchedule;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-            $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-
-            $transport = $packing_list->transports()->first();
-
-            $old_sechedule = $transport->schedules()->first();
-
-            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
-
-            $scheduleObject = new ScheduleObject(
-                Carbon::parse($request->input('eta')), 
-                Carbon::parse($request->input('etd')), 
-                ApprovalStatus::APPROVED
-             );
-            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-            return $this->resourceResponse(new PackingListResource($packing_list));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-
-}

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

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transports\Services\UpdatesDispatchDateTransport;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Http\Resources\PackingListResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class UpdateDispatchDatePackingListLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Dispatch Date Packing List',
-            'message' => 'You have successfully updated the Dispatch Date Packing List'
-        ];
-    }
-
-
-    /** @var UpdatesDispatchDateTransport */
-    private $updatesDispatchDateTransport;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /**
-     * UpdateDispatchDatePackingListLogic constructor.
-     * @param CanUpdateContainer $canUpdateContainer
-     * @param UpdatesDispatchDateTransport $updatesDispatchDateTransport
-     * @param FetchesPackingList $fetchesPackingList
-     */
-    public function __construct(UpdatesDispatchDateTransport $updatesDispatchDateTransport, FetchesPackingList $fetchesPackingList)
-    {
-        $this->updatesDispatchDateTransport = $updatesDispatchDateTransport;
-        $this->fetchesPackingList = $fetchesPackingList;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-        $transport = $packing_list->transports()->first();
-        $query = $this->updatesDispatchDateTransport->execute($transport, Carbon::parse($request->input('dispatch_date')));
-        return $this->resourceResponse(new PackingListResource($packing_list));
-    }
-
-}