Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into delivery-complete-button-ui

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

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

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

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

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

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

app/Classes/General/Interfaces/Notifiable.php

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

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

@@ -15,7 +15,6 @@ 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;
@@ -77,9 +76,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -92,9 +88,8 @@ 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, 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)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -106,7 +101,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
     }
 
     /**
@@ -132,9 +126,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
 
-        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
-
-        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');
+        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
 
         $connection = $this->createsCompanyConnection->execute($connectionObject);
 

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

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

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

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

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

@@ -68,11 +68,7 @@ class GeneratesAuthenticationToken {
             $companyModule = $user->companyModule()->first();
 
             $claims = array_merge($claims, [
-                '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',
+                'company_id' => $companyModule->company_id
             ]);
         }
 

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

@@ -14,7 +14,6 @@ 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;
@@ -83,7 +82,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('type'), ApprovalStatus::APPROVED, $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('reference'));
 
         $this->canCreateAddress->passes($object);
 

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

@@ -13,8 +13,6 @@ 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;
@@ -81,7 +79,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'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $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('reference'));
 
         $this->canUpdateAddress->passes($object);
 

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

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

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

@@ -10,8 +10,6 @@ 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;
 
@@ -33,7 +31,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, AddressType::DELIVERY, ApprovalStatus::APPROVED, '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, 'Delivery Address');
 
     }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,86 +0,0 @@
-<?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,
-            ''
-        ];
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -63,12 +63,10 @@ class CreateOrderLogic extends AbstractControllerLogic
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
         
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
-
+        
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU_2 : WarehouseReferences::YD_YIWU]);
-        }
+        $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => in_array($company->id, [2376]) ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]);
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
             throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Http\Resources\OrderResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateOrderRemarkLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Order',
+            'message' => 'You have successfully created a new Order'
+        ];
+    }
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
+    /**
+     * CreateOrderRemarkLogic constructor.
+     * @param FetchesOrder $fetchesOrder
+     * @param CreateRemarkProcessor $createRemarkProcessor
+     */
+    public function __construct(FetchesOrder $fetchesOrder, CreateRemarkProcessor $createRemarkProcessor)
+    {
+        $this->fetchesOrder = $fetchesOrder;
+        $this->createRemarkProcessor = $createRemarkProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
+
+        $object = new RemarkObject($request->input('content'), auth()->user()->id);
+
+        $this->createRemarkProcessor->execute($order, $object);
+
+        return $this->resourceResponse(new OrderResource($order));
+
+    }
+}

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

@@ -6,7 +6,6 @@ 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;
@@ -45,7 +44,7 @@ class ListOrdersLogic extends AbstractControllerLogic
     {
         $this->canListOrders->passes();
 
-        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]));
+        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true]));
 
         return $this->collectionResponse(OrderResource::collection($query));
 

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

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

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

@@ -7,7 +7,6 @@ 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
@@ -66,11 +65,7 @@ class ApproveChangeOrderAddressProcessor
             $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
 
             $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-            if($appointee === 2) {
-                foreach($address->owner->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST) as $packingList){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                }
-            }
+            $appointee === 2  ? $this->updateDoFromVTPortalProcessor->execute($address) : $this->updateDoFromYDPortalProcessor->execute($address);
 
         }
 

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

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

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

@@ -8,7 +8,6 @@ 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;
@@ -77,7 +76,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, AddressType::DELIVERY, ApprovalStatus::PENDING_VERIFICATION, $address->reference);
+        $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);
         $order_address = $this->createsAddress->execute($order, $addressObject);
 
         $contact = $address->contacts()->first();

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

@@ -6,9 +6,23 @@ 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 */
@@ -29,20 +43,19 @@ class UpdateDoFromVTPortalProcessor
     }
 
     /**
-     * @param PackingList $packing_list
+     * @param $address
      * @return array
      * @throws GuzzleException
-     * @throws InternalServerErrorException
      */
-    public function execute(PackingList $packing_list) {
+    public function execute($address) {
 
         if(!app()->environment(['production'])){
             return [];
         }
 
         try {
-            $address= $packing_list->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-            $order = $packing_list->owner;
+            $order = $address->owner()->orderBy('id', 'desc')->first();
+            $packing_list = $order->packingLists()->orderBy('id', 'desc')->first();
 
             if ($packing_list) {
                 $contact = $address->contacts()->first();
@@ -54,7 +67,7 @@ class UpdateDoFromVTPortalProcessor
 
                 $status = 'On Hold';
 
-                if (in_array($packing_list->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                if (in_array($packing_list->status, [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
                     $status = 'Release';
                 }
 
@@ -64,7 +77,6 @@ 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', 
@@ -129,7 +141,7 @@ class UpdateDoFromVTPortalProcessor
             }
 
         } catch (\Exception $exception){
-            throw new InternalServerErrorException('failed to approve address due to an error related to VT portal: '.$exception->getMessage());
+            return [];
         }
 
     }

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

@@ -8,7 +8,6 @@ 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
@@ -31,34 +30,36 @@ class UpdateDoFromYDPortalProcessor
     }
 
     /**
-     * @param PackingList $packingList
+     * @param $address
      * @return void
      * @throws InternalServerErrorException
      */
-    public function execute(PackingList $packingList) {
-        if(!app()->environment(['production'])){
-            return;
-        }
-
+    public function execute($address) {
         try {
-            $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            $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();
 
-            if (!in_array($packingList->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-                return;
-            }
 
-            $contact = $address->contacts()->first();
-            $remark = $address->remarks()->first();
+            foreach ($packing_lists as $key => $row) {
+                if ($row->status === ApprovalStatus::SUSPENDED) {
+                    continue;
+                }
 
-            $phone = $contact ? $contact->phone : null;
-            $reference = $contact ? $contact->reference : null;
-            $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
+                $contact = $address->contacts()->first();
+                $remark = $address->remarks()->first();
 
-            $this->fetchesDataFRomYDPortal->clientRequest(
-                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
-                'POST',
+                $phone = $contact ? $contact->phone : null;
+                $reference = $contact ? $contact->reference : null;
+                $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
+
+                $this->fetchesDataFRomYDPortal->clientRequest(
+                'http://www.yd-wl.com/api/UpdateOrderAddress.ashx', 
+                'POST', 
                 [
-                    'expressno' => $packingList->reference,
+                    'expressno' => $row->reference,
                     'customers_name' => $reference,
                     'cellphone' => $phone,
                     'postcode' => $address->postcode,
@@ -67,6 +68,8 @@ class UpdateDoFromYDPortalProcessor
                 ]);
 
 
+            }
+
         } catch (\Exception $exception){
             throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
         }

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

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

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

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

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

@@ -72,16 +72,8 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
 
     /**
      * CreateRemarkLogic constructor.
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesOrder $fetchesOrder
-     * @param UpdatesPackingListOwner $updatesPackingListOwner
-     * @param UpdatesTransportStatus $updatesTransportStatus
-     * @param CreatesContract $unityCreateContract
-     * @param ActivateContractProcessor $unityActivateContract
-     * @param CreateContractEntityProcessor $unityCreateContractEntity
-     * @param AssignContractEntityProcessor $unityAssignContractEntity
-     * @param UpdatesPackingListContractReference $updatesPackingListContractReference
-     * @param CreatesStep $createsStep
+     * @param CanCreateRemark $canCreateRemark
+     * @param CreatesPackingListRemark $createsPackingListRemark
      */
     public function __construct(FetchesPackingList $fetchesPackingList, FetchesOrder $fetchesOrder, UpdatesPackingListOwner $updatesPackingListOwner, UpdatesTransportStatus $updatesTransportStatus, CreatesContract $unityCreateContract,  ActivateContractProcessor $unityActivateContract, CreateContractEntityProcessor $unityCreateContractEntity, AssignContractEntityProcessor $unityAssignContractEntity, UpdatesPackingListContractReference $updatesPackingListContractReference, CreatesStep $createsStep)
     {

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

@@ -20,8 +20,8 @@ class CreateContainerRemarkLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Created Container Remark',
-            'message' => 'You have successfully created a new Container Remark'
+            'title' => 'Created Container',
+            'message' => 'You have successfully created a new Container'
         ];
     }
 

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

@@ -56,23 +56,28 @@ class ReschedulePackingListLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+        try {
+            $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $transport = $packing_list->transports()->first();
+            $transport = $packing_list->transports()->first();
 
-        $old_sechedule = $transport->schedules()->first();
+            $old_sechedule = $transport->schedules()->first();
 
-        $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
+            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
 
-        $scheduleObject = new ScheduleObject(
-            Carbon::parse($request->input('eta')), 
-            Carbon::parse($request->input('etd')), 
-            ApprovalStatus::APPROVED
-        );
-        
-        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+            $scheduleObject = new ScheduleObject(
+                Carbon::parse($request->input('eta')), 
+                Carbon::parse($request->input('etd')), 
+                ApprovalStatus::APPROVED
+             );
+            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+
+            return $this->resourceResponse(new PackingListResource($packing_list));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
-        return $this->resourceResponse(new PackingListResource($packing_list));
     }
 
 }

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

@@ -14,7 +14,6 @@ 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;
@@ -71,16 +70,16 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        /** @var PackingList $packingList */
-        $packingList = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+        $packing_list = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+        $address = $packing_list->owner()->first()->addresses()->where('status', ApprovalStatus::APPROVED)->first();
 
 
 //        $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
-        $this->updateDoFromVTPortalProcessor->execute($packingList);
-        $this->updateDoFromYDPortalProcessor->execute($packingList);
+        $this->updateDoFromVTPortalProcessor->execute($address);
+        $this->updateDoFromYDPortalProcessor->execute($address);
 
-        return $this->resourceResponse(new PackingListResource($packingList));
+        return $this->resourceResponse(new PackingListResource($packing_list));
     }
 
 }

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

@@ -6,8 +6,6 @@ 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
@@ -50,11 +48,6 @@ class CreatePackageProcessor
 
         if($replica) {
             $modificationValue = 1;
-
-            if($replica->owner->owner instanceof Order){
-                $modificationValue = in_array( $replica->owner->owner->companyModule->id, WarehouseReferences::REPLICA_WHITE_LIST) ? 0 : 1;
-            }
-
             $packageObject = new PackageObject($object->getType(), $object->getDescription(), $object->getWidth() + $modificationValue, $object->getHeight() + $modificationValue, $object->getLength() + $modificationValue, $object->getWeight(), $object->getQuantity(), $object->getStatus());
             $package = $this->createsPackage->execute($packageObject, $replica);
         }

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

@@ -10,10 +10,7 @@ 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
 {
@@ -54,7 +51,6 @@ class CreatePackingListProcessor
         $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
 
         $type = $object->getType() === PackingListType::SHIPPING_PACKING_LIST ? PackingListType::SHIPPING_PACKING_LIST_REPLICA : PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA;
-
         /** create packing list replica */
         $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
         $this->createsPackingList->execute($object, $packingList);

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

@@ -142,6 +142,7 @@ class FetchLoadedContainersFromVTPortalProcessor
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
 
             foreach ($containers->Rows as $container){
+
                 $filter = '["ContainerID:=%js%'.$container[11].'"]';
                 $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
@@ -158,9 +159,13 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 foreach($containerDetail->Rows as $packingList){
-                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13]));
+                    $marking = explode('/', explode('CIEF/', $packingList[13])[1]);
 
-                    $orderNumber = $marking[array_key_last($marking)];
+                    if(!array_key_exists(1, $marking)){
+                        continue;
+                    }
+
+                    $orderNumber = $marking[1];
 
                     if(!$packingList[22]){
                         continue;

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

@@ -36,7 +36,6 @@ use App\Models\Transport;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
 
 class FetchOrderListsFromYdPortalProcessor
 {
@@ -154,6 +153,7 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
+
                 $containerReference = null;
                 $loadingDate = null;
                 $unstuffingDate = null;
@@ -168,11 +168,6 @@ 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);
@@ -186,43 +181,21 @@ class FetchOrderListsFromYdPortalProcessor
                         $eta = Carbon::parse($tracking[2]);
                     }
 
-                    $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
-                    $rescheduleETA = strpos($trackingRow->remark, '到港');
-                    if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
-                        preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
-                        $dates = collect();
-
-                        foreach($matches[0] as $date){
-                            try {
-                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
-                            } catch (\Exception $exception) {
-                                continue;
-                            }
-
-                        }
-
-                        $rescheduleDate = $dates->sortDesc()->first();
-                        if(!$delayDate || $rescheduleDate > $delayDate){
-                            /** @var Carbon $delayDate */
-                            $delayDate = $rescheduleDate;
-
-                            if($rescheduleETA === false && $delayDate) {
-                                $delayDate = $delayDate->addDays('5');
-                            }
-                        }
-
+                    if (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 (strpos($trackingRow->tracking, '预计开船为') !== false) {
+                        $tracking = explode('预计开船为', $trackingRow->tracking);
+                        $delayDate = Carbon::parse(explode('日', $tracking[1])[0]);
                     }
 
-
                     if ($trackingRow->tracking === '货物已进目的港仓库') {
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if (Str::contains($trackingRow->tracking, ['派送中'])) {
+                    if ($trackingRow->tracking === '货物已派送完成') {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
                 }
@@ -315,13 +288,6 @@ 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,8 +310,7 @@ class FetchOrderListsFromYdPortalProcessor
                 if($containerReference) {
                     try {
                         $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
+                        $container->packingLists()->syncWithoutDetaching([$packingList->id]);
                     } catch (ResourceNotFoundException $exception){
 
                         if (!$allow_contract) {
@@ -361,8 +326,8 @@ class FetchOrderListsFromYdPortalProcessor
                         /** @var Container $container */
                         $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
 
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
+                    $container->packingLists()->detach($packingList);
+                    $container->packingLists()->attach($packingList);
 
                         $transport = $container->transports()->first();
 
@@ -378,7 +343,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                         $transport = $container->transports()->first();
 
-                        if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
+                        if(!$transport->schedules()->where('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));
@@ -407,7 +372,12 @@ class FetchOrderListsFromYdPortalProcessor
                     }
                 }
 
-                if($deliveryDate && !$packingList->transports()->exists()){
+                if($deliveryDate){
+
+                    if($packingList->transports){
+                        continue;
+                    }
+
                     $packingList->status = ApprovalStatus::COMPLETED;
                     $packingList->save();
 

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

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

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

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

app/Classes/Modules/PackingLists/Services/UpdatesPackingListOwner.php

@@ -12,12 +12,14 @@ class UpdatesPackingListOwner extends AbstractUpdateRelationshipRecord
 
     /**
      * @param PackingList $model
-     * @param Packable $packable
+     * @param int $status
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function execute(PackingList $model, Packable $packable) {
 
+        $model->status = ApprovalStatus::APPROVED;
+
         return $this->handler($packable->packingLists(), $model);
 
     }

app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php

@@ -4,16 +4,18 @@ namespace App\Classes\Modules\Remarks\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Remarks\Services\CreatesRemark;
+use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Http\Resources\RemarkResource;
+use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Http\Resources\RemarkResource;
 
 class CreateRemarkLogic extends AbstractControllerLogic
 {
+
     /**
      * @return array
      */
@@ -24,16 +26,25 @@ class CreateRemarkLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var CreateRemarkProcessor */
-    private $createRemarkProcessor;
+    /** @var CanCreateRemark */
+    private $canCreateRemark;
+
+    /** @var CreatesRemark */
+    private $createsRemark;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
 
     /**
      * CreateRemarkLogic constructor.
-     * @param CreateRemarkProcessor $createRemarkProcessor
+     * @param CanCreateRemark $canCreateRemark
+     * @param CreatesRemark $createsRemark
      */
-    public function __construct(CreateRemarkProcessor $createRemarkProcessor)
+    public function __construct(CanCreateRemark $canCreateRemark, CreatesRemark $createsRemark, FetchesUser $fetchesUser)
     {
-        $this->createRemarkProcessor = $createRemarkProcessor;
+        $this->canCreateRemark = $canCreateRemark;
+        $this->createsRemark = $createsRemark;
+        $this->fetchesUser = $fetchesUser;
     }
 
     /**
@@ -45,18 +56,15 @@ class CreateRemarkLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $classs = '\\App\\Models\\' . Str::studly($request->input('model_type'));
 
-        if (!class_exists($classs)) {
-            throw new MalformedRequestException('Unable to process this entity');
-        }
-        
-        $remarkOwner = $classs::find($request->route('id'));
+        $object = new RemarkObject($request->input('content'), $request->input('commenter_id'));
 
-        $remarkObject = new RemarkObject($request->input('content'), auth()->user()->id);
+        $this->canCreateRemark->passes($object);
 
-        $remmark = $this->createRemarkProcessor->execute($remarkOwner, $remarkObject);
+        $query = $this->createsRemark->execute($this->fetchesUser->execute(['id' => $request->input('commenter_id')]), $object);
+
+        return $this->resourceResponse(new RemarkResource($query));
 
-        return $this->resourceResponse(new RemarkResource($remmark));
     }
+
 }

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

@@ -76,7 +76,7 @@ class UpdateConstantLogic  extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
-        $object = new ConstantObject($request->input('reference'), $request->input('value'));
+        $object = new ConstantObject($request->input('name'), $request->input('reference'), $request->input('detail'));
 
         $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
 

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

@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use App\Http\Resources\ConstantResource;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Services\FetchesConstant;
-use App\Classes\Modules\Segments\Services\UpdatesConstant;
-use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
-use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
-use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
-use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
-
-class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Segment Constant',
-            'message' => 'You have successfully updated the Segment Constant'
-        ];
-    }
-
-    /** @var CanUpdateConstant */
-    private $canUpdateConstant;
-
-    /** @var UpdatesConstant */
-    private $updatesConstant;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var FetchesConstant */
-    private $fetchesConstant;
-
-    /** @var AddItemToConstantValueArray */
-    private $addItemToConstantValueArray;
-
-    /** @var RemoveItemFromConstantValueArray */
-    private $removeItemFromConstantValueArray;
-
-
-    /**
-     * UpdateConstantLogic constructor.
-     * @param CanUpdateConstant $canUpdateConstant
-     * @param UpdatesConstant $updatesConstant
-     * @param FetchesSegment $fetchesSegment
-     * @param FetchesConstant $fetchesConstant
-     * @param AddItemToConstantValueArray $addItemToConstantValueArray
-     * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
-     */
-    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant,AddItemToConstantValueArray $addItemToConstantValueArray, RemoveItemFromConstantValueArray $removeItemFromConstantValueArray)
-    {
-        $this->canUpdateConstant = $canUpdateConstant;
-        $this->updatesConstant = $updatesConstant;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->fetchesConstant = $fetchesConstant;
-        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
-        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
-    }
-    /**
-     * @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' => $request->input('reference')]);
-
-        $object = new ConstantObject($constant->reference, $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode')));
-        $this->canUpdateConstant->passes($object);
-
-        $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),
-        ]);
-    }
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,81 +0,0 @@
-<?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([]);
-    }
-
-}

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

@@ -1,121 +0,0 @@
-<?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([]);
-    }
-}

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

@@ -8,28 +8,29 @@ use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-
 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 App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\TransactionDetailType;
 
-use App\Models\Document;
-use App\Models\Transaction;
+// use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+// use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+// use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+// use App\Classes\Modules\Documents\Services\CreatesDocument;
+// use App\Classes\Modules\Documents\Services\CreatesFiles;
+// use App\Classes\ValueObjects\Constants\DocumentType;
+// use App\Models\Document;
+// use App\Models\Transaction;
+// use Barryvdh\DomPDF\PDF;
+// use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+
+// use Meneses\LaravelLaravelMpdf\Facades\LaravelLaravelMpdf;
+// use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
@@ -57,23 +58,36 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var CreatesTransaction */
     private $createsTransaction;
 
-    /** @var CreatesTransactionDetail */
-    private $createsTransactionDetail;
+    // /** @var FetchesTransaction */
+    // private $fetchesTransaction;
+    // /** @var UpdatesTransactionStatus */
+    // private $updatesTransactionStatus;
+    // /** @var CreatesDocument */
+    // private $createsDocument;
+    // /** @var CreatesFiles */
+    // private $createsFile;
+    // /** @var PDF */
+    // private $pdf;
 
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFile;
-    
+    /**
+     * CreateSupplierTransactionLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param PDF $pdf
+     */
     public function __construct(
         FetchesPackingList $fetchesPackingList, 
         FetchesSegmentConstant $fetchesSegmentConstant, 
         GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
-        CreatesTransaction $createsTransaction,
-        CreatesTransactionDetail $createsTransactionDetail,
-        CreatesDocument $createsDocument,
-        CreatesFiles $createsFile
+        CreatesTransaction $createsTransaction
+
+        // UpdatesTransactionStatus $updatesTransactionStatus, 
+        // CreatesDocument $createsDocument, 
+        // CreatesFiles $createsFile, 
+        // PDF $pdf
     )
     {
 
@@ -81,20 +95,18 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         $this->fetchesSegmentConstant = $fetchesSegmentConstant;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
-        $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->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) {
+        $cbm = $packing_list->packages->sum(function($package) {
             return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
         });
 
@@ -151,7 +163,7 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         }
 
         $price_cbm = $base_price + $warehouse_rate + $state_rate;
-        $total_cbm = $price_cbm * ($cbm + $over_weight_cbm);
+        $total_cbm = $price_cbm * $cbm;
 
         $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
 
@@ -173,43 +185,7 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
             ApprovalStatus::PENDING_SUBMISSION
         );
 
-        /** @var Transaction $invoice_transaction */
-        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
-
-        $object_detail = new TransactionDetailObject(
-            'SHIPPING_FEE',
-            TransactionDetailType::SHIPPING_FEE,
-            $cbm,
-            $price_cbm
-        );
-
-        $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]);
-
-        $document_object = new DocumentObject(
-            DocumentType::SHIPPING_INVOICE,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'shipping_invoice'
-        );
-
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
-
-        $this->createsFile->execute($document, $document_object);
+        $transactions = $this->createsTransaction->execute($packing_list, $object);
 
         return $this->response([]);
     }

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

@@ -1,87 +0,0 @@
-<?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([]);
-    }
-}

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

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

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

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

app/Classes/Modules/Transactions/Services/CreatesPaymentTransaction.php

@@ -1,37 +0,0 @@
-<?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);
-    }
-}

app/Classes/Modules/Transactions/Services/CreatesTransactionDetail.php

@@ -18,8 +18,8 @@ class CreatesTransactionDetail extends AbstractUpdateRelationshipRecord
      */
     public function execute(Transaction $transaction, TransactionDetailObject $object) {
         $model = new TransactionDetail();
-        $model->reference = $object->getReference();
-        $model->name = $object->getName();
+        $model->product_code = $object->getCode();
+        $model->product_name = $object->getName();
         $model->quantity = $object->getQuantity();
         $model->price = $object->getPrice();
         $model->amount = $object->getAmount();

app/Classes/ValueObjects/Constants/AddressType.php

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

app/Classes/ValueObjects/Constants/BusinessType.php

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

app/Classes/ValueObjects/Constants/DocumentType.php

@@ -21,8 +21,4 @@ final class DocumentType {
     public const DELIVER_ORDER = 'DELIVER_ORDER';
     public const INVOICE = 'INVOICE';
     public const SUPPLIER_DELIVER_ORDER = 'SUPPLIER_DELIVER_ORDER';
-
-
-    public const SHIPPING_INVOICE = 'SHIPPING_INVOICE';
-
 }

app/Classes/ValueObjects/Constants/NotificationType.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-
-final class NotificationType
-{
-
-    public const SUPERVISOR = 0;
-
-}

app/Classes/ValueObjects/Constants/Notifications.php

@@ -2,15 +2,13 @@
 
 namespace App\Classes\ValueObjects\Constants;
 
+
 class Notifications
 {
-    public const NEW_ARRIVED_PARCEL = [
-        'title' => 'New Arrived Parcel',
-        'message' => 'you have received new parcel for your order #-'
-    ];
 
     public const UNDEFINED = [
-        'title' => 'UNDEFINED TITLE',
-        'message' => 'undefined message'
+        'title' => 'Unknown Action',
+        'message' => 'unknown message..'
     ];
+
 }

app/Classes/ValueObjects/Constants/OrderType.php

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

app/Classes/ValueObjects/Constants/PackageType.php

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

app/Classes/ValueObjects/Constants/TransactionDetailType.php

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

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -6,10 +6,9 @@ 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;
 

app/Classes/ValueObjects/Constants/WarehouseReferences.php

@@ -8,8 +8,6 @@ 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,10 +41,5 @@ final class WarehouseReferences {
 
     public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG;
 
-    public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726];
-
-    public const REPLICA_WHITE_LIST = [502];
-
-    //2376 qce
 
 }

app/Http/Controllers/Billplz/CallbackBillplzController.php

@@ -1,22 +0,0 @@
-<?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);
-    }
-
-}

app/Http/Controllers/Billplz/CreateBillplzBillController.php

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

app/Http/Controllers/Companies/ListCompanyModulesController.php

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

app/Http/Controllers/Delivery/CancelDeliveryOrderController.php

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

app/Http/Controllers/Delivery/CreateDeliveryCustomerController.php

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

app/Http/Controllers/Delivery/CreateDeliveryOrderController.php

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

app/Http/Controllers/Delivery/ExportDeliveryOrdersToExcelController.php

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

app/Http/Controllers/Delivery/ListOrdersController.php

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

app/Http/Controllers/Exports/ExportArrivedParcelController.php

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

app/Http/Controllers/Exports/ExportPendingArrangementPackingListController.php

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

app/Http/Controllers/Orders/CreateOrderRemarkController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\CreateOrderRemarkLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateOrderRemarkController
+{
+    public function create(Request $request, CreateOrderRemarkLogic $logic): JsonResponse{
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Orders/DownloadOrderQrPdfController.php

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

app/Http/Controllers/Reports/MonthlyReportController.php

@@ -200,62 +200,4 @@ 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();
-    }
 }