fix issue unable to generate invoice

# Conflicts:
#	routes/web.php

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

@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class OwnerId implements Filter
+class TypeIn implements Filter
 {
 
     /**
@@ -14,7 +14,7 @@ class OwnerId implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('owner_id', $value);
+        return $builder->whereIn('type', $value);
     }
 
 }

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

@@ -15,6 +15,7 @@ use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
 use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
 use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
@@ -76,6 +77,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -88,8 +92,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -101,6 +106,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
     }
 
     /**
@@ -126,7 +132,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
 
-        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');
 
         $connection = $this->createsCompanyConnection->execute($connectionObject);
 

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

@@ -12,6 +12,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class GeneratePasswordResetLogic extends AbstractControllerLogic
 {

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

@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\Accounts\Services;
 
+use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Models\User;
 
@@ -11,6 +12,11 @@ class AuthenticationRedirect
     public function url(User $user){
 
         if($user->type === RoleTypes::USER){
+
+            if (in_array($user->companyModule()->first()->type, [BusinessType::ONLINE_SELLER, BusinessType::LAST_MILE_DELIVERY_AGENT])) {
+                return route('last_mile_delivery.dashboard');
+            }
+
             return route('dashboard');
         }
 

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

@@ -68,7 +68,11 @@ class GeneratesAuthenticationToken {
             $companyModule = $user->companyModule()->first();
 
             $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id
+                'company_id' => $companyModule->company_id,
+                'company_module_id' => $companyModule->id,
+                'company_module_type' => $companyModule->type,
+                'company_name' => $companyModule->name,
+                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
             ]);
         }
 

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

@@ -14,6 +14,7 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use ErrorException;
@@ -82,7 +83,7 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('type'), ApprovalStatus::APPROVED, $request->input('reference'));
 
         $this->canCreateAddress->passes($object);
 

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

@@ -13,6 +13,8 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use Illuminate\Http\JsonResponse;
@@ -79,7 +81,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
     {
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $request->input('reference'));
 
         $this->canUpdateAddress->passes($object);
 

app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php

@@ -26,6 +26,12 @@ class AddressObject implements DataTransferObject
     /** @var int */
     private $postCode;
 
+    /** @var int */
+    private $type;
+
+    /** @var int */
+    private $status;
+
     /** @var string|null */
     private $reference;
 
@@ -37,9 +43,11 @@ class AddressObject implements DataTransferObject
      * @param int $stateId
      * @param int $districtId
      * @param int $postCode
+     * @param int $type
+     * @param int $status
      * @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, int $type, int $status, ?string $reference = null)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -47,8 +55,9 @@ class AddressObject implements DataTransferObject
         $this->stateId = $stateId;
         $this->districtId = $districtId;
         $this->postCode = $postCode;
-        $this->reference = $reference;
+        $this->type = $type;
         $this->status = $status;
+        $this->reference = $reference;
     }
 
     /**
@@ -100,11 +109,11 @@ class AddressObject implements DataTransferObject
     }
 
     /**
-     * @return null|string
+     * @return int
      */
-    public function getReference(): ?string
+    public function getType(): int
     {
-        return $this->reference;
+        return $this->type;
     }
 
     /**
@@ -115,5 +124,13 @@ class AddressObject implements DataTransferObject
         return $this->status;
     }
 
+    /**
+     * @return null|string
+     */
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+
 
 }

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

@@ -10,6 +10,8 @@ namespace App\Classes\Modules\Addresses\Services;
 
 
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\District;
 use App\Models\OldAddress;
 
@@ -31,7 +33,7 @@ class CleansOldAddress
             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');
+        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, AddressType::DELIVERY, ApprovalStatus::APPROVED, 'Delivery Address');
 
     }
 

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

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

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

@@ -26,8 +26,6 @@ use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
-
-
     /** @var GetBillplzBill */
     private $getBillplzBill;
 
@@ -47,12 +45,11 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdatesWalletBalance $updatesWalletBalance
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWalletBalance $updatesWalletBalance)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->updatesWalletBalance = $updatesWalletBalance;
     }
 
 
@@ -84,22 +81,11 @@ class CallbackBillplzLogic
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
 
-        if($transaction->status !== ApprovalStatus::COMPLETED){
-
-            if($transaction->owner instanceof Wallet && $transaction->status !== ApprovalStatus::APPROVED && $status === ApprovalStatus::APPROVED) {
-                $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-            }
-            $this->updatesTransactionStatus->execute($transaction, $status);
-
-        }
-
-
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $marking = $transaction->owner instanceof Booking ? $transaction->booking->marking : $transaction->owner->owner->bookings()->orderBy('id', 'DESC')->first()->marking;
-
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking, 'transaction' => $transaction, 'status' => $status]);
+        $marking = $transaction->owner()->first()->owner()->first();
 
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking->reference, 'transaction' => $transaction, 'status' => $status]);
     }
 }

app/Classes/Modules/Companies/DataTransferObjects/CompanyConnectionObject.php

@@ -10,6 +10,9 @@ class CompanyConnectionObject implements DataTransferObject
 
     /** @var CompanyModule */
     private $invitee;
+    
+    /** @var CompanyModule */
+    private $inviter;
 
     /** @var string */
     private $inviterReference;
@@ -20,12 +23,14 @@ class CompanyConnectionObject implements DataTransferObject
     /**
      * CompanyConnectionObject constructor.
      * @param CompanyModule $invitee
+     * @param CompanyModule $inviter
      * @param string $inviterReference
      * @param string $inviteeReference
      */
-    public function __construct(CompanyModule $invitee, string $inviterReference, string $inviteeReference)
+    public function __construct(CompanyModule $invitee, CompanyModule $inviter, string $inviteeReference, string $inviterReference)
     {
         $this->invitee = $invitee;
+        $this->inviter = $inviter;
         $this->inviterReference = $inviterReference;
         $this->inviteeReference = $inviteeReference;
     }
@@ -38,6 +43,14 @@ class CompanyConnectionObject implements DataTransferObject
         return $this->invitee;
     }
 
+    /**
+     * @return CompanyModule
+     */
+    public function getInviter(): CompanyModule
+    {
+        return $this->inviter;
+    }
+
     /**
      * @return string
      */

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

@@ -30,10 +30,8 @@ class CreatesCompanyConnection extends AbstractUpdateRecord
     public function execute(CompanyConnectionObject $object)
     {
 
-        $companyModule = $this->fetchesCompany->execute(['id', 1])->companyModules()->first();
-
         $connection = new CompanyConnection();
-        $connection->inviter_id = $companyModule->id;
+        $connection->inviter_id = $object->getInviter()->id;
         $connection->invitee_id = $object->getInvitee()->id;
         $connection->inviter_reference = $object->getInviterReference();
         $connection->invitee_reference = $object->getInviteeReference();

app/Classes/Modules/Delivery/ControllersLogic/CancelDeliveryOrderLogic.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\CancelsOrder;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelDeliveryOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Cancelled Order',
+            'message' => 'You have successfully cancelled an order'
+        ];
+    }
+
+    /** @var CancelsOrder */
+    private $cancelsOrder;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * CancelDeliveryOrderLogic constructor.
+     * @param CancelsOrder $cancelsOrder
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(CancelsOrder $cancelsOrder, FetchesOrder $fetchesOrder)
+    {
+        $this->cancelsOrder = $cancelsOrder;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+
+        /** @var Order $order */
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new DeliveryOrderResource($this->cancelsOrder->execute($order)));
+
+    }
+}

app/Classes/Modules/Delivery/ControllersLogic/CreateDeliveryCustomerLogic.php

@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
+
+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 App\Models\Company;
+use App\Models\CompanyModule;
+use App\Models\User;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use Illuminate\Support\Facades\Log;
+
+class CreateDeliveryCustomerLogic 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 CreateCompanyProcessor */
+    private $createCompanyProcessor;
+
+    /** @var CreateCompanyModuleProcessor */
+    private $createCompanyModuleProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreatesCompanyConnection */
+    private $createsCompanyConnection;
+
+    /** @var ApprovesCompanyConnection */
+    private $approvesCompanyConnection;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var UploadIdentityDocumentProcessor */
+    private $uploadIdentityDocumentProcessor;
+
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
+
+    /** @var GenerateEmailVerificationAttemptProcessor */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /**
+     * CreateDeliveryCustomerLogic constructor.
+     * @param CreateUserProcessor $createUserProcessor
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreatesCompanyConnection $createsCompanyConnection
+     * @param ApprovesCompanyConnection $approvesCompanyConnection
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
+     * @param AuthenticationProcessor $authenticationProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     */
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
+    {
+        $this->createUserProcessor = $createUserProcessor;
+        $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->approvesCompanyConnection = $approvesCompanyConnection;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
+        $this->authenticationProcessor = $authenticationProcessor;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+    }
+
+    /**
+     * @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 User $user */
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+
+        /** @var Company $company */
+        $company = $this->createCompanyProcessor->execute($request->input('name'), CompanyType::PERSONAL_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
+
+        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
+
+        $this->createContactProcessor->execute($contactObject, $company);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::ONLINE_SELLER);
+
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'HWT']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'HWT');
+
+        $connection = $this->createsCompanyConnection->execute($connectionObject);
+
+        $this->approvesCompanyConnection->execute($connection);
+
+        $Object = new EmploymentObject($companyModule, $user);
+
+        $this->assignEmployeeProcessor->execute($Object);
+
+        return $this->response($this->authenticationProcessor->execute($request));
+    }
+}

app/Classes/Modules/Delivery/ControllersLogic/CreateDeliveryOrderLogic.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Orders\DataTransferObjects\OrderObject;
+use App\Classes\Modules\Orders\Services\CreatesOrder;
+use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\Modules\Orders\Standards\Rules\CanCreateOrder;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
+use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Models\Address;
+use App\Models\CompanyModule;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliveryOrderLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created Order',
+            'message' => 'You have successfully created a new Order'
+        ];
+    }
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var fetchesAddress */
+    private $fetchesAddress;
+
+    /** @var CanCreateOrder */
+    private $canCreateOrder;
+
+    /** @var CreatesOrder */
+    private $createsOrder;
+
+    /** @var CreatesAddress */
+    private $createAddress;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
+    /** @var GeneratesOrderNumber */
+    private $generatesOrderNumber;
+
+    /** @var CreatesPackingList */
+    private $createsPackingList;
+
+    /** @var CreatesPackage */
+    private $createsPackage;
+
+
+    /**
+     * CreateDeliveryOrderLogic constructor.
+     * @param FetchesCompany $fetchesCompany
+     * @param FetchesAddress $fetchesAddress
+     * @param CanCreateOrder $canCreateOrder
+     * @param CreatesOrder $createsOrder
+     * @param CreatesAddress $createAddress
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
+     * @param GeneratesOrderNumber $generatesOrderNumber
+     * @param CreatesPackingList $createsPackingList
+     * @param CreatesPackage $createPackage
+     */
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CanCreateOrder $canCreateOrder, CreatesOrder $createsOrder, CreatesAddress $createAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor, GeneratesOrderNumber $generatesOrderNumber, CreatesPackingList $createsPackingList, CreatesPackage $createsPackage)
+    {
+        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->canCreateOrder = $canCreateOrder;
+        $this->createsOrder = $createsOrder;
+        $this->createAddress = $createAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
+        $this->generatesOrderNumber = $generatesOrderNumber;
+        $this->createsPackingList = $createsPackingList;
+        $this->createsPackage = $createsPackage;
+    }
+
+    /**
+     * @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->input('company_id')]);
+
+        $senderAddress = $this->fetchesAddress->execute(['id' => $request->input('sender_address_id')]);
+        $deliveryAddress = $this->fetchesAddress->execute(['id' => $request->input('delivery_address_id')]);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $company->companyModules()->where('type', BusinessType::ONLINE_SELLER)->first();
+
+        $orderObject = new OrderObject($this->generatesOrderNumber->execute('168M', 7), OrderType::LAST_MILE_DELIVERY, ApprovalStatus::APPROVED);
+
+        $this->canCreateOrder->passes($orderObject);
+
+        /** @var Order $order */
+        $order = $this->createsOrder->execute($companyModule, $orderObject);
+
+        $senderAddressObject = new AddressObject($senderAddress->street_one, $senderAddress->street_two, $senderAddress->country_id, $senderAddress->state_id, $senderAddress->district_id, $senderAddress->postcode, $senderAddress->type, ApprovalStatus::APPROVED, $senderAddress->reference);
+        $deliveryAddressObject = new AddressObject($deliveryAddress->street_one, $deliveryAddress->street_two, $deliveryAddress->country_id, $deliveryAddress->state_id, $deliveryAddress->district_id, $deliveryAddress->postcode, $deliveryAddress->type, ApprovalStatus::APPROVED, $deliveryAddress->reference);
+
+        /** @var Address $orderSenderAddress */
+        $orderSenderAddress = $this->createAddress->execute($order, $senderAddressObject);
+        /** @var Address $orderDeliveryAddress */
+        $orderDeliveryAddress = $this->createAddress->execute($order, $deliveryAddressObject);
+
+        $senderContact = $senderAddress->contacts()->first();
+        $deliveryContact = $deliveryAddress->contacts()->first();
+
+        $contactObject = new ContactObject($senderContact->reference, $senderContact->phone, '','');
+        $this->createContactProcessor->execute($contactObject, $orderSenderAddress);
+
+        $contactObject = new ContactObject($deliveryContact->reference, $deliveryContact->phone, '','');
+        $this->createContactProcessor->execute($contactObject, $orderDeliveryAddress);
+
+        $senderRemark = $senderAddress->remarks()->first();
+        $deliveryRemark = $deliveryAddress->remarks()->first();
+
+        if ($senderRemark){
+            $remarkObject = new RemarkObject($senderRemark->content, Auth()->user()->id);
+
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($orderSenderAddress, $remarkObject);
+            }
+        }
+
+        if ($deliveryRemark){
+            $remarkObject = new RemarkObject($deliveryRemark->content, Auth()->user()->id);
+
+            if($remarkObject->getContent()){
+                $this->createRemarkProcessor->execute($orderDeliveryAddress, $remarkObject);
+            }
+        }
+
+        $packingListObject = new PackingListObject($order->reference, $companyModule->id, PackingListType::DELIVERY_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION);
+
+        /** @var PackingList $packingList */
+        $packingList = $this->createsPackingList->execute($packingListObject, $order);
+
+        $packageObject = new PackageObject($request->input('packing_list.type'), $request->input('packing_list.description'), (float) 1, (float) 1, (float) 1, $request->input('packing_list.weight'), (float) $request->input('packing_list.quantity'), ApprovalStatus::APPROVED);
+        $this->createsPackage->execute($packageObject, $packingList);
+
+        return $this->resourceResponse(new DeliveryOrderResource($order));
+
+    }
+}

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

@@ -0,0 +1,57 @@
+<?php
+
+
+namespace App\Classes\Modules\Delivery\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\ListsOrders;
+use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Http\Resources\DeliveryOrderResource;
+use App\Http\Resources\OrderResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListOrdersLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Orders',
+            'message' => 'You have successfully retrieved a list of Orders'
+        ];
+    }
+
+    /** @var CanListOrders */
+    private $canListOrders;
+
+    /** @var ListsOrders */
+    private $listsOrders;
+
+    /**
+     * ListOrdersLogic constructor.
+     * @param CanListOrders $canListOrders
+     * @param ListsOrders $listsOrders
+     */
+    public function __construct(CanListOrders $canListOrders, ListsOrders $listsOrders)
+    {
+        $this->canListOrders = $canListOrders;
+        $this->listsOrders = $listsOrders;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canListOrders->passes();
+
+        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::LAST_MILE_DELIVERY]]));
+
+        return $this->collectionResponse(DeliveryOrderResource::collection($query));
+
+    }
+
+
+
+}

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\Order;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+
+class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'ORDER NUMBER',
+            'Marking',
+            'Warehouse',
+            'Cbm',
+            'Description',
+            'quantity',
+            'Received Date',
+            'Remarks'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
+    }
+
+    /**
+     * @param $packingList
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $order = $packingList->owner;
+
+        $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
+
+        $cbm = $packingList->packages->sum(function($package){
+           return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+        });
+
+        $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y');
+
+        return [
+            $packingList->owner->reference,
+            $marking,
+            $warehouse->reference,
+            $cbm,
+            $packingList->packages->implode('description', ', '),
+            $packingList->packages->sum('quantity'),
+            $arrival_date,
+            ''
+        ];
+    }
+}

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

@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\Container;
+use App\Models\Package;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsCompanyModuleSummary implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    protected $companyModuleId, $containerIds;
+
+    public function headings(): array
+    {
+        return [
+            'Date',
+            'Full Marking',
+            'Container',
+            'Description',
+            'Ctns',
+            'L (cm)',
+            'H (cm)',
+            'W (cm)',
+            'CBM'
+        ];
+    }
+    
+    public function setParameters($companyModuleId, $containerIds)
+    {
+        $this->companyModuleId = $companyModuleId;
+        $this->containerIds = $containerIds;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $packagesArray = collect();
+        $containers = Container::whereIn('reference', explode(',', $this->containerIds))->get();
+        foreach ($containers as $container){
+            $company_module_id = $this->companyModuleId;
+            $packingLists = $container->packingLists()->get()->filter(function ($packingList) use ($company_module_id) {
+                return $packingList->owner->company_module_id == $company_module_id;
+            });
+            foreach ($packingLists as $packingList){
+                if($packingList->packingLists->first()){
+                    $packingList = $packingList->packingLists->first();
+                }
+                $packages = $packingList->packages;
+                foreach ($packages as $package){
+                    $packagesArray->push($package);
+                }
+            }
+        }
+
+        return $packagesArray;
+    }
+
+    /**
+     * @param Package $package
+     *
+     * @return array
+     */
+    public function map($package): array
+    {
+        $connection = $package->packingList->owner->companyModule->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        return [
+            Carbon::parse($package->created_at)->format('d-m-Y'),
+            $marking,
+            $package->packingList->containers()->first()->reference,
+            $package->description,
+            $package->quantity,
+            $package->length,
+            $package->height,
+            $package->width,
+            ((($package->length / 100) * ($package->height / 100) * ($package->width / 100)) *  $package->quantity)
+        ];
+    }
+}

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

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Models\Order;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithTitle;
+
+class ExportsDeliveryOrders implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, WithTitle
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Types_Of_Services',
+            'Service_Type',
+            'Sender_Name',
+            'Sender_Company_Name',
+            'Sender_Building_Unit',
+            'Sender_Address',
+            'Sender_Address_2',
+            'Sender_Postal_Code',
+            'Sender_Phone_Number',
+            'Delivery_Name',
+            'Delivery Company Name',
+            'Delivery_Building_Unit',
+            'Delivery_Address',
+            'Delivery_Address_2',
+            'Delivery_Postal_Code',
+            'Delivery_Phone_Number',
+            'Shipment_Type',
+            'Mode',
+            'Pickup_Address_Type',
+            'Reference_Number',
+            'Quantity',
+            'Weight',
+            'Length',
+            'Width',
+            'Height',
+            'COD_Amount',
+            'DO_Numbers'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $selectedIds = array_map(function($value){
+            return ['id' => $value];
+        }, json_decode($this->request->input('ids')));
+        
+        return Order::where('type', OrderType::LAST_MILE_DELIVERY)->whereIn('id', $selectedIds);
+    }
+
+    public function title(): string
+    {
+        return 'bulk-shipment';
+    }
+
+    /**
+     * @param Order $order
+     *
+     * @return array
+     */
+    public function map($order): array
+    {
+        $senderAddress = $order->addresses()->where('type', AddressType::PICK_UP)->first();
+        $deliveryAddress = $order->addresses()->where('type', AddressType::DELIVERY)->first();
+        $package = $order->packingLists()->first()->packages()->first();
+
+        return [
+            'Domestic Shipment',
+            'ST00000020',
+            $senderAddress->contacts()->first()->reference,
+            $senderAddress->reference ? $senderAddress->reference : $order->companyModule->name,
+            $senderAddress->street_one,
+            $senderAddress->street_two.' '.$senderAddress->district->name.' '.$senderAddress->postcode.' '.$senderAddress->state->name.' '.$senderAddress->country->name,
+            '',
+            $senderAddress->postcode,
+            $senderAddress->contacts()->first()->phone,
+            $deliveryAddress->contacts()->first()->reference,
+            $deliveryAddress->reference,
+            $deliveryAddress->street_one,
+            $deliveryAddress->street_two.' '.$deliveryAddress->district->name.' '.$deliveryAddress->postcode.' '.$deliveryAddress->state->name.' '.$deliveryAddress->country->name,
+            '',
+            $deliveryAddress->postcode,
+            $deliveryAddress->contacts()->first()->phone,
+            $package->type === PackageType::CARTON ? 'Package' : ($package->type === PackageType::PALLET ? 'Pallet' : 'Documents'),
+            'Pick Up',
+            'Default',
+            $order->reference,
+            $package->quantity,
+            $package->weight * $package->quantity,
+            1,
+            1,
+            1,
+            '',
+            ''
+        ];
+    }
+}

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

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithTitle;
+
+class ExportsDeliveryValidValues implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, WithTitle, FromCollection
+{
+    use Exportable;
+
+    private $request;
+
+    /**
+     * ExportsDeliveryValidValues constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Types_Of_Services',
+            'Service_Type',
+            'Mode',
+            'Flag',
+            'Pickup Address'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $returnArray = collect();
+
+        $returnArray->push(['Domestic Shipment', 'Package', 'Pick Up', 'Yes', 'Default']);
+        $returnArray->push(['', 'Documents', 'Lodge In / Walk In', 'No', 'Sender']);
+        $returnArray->push(['', 'Pallet', '', '', '']);
+
+        return $returnArray;
+    }
+
+    public function title(): string
+    {
+        return 'valid-values';
+    }
+
+    /**
+     * @param ReturnArray $returnArray
+     *
+     * @return array
+     */
+    public function map($returnArray): array
+    {
+        return [
+            $returnArray[0],
+            $returnArray[1],
+            $returnArray[2],
+            $returnArray[3],
+            $returnArray[4],
+        ];
+    }
+}

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

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\Modules\Exports\Services\ExportsDeliveryOrders; 
+use App\Classes\Modules\Exports\Services\ExportsDeliveryValidValues; 
+use App\Models\Order;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+
+class ExportsMultipleDeliveryOrders implements WithMultipleSheets
+{
+    use Exportable;
+
+    protected $request;
+    
+    /**
+     * ExportsMultipleDeliveryOrders constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @return array
+     */
+    public function sheets(): array
+    {
+        $sheets = [];
+        $sheets[] = new ExportsDeliveryOrders($this->request);
+        $sheets[] = new ExportsDeliveryValidValues($this->request);
+
+        return $sheets;
+    }
+}

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

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsOnHoldPackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
+            'Marking',
+            'Order Number'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereIn('status', [4, 5])->whereHas('containers');
+    }
+
+    /**
+     * @param PackingList $packingList
+     *
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
+        $order = $packingList->owner;
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            $container->reference,
+            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a',
+            $ContainerTransport ? $ContainerTransport->drop_date : 'n/a',
+            $marking,
+            $order->reference,
+        ];
+    }
+}

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

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
+            'Marking',
+            'Order Number',
+            'status',
+            'Delay Days / delivery date',
+            'Quantity',
+            'State',
+            'Postcode',
+            'Address',
+            'PIC',
+            'Phone',
+            'Remark'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
+            $query->where('containers.status', ApprovalStatus::COMPLETED);
+        });
+    }
+
+    /**
+     * @param PackingList $packingList
+     *
+     * @return array
+     */
+    public function map($packingList): array
+    {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
+        $order = $packingList->owner;
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        $contacts = $address->contacts->first() ? $address->contacts->first(): '';
+        $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
+        $transport = $originalPackingList->containers()->first()->transports()->first();
+        $deliveryTransport = $originalPackingList->transports()->first();
+
+        return [
+            $container->reference,
+            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta,
+            $ContainerTransport->drop_date,
+            $marking,
+            $order->reference,
+            $deliveryTransport ? (Carbon::parse($deliveryTransport->schedules()->first()->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
+            $deliveryTransport ? $deliveryTransport->schedules()->first()->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
+            $packingList->packages()->sum('quantity'),
+            $address->state->name,
+            $address->postcode,
+            $address->street_one.', '.$address->street_two.' '.$address->district->name.' '.$address->postcode.' '.$address->state->name.' '.$address->country->name,
+            $address->remarks->first() ? $address->remarks->first()->content: '',
+            $contacts ? $contacts ->reference : '',
+            $contacts ? $contacts ->phone : '',
+        ];
+    }
+}

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

@@ -6,6 +6,7 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Orders\Services\ListsOrders;
 use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
+use App\Classes\ValueObjects\Constants\OrderType;
 use App\Http\Resources\OrderResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -44,7 +45,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(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]));
 
         return $this->collectionResponse(OrderResource::collection($query));
 

app/Classes/Modules/Orders/DataTransferObjects/OrderObject.php

@@ -9,7 +9,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 class OrderObject  implements DataTransferObject
 {
 
-    /** @var int */
+    /** @var string */
     private $reference;
 
     /** @var int  */
@@ -20,11 +20,11 @@ class OrderObject  implements DataTransferObject
 
     /**
      * OrderObject constructor.
-     * @param int $reference
+     * @param string $reference
      * @param int $type
      * @param int|null $status
      */
-    public function __construct(int $reference, int $type, ?int $status = ApprovalStatus::PENDING_VERIFICATION)
+    public function __construct(string $reference, int $type, ?int $status)
     {
         $this->reference = $reference;
         $this->type = $type;
@@ -32,9 +32,9 @@ class OrderObject  implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getReference(): int
+    public function getReference(): string
     {
         return $this->reference;
     }
@@ -48,12 +48,13 @@ class OrderObject  implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return int|null
      */
-    public function getStatus(): int
+    public function getStatus(): ?int
     {
         return $this->status;
     }
 
 
+
 }

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

@@ -7,6 +7,7 @@ use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use Illuminate\Http\Request;
 
 class ApproveChangeOrderAddressProcessor
@@ -65,7 +66,11 @@ class ApproveChangeOrderAddressProcessor
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
 
             $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-            $appointee === 2  ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address);
+            if($appointee === 2) {
+                foreach($address->owner->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST) as $packingList){
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                }
+            }
 
         }
 

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

@@ -84,7 +84,7 @@ class CreateOrderProcessor
         /** @var Order $order */
         $order = $this->createsOrder->execute($importer, $orderObject);
 
-        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode,$address->reference);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->type, ApprovalStatus::APPROVED, $address->reference);
 
         /** @var Address $order_address */
         $order_address = $this->createAddress->execute($order, $addressObject);

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

@@ -8,6 +8,7 @@ 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\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
@@ -76,7 +77,7 @@ class RequestChangeOrderAddressProcessor
         }
 
         $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
-        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->reference, ApprovalStatus::PENDING_VERIFICATION);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::DELIVERY, ApprovalStatus::PENDING_VERIFICATION, $address->reference);
         $order_address = $this->createsAddress->execute($order, $addressObject);
 
         $contact = $address->contacts()->first();

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

@@ -6,23 +6,9 @@ use App\Classes\Exceptions\InternalServerErrorException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Log;
-
-use Illuminate\Http\Request;
-
 class UpdateDoFromVTPortalProcessor
 {
     /** @var FetchesDataFromVTPortal */
@@ -43,19 +29,20 @@ class UpdateDoFromVTPortalProcessor
     }
 
     /**
-     * @param $address
+     * @param PackingList $packing_list
      * @return array
      * @throws GuzzleException
+     * @throws InternalServerErrorException
      */
-    public function execute($address) {
+    public function execute(PackingList $packing_list) {
 
         if(!app()->environment(['production'])){
             return [];
         }
 
         try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
+            $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            $order = $packing_list->owner;
 
             if ($packing_list) {
                 $contact = $address->contacts()->first();
@@ -67,7 +54,7 @@ class UpdateDoFromVTPortalProcessor
 
                 $status = 'On Hold';
 
-                if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                if (in_array($packing_list->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
                     $status = 'Release';
                 }
 
@@ -77,6 +64,7 @@ class UpdateDoFromVTPortalProcessor
 
                 if ($vt_do) {
                     foreach ($vt_do->Rows as $key => $row) {
+                        if($row[4] !== $packing_list->containers()->first()->reference) continue;
                         $vt_do_update = $this->fetchesDataFRomVTPortal->clientRequest(
                         'http://portal.vtnation.com.my/Services/DataControllerService.asmx/Execute', 
                         'POST', 
@@ -141,7 +129,7 @@ class UpdateDoFromVTPortalProcessor
             }
 
         } catch (\Exception $exception){
-            return [];
+            throw new InternalServerErrorException('failed to approve address due to an error related to VT portal: '.$exception->getMessage());
         }
 
     }

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

@@ -8,6 +8,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\PackingList;
 use Illuminate\Support\Facades\Log;
 
 class UpdateDoFromYDPortalProcessor
@@ -30,36 +31,34 @@ class UpdateDoFromYDPortalProcessor
     }
 
     /**
-     * @param $address
+     * @param PackingList $packingList
      * @return void
      * @throws InternalServerErrorException
      */
-    public function execute($address) {
+    public function execute(PackingList $packingList) {
+        if(!app()->environment(['production'])){
+            return;
+        }
+
         try {
-            $order = $address->owner()->orderBy('id', 'desc')->first();
-            $packing_lists = $order->packingLists()
-                ->where('type', PackingListType::SHIPPING_PACKING_LIST)
-                ->where('status', '!=', ApprovalStatus::SUSPENDED)
-                ->orderBy('id', 'desc')->get();
+            $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
 
+            if (!in_array($packingList->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                return;
+            }
 
-            foreach ($packing_lists as $key => $row) {
-                if ($row->status === ApprovalStatus::SUSPENDED) {
-                    continue;
-                }
+            $contact = $address->contacts()->first();
+            $remark = $address->remarks()->first();
 
-                $contact = $address->contacts()->first();
-                $remark = $address->remarks()->first();
+            $phone = $contact ? $contact->phone : null;
+            $reference = $contact ? $contact->reference : null;
+            $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
 
-                $phone = $contact ? $contact->phone : null;
-                $reference = $contact ? $contact->reference : null;
-                $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
-
-                $this->fetchesDataFRomYDPortal->clientRequest(
-                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 
-                'POST', 
+            $this->fetchesDataFRomYDPortal->clientRequest(
+                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
+                'POST',
                 [
-                    'expressno' => $row->reference,
+                    'expressno' => $packingList->reference,
                     'customers_name' => $reference,
                     'cellphone' => $phone,
                     'postcode' => $address->postcode,
@@ -68,8 +67,6 @@ class UpdateDoFromYDPortalProcessor
                 ]);
 
 
-            }
-
         } catch (\Exception $exception){
             throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
         }

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

@@ -21,7 +21,7 @@ class ChecksIfOrderNumberExists
         $this->repository = $repository;
     }
 
-    public function execute(int $orderNumber): bool {
+    public function execute(string $orderNumber): bool {
         return $this->repository->where('reference', $orderNumber)->exists();
     }
 

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

@@ -20,11 +20,13 @@ class GeneratesOrderNumber
 
 
     /**
-     * @return int
+     * @param null|string $prefix
+     * @param int|null $length
+     * @return string
      */
-    public function execute(): int {
+    public function execute(?string $prefix = '', ?int $length = 9): string {
 
-        $reference = rand(100000001, 999999999);
+        $reference = $prefix.rand((int)('1'.str_repeat(0, $length - 2).'1'), (int) str_repeat(9, $length));
         return !$this->checkIfOrderNumberExists->execute($reference) ? $reference : self::execute();
     }
 

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

@@ -56,28 +56,23 @@ class ReschedulePackingListLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $transport = $packing_list->transports()->first();
+        $transport = $packing_list->transports()->first();
 
-            $old_sechedule = $transport->schedules()->first();
+        $old_sechedule = $transport->schedules()->first();
 
-            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
+        $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());
-        }
+        $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));
     }
 
 }

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

@@ -14,6 +14,7 @@ use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Http\Resources\PackingListResource;
+use App\Models\PackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -70,16 +71,16 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
-        $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        /** @var PackingList $packingList */
+        $packingList = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
 
 
 //        $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
-        $this->updateDoFromVTPortalProcessor->execute($address);
-        $this->updateDoFromYDPortalProcessor->execute($address);
+        $this->updateDoFromVTPortalProcessor->execute($packingList);
+        $this->updateDoFromYDPortalProcessor->execute($packingList);
 
-        return $this->resourceResponse(new PackingListResource($packing_list));
+        return $this->resourceResponse(new PackingListResource($packingList));
     }
 
 }

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

@@ -6,6 +6,8 @@ namespace App\Classes\Modules\PackingLists\Processors;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\Services\Packages\CreatesPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanCreatePackage;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;
 
 class CreatePackageProcessor
@@ -48,6 +50,11 @@ class CreatePackageProcessor
 
         if($replica) {
             $modificationValue = 1;
+
+            if($replica->owner->owner instanceof Order){
+                $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1;
+            }
+
             $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
             $package = $this->createsPackage->execute($packageObject, $replica);
         }

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

@@ -10,7 +10,10 @@ use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\WarehouseReferences;
+use App\Models\Order;
 use App\Models\PackingList;
+use function PHPUnit\Framework\isInstanceOf;
 
 class CreatePackingListProcessor
 {
@@ -51,6 +54,7 @@ class CreatePackingListProcessor
         $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
         $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
+
         /** create packing list replica */
         $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);

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

@@ -158,13 +158,9 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 foreach($containerDetail->Rows as $packingList){
-                    $marking = explode('/', explode('CIEF/', $packingList[13])[1]);
+                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13]));
 
-                    if(!array_key_exists(1, $marking)){
-                        continue;
-                    }
-
-                    $orderNumber = $marking[1];
+                    $orderNumber = $marking[array_key_last($marking)];
 
                     if(!$packingList[22]){
                         continue;

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

@@ -36,6 +36,7 @@ use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 
 class FetchOrderListsFromYdPortalProcessor
 {
@@ -153,7 +154,6 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
-
                 $containerReference = null;
                 $loadingDate = null;
                 $unstuffingDate = null;
@@ -168,6 +168,11 @@ class FetchOrderListsFromYdPortalProcessor
 
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
+                if(!$rows){
+                    Log::debug($row->expressno);
+                    continue;
+                }
+
                 foreach (array_reverse($rows->data) as $trackingRow) {
                     if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
                         $receiveDate = Carbon::parse($trackingRow->trackingtime);
@@ -181,21 +186,43 @@ class FetchOrderListsFromYdPortalProcessor
                         $eta = Carbon::parse($tracking[2]);
                     }
 
-                    if (strpos($trackingRow->tracking, '预计船时间为') !== false) {
-                        $tracking = explode('预计船时间为', $trackingRow->tracking);
-                        $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
+                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
+                    $rescheduleETA = strpos($trackingRow->remark, '到港');
+                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
+                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
+                        $dates = collect();
+
+                        foreach($matches[0] as $date){
+                            try {
+                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
+                            } catch (\Exception $exception) {
+                                continue;
+                            }
+
+                        }
+
+                        $rescheduleDate = $dates->sortDesc()->first();
+                        if(!$delayDate || $rescheduleDate > $delayDate){
+                            /** @var Carbon $delayDate */
+                            $delayDate = $rescheduleDate;
+
+                            if($rescheduleETA === false && $delayDate) {
+                                $delayDate = $delayDate->addDays('5');
+                            }
+                        }
+
                     }
 
-                    if (strpos($trackingRow->tracking, '预计开船为') !== false) {
-                        $tracking = explode('预计开船为', $trackingRow->tracking);
-                        $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
+                    if ($trackingRow->tracking === '已开船') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
                     }
 
+
                     if ($trackingRow->tracking === '货物已进目的港仓库') {
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if ($trackingRow->tracking === '货物已派送完成') {
+                    if (Str::contains($trackingRow->tracking, ['派送中'])) {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
                 }
@@ -288,6 +315,13 @@ class FetchOrderListsFromYdPortalProcessor
                     $this->createPackageProcessor->execute($packageObject, $packingList);
                 }
 
+                if(!count($row->deliverysize)){
+                    $measurement = round(((float) $row->volume / (float) $row->goodcount) ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $measurement, (float) $measurement, (float) $measurement, 0, (float) $row->goodcount, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
                 $weightCbm = (float) $row->weight / 500;
                 $overWeightCbm = $weightCbm - $packingList->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity'));
 
@@ -344,7 +378,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                         $transport = $container->transports()->first();
 
-                        if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
+                        if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
                             $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
                             $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
                             $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
@@ -373,7 +407,7 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                if($deliveryDate && !$packingList->transports){
+                if($deliveryDate && !$packingList->transports()->exists()){
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();
 

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

@@ -134,19 +134,13 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             foreach ($response->Rows as $parcel){
 
-                $marking = explode('/', explode('CIEF/', $parcel[5])[1]);
-
-                if(!array_key_exists(1, $marking)){
-                    continue;
-                }
-
-                $orderNumber = $marking[1];
+                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5]));
+                $orderNumber = $marking[array_key_last($marking)];
 
                 if(!$parcel[9]){
                     continue;
                 }
 
-
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
                 } catch (ResourceNotFoundException $exception) {

app/Classes/Modules/Segments/ControllersLogic/CreateBasePriceLogic.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\UpdatesBasePriceConstantByDates;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ConstantResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBasePriceLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Base Price',
+            'message' => 'You have successfully created a Base Price'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var CanCreateConstant */
+    private $canCreateConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /** @var UpdatesBasePriceConstantByDates */
+    private $updatesBasePriceConstantByDates;
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param CanCreateConstant $canCreateConstant
+     * @param CreatesConstant $createsConstant
+     * @param UpdatesBasePriceConstantByDates $updatesBasePriceConstantByDates
+     */
+    public function __construct(
+        CanUpdateConstant $canUpdateConstant, 
+        UpdatesConstant $updatesConstant, 
+        FetchesSegment $fetchesSegment, 
+        FetchesConstant $fetchesConstant, 
+        CanCreateConstant $canCreateConstant, 
+        CreatesConstant $createsConstant,
+        UpdatesBasePriceConstantByDates $updatesBasePriceConstantByDates
+    )
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->canCreateConstant = $canCreateConstant;
+        $this->createsConstant = $createsConstant;
+        $this->updatesBasePriceConstantByDates = $updatesBasePriceConstantByDates;
+    }
+    /**
+     * @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
+    {
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => SegmentConstants::BASE_PRICE]);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $constantObject = [];
+
+            $object = new ConstantObject(
+                SegmentConstants::BASE_PRICE,
+                $constantObject
+            );
+
+            $constant = $this->createsConstant->execute($segment, $object);
+        }
+
+        $constantValue = $this->updatesBasePriceConstantByDates->execute($constant->value, $request->input('dateFrom'), $request->input('dateTo'), $request->input('rate'));
+
+        $object = new ConstantObject(SegmentConstants::BASE_PRICE, $constantValue);
+
+        $this->canUpdateConstant->passes($object);
+        
+        $constant = $this->updatesConstant->execute($constant, $object);
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}

app/Classes/Modules/Segments/ControllersLogic/FetchBasePriceLogic.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ConstantResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\CarbonPeriod;
+
+class FetchBasePriceLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Base Price',
+            'message' => 'You have successfully retrieved the Base Price'
+        ];
+    }
+
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /**
+     * FetchConstantLogic constructor.
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(FetchesConstant $fetchesConstant)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $request->route('id'), 'reference' => SegmentConstants::BASE_PRICE]);
+
+        $constantObject = (array) $constant->value;
+
+        if ($request->input('dateFrom') !== null && $request->input('dateTo') !== null) {
+
+            $period = CarbonPeriod::create($request->input('dateFrom'), $request->input('dateTo'));
+
+            $returnObject = [];
+
+            foreach ($period as $date) {
+                array_key_exists($date->format('Y-m-d'), $constantObject) === true ? $returnObject[$date->format('Y-m-d')] = $constantObject[$date->format('Y-m-d')] : '';
+            }
+
+            $constant->value = json_encode($returnObject);
+
+        }
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php

@@ -5,7 +5,9 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
 use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\CreatesSegment;
 use App\Classes\Modules\Segments\Services\FetchesConstant;
 use App\Classes\Modules\Segments\Services\FetchesSegment;
 use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
@@ -15,6 +17,7 @@ use App\Http\Resources\ConstantResource;
 use App\Models\SegmentConstant;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\Modules\Segments\Services\UpdatesConstantValue;
 
 class UpdateConstantLogic  extends AbstractControllerLogic
 {
@@ -47,6 +50,11 @@ class UpdateConstantLogic  extends AbstractControllerLogic
     /** @var CreatesConstant */
     private $createsConstant;
 
+    /** @var CreatesSegment */
+    private $createsSegment;
+
+    /** @var UpdatesConstantValue */
+    private $updatesConstantValue;
 
     /**
      * UpdateConstantLogic constructor.
@@ -56,8 +64,19 @@ class UpdateConstantLogic  extends AbstractControllerLogic
      * @param FetchesConstant $fetchesConstant
      * @param CanCreateConstant $canCreateConstant
      * @param CreatesConstant $createsConstant
+     * @param UpdatesConstantValueByState $updatesConstantValueByState
+     * @param CreatesSegment $createsSegment
      */
-    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, CanCreateConstant $canCreateConstant, CreatesConstant $createsConstant)
+    public function __construct(
+        CanUpdateConstant $canUpdateConstant, 
+        UpdatesConstant $updatesConstant, 
+        FetchesSegment $fetchesSegment, 
+        FetchesConstant $fetchesConstant, 
+        CanCreateConstant $canCreateConstant, 
+        CreatesConstant $createsConstant,
+        UpdatesConstantValue $updatesConstantValue,
+        CreatesSegment $createsSegment
+    )
     {
         $this->canUpdateConstant = $canUpdateConstant;
         $this->updatesConstant = $updatesConstant;
@@ -65,6 +84,8 @@ class UpdateConstantLogic  extends AbstractControllerLogic
         $this->fetchesConstant = $fetchesConstant;
         $this->canCreateConstant = $canCreateConstant;
         $this->createsConstant = $createsConstant;
+        $this->updatesConstantValue = $updatesConstantValue;
+        $this->createsSegment = $createsSegment;
     }
     /**
      * @param Request $request
@@ -75,28 +96,33 @@ class UpdateConstantLogic  extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-
-        $object = new ConstantObject($request->input('name'), $request->input('reference'), $request->input('detail'));
-
         $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
 
         try {
 
-            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $object->getReference()]);
-            $this->canUpdateConstant->passes($object);
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
 
-            /** @var SegmentConstant $constant */
-            $constant = $this->updatesConstant->execute($constant, $object);
+            $constantValue = $this->updatesConstantValue->execute($constant->value, $request->input('id'), $request->input('rate'));
+
+            $object = new ConstantObject($request->input('reference'), $constantValue);
+
+            $this->canUpdateConstant->passes($object);
 
         } catch (ResourceNotFoundException $exception){
 
-            $this->canCreateConstant->passes($object);
+            $constantObject = [];
+
+            $constantObject[$request->input('id')] = $request->input('rate');
+
+            $object = new ConstantObject(
+                $request->input('reference'),
+                $constantObject
+            );
 
-            /** @var SegmentConstant $constant */
             $constant = $this->createsConstant->execute($segment, $object);
-
         }
-
+        
+        $constant = $this->updatesConstant->execute($constant, $object);
 
         return $this->resourceResponse(new ConstantResource($constant));
     }

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\ConstantResource;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
+use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+
+class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment Constant',
+            'message' => 'You have successfully updated the Segment Constant'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var AddItemToConstantValueArray */
+    private $addItemToConstantValueArray;
+
+    /** @var RemoveItemFromConstantValueArray */
+    private $removeItemFromConstantValueArray;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param AddItemToConstantValueArray $addItemToConstantValueArray
+     * @param CreatesConstant $createsConstant
+     * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
+     */
+    public function __construct(
+        CanUpdateConstant $canUpdateConstant, 
+        UpdatesConstant $updatesConstant, 
+        FetchesSegment $fetchesSegment, 
+        FetchesConstant $fetchesConstant,
+        AddItemToConstantValueArray $addItemToConstantValueArray, 
+        RemoveItemFromConstantValueArray $removeItemFromConstantValueArray,
+        CreatesConstant $createsConstant
+    )
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
+        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
+        $this->createsConstant = $createsConstant;
+    }
+    /**
+     * @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
+    {
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
+
+            $constantValue = $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode'));
+
+            $object = new ConstantObject($request->input('reference'), $constantValue);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $constantObject = [$request->input('postcode')];
+
+            $object = new ConstantObject(
+                $request->input('reference'),
+                $constantObject
+            );
+
+            $constant = $this->createsConstant->execute($segment, $object);
+        }
+
+        try {
+            // check if postcode exist in the opposite constant, and delete it
+            $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
+
+            $oppositeConstantValue = $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $request->input('postcode'));
+
+            $oppositeObject = new ConstantObject($request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $oppositeConstantValue);
+
+            $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
+
+        } catch (ResourceNotFoundException $exception){
+            // if opposite constant does not exist, do nothing
+        }
+
+        $constant = $this->updatesConstant->execute($constant, $object);
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}

app/Classes/Modules/Segments/DataTransferObjects/ConstantObject.php

@@ -7,34 +7,22 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class ConstantObject implements DataTransferObject
 {
 
-    /** @var string */
-    private $name;
-
     /** @var string */
     private $reference;
 
     /** @var array */
-    private $detail;
+    private $value;
 
     /**
      * ConstantObject constructor.
      * @param string $name
      * @param string $reference
-     * @param array $detail
+     * @param array $value
      */
-    public function __construct(string $name, string $reference, array $detail)
+    public function __construct(string $reference, array $value)
     {
-        $this->name = $name;
         $this->reference = $reference;
-        $this->detail = $detail;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
+        $this->value = $value;
     }
 
     /**
@@ -48,9 +36,9 @@ class ConstantObject implements DataTransferObject
     /**
      * @return array
      */
-    public function getDetail(): array
+    public function getValue(): array
     {
-        return $this->detail;
+        return $this->value;
     }
 
 

app/Classes/Modules/Segments/Services/AddItemToConstantValueArray.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+class AddItemToConstantValueArray
+{
+
+    /**
+     * @param array $array
+     * @param $item
+     * @return array
+     */
+    public function execute($array, $item): array {
+        $array[] = $item;
+        sort($array);
+        return $array;
+    }
+
+}

app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php

@@ -27,11 +27,11 @@ class ConvertsConstantDetailsToResource
 
     public function execute(SegmentConstant $constant){
 
-        if($constant->reference === SegmentConstants::SUPPLIER_CURRENCIES) {
-            return property_exists($constant->detail, 'id') ? new CurrencyResource($this->fetchesCurrency->execute(['id' => $constant->detail->id])) : '';
-        }
+        // if($constant->reference === SegmentConstants::SUPPLIER_CURRENCIES) {
+        //     return property_exists($constant->detail, 'id') ? new CurrencyResource($this->fetchesCurrency->execute(['id' => $constant->detail->id])) : '';
+        // }
 
-        return $constant->detail;
+        return $constant->value;
 
     }
 

app/Classes/Modules/Segments/Services/CreatesConstant.php

@@ -18,9 +18,8 @@ class CreatesConstant extends AbstractUpdateRelationshipRecord
     public function execute(Segment $segment, ConstantObject $object)
     {
         $model = new SegmentConstant();
-        $model->name = $object->getName();
         $model->reference = $object->getReference();
-        $model->detail = json_encode($object->getDetail());
+        $model->value = json_encode($object->getValue());
 
         return $this->handler($segment->constants(), $model);
     }

app/Classes/Modules/Segments/Services/RemoveItemFromConstantValueArray.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+class RemoveItemFromConstantValueArray
+{
+
+    /**
+     * @param array $array
+     * @param $item
+     * @return array
+     */
+    public function execute($array, $item): array {
+        foreach($array as $key => $value){
+            if($array[$key] == $item){
+                unset($array[$key]);
+            }
+        }
+        return array_values($array);
+    }
+
+}

app/Classes/Modules/Segments/Services/UpdatesBasePriceConstantByDates.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+use Carbon\CarbonPeriod;
+
+class UpdatesBasePriceConstantByDates
+{
+
+    /**
+     * @param $json
+     * @param int $status_id
+     * @param Array $rate
+     * @return Array
+     */
+    public function execute($json, String $date_from,  String $date_to, String $rate) {
+
+        $objectArray = (array) $json;
+
+        $period = CarbonPeriod::create($date_from, $date_to);
+
+        foreach ($period as $date) {
+            $objectArray[$date->format('Y-m-d')] = $rate;
+        }
+
+        return $objectArray;
+    }
+
+}

app/Classes/Modules/Segments/Services/UpdatesConstant.php

@@ -17,9 +17,8 @@ class UpdatesConstant extends AbstractUpdateRecord
      */
     public function execute(SegmentConstant $model, ConstantObject $object)
     {
-        $model->name = $object->getName();
         $model->reference = $object->getReference();
-        $model->detail = json_encode($object->getDetail());
+        $model->value = json_encode($object->getValue());
 
         return $this->handler($model);
     }

app/Classes/Modules/Segments/Services/UpdatesConstantValue.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+class UpdatesConstantValue
+{
+
+    /**
+     * @param $json
+     * @param int $status_id
+     * @param Array $rate
+     * @return Array
+     */
+    public function execute($json, int $state_id, Array $rate) {
+
+        $objectArray = (array) $json;
+
+        $objectArray[$state_id] = $rate;
+
+        return $objectArray;
+    }
+
+}

app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php

@@ -15,9 +15,8 @@ class ConstantValidation extends AbstractValidation
     protected function data($object): array {
 
         $data = [
-            'name' => $object->getName(),
             'reference' => $object->getReference(),
-            'detail' => $object->getDetail()
+            'value' => $object->getValue()
         ];
 
         return $data;
@@ -28,9 +27,8 @@ class ConstantValidation extends AbstractValidation
      */
     protected function rules(): array {
         return [
-            'name' => 'required',
             'reference' => 'required',
-            'detail' => 'required'
+            'value' => 'required'
         ];
     }
 

app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php

@@ -20,7 +20,13 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionDetailType;
 
+use App\Models\Document;
+use App\Models\Transaction;
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
@@ -86,64 +92,46 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     {
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
 
-        $cbm = $packing_list->packages->sum(function($package) {
+        $cbm = $packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
             return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
         });
 
-        $order =  $packing_list->owner()->first();
+        $over_weight_cbm = $packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        });
+
+        $order =  $packing_list->owner;
         $address = $order->addresses()->first();
 
-        $base_price_constant = $this->fetchesSegmentConstant->execute(['id' => 1]);
-        $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['id' => 2]);
-        $state_rate_constant = $this->fetchesSegmentConstant->execute(['id' => 3]);
-        $center_postcode_constant = $this->fetchesSegmentConstant->execute(['id' => 4]);
-        $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['id' => 5]);
+        $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
+        $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::WAREHOUSE_RATE]);
+        $state_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::STATE_RATE]);
+        $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
+        $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
 
         $base_price = 0;
         $warehouse_rate = 0;
         $state_rate = 0;
-        $state_select = [];
-        $with_out = false;
+        $state_select = '';
 
-        if ($base_price_constant) {
-            $base_price = $base_price_constant->value->price;
-        }
+        $base_price = $this->getConstantByKey($base_price_constant, date('Y-m-d'));
 
-        if ($warehouse_rate_constant) {
-            $package_warehouse = $order->OrderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->reference;
-            foreach ($warehouse_rate_constant->value->config as $key_warehouse => $row_warehouse) {
-                if ($row_warehouse->warehouse_name == $package_warehouse) {
-                    $warehouse_rate = $row_warehouse->rate;
-                }
-            }
-        }
+        $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
+        $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
+        $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
 
-        if ($state_rate_constant) {
-            foreach ($state_rate_constant->value->config as $key_state => $row_state) {
-                if ($row_state->status_id == $address->state_id) {
-                    $state_select = $row_state;
-                }
-            }
-        }
+        $stateId = $address->state_id;
+        $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId);
 
-        if ($outstation_postcode_constant) {
-            foreach ($outstation_postcode_constant->value as $key_out => $row_out) {
-
-                if($row_out == $address->postcode) {
-                    $with_out = true;
-                }
-            }
-        }
-
-        if (!empty($state_select)) {
-            $state_rate = $state_select->rate;
-            if ($with_out) {
-                $state_rate = $state_select->rate + $state_select->outstation_rate;
-            }
-        }
+        // get $state_rate
+        $postcode = $address->postcode;
+        $this->checkPostcodeExistInConstant($center_postcode_constant, $postcode) === true ? $state_select = 'center' : '' ;
+        $this->checkPostcodeExistInConstant($outstation_postcode_constant, $postcode) === true ? $state_select = 'outstation' : '' ;
+        $state_rate_constant = (array)$state_rate_constant;
+        $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
 
         $price_cbm = $base_price + $warehouse_rate + $state_rate;
-        $total_cbm = $price_cbm * $cbm;
+        $total_cbm = $price_cbm * ($cbm + $over_weight_cbm);
 
         $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
 
@@ -162,19 +150,31 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
             0, 
             0,
             null, 
-            ApprovalStatus::PENDING_SUBMISSION
+            ApprovalStatus::PENDING_VERIFICATION
         );
 
+        /** @var Transaction $invoice_transaction */
         $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
 
         $object_detail = new TransactionDetailObject(
-            $invoice_transaction->bill_no,
-            $invoice_transaction->bill_no,
-            1,
-            $invoice_transaction->amount, 
-            $invoice_transaction->amount
+            'SHIPPING_FEE',
+            TransactionDetailType::SHIPPING_FEE,
+            $cbm,
+            $price_cbm
         );
-        $transaction_detail = $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+
+        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        
+        if ($over_weight_cbm > 0) {
+            $object_detail = new TransactionDetailObject(
+                'OVER_WEIGHT_CHARGES',
+                TransactionDetailType::OVER_WEIGHT_CHARGES,
+                $over_weight_cbm,
+                $price_cbm
+            );
+
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }
 
         $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
 
@@ -185,11 +185,30 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
             ApprovalStatus::COMPLETED,
             'shipping_invoice'
         );
+
         /** @var Document $document */
         $document = $this->createsDocument->execute($invoice_transaction, $document_object);
+
         $this->createsFile->execute($document, $document_object);
 
-        // dd('yess');
         return $this->response([]);
     }
+
+    function getConstantByKey($segmentConstantObject, $key) {
+        if ($segmentConstantObject) {
+            $base_rate = (array) $segmentConstantObject->value;
+            $base_rate = array_key_exists($key, $base_rate) === true ? $base_rate[$key] : 0;
+            return $base_rate;
+        }
+    }
+
+    function checkPostcodeExistInConstant($segmentConstantObject, $postcode) {
+        $segmentConstantObject = $segmentConstantObject->value;
+        if (!empty($segmentConstantObject)) {
+            return in_array($postcode, $segmentConstantObject);
+        } else {
+            return false;
+        }
+    }
+
 }

app/Classes/Modules/Transactions/DataTransferObjects/TransactionDetailObject.php

@@ -12,7 +12,7 @@ class TransactionDetailObject implements DataTransferObject
     /** @var string|null */
     private $name;
 
-    /** @var int|null */
+    /** @var float|null */
     private $quantity;
 
     /** @var float|null */
@@ -22,10 +22,10 @@ class TransactionDetailObject implements DataTransferObject
      * TransactionDetailObject constructor.
      * @param string $reference
      * @param string $name
-     * @param int $quantity
+     * @param float $quantity
      * @param float $price
      */
-    public function __construct(?string $reference, ?string $name , ?int $quantity, ?float $price)
+    public function __construct(?string $reference, ?string $name , ?float $quantity, ?float $price)
     {
         $this->reference = $reference;
         $this->name = $name;
@@ -50,9 +50,9 @@ class TransactionDetailObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return float
      */
-    public function getQuantity(): ?int
+    public function getQuantity(): ?float
     {
         return $this->quantity;
     }

app/Classes/ValueObjects/Constants/AddressType.php

@@ -8,4 +8,6 @@ final class AddressType {
 
     public const DELIVERY = 2;
 
+    public const PICK_UP = 3;
+
 }

app/Classes/ValueObjects/Constants/BusinessType.php

@@ -18,4 +18,7 @@ final class BusinessType {
 
     public const CURRENCY_VENDOR = 6;
 
+    public const ONLINE_SELLER = 7;
+
+    public const LAST_MILE_DELIVERY_AGENT = 8;
 }

app/Classes/ValueObjects/Constants/OrderType.php

@@ -8,4 +8,6 @@ final class OrderType {
 
     public const DEDICATED_CONTAINER = 1;
 
+    public const LAST_MILE_DELIVERY = 2;
+
 }

app/Classes/ValueObjects/Constants/PackageType.php

@@ -10,4 +10,6 @@ final class PackageType {
 
     public const OVER_WEIGHT = 2;
 
+    public const DOCUMENT = 3;
+
 }

app/Classes/ValueObjects/Constants/TransactionDetailType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class TransactionDetailType {
+
+    public const SHIPPING_FEE = 'Shipping Fee';
+
+    public const OVER_WEIGHT_CHARGES = 'Over weight charges';
+}

app/Classes/ValueObjects/Constants/WarehouseReferences.php

@@ -8,6 +8,8 @@ final class WarehouseReferences {
 
     public const YD_GUANG_ZHOU = 'GZ-V02';
 
+    public const YD_GUANG_ZHOU_2 = 'GZ-V03';
+
     public const VT_YIWU = 'YW-V01';
 
     public const YD_YIWU = 'YW-V02';
@@ -43,6 +45,8 @@ final class WarehouseReferences {
 
     public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726];
 
+    public const REPLICA_WHITE_LIST = [502];
+
     //2376 qce
 
 }

app/Http/Controllers/Delivery/CancelDeliveryOrderController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+use App\Classes\Modules\Delivery\ControllersLogic\CancelDeliveryOrderLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelDeliveryOrderController
+{
+    /**
+     * @param Request $request
+     * @param CancelOrderLogic $logic
+     * @return JsonResponse
+     */
+    public function cancel(Request $request, CancelDeliveryOrderLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Delivery/CreateDeliveryCustomerController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+use App\Classes\Modules\Delivery\ControllersLogic\CreateDeliveryCustomerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliveryCustomerController
+{
+    /**
+     * @param Request $request
+     * @param CreateDeliveryCustomerLogic $createDeliveryCustomerLogic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateDeliveryCustomerLogic $createDeliveryCustomerLogic): JsonResponse
+    {
+        return $createDeliveryCustomerLogic->execute($request);
+    }
+}

app/Http/Controllers/Delivery/CreateDeliveryOrderController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+use App\Classes\Modules\Delivery\ControllersLogic\CreateDeliveryOrderLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliveryOrderController
+{
+    /**
+     * @param Request $request
+     * @param CreateDeliveryOrderLogic $createDeliveryOrderLogic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateDeliveryOrderLogic $createDeliveryOrderLogic): JsonResponse
+    {
+        return $createDeliveryOrderLogic->execute($request);
+    }
+}

app/Http/Controllers/Delivery/ExportDeliveryOrdersToExcelController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Controllers\Delivery;
+
+
+use App\Classes\Modules\Exports\Services\ExportsCustomers;
+use App\Classes\Modules\Exports\Services\ExportsMultipleDeliveryOrders;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportDeliveryOrdersToExcelController
+{
+
+    /**
+     * ExportCustomersToExcelController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function lineClear(Request $request){
+        $exportsTransactions = new ExportsMultipleDeliveryOrders($request);
+        $response = $exportsTransactions->download('line-clear-export.xlsx', Excel::XLSX, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
+}

app/Http/Controllers/Delivery/ListOrdersController.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace App\Http\Controllers\Delivery;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Delivery\ControllersLogic\ListOrdersLogic;
+
+
+class ListOrdersController
+{
+    /**
+     * @param Request $request
+     * @param ListOrdersLogic $logic
+     * @return JsonResponse
+     */
+
+    public function list(Request $request, ListOrdersLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Exports/ExportArrivedParcelController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsArrivedParcel;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportArrivedParcelController
+{
+    /**
+     * ExportArrivedParcelController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function export(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsArrivedParcel($request);
+        $response = $exportsPendingArrangementDeliveryList->download('arrived-parcel.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}

app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsCompanyModuleSummary;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportCompanyModuleSummaryController
+{
+    /**
+     * ExportCompanyModuleSummaryController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function export(Request $request) {
+        $exportsCompanyModuleSummary = new ExportsCompanyModuleSummary($request);
+        $exportsCompanyModuleSummary->setParameters($request->route('company_module_id'), $request->input('containerNumber'));
+        $response = $exportsCompanyModuleSummary->download('customerid-markingno.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}

app/Http/Controllers/Exports/ExportPendingArrangementPackingListController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
+use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportPendingArrangementPackingListController
+{
+    /**
+     * ExportPendingArrangementPackingListController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+    }
+
+    public function export(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsPendingArrangementDeliveryList($request);
+        $response = $exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
+    public function onHold(Request $request) {
+        $exportsPendingArrangementDeliveryList = new ExportsOnHoldPackingList($request);
+        $response = $exportsPendingArrangementDeliveryList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}

app/Http/Controllers/Orders/DownloadOrderQrPdfController.php

@@ -24,7 +24,7 @@ class DownloadOrderQrPdfController
         $warehousePrefix = '';
         $deliveryPrefix = '';
         $customerMarking = '';
-        $remark = $warehouse->remarks()->first()->content;
+        $remark = $warehouse->remarks()->first();
 
         if($warehouse->reference === WarehouseReferences::VT_GUANG_ZHOU || $warehouse->reference === WarehouseReferences::VT_YIWU) {
             $customerMarking = $order->companyModule->connections()->first()->invitee_reference.'/';
@@ -41,14 +41,14 @@ class DownloadOrderQrPdfController
             $warehousePrefix = 'YW/';
         }
 
-        if($warehouse->reference === WarehouseReferences::YD_GUANG_ZHOU){
+        if(in_array($warehouse->reference,[WarehouseReferences::YD_GUANG_ZHOU, WarehouseReferences::YD_GUANG_ZHOU_2])){
             $warehousePrefix = 'YD/';
 
-            if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan') {
+            if(strtolower($deliveryAddress->state->name) === 'sabah' || strtolower($deliveryAddress->state->name) === 'labuan' || in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) {
                 $warehousePrefix = 'KK/';
             }
 
-            if(strtolower($deliveryAddress->state->name) === 'sarawak') {
+            if(strtolower($deliveryAddress->state->name) === 'sarawak' && !in_array(strtolower($deliveryAddress->district->name), ['limbang', 'lawas'])) {
                 $warehousePrefix = 'KU/';
             }
         }
@@ -60,7 +60,7 @@ class DownloadOrderQrPdfController
             'delivery_address' => $deliveryAddress,
             'warehouse_address' => $warehouseAddress,
             'warehouse_contacts' => $warehouseContacts,
-            'remark' => $remark
+            'remark' => $remark ? $remark->content : ''
         ];
 
         $pdf = LaravelMpdf::loadView('pdfs.qr', $data, [], [

app/Http/Controllers/Reports/MonthlyReportController.php

@@ -200,4 +200,62 @@ class MonthlyReportController
                 })->sum('quantity'),
             ]]))->handler();
     }
+
+    public function customerActivityReport(Request $request): JsonResponse {
+
+        $active_start = $request->input('active_start');
+        $active_end = $request->input('active_end');
+        $inactive_start = $request->input('inactive_start');
+        $inactive_end = $request->input('inactive_end');
+        $minCbm = $request->input('cbm');
+        $minOrders = $request->input('minOrders');
+
+        $activeCompanies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
+            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
+                return $query->where('drop_date', '>=', \Carbon\Carbon::parse($inactive_start))->where('drop_date', '<=', \Carbon\Carbon::parse($inactive_end)->addDay());
+            });
+        })->pluck('id');
+
+        $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
+            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
+                return $query->whereDate('drop_date', '>=', \Carbon\Carbon::parse($active_start))->whereDate('drop_date', '<=', \Carbon\Carbon::parse($active_end)->addDay());
+            });
+        })->whereNotIn('id', $activeCompanies)->get();
+
+        $customerActivityData = [];
+        $counter = 1;
+
+        foreach ($companies as $key => $company){
+            $connection = $company->inviters()->withPivot('invitee_reference')->first();
+            $marking = $connection ? $connection->pivot->invitee_reference:'';
+            $packingList = $company->orderPackingLists()->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->get();
+            $totalCbm = $packingList->flatMap(function ($packingList) {
+                return $packingList->packages;
+            })->sum(function($package){
+                return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+            });
+
+            if ($minCbm != 'null' && $totalCbm < $minCbm) { continue; }
+
+            if ($minOrders != 'null' && $packingList->count() < $minOrders) { continue; }
+
+            array_push($customerActivityData, array(
+                'key' => $counter, 
+                'marking' => $marking,
+                'packingListCount'=> $packingList->count(),
+                'totalCbm'=> $totalCbm,
+            ));
+            $counter ++;
+        }
+
+        return (new ApiResponseObject('fetch service report Successful',
+            '',
+            HttpStatus::OK_WITH_MESSAGE, ['data' => [
+                'active_start' => Carbon::parse($active_start)->format('d/m/Y'),
+                'active_end' => Carbon::parse($active_end)->format('d/m/Y'),
+                'inactive_start' => Carbon::parse($inactive_start)->format('d/m/Y'),
+                'inactive_end' => Carbon::parse($inactive_end)->format('d/m/Y'),
+                'customerActivityData' => $customerActivityData,
+            ]]))->handler();
+    }
 }

app/Http/Controllers/Segments/CreateBasePriceController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\CreateBasePriceLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBasePriceController
+{
+    /**
+     * @param Request $request
+     * @param CreateBasePriceLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBasePriceLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Segments/FetchBasePriceController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchBasePriceLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchBasePriceController
+{
+    /**
+     * @param Request $request
+     * @param FetchSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchBasePriceLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Segments/UpdateConstantPostcodeController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantPostcodeLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantPostcodeController
+{
+    /**
+     * @param Request $request
+     * @param UpdateConstantPostcodeLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateConstantPostcodeLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Resources/AddressResource.php

@@ -5,6 +5,8 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\Order;
 use Illuminate\Http\Resources\Json\JsonResource;
+use App\Models\SegmentConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 
 class AddressResource extends JsonResource
 {
@@ -17,6 +19,14 @@ class AddressResource extends JsonResource
     public function toArray($request)
     {
 
+        $centerPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::CENTER_POSTCODE)->get();
+        $centerPostcodeConstant = $centerPostcodeConstantObject->isEmpty() ? [] : (array)$centerPostcodeConstantObject->first()->value;
+        $postcodeArea = in_array($this->postcode, $centerPostcodeConstant) ? 'CENTER_POSTCODE' : '';
+        
+        $outstationPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::OUTSTATION_POSTCODE)->get();
+        $outstationPostcodeConstant = $outstationPostcodeConstantObject->isEmpty() ? [] : (array)$outstationPostcodeConstantObject->first()->value;
+        in_array($this->postcode, $outstationPostcodeConstant) ? $postcodeArea = 'OUTSTATION_POSTCODE' : '';
+
         return [
             'id' => $this->id,
             'reference' => $this->reference,
@@ -25,6 +35,7 @@ class AddressResource extends JsonResource
             'district' => $this->district,
             'state' => $this->state,
             'post_code' => $this->postcode,
+            'post_code_area' => $postcodeArea,
             'country' => $this->country,
             'default' => (int) $this->default,
             'status' => (int) $this->status,

app/Http/Resources/CompanyModuleResource.php

@@ -32,6 +32,9 @@ class CompanyModuleResource extends JsonResource
         $connection = $this->inviters()->withPivot('invitee_reference')->first();
         $marking = $connection ? $connection->pivot->invitee_reference:'';
 
+        $segmentConstantObject = SegmentConstant::where('reference', SegmentConstants::WAREHOUSE_RATE)->get();
+        $segmentConstant = $segmentConstantObject->isEmpty() ? [] : (array)$segmentConstantObject->first()->value;
+
         return [
             'id' => $this->id,
             'type' => $this->type,
@@ -40,7 +43,8 @@ class CompanyModuleResource extends JsonResource
             'address' => new AddressResource($defaultAddress),
             'company' => new CompanyResource($this->whenLoaded('company')),
             'remarks' => RemarkResource::collection($this->remarks),
-            'marking' => $marking
+            'marking' => $marking,
+            'warehouseCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
         ];
 
     }

app/Http/Resources/CompanyResource.php

@@ -18,7 +18,7 @@ class CompanyResource extends JsonResource
      */
     public function toArray($request)
     {
-        $companyModule = $this->companyModules()->where('type', '=', BusinessType::IMPORTER)->first();
+        $companyModule = $this->companyModules()->first();
         return [
             'id' => $this->id,
             'hash_id' => Crypt::encryptString($this->id),
@@ -30,8 +30,8 @@ class CompanyResource extends JsonResource
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
             'employee' => new UserResource($companyModule->employees()->first()),
             'company_module' => new CompanyModuleResource($companyModule),
-            'last_order' => new OrderResource($companyModule ? $companyModule->orders()->orderBy('id', 'DESC')->first(): null),
-            'order_count' => $this->orders()->count(),
+            'last_order' => $companyModule->type === 7 ? new DeliveryOrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()) : new OrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()),
+            'order_count' => $companyModule->orders()->count(),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first()),
             'created_at' => $this->created_at->format('d-m-Y')
 

app/Http/Resources/ConstantResource.php

@@ -19,9 +19,8 @@ class ConstantResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'name' => $this->name,
             'reference' => $this->reference,
-            'detail' => (App()->make(ConvertsConstantDetailsToResource::class))->execute($this->resource)
+            'value' => (App()->make(ConvertsConstantDetailsToResource::class))->execute($this->resource)
         ];
     }
 }

app/Http/Resources/DeliveryOrderResource.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DeliveryOrderResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'reference' => $this->reference,
+            'type' => (int) $this->type,
+            'status' => (int) $this->status,
+            'company_module' => new CompanyModuleResource($this->companyModule),
+            'sender_address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->where('type', AddressType::PICK_UP)->first()),
+            'delivery_address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->where('type', AddressType::DELIVERY)->first()),
+            'packingList' => new DeliveryPackingListResource($this->packingLists()->first()),
+            'remarks' => RemarkResource::collection($this->remarks),
+            'created_at' => $this->created_at->format('d-m-Y')
+        ];
+
+    }
+}

app/Http/Resources/DeliveryPackingListResource.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DeliveryPackingListResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $package = $this->packages()->first();
+
+        return [
+            'id' => $this->id,
+            'claimant_id' => $this->claimant_id,
+            'reference' => $this->reference,
+            'status' => $this->status,
+            'transport' => new TransportResource($this->transports()->first()),
+            'type' => $package->type,
+            'description' => $package->description,
+            'weight' => (float) $package->weight,
+            'quantity' => (float) $package->quantity,
+        ];
+    }
+}

app/Http/Resources/DistrictResource.php

@@ -20,6 +20,7 @@ class DistrictResource extends JsonResource
             'state' => $this->state,
             'country' => $this->country,
             'postcode' => $this->postcode,
+            'postcodeArray' => PostcodeResource::collection(json_decode($this->postcode)),
         ];
     }
 }

app/Http/Resources/PostcodeResource.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Models\SegmentConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+
+
+class PostcodeResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $centerPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::CENTER_POSTCODE)->get();
+        $centerPostcodeConstant = $centerPostcodeConstantObject->isEmpty() ? [] : (array)$centerPostcodeConstantObject->first()->value;
+        $postcodeArea = in_array($this->resource, $centerPostcodeConstant) ? 'CENTER_POSTCODE' : '';
+        
+        $outstationPostcodeConstantObject = SegmentConstant::where('reference', SegmentConstants::OUTSTATION_POSTCODE)->get();
+        $outstationPostcodeConstant = $outstationPostcodeConstantObject->isEmpty() ? [] : (array)$outstationPostcodeConstantObject->first()->value;
+        in_array($this->resource, $outstationPostcodeConstant) ? $postcodeArea = 'OUTSTATION_POSTCODE' : '';
+
+        return [
+            'postcode' => $this->resource,
+            'postcodeArea' => $postcodeArea,
+        ];
+    }
+}

app/Http/Resources/StateResource.php

@@ -1,8 +1,9 @@
 <?php
 
 namespace App\Http\Resources;
-
+use App\Models\SegmentConstant;
 use Illuminate\Http\Resources\Json\JsonResource;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
 
 class StateResource extends JsonResource
 {
@@ -14,10 +15,15 @@ class StateResource extends JsonResource
      */
     public function toArray($request)
     {
+
+        $segmentConstantObject = SegmentConstant::where('reference', SegmentConstants::STATE_RATE)->get();
+        $segmentConstant = $segmentConstantObject->isEmpty() ? [] : (array)$segmentConstantObject->first()->value;
+
         return [
             'id' => $this->id,
             'name' => $this->name,
             'country' => $this->country,
+            'stateCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
         ];
     }
 }

app/Http/Resources/TransportResource.php

@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class TransportResource extends JsonResource
@@ -15,6 +16,7 @@ class TransportResource extends JsonResource
      */
     public function toArray($request)
     {
+        $currentSchedule = $this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first();
         return [
             'id' => $this->id,
             'type' => $this->type,
@@ -23,8 +25,10 @@ class TransportResource extends JsonResource
             'dispatch_date' => $this->dispatch_date ? $this->dispatch_date->format('d-m-Y') : $this->dispatch_date,
             'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
             'status' => $this->status,
-            'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
-            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
+            'current_schedule' => new ScheduleResource($currentSchedule),
+            'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get()),
+            'dropped_days' => Carbon::now()->diffInDays($this->drop_date, false),
+            'schedule_complete' => $currentSchedule ? $currentSchedule->eta <= Carbon::now() : false
         ];
     }
 }

app/Models/Addon.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+use App\Classes\General\Interfaces\Steppable;
+use App\Classes\General\Interfaces\Transportable;
+use App\Classes\General\Interfaces\Packable;
+use App\Classes\General\Interfaces\Transactionable;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+
+class Addon extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'addons';
+
+    protected $fillable = ['status'];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+}

app/Models/Order.php

@@ -58,6 +58,14 @@ class Order extends AbstractModel implements Addressable, Packable, Remarkable,
         return $this->morphMany(PackingList::class, 'owner');
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function addons(): morphMany
+    {
+        return $this->morphMany(Addon::class, 'owner');
+    }
+
     /**
      * @return MorphMany
      */

app/Models/PackingList.php

@@ -36,6 +36,14 @@ class PackingList extends AbstractModel implements Transportable, Steppable, Pac
         return $this->morphTo();
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function addons(): morphMany
+    {
+        return $this->morphMany(Addon::class, 'owner');
+    }
+
     public function containers(): BelongsToMany
     {
         return $this->BelongsToMany(Container::class, ContainerPackingList::class);

app/Models/SegmentCompany.php

@@ -1,8 +1,11 @@
 <?php
 
 namespace App\Models;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class SegmentCompany extends AbstractModel
 {
+    use SoftDeletes;
+
     protected $table = 'segment_companies';
 }

app/Models/SegmentConstant.php

@@ -15,6 +15,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  */
 class SegmentConstant extends AbstractModel
 {
+    use SoftDeletes;
+    
     protected $table = 'segment_constants';
 
     public function getDetailAttribute($value)

app/Models/User.php

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 use Spatie\Permission\Traits\HasRoles;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 use Tymon\JWTAuth\Contracts\JWTSubject;
 use Illuminate\Notifications\Notifiable;
@@ -24,8 +25,9 @@ class User extends AbstractModel implements
     AuthorizableContract,
     CanResetPasswordContract
 {
-    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail;
+    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes;
 
+    protected $dates = ['deleted_at'];
 
     /**
      * Get the identifier that will be stored in the subject claim of the JWT.

database/migrations/2021_06_25_014905_create_segment_companies_table.php

@@ -16,6 +16,7 @@ class CreateSegmentCompaniesTable extends Migration
         Schema::create('segment_companies', function (Blueprint $table) {
             $table->foreignId('segment_id');
             $table->foreignId('company_id');
+            $table->softDeletes();
             $table->timestamps();
             $table->primary(['segment_id', 'company_id']);
         });

database/migrations/2021_10_16_223129_create_transaction_details_table.php

@@ -18,7 +18,7 @@ class CreateTransactionDetailsTable extends Migration
             $table->foreignId('transaction_id')->unsigned();
             $table->string('reference');
             $table->string('name');
-            $table->integer('quantity')->default(0);
+            $table->decimal('quantity', 25, 5)->default(0.00);
             $table->decimal('price', 25, 5)->default(0.00);
             $table->decimal('amount', 25, 5)->default(0.00);
             $table->softDeletes();

database/migrations/2022_03_14_133555_add_deleted_at_to_users_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDeletedAtToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2022_03_14_133563_create_addons_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAddonsTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('addons', function (Blueprint $table) {
+            $table->id();
+            $table->morphs('owner');
+            $table->string('reference',200);
+            $table->integer('type')->default(0);
+            $table->integer('quantity')->default(1);
+            $table->integer('status')->default(0);
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('addons');
+    }
+}

database/seeders/CompaniesTableSeeder.php

@@ -16,6 +16,7 @@ use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\BusinessType;
@@ -112,7 +113,7 @@ class CompaniesTableSeeder extends Seeder
                 /** @var CompanyModule $companyModule */
                 $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::FREIGHT_FORWARDER);
 
-                $address = new AddressObject('Malaysian Global Innovation & Creativity Center Level 1 CWS', 'Block 3730,Persiaran APEC', 1, 15, 402, 63000);
+                $address = new AddressObject('Malaysian Global Innovation & Creativity Center Level 1 CWS', 'Block 3730,Persiaran APEC', 1, 15, 402, 63000, AddressType::BILLING, ApprovalStatus::APPROVED);
                 $this->createsAddress->execute($companyModule, $address);
 
                 $contact = new ContactObject('Office Number', '0182909252', '', '');
@@ -131,22 +132,22 @@ class CompaniesTableSeeder extends Seeder
 
                         if ($name === 'Guangzhou'){
                             $companyModule->update(['name' => $name, 'reference' => 'GZ-V01']);
-                            $address = new AddressObject('白云区，大朗南路 白云湖大道自编13号 7号仓库', '高德地图导航：广州市世通行', 2, 35, 633, 510450);
+                            $address = new AddressObject('白云区，大朗南路 白云湖大道自编13号 7号仓库', '高德地图导航：广州市世通行', 2, 35, 633, 510450, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                             $contact = new ContactObject('杨维民', '13600055019', '', '');
                         } elseif ($name === 'Yiwu') {
                             $companyModule->update(['name' => $name, 'reference' => 'YW-V01']);
-                            $address = new AddressObject('义乌市诚信大道义乌港A区2楼194号', '', 2, 27, 532, 322000);
+                            $address = new AddressObject('义乌市诚信大道义乌港A区2楼194号', '', 2, 27, 532, 322000, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                             $contact = new ContactObject('小曾', '13575982901', '', '');
                         } elseif ($name === 'Klang') {
                             $companyModule->update(['name' => $name, 'reference' => 'KL-V01']);
-                            $address = new AddressObject('LOT 1357 A, JALAN TANJUNG SHAWAL', 'KAMPUNG SUNGAI PINANG', 1, 15, 412, 41400);
+                            $address = new AddressObject('LOT 1357 A, JALAN TANJUNG SHAWAL', 'KAMPUNG SUNGAI PINANG', 1, 15, 412, 41400, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                             $contact = new ContactObject('Mr. Yang', '0162237680', '', '');
                         } elseif ($name === 'Sabah') {
                             $companyModule->update(['name' => $name, 'reference' => 'SB-V01']);
-                            $address = new AddressObject('Warehouse A & B, No. 2, Lorong Kacang Tanah 1', 'Jalan Kolombong, Kolombong', 1, 13, 316, 88450);
+                            $address = new AddressObject('Warehouse A & B, No. 2, Lorong Kacang Tanah 1', 'Jalan Kolombong, Kolombong', 1, 13, 316, 88450, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                         } elseif ($name === 'Sarawak') {
                             $companyModule->update(['name' => $name, 'reference' => 'SRW-V01']);
-                            $address = new AddressObject('OPPOSITE HT POLE 51, LT 664 JALAN SUNGAI SALIM', '', 1, 14, 381, 96000);
+                            $address = new AddressObject('OPPOSITE HT POLE 51, LT 664 JALAN SUNGAI SALIM', '', 1, 14, 381, 96000, AddressType::DELIVERY, ApprovalStatus::APPROVED);
                         }
 
 
@@ -161,7 +162,7 @@ class CompaniesTableSeeder extends Seeder
                 /** @var CompanyModule $companyModule */
                 $companyModule = $this->createCompanyModuleProcessor->execute($company, $businessType);
 
-                $address = new AddressObject('2, Jalan TSB 6, Taman Industri Sungai Buloh', '', 1, 15, 419, 47000);
+                $address = new AddressObject('2, Jalan TSB 6, Taman Industri Sungai Buloh', '', 1, 15, 419, 47000, AddressType::BILLING, ApprovalStatus::APPROVED);
                 $this->createsAddress->execute($companyModule, $address);
 
                 $contact = new ContactObject('Office Number', '036148 8108', '', '');

database/seeders/LastMileDeliveryTableSeeder.php

@@ -0,0 +1,147 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Processors\CreateAddressFromOldAddressProcessor;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompany;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\BusinessType;
+
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\CompanyModule;
+use App\Models\User;
+use Illuminate\Database\Seeder;
+
+use App\Models\Company;
+
+class LastMileDeliveryTableSeeder extends Seeder
+{
+
+    /** @var CreateCompanyProcessor */
+    private $createCompanyProcessor;
+
+    /** @var UpdatesCompanyStatus*/
+    private $updatesCompanyStatus;
+
+    /** @var CreateCompanyModuleProcessor */
+    private $createCompanyModuleProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreatesCompanyConnection */
+    private $createsCompanyConnection;
+
+    /** @var ApprovesCompanyConnection */
+    private $approvesCompanyConnection;
+
+    /** @var CreateAddressFromOldAddressProcessor */
+    private $createAddressFromOldAddressProcessor;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var CreatesCompany */
+    private $createsCompany;
+
+    /** @var CreatesContact */
+    private $createsContact;
+
+    /** @var CreatesUser */
+    private $createsUser;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /**
+     * LastMileDeliveryTableSeeder constructor.
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param UpdatesCompanyStatus $updatesCompanyStatus
+     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreatesCompanyConnection $createsCompanyConnection
+     * @param ApprovesCompanyConnection $approvesCompanyConnection
+     * @param CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor
+     * @param CreatesAddress $createsAddress
+     * @param CreatesCompany $createsCompany
+     * @param CreatesContact $createsContact
+     * @param CreatesUser $createsUser
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     */
+    public function __construct(CreateCompanyProcessor $createCompanyProcessor, UpdatesCompanyStatus $updatesCompanyStatus, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor, CreatesAddress $createsAddress, CreatesCompany $createsCompany, CreatesContact $createsContact, CreatesUser $createsUser, AssignEmployeeProcessor $assignEmployeeProcessor)
+    {
+        $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->updatesCompanyStatus = $updatesCompanyStatus;
+        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->approvesCompanyConnection = $approvesCompanyConnection;
+        $this->createAddressFromOldAddressProcessor = $createAddressFromOldAddressProcessor;
+        $this->createsAddress = $createsAddress;
+        $this->createsCompany = $createsCompany;
+        $this->createsContact = $createsContact;
+        $this->createsUser = $createsUser;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+    }
+
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function run()
+    {
+
+        $companies = [
+            new CompanyObject('Last Mile Delivery', 'HWT', CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED),
+        ];
+
+
+        foreach ($companies as $companyObject) {
+
+            /** @var Company $company */
+            $company = $this->createsCompany->execute($companyObject);
+
+            /** @var CompanyModule $companyModule */
+            $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::LAST_MILE_DELIVERY_AGENT);
+
+            $address = new AddressObject('B-39-13, Menara Simfoni, Jalan Simfoni 2, Balakong', 'Block 3730,Persiaran APEC', 1, 15, 432, 43300, AddressType::BILLING, ApprovalStatus::APPROVED);
+            $this->createsAddress->execute($companyModule, $address);
+
+            $contact = new ContactObject('Office Number', '01155543194', '', '');
+            $this->createsContact->execute($companyModule, $contact);
+
+            $user_object = new RegistrationObject('CQ', 'hywavetech168@gmail.com', 'FIzxqcZFFob7btVLEfWC', 'FIzxqcZFFob7btVLEfWC', RoleTypes::USER, ApprovalStatus::APPROVED);
+
+            /** @var User $user */
+            $user = $this->createsUser->execute($user_object);
+
+            $Object = new EmploymentObject($companyModule, $user);
+            $this->assignEmployeeProcessor->execute($Object);
+
+            continue;
+
+        }
+    }
+}

database/seeders/ModernWarehouseTableSeeder.php

@@ -17,6 +17,7 @@ use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\BusinessType;
@@ -104,10 +105,10 @@ class ModernWarehouseTableSeeder extends Seeder
 
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::WAREHOUSE);
-        $companyModule->update(['name' => 'Yiwu', 'reference' => 'YW-V02']);
+        $companyModule->update(['name' => 'Guangzhou', 'reference' => 'GZ-V02']);
 
-        $address = new AddressObject('义乌市 后宅街道 起航路233号百汇科创园园区里面', '（进口处进来第一个路口左转至出口处右手边国际物流仓库)', 2, 27, 532, 322000);
-        $contact = new ContactObject('韩成名', '18058489899 / 18058929899', '', '');
+        $address = new AddressObject('广东省 广州市 白云区 江高镇松岗街七横63号', '', 2, 35, 633, 510450, AddressType::BILLING, ApprovalStatus::APPROVED);
+        $contact = new ContactObject('郑先生', '13719211997', '', '');
 
         $this->createsAddress->execute($companyModule, $address);
         $this->createsContact->execute($companyModule, $contact);

database/seeders/SegmentConstantsTableSeeder.php

@@ -19,8 +19,8 @@ class SegmentConstantsTableSeeder extends Seeder
                 'segment_id' => 1,
                 'reference' => SegmentConstants::BASE_PRICE,
                 'value' => json_encode([
-                    'id'=> 1,
-                    'price' => 500,
+                    '2022-05-01'=> '0.00',
+                    '2022-05-02'=> '0.00',
                 ]),
             ],
             [
@@ -28,21 +28,12 @@ class SegmentConstantsTableSeeder extends Seeder
                 'segment_id' => 1,
                 'reference' => SegmentConstants::WAREHOUSE_RATE,
                 'value' => json_encode([
-                    'id'=> 1,
-                    'config' => [
-                        [
-                            'warehouse_name' => WarehouseReferences::VT_GUANG_ZHOU,
-                            'rate' => 10
-                        ],
-                        [
-                            'warehouse_name' => WarehouseReferences::YD_GUANG_ZHOU,
-                            'rate' => 10
-                        ],
-                        [
-                            'warehouse_name' => WarehouseReferences::VT_YIWU,
-                            'rate' => 10
-                        ],
-                    ]
+                    '7' =>[
+                            'amount' => '0.00',
+                    ],
+                    '6' =>[
+                        'amount' => '0.00',
+                    ],
                 ]),
             ],
             [
@@ -50,88 +41,69 @@ class SegmentConstantsTableSeeder extends Seeder
                 'segment_id' => 1,
                 'reference' => SegmentConstants::STATE_RATE,
                 'value' => json_encode([
-                    'id'=> 1,
-                    'config' => [
-                        [
-                            'status_id' => 1,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 2,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 3,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 4,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 5,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 6,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 7,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 8,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 9,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 10,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 11,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 12,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 13,
-                            'rate' => 20,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 14,
-                            'rate' => 20,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 15,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ],
-                        [
-                            'status_id' => 16,
-                            'rate' => 10,
-                            'outstation_rate' => 2
-                        ]
+                    '1' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '2' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '3' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '4' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '5' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '6' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '7' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '8' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '9' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '10' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '11' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '12' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '13' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '14' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '15' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
+                    ],
+                    '16' =>[
+                        'center' => '10.00',
+                        'outstation' => '2.00'
                     ]
                 ]),
             ],

load_font.php

@@ -0,0 +1,202 @@
+<?php
+// 1. [Required] Point to the composer or dompdf autoloader
+require_once "vendor/autoload.php";
+
+// 2. [Optional] Set the path to your font directory
+//    By default dompdf loads fonts to dompdf/lib/fonts
+//    If you have modified your font directory set this
+//    variable appropriately.
+//$fontDir = "lib/fonts";
+$fontDir = 'storage/fonts';
+
+// *** DO NOT MODIFY BELOW THIS POINT ***
+
+use Dompdf\Dompdf;
+use Dompdf\CanvasFactory;
+use Dompdf\Exception;
+use Dompdf\FontMetrics;
+use Dompdf\Options;
+
+use FontLib\Font;
+
+/**
+ * Display command line usage
+ */
+function usage() {
+  echo <<<EOD
+
+Usage: {$_SERVER["argv"][0]} font_family [n_file [b_file] [i_file] [bi_file]]
+
+font_family:      the name of the font, e.g. Verdana, 'Times New Roman',
+                  monospace, sans-serif. If it equals to "system_fonts", 
+                  all the system fonts will be installed.
+
+n_file:           the .ttf or .otf file for the normal, non-bold, non-italic
+                  face of the font.
+
+{b|i|bi}_file:    the files for each of the respective (bold, italic,
+                  bold-italic) faces.
+
+If the optional b|i|bi files are not specified, load_font.php will search
+the directory containing normal font file (n_file) for additional files that
+it thinks might be the correct ones (e.g. that end in _Bold or b or B).  If
+it finds the files they will also be processed.  All files will be
+automatically copied to the DOMPDF font directory, and afm files will be
+generated using php-font-lib (https://github.com/PhenX/php-font-lib).
+
+Examples:
+
+./load_font.php silkscreen /usr/share/fonts/truetype/slkscr.ttf
+./load_font.php 'Times New Roman' /mnt/c_drive/WINDOWS/Fonts/times.ttf
+
+EOD;
+exit;
+}
+
+if ( $_SERVER["argc"] < 3 && @$_SERVER["argv"][1] != "system_fonts" ) {
+  usage();
+}
+
+$dompdf = new Dompdf();
+if (isset($fontDir) && realpath($fontDir) !== false) {
+  $dompdf->getOptions()->set('fontDir', $fontDir);
+}
+
+/**
+ * Installs a new font family
+ * This function maps a font-family name to a font.  It tries to locate the
+ * bold, italic, and bold italic versions of the font as well.  Once the
+ * files are located, ttf versions of the font are copied to the fonts
+ * directory.  Changes to the font lookup table are saved to the cache.
+ *
+ * @param Dompdf $dompdf      dompdf main object 
+ * @param string $fontname    the font-family name
+ * @param string $normal      the filename of the normal face font subtype
+ * @param string $bold        the filename of the bold face font subtype
+ * @param string $italic      the filename of the italic face font subtype
+ * @param string $bold_italic the filename of the bold italic face font subtype
+ *
+ * @throws Exception
+ */
+function install_font_family($dompdf, $fontname, $normal, $bold = null, $italic = null, $bold_italic = null) {
+  $fontMetrics = $dompdf->getFontMetrics();
+  
+  // Check if the base filename is readable
+  if ( !is_readable($normal) )
+    throw new Exception("Unable to read '$normal'.");
+
+  $dir = dirname($normal);
+  $basename = basename($normal);
+  $last_dot = strrpos($basename, '.');
+  if ($last_dot !== false) {
+    $file = substr($basename, 0, $last_dot);
+    $ext = strtolower(substr($basename, $last_dot));
+  } else {
+    $file = $basename;
+    $ext = '';
+  }
+
+  if ( !in_array($ext, array(".ttf", ".otf")) ) {
+    throw new Exception("Unable to process fonts of type '$ext'.");
+  }
+
+  // Try $file_Bold.$ext etc.
+  $path = "$dir/$file";
+  
+  $patterns = array(
+    "bold"        => array("_Bold", "b", "B", "bd", "BD"),
+    "italic"      => array("_Italic", "i", "I"),
+    "bold_italic" => array("_Bold_Italic", "bi", "BI", "ib", "IB"),
+  );
+  
+  foreach ($patterns as $type => $_patterns) {
+    if ( !isset($$type) || !is_readable($$type) ) {
+      foreach($_patterns as $_pattern) {
+        if ( is_readable("$path$_pattern$ext") ) {
+          $$type = "$path$_pattern$ext";
+          break;
+        }
+      }
+      
+      if ( is_null($$type) )
+        echo ("Unable to find $type face file.\n");
+    }
+  }
+
+  $fonts = compact("normal", "bold", "italic", "bold_italic");
+  $entry = array();
+
+  // Copy the files to the font directory.
+  foreach ($fonts as $var => $src) {
+    if ( is_null($src) ) {
+      $entry[$var] = $dompdf->getOptions()->get('fontDir') . '/' . mb_substr(basename($normal), 0, -4);
+      continue;
+    }
+
+    // Verify that the fonts exist and are readable
+    if ( !is_readable($src) )
+      throw new Exception("Requested font '$src' is not readable");
+
+    $dest = $dompdf->getOptions()->get('fontDir') . '/' . basename($src);
+
+    if ( !is_writeable(dirname($dest)) )
+      throw new Exception("Unable to write to destination '$dest'.");
+
+    echo "Copying $src to $dest...\n";
+
+    if ( !copy($src, $dest) )
+      throw new Exception("Unable to copy '$src' to '$dest'");
+    
+    $entry_name = mb_substr($dest, 0, -4);
+    
+    echo "Generating Adobe Font Metrics for $entry_name...\n";
+    
+    $font_obj = Font::load($dest);
+    $font_obj->saveAdobeFontMetrics("$entry_name.ufm");
+    $font_obj->close();
+
+    $entry[$var] = $entry_name;
+  }
+
+  // Store the fonts in the lookup table
+  $fontMetrics->setFontFamily($fontname, $entry);
+
+  // Save the changes
+  $fontMetrics->saveFontFamilies();
+}
+
+// If installing system fonts (may take a long time)
+if ( $_SERVER["argv"][1] === "system_fonts" ) {
+  $fontMetrics = $dompdf->getFontMetrics();
+  $files = glob("/usr/share/fonts/truetype/*.ttf") +
+    glob("/usr/share/fonts/truetype/*/*.ttf") +
+    glob("/usr/share/fonts/truetype/*/*/*.ttf") +
+    glob("C:\\Windows\\fonts\\*.ttf") +
+    glob("C:\\WinNT\\fonts\\*.ttf") +
+    glob("/mnt/c_drive/WINDOWS/Fonts/");
+  $fonts = array();
+  foreach ($files as $file) {
+      $font = Font::load($file);
+      $records = $font->getData("name", "records");
+      $type = $fontMetrics->getType($records[2]);
+      $fonts[mb_strtolower($records[1])][$type] = $file;
+      $font->close();
+  }
+  
+  foreach ( $fonts as $family => $files ) {
+    echo " >> Installing '$family'... \n";
+    
+    if ( !isset($files["normal"]) ) {
+      echo "No 'normal' style font file\n";
+    }
+    else {
+      install_font_family($dompdf, $family, @$files["normal"], @$files["bold"], @$files["italic"], @$files["bold_italic"]);
+      echo "Done !\n";
+    }
+    
+    echo "\n";
+  }
+}
+else {
+  call_user_func_array("install_font_family", array_merge( array($dompdf), array_slice($_SERVER["argv"], 1) ));
+}