update base price date range

update list base price section component
update constant base price
2026-08-19 12:34:18 +00:00 · 2022-04-23 14:59:52 +08:00 · 2022-04-22 22:23:35 +08:00 · 2022-04-22 21:41:02 +08:00 · 2022-04-22 00:23:59 +08:00 · 2022-04-22 00:18:12 +08:00
177 changed files with 5695 additions and 974 deletions
@@ -16,13 +16,15 @@ class PackingListDeliveryStatus implements Filter
     */
    public static function apply(Builder $builder, $value)
    {
-        return $value == 1 ? $builder->whereDoesntHave('transports') : ($value == 2 ? $builder->whereHas('transports', function (Builder $query) use ($value) {
+        return $value == 1 ? $builder->whereHas('containers', function ($query){
+            $query->where('containers.status', ApprovalStatus::COMPLETED);
+        })->whereDoesntHave('transports') : ($value == 2 ? $builder->whereHas('transports', function (Builder $query) use ($value) {
            $query->whereDoesntHave('schedules', function (Builder $query) use ($value) {
-                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '>',  Carbon::now());
+                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
            });
        }) : $builder->whereHas('transports', function (Builder $query) use ($value) {
            $query->whereHas('schedules', function (Builder $query) use ($value) {
-                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<',  Carbon::now());
+                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
            });
        }));
    }
@@ -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);
    }

 }
@@ -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);

@@ -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
 {
@@ -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');
        }

@@ -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',
            ]);
        }

@@ -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);

@@ -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);

@@ -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;
+    }
+

 }
@@ -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');

    }

@@ -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);

@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\ControllersLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Http\Resources\TransactionResource;
+use App\Models\Booking;
+use App\Models\User;
+use App\Models\Wallet;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
+use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+class CallbackBillplzLogic
+{
+    /** @var GetBillplzBill */
+    private $getBillplzBill;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /**
+     * CallbackBillplzLogic constructor.
+     * @param GetBillplzBill $getBillplzBill
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     */
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->getBillplzBill = $getBillplzBill;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws MalformedRequestException
+     * @throws ResourceNotFoundException
+     */
+    public function execute(Request $request)
+    {
+        $billplzXSignatureObject = new BillplzXSignatureObject($request);
+
+        if(!$billplzXSignatureObject->isValidSignature()){
+            throw new MalformedRequestException('Billplz Payment validation failed.');
+        }
+
+        $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
+
+        if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
+
+        $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
+
+        if($billPlz->state === 'paid') {
+            $status = ApprovalStatus::APPROVED;
+        }
+
+        if($billPlz->state === 'due') {
+            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
+        }
+
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer '.$token);
+
+        $marking = $transaction->owner()->first()->owner()->first();
+
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking->reference, 'transaction' => $transaction, 'status' => $status]);
+    }
+}
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+
+use ErrorException;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillplzBillLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Billplz Bill',
+            'message' => 'You have successfully created a new Bill'
+        ];
+    }
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /**
+     * CreateBookingLogic constructor.
+     * @param CreatesBillplzBill $createsBillplzBill
+     */
+    public function __construct(CreatesBillplzBill $createsBillplzBill)
+    {
+        $this->createsBillplzBill = $createsBillplzBill;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $billPlz = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, $request->input('description'), 200, $request->input('bankName'));
+
+        if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.');
+        
+        return $this->response(['data' => $billPlz]);
+
+    }
+}
@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+use function PHPSTORM_META\map;
+
+class BillplzXSignatureObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $billPlzId;
+
+    /** @var string */
+    private $status;
+
+    /** @var array */
+    private $billPlzConstructArray;
+
+    /** @var string */
+    private $billPlzConstructString;
+
+    /** @var string  */
+    private $billPlzComputedXSignature;
+
+    /** @var string */
+    private $type;
+
+    /** @var Request  */
+    private $request;
+
+    /** @var string  */
+    private $requestXSignature;
+
+    public function __construct(Request $request)
+    {
+
+        $this->type = $request->exists('billplz') ? 'redirect' : 'callback';
+
+        $this->request = $this->type === 'redirect' ? $request->input('billplz') : $request;
+
+        $this->billPlzId = $this->request['id'];
+
+        $this->status = $this->request['transaction_status'];
+
+        $this->requestXSignature = $this->request['x_signature'];
+
+        $this->_constructBillplzArray()->_natSortBillplzArray()->_constructBillplzString()->_computeBillplzXSignature();
+    }
+
+    private function _constructBillplzArray(){
+
+        $this->billPlzConstructArray = collect($this->request)->forget('x_signature')->map(function($item, $key){
+            return $this->type === 'redirect' ? 'billplz'.$key.$item : $key.$item;
+        })->toArray();
+
+        return $this;
+    }
+
+    private function _natCaseSortBillplzArray(){
+        natcasesort($this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _natSortBillplzArray(){
+        natsort($this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _constructBillplzString(){
+        $this->billPlzConstructString = implode('|', $this->billPlzConstructArray);
+        return $this;
+    }
+
+    private function _computeBillplzXSignature(){
+        $this->billPlzComputedXSignature = hash_hmac('sha256', $this->billPlzConstructString, config('billplz.x_signature_key'));
+        return $this;
+    }
+
+    public function getBillPlzId(): string
+    {
+        return $this->billPlzId;
+    }
+
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBillPlzConstructArray(): array
+    {
+        return $this->billPlzConstructArray;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillPlzConstructString(): string
+    {
+        return $this->billPlzConstructString;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillPlzComputedXSignature(): string
+    {
+        return $this->billPlzComputedXSignature;
+    }
+
+    public function isValidSignature(): bool
+    {
+        return $this->billPlzComputedXSignature === $this->requestXSignature ? true : false;
+    }
+
+}
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+
+class CreatesBillplzBill
+{
+
+    /**
+     * @param string $name
+     * @param string $email
+     * @param string $description
+     * @param float $amount
+     * @param string $billNumber
+     * @param null|string $bankCode
+     * @param null|Boolean $wallet
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?bool $wallet = null) {
+        try{
+//            config('billplz.maybank')
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
+                'collection_id' => $wallet ? config('billplz.wallet_collection_id') : config('billplz.collection_id'),
+                'name' => $name,
+                'email' => $email,
+                'description' => $description,
+                'amount' => $this->finalizeAmount($amount),
+                'redirect_url' => route('online_payment.redirect'),
+                'callback_url' => route('api.online_payment.callback'),
+                'reference_1_label' => 'Bank Code',
+                'reference_1' => $bankCode ? $bankCode : '',
+                'reference_2_label' => 'Bill Number',
+                'reference_2' => $billNumber
+            ]);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server' . $exception->getMessage());
+        }
+    }
+
+    protected function finalizeAmount($amount){
+        $number = round($amount, 2) * 100;
+        return (string) $number;
+    }
+}
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Http;
+
+class GetBillplzBill
+{
+
+    /**
+     * @param string $billPlzId
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billPlzId) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$billPlzId);
+
+            if($response->successful()){
+                $data = $response->json();
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server');
+        }
+    }
+}
@@ -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
     */
@@ -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();
@@ -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)));
+
+    }
+}
@@ -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));
+    }
+}
@@ -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));
+
+    }
+}
@@ -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));
+
+    }
+
+
+
+}
@@ -0,0 +1,86 @@
+<?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\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'ORDER NUMBER',
+            'Marking',
+            'Warehouse',
+            'Cbm',
+            'Description',
+            'quantity',
+            'Received Date',
+            'Remarks'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $returnArray = collect();
+
+        $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->get();
+        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+
+        foreach($packingLists as $packingList){
+            $packages = !$packingList->packingLists()->exists() || $exceptionUsers ? $packingList->packages : $packingList->packingLists->first()->packages;
+            foreach ($packages as $package) {
+                $returnArray->push($package);
+            }
+        }
+        
+        return $returnArray;
+    }
+
+    /**
+     * @param ReturnArray $returnArray
+     *
+     * @return array
+     */
+    public function map($package): array
+    {
+        $packingList = $package->packingList;
+        $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 = (($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,
+            $package->description,
+            $package->quantity,
+            $arrival_date,
+            ''
+        ];
+    }
+}
@@ -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,
+            '',
+            ''
+        ];
+    }
+}
@@ -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],
+        ];
+    }
+}
@@ -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;
+    }
+}
@@ -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,
+        ];
+    }
+}
@@ -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 : '',
+        ];
+    }
+}
@@ -67,7 +67,7 @@ class CreateOrderLogic extends AbstractControllerLogic
        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);

        if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU_2 : WarehouseReferences::YD_YIWU]);
        }

        if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
@@ -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));

@@ -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;
    }


+
 }
@@ -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);
+                }
+            }

        }

@@ -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);
@@ -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();
@@ -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());
        }

    }
@@ -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');
        }
@@ -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();
    }

@@ -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();
    }

@@ -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));
    }

 }
@@ -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);
        }
@@ -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);
@@ -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;
@@ -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,12 +407,7 @@ class FetchOrderListsFromYdPortalProcessor
                    }
                }

-                if($deliveryDate){
-
-                    if($packingList->transports){
-                        continue;
-                    }
-
+                if($deliveryDate && !$packingList->transports()->exists()){
                    $packingList->status = ApprovalStatus::COMPLETED;
                    $packingList->save();

@@ -50,9 +50,10 @@ class FetchPackingListFromVTPortalProcessor
            $query->where('status', '=', ApprovalStatus::COMPLETED);
        })->get();

+        DB::beginTransaction();
        foreach($packingLists as $packingList){
            try {
-                DB::beginTransaction();
+

                $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';

@@ -75,14 +76,12 @@ class FetchPackingListFromVTPortalProcessor
                    }
                }

-
-
-                DB::commit();
            } catch (GuzzleException $exception) {
                continue;
            }

        }
+        DB::commit();

        return [];

@@ -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) {
@@ -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));
+    }
+
+}
@@ -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));
+    }
+
+}
@@ -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('reference'), $request->input('value'));
-
        $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));
    }
@@ -14,6 +14,8 @@ 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
 {
@@ -46,6 +48,8 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
    /** @var RemoveItemFromConstantValueArray */
    private $removeItemFromConstantValueArray;

+    /** @var CreatesConstant */
+    private $createsConstant;

    /**
     * UpdateConstantLogic constructor.
@@ -54,9 +58,18 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
     * @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)
+    public function __construct(
+        CanUpdateConstant $canUpdateConstant, 
+        UpdatesConstant $updatesConstant, 
+        FetchesSegment $fetchesSegment, 
+        FetchesConstant $fetchesConstant,
+        AddItemToConstantValueArray $addItemToConstantValueArray, 
+        RemoveItemFromConstantValueArray $removeItemFromConstantValueArray,
+        CreatesConstant $createsConstant
+    )
    {
        $this->canUpdateConstant = $canUpdateConstant;
        $this->updatesConstant = $updatesConstant;
@@ -64,6 +77,7 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
        $this->fetchesConstant = $fetchesConstant;
        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
+        $this->createsConstant = $createsConstant;
    }
    /**
     * @param Request $request
@@ -76,24 +90,42 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
    {
        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);

-        $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
+        try {
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);

-        $object = new ConstantObject($constant->reference, $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode')));
-        $this->canUpdateConstant->passes($object);
+            $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);

-        $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
-
-        $oppositeObject = new ConstantObject($request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $request->input('postcode')));
-
-        $oppositeConstant = $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
-
-
-        return $this->response([
-            'CENTER_POSTCODE' => $constant->reference == SegmentConstants::CENTER_POSTCODE ? new ConstantResource($constant) : New ConstantResource($oppositeConstant),
-            'OUTSTATION_POSTCODE' => $constant->reference == SegmentConstants::OUTSTATION_POSTCODE ? new ConstantResource($constant) : New ConstantResource($oppositeConstant),
-        ]);
+        return $this->resourceResponse(new ConstantResource($constant));
    }

 }
@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-use Illuminate\Http\Request;
-use App\Models\SegmentConstant;
-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\UpdatesConstantValueByState;
-
-class UpdateConstantStateLogic  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 UpdatesConstantValueByState */
-    private $updatesConstantValueByState;
-
-
-    /**
-     * UpdateConstantLogic constructor.
-     * @param CanUpdateConstant $canUpdateConstant
-     * @param UpdatesConstant $updatesConstant
-     * @param FetchesSegment $fetchesSegment
-     * @param FetchesConstant $fetchesConstant
-     * @param UpdatesConstantValueByState $updatesConstantValueByState
-     */
-    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant,UpdatesConstantValueByState $updatesConstantValueByState)
-    {
-        $this->canUpdateConstant = $canUpdateConstant;
-        $this->updatesConstant = $updatesConstant;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->fetchesConstant = $fetchesConstant;
-        $this->updatesConstantValueByState = $updatesConstantValueByState;
-    }
-    /**
-     * @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')]);
-
-        $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => SegmentConstants::STATE_RATE]);
-        
-        $constantValue = $this->updatesConstantValueByState->execute($constant->value, $request->input('status_id'), $request->input('rate'));
-
-        $object = new ConstantObject(SegmentConstants::STATE_RATE, (array) $constantValue);
-        $this->canUpdateConstant->passes($object);
-        
-        $constant = $this->updatesConstant->execute($constant, $object);
-
-
-        return $this->resourceResponse(new ConstantResource($constant));
-    }
-
-}
@@ -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;
+    }
+
+}
@@ -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;
+    }
+
+}
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Services;
-
-class UpdatesConstantValueByState
-{
-
-    /**
-     * @param $json
-     * @param int $status_id
-     * @param int $rate
-     * @return string
-     */
-    public function execute($json, int $status_id, int $rate) {
-
-        $newArray = $json;
-        foreach($json->config as $key => $object){
-            if($object->status_id == $status_id){
-                $newArray->config[$key] = (object) [
-                    'rate' => $rate,
-                    'status_id' => $object->status_id,
-                    'outstation_rate' => $object->outstation_rate,
-                ];
-            }else{
-                $newArray->config[$key] = $object;
-            }
-        }
-        return $newArray;
-
-    }
-
-}
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+
+use App\Classes\Modules\Documents\Services\ApprovesDocument;
+use App\Classes\Modules\Documents\Services\FetchesDocument;
+use App\Classes\Modules\Documents\Services\RejectsDocument;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePaymentTransactionLogic extends AbstractControllerLogic
+{
+    /**
+     * ApprovePaymentVerificationLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param ApprovesDocument $approvesDocument
+     * @param RejectsDocument $rejectsDocument
+     * @param FetchesDocument $fetchesDocument
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->approvesDocument = $approvesDocument;
+        $this->rejectsDocument = $rejectsDocument;
+    }
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Payment Status',
+            'message' => 'You have successfully updated the payment status'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var ApprovesDocument */
+    private $approvesDocument;
+
+    /** @var RejectsDocument */
+    private $rejectsDocument;
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $status = $request->route('status');
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('transaction_id')]);
+        
+        $status === 'approve' ? $this->approvesDocument->execute($transaction->documents()->first()) : $this->rejectsDocument->execute($transaction->documents()->first());
+
+        $this->updatesTransactionStatus->execute($transaction, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
+        // $this->createInvoiceTransactionProcessor->execute($transaction->booking);
+        return $this->response([]);
+    }
+
+}
@@ -0,0 +1,121 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
+
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+
+class CreatePaymentTransactionLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Payment Transactions',
+            'message' => 'You have successfully created currency supplier transactions'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var FetchesSegmentConstant */
+    private $fetchesSegmentConstant;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesPaymentTransaction */
+    private $createsPaymentTransaction;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
+
+    public function __construct(
+        FetchesTransaction $fetchesTransaction, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        CreatesPaymentTransaction $createsPaymentTransaction,
+        CreatesTransactionDetail $createsTransactionDetail,
+        CreatesBillplzBill $createsBillplzBill
+    )
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsPaymentTransaction = $createsPaymentTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->createsBillplzBill = $createsBillplzBill;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);
+        $amount = $request->input('amount');
+        $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+        $payment_reference = null;
+        if ($request->input('payment_method') == 5) {
+            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
+            $billPlzBill = $this->createsBillplzBill->execute(
+                $company_module->name, 
+                $company_module->employees()->first()->email, 
+                'This payment is credit topup for company ref. ' . $company_module->reference, $amount, $billNumber, 
+                $request->input('bank_code'), true
+            );
+
+            $payment_reference = $billPlzBill->id;
+        }
+        else {
+            $payment_method = PaymentMethodType::CASH;
+        }
+
+        $object = new TransactionObject(
+            $billNumber, 
+            TransactionType::PAYMENT, 
+            $company_module->id,
+            1,
+            1, 
+            $payment_method,
+            $request->input('amount'),
+            $request->input('amount'),
+            1,
+            1, 
+            0, 
+            0, 
+            0,
+            null, 
+            ApprovalStatus::PENDING_SUBMISSION,
+            null,
+            $payment_reference
+        );
+
+        $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
+
+        return $this->response([]);
+    }
+}
@@ -20,24 +20,15 @@ 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\TransactionDetailType;

-// use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-// use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-// use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-
-// use App\Models\Document;
-// use App\Models\Transaction;
-// use Barryvdh\DomPDF\PDF;
-// use Carbon\Carbon;
-
-
-
+use App\Models\Document;
+use App\Models\Transaction;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-
-// use Meneses\LaravelLaravelMpdf\Facades\LaravelLaravelMpdf;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;

 class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
@@ -74,16 +65,6 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic

    /** @var CreatesFiles */
    private $createsFile;
-
-    // /** @var FetchesTransaction */
-    // /** @var UpdatesTransactionStatus */
-    // private $updatesTransactionStatus;
-    // /** @var CreatesDocument */
-    // private $createsDocument;
-    // /** @var CreatesFiles */
-    // private $createsFile;
-    // /** @var PDF */
-    // private $pdf;
    
    public function __construct(
        FetchesPackingList $fetchesPackingList, 
@@ -93,10 +74,6 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
        CreatesTransactionDetail $createsTransactionDetail,
        CreatesDocument $createsDocument,
        CreatesFiles $createsFile
-
-        // CreatesDocument $createsDocument, 
-        // CreatesFiles $createsFile, 
-        // PDF $pdf
    )
    {

@@ -107,18 +84,17 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
        $this->createsTransactionDetail = $createsTransactionDetail;
        $this->createsDocument = $createsDocument;
        $this->createsFile = $createsFile;
-
-        // $this->updatesTransactionStatus = $updatesTransactionStatus;
-        // $this->createsDocument = $createsDocument;
-        // $this->createsFile = $createsFile;
-        // $this->pdf = $pdf;
    }

    public function logic(Request $request) : JsonResponse
    {
        $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);
+        });
+
+        $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);
        });

@@ -175,7 +151,7 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
        }

        $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-');

@@ -197,16 +173,28 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
            ApprovalStatus::PENDING_SUBMISSION
        );

+        /** @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]);

@@ -217,11 +205,12 @@ 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([]);
    }
 }
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Company;
+use App\Models\Document;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UploadPaymentVerificationDocumentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Payment Verify Document',
+            'message' => 'You have successfully submitted your payment verify document'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /**
+     * CreatePaymentVerificationDocumentLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('transaction_id')]);
+
+        $object = new DocumentObject(
+            DocumentType::CUSTOMER_PAYMENT_PROOF, 
+            $request->input('files'), 
+            '', 
+            ApprovalStatus::PENDING_VERIFICATION, 
+            'payments'
+        );
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($transaction, $object);
+
+        $this->createsFile->execute($document, $object);
+
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+
+        return $this->response([]);
+    }
+}
@@ -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;
    }
@@ -57,6 +57,9 @@ class TransactionObject implements DataTransferObject
    /** @var array|null */
    private $details;

+    /** @var string */
+    private $paymentReference;
+
    /**
     * TransactionObject constructor.
     * @param string $billNo
@@ -92,7 +95,8 @@ class TransactionObject implements DataTransferObject
        float $serviceCharge, 
        ?Carbon $expiresOn, 
        ?int $status = ApprovalStatus::PENDING_SUBMISSION, 
-        ?array $details = []
+        ?array $details = [],
+        ?string $paymentReference = null
    )
    {
        $this->billNo = $billNo;
@@ -111,6 +115,7 @@ class TransactionObject implements DataTransferObject
        $this->expiresOn = $expiresOn;
        $this->status = $status;
        $this->details = $details;
+        $this->paymentReference = $paymentReference;
    }

    /**
@@ -243,7 +248,11 @@ class TransactionObject implements DataTransferObject
        }, $this->details);
    }

-
-
-
+    /**
+     * @return string|null
+     */
+    public function getPaymentReference(): ?string
+    {
+        return $this->paymentReference;
+    }
 }
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Models\Transaction;
+
+class CreatesPaymentTransaction extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param TransactionObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transaction $transaction, TransactionObject $object) {
+        $model = new Transaction();
+        $model->bill_no = $object->getBillNo();
+        $model->type = $object->getTransactionType();
+        $model->issuer = $object->getIssuer();
+        $model->receiver = $object->getReceiver();
+        $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
+        $model->payment_method = $object->getPaymentMethod();
+        $model->amount = $object->getAmount();
+        $model->original_amount = $object->getOriginalAmount();
+        $model->currency_id = $object->getCurrencyId();
+        $model->original_currency_id = $object->getOriginalCurrencyId();
+        $model->currency_rate = $object->getCurrencyRate();
+        $model->tax = $object->getTax();
+        $model->service_charge = $object->getServiceCharge();
+        $model->expires_on = $object->getExpiresOn();
+        $model->status = $object->getStatus();
+
+        return $this->handler($transaction->transactions(), $model);
+    }
+}
@@ -8,4 +8,6 @@ final class AddressType {

    public const DELIVERY = 2;

+    public const PICK_UP = 3;
+
 }
@@ -18,4 +18,7 @@ final class BusinessType {

    public const CURRENCY_VENDOR = 6;

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

    public const DEDICATED_CONTAINER = 1;

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

    public const OVER_WEIGHT = 2;

+    public const DOCUMENT = 3;
+
 }
@@ -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';
+}
@@ -6,9 +6,10 @@ final class TransactionType {

    public const SHIPPING_INVOICE = 1;
    
+    public const PAYMENT = 2;
+
    // public const PAYMENT_ATTEMPT = 0;

-    // public const PAYMENT = 1;

    // public const INVOICE = 2;

@@ -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

 }
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Billplz;
+
+use App\Classes\Modules\Billplzs\ControllersLogic\CallbackBillplzLogic;
+use Illuminate\Http\Request;
+
+class CallbackBillplzController
+{
+
+    /**
+     * @param Request $request
+     * @param CallbackBillplzLogic $logic
+     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\ResourceNotFoundException
+     */
+    public function callback(Request $request, CallbackBillplzLogic $logic) {
+        return $logic->execute($request);
+    }
+
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Billplz;
+
+use App\Classes\Modules\Billplzs\ControllersLogic\CreateBillplzBillLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillplzBillController
+{
+    /**
+     * @param Request $request
+     * @param CreateBillplzBillLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBillplzBillLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
@@ -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);
+    }
+}
@@ -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);
+    }
+}
@@ -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);
+    }
+}
@@ -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;
+    }
+
+}
@@ -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);
+    }
+}
@@ -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;
+    }
+}
@@ -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;
+    }
+}
@@ -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, [], [
@@ -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();
+    }
 }
@@ -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);
+    }
+
+}
@@ -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);
+    }
+
+}
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Segments;
-
-use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantStateLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateConstantStateController
-{
-    /**
-     * @param Request $request
-     * @param UpdateConstantStateLogic $logic
-     * @return JsonResponse
-     */
-    public function update(Request $request, UpdateConstantStateLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ApprovePaymentTransactionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApprovePaymentTransactionController
+{
+
+    public function approve(Request $request, ApprovePaymentTransactionLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\CreatePaymentTransactionLogic;
+
+class CreatePaymentTransactionController
+{
+    /**
+     * @param Request $request
+     * @param CreatePaymentTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreatePaymentTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\UploadPaymentVerificationDocumentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UploadPaymentVerificationDocumentController
+{
+    /**
+     * @param Request $request
+     * @param UploadPaymentVerificationDocumentLogic $logic
+     * @return JsonResponse
+     */
+    public function upload(Request $request, UploadPaymentVerificationDocumentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
@@ -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,
@@ -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,
        ];

    }
@@ -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')

@@ -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')
+        ];
+
+    }
+}
@@ -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,
+        ];
+    }
+}
@@ -20,6 +20,7 @@ class DistrictResource extends JsonResource
            'state' => $this->state,
            'country' => $this->country,
            'postcode' => $this->postcode,
+            'postcodeArray' => PostcodeResource::collection(json_decode($this->postcode)),
        ];
    }
 }
@@ -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,
+        ];
+    }
+}
@@ -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,
        ];
    }
 }
@@ -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
        ];
    }
 }
@@ -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();
+    }
+}
@@ -140,7 +140,7 @@ class CompanyModule extends AbstractModel implements Addressable, Documentable,
      */
     public function banks(): HasMany
     {
-         return $this->HasMany(Bank::class, 'company_id');
+         return $this->HasMany(BankAccount::class, 'company_id');
     }

    /**
@@ -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
     */
@@ -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);
@@ -3,6 +3,7 @@
 namespace App\Models;

 use App\Classes\General\Interfaces\Documentable;
+use App\Classes\General\Interfaces\Transactionable;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use Carbon\Carbon;
@@ -12,7 +13,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;

-class Transaction extends AbstractModel implements Documentable
+class Transaction extends AbstractModel implements Documentable, Transactionable
 {
    protected $table = 'transactions';

@@ -29,6 +30,14 @@ class Transaction extends AbstractModel implements Documentable
        return $this->morphMany(Order::class, 'owner');
    }

+    /**
+     * @return MorphMany
+     */
+    public function transactions(): MorphMany
+    {
+        return $this->MorphMany(Transaction::class, 'owner');
+    }
+
    /**
     * @return MorphMany
     */
@@ -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.
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'base_url' => env('BILLPLZ_BASE_URL', 'https://www.billplz.com'),
+    'api_key' => env('BILLPLZ_API_KEY', '0fa4c710-761b-4a7a-a501-c2c2d02643d5'),
+    'x_signature_key' => env('BILLPLZ_X_SIGNATURE_KEY', 'S-pbNVthVRsvnPfZlgLwqqOg'),
+    'collection_id' => env('BILLPLZ_COLLECTION_ID', 'hev2wdjy'),
+    'wallet_collection_id' => env('BILLPLZ_WALLET_COLLECTION_ID', 'hev2wdjy'),
+    'redirect_url' => env('BILLPLZ_REDIRECT_URL', 'localhost'),
+    'callback_url' => env('BILLPLZ_CALLBACK_URL', 'localhost'),
+    'maybank' => 'MB2U0227',
+    'cimb' => 'BCBB0235'
+];
--- a/Show More
+++ b/Show More