remove spaces on Export warehouse service

# Conflicts:
#   config/app.php

.gitignore

@@ -2,6 +2,8 @@
 /public/hot
 /public/storage
 /storage/*.key
+/tests/_output
+/tests/_support
 /vendor
 **/.idea/
 .env
@@ -21,6 +23,7 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
+docker-compose.yml
 package-lock.json
 public/*
 /public/*

.gitlab-ci.yml

@@ -0,0 +1,39 @@
+image: php:7.4
+stages:
+  - build
+  - test
+
+before_script:
+- apt-get update -yqq
+- apt-get install -yqq
+- apt-get install -y  libonig-dev
+- apt-get install -y libxml2-dev
+- apt-get install -y libzip-dev
+- apt-get install -y libgd-dev
+
+#install php depandancies
+- docker-php-ext-install mbstring xml zip gd
+
+#  Install composer package manager
+- curl --location --output /usr/local/bin/composer https://getcomposer.org/download/latest-stable/composer.phar
+- chmod +x /usr/local/bin/composer
+
+#jobs
+build_job:
+  stage: build
+  script:
+    - composer install
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'
+
+test_job:
+  stage: test
+  script:
+    - composer install
+    - cp .env.example .env
+    - php artisan key:generate
+   # - php artisan migrate
+    #- php artisan db:seed
+    - php artisan test
+  rules:
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'

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

@@ -15,7 +15,7 @@ class DoesNotHaveTransactionType implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value)->whereIn('status', [0,1,2,3]);
+            $query->where('type', $value);
         })->whereHas('containers', function ($query){
             return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
         });

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

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

app/Classes/Jobs/CreatePerfexCRMCustomer.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-
-class CreatePerfexCRMCustomer implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var CreateLeadPerfexCRMObject */
-    private $createLeadPerfexCRMObject;
-
-    /**
-     * CreatePerfexCRMCustomer constructor.
-     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
-     */
-    public function __construct(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject)
-    {
-        $this->createLeadPerfexCRMObject = $createLeadPerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
-    }
-}

app/Classes/Jobs/CreatePerfexCRMInvoice.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Models\Transaction;
-
-class CreatePerfexCRMInvoice implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var Transaction $transaction*/
-    private $transaction;
-
-    /**
-     * CreatePerfexCRMInvoice constructor.
-     * @param Transaction $transaction
-     */
-    public function __construct(Transaction $transaction)
-    {
-        $this->transaction = $transaction;
-    }
-
-    public function handle()
-    {
-        (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($this->transaction);
-    }
-}

app/Classes/Jobs/CreatePerfexCRMSingleTask.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMTaskProcessor;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class CreatePerfexCRMSingleTask implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var FetchesPerfexCRMLead  */
-    private $fetchesPerfexCRMLead;
-
-    /** @var CreateTaskPerfexCRMObject */
-    private $createTaskPerfexCRMObject;
-
-    /**
-     * CreatePerfexCRMSingleTask constructor.
-     * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
-     */
-    public function __construct(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject)
-    {
-        $this->createTaskPerfexCRMObject = $createTaskPerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        $lead = (App()->make(FetchesPerfexCRMLead::class))->execute($this->createTaskPerfexCRMObject->getEmail());
-        if(!is_null($lead))
-        {
-            $this->createTaskPerfexCRMObject->setLeadId($lead->id);
-            (App()->make(CreatePerfexCRMTaskProcessor::class))->execute($this->createTaskPerfexCRMObject);
-        }
-    }
-}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -2,12 +2,8 @@
 
 namespace App\Classes\Jobs;
 
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -29,12 +25,8 @@ class FetchOrdersFromYDPortalJob implements ShouldQueue
      */
     public function handle()
     {
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
 
-//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
 
 }

app/Classes/Jobs/InitializePerfexCRM.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-
-class InitializePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var InitialPerfexCRMObject */
-    private $initialPerfexCRMObject;
-
-    /**
-     * InitializePerfexCRM constructor.
-     * @param InitialPerfexCRMObject $initialPerfexCRMObject
-     */
-    public function __construct(InitialPerfexCRMObject $initialPerfexCRMObject)
-    {
-        $this->initialPerfexCRMObject = $initialPerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        (App()->make(InitializePerfexCRMProcessor::class))->execute($this->initialPerfexCRMObject);
-    }
-}

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-
-class UpdatePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMObject */
-    private $updatePerfexCRMObject;
-
-    /**
-     * UpdatePerfexCRM constructor.
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject)
-    {
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
-    }
-}

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -1,92 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
-use App\Models\Transaction;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Carbon\Carbon;
-
-class UpdatePerfexCRMInvoice implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMInvoiceObject */
-    private $updatePerfexCRMInvoiceObject;
-
-    /**
-     * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
-     */
-    public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
-    {
-        $this->updatePerfexCRMInvoiceObject = $updatePerfexCRMInvoiceObject;
-    }
-
-    public function handle()
-    {
-        //get the client id
-        $customer = (App()->make(FetchesPerfexCRMCustomer::class))->execute($this->updatePerfexCRMInvoiceObject->getEmail());
-        $transaction = $this->updatePerfexCRMInvoiceObject->getTransaction();
-
-        //get the invoice id
-        $invoiceId = 0;
-        $invoiceStatus = 0;
-        $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-
-        if(is_null($invoice)){
-            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
-            $invoiceId = $result->payload['id'];
-        }
-        else{
-            $invoiceId = $invoice->id;
-            $invoiceStatus = $invoice->status;
-
-            //This only run when invoice already exist and the invoice does not have a PAID status
-            if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
-                //get project
-                $projectId = "";
-                if($transaction->owner instanceof Transaction){
-                    $orderReference = $transaction->owner->owner->owner()->first()->reference;
-                    $packingListReference = $transaction->owner->owner->reference;
-                    $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-                    $project = (App()->make(FetchesPerfexCRMProject::class))->execute($projectName, $customer->userid);
-                    if(!is_null($project)){
-                        $projectId = $project->id;
-                    }
-                }
-
-                //update invoice
-                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $projectId);
-            }
-        }
-
-        //create invoice payment
-        if($invoiceId != 0 && $invoiceStatus != PerfexCRMInvoiceStatus::PAID){
-
-            $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
-
-            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
-                $invoiceId,
-                "$transaction->amount",
-                $date,
-                1,
-                "",
-                ""
-            );
-            (App()->make(CreatesPerfexCRMInvoicePayment::class))->execute($invoicePaymentPerfexCRMObject);
-        }
-    }
-}

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

@@ -8,27 +8,23 @@ 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\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
-use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 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\Classes\Jobs\CreatePerfexCRMCustomer;
-
 use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\User;
@@ -84,9 +80,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var FetchesCompanyModule */
     private $fetchesCompanyModule;
 
-    /** @var CreatePerfexCRMLeadProcessor */
-    private $createPerfexCRMLeadProcessor;
-
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -100,9 +93,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor
      */
-    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, CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor)
+    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;
@@ -115,7 +107,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -155,17 +146,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
-        if(config('perfexcrm.is_enabled') == 'true'){
-            // $this->createPerfexCRMLeadProcessor->execute($request);
-            $createLeadPerfexCRMObject = new CreateLeadPerfexCRMObject(
-                $request->input('name'),
-                $request->input('email'),
-                $request->input('phone'),
-                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name')
-            );
-            CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
-        }
-
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

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

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Addresses\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Addresses\Services\CreatesAddress;
-use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\AddressResource;
-use App\Models\Address;
-use App\Models\CompanyModule;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateBillingAddressLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Billing Address',
-            'message' => 'You have successfully created a new Billing Address'
-        ];
-    }
-
-    /** @var CanCreateAddress */
-    private $canCreateAddress;
-
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var CreatesAddress */
-    private $createsAddress;
-
-    /** @var FetchesAddress */
-    private $fetchesAddress;
-
-    /**
-     * CreateAddressLogic constructor.
-     * @param CanCreateAddress $canCreateAddress
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreatesAddress $createsAddress
-     * @param FetchesAddress $fetchesAddress
-     */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress)
-    {
-        $this->canCreateAddress = $canCreateAddress;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createsAddress = $createsAddress;
-        $this->fetchesAddress = $fetchesAddress;
-    }
-
-    /**
-     * @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
-    {
-        $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
-        
-        $address = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
-
-        if ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
-            // delete all current billing address
-            Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
-
-            // create addrress
-            $billingAddress = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $address->reference);
-            $this->canCreateAddress->passes($billingAddress);
-            $this->createsAddress->execute($companyModule, $billingAddress);
-        }
-
-        return $this->resourceResponse(new AddressResource($address));
-    }
-
-}

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

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Models\CompanyConnection;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\Package;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Carbon\Carbon;
-
-class ExportsOrderSummaryByMarking implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-
-    use Exportable;
-
-    protected $customerMarking;
-    protected $dateFrom;
-    protected $dateTo;
-
-    public function headings(): array
-    {
-        return [
-            'Date',
-            'Container',
-            'Order Marking',
-            'Packing List Reference',
-            'Description',
-            'Quantity',
-            'L (cm)',
-            'H (cm)',
-            'W (cm)',
-            'CBM'
-        ];
-    }
-    
-    public function setParameters($customerMarking, $dateFrom, $dateTo)
-    {
-        $this->customerMarking = $customerMarking;
-        $this->dateFrom = $dateFrom;
-        $this->dateTo = $dateTo;
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function collection()
-    {
-        $connection = CompanyConnection::where('invitee_reference', $this->customerMarking)->first();
-
-        $company_id = $connection->invitee->company->id;
-        $company_module_id = $connection->invitee->id;
-        $packagesArray = collect();
-        $orders = Order::where('company_module_id', $company_module_id);
-
-        if (isset($this->dateFrom) && isset($this->dateTo)) {
-            $from = Carbon::createFromFormat('d-m-Y', $this->dateFrom);
-            $to = Carbon::createFromFormat('d-m-Y', $this->dateTo);
-            $orders = $orders->whereBetween('created_at', [$from, $to]);
-        }
-
-        $orders = $orders->get();
-
-        foreach ($orders as $order){
-            $packingLists = $order->packingLists;
-            foreach ($packingLists as $packingList){
-                if($packingList->packingLists->first()){
-                    $packingList = $packingList->packingLists->first();
-                }
-                $packages = $packingList->packages;
-                foreach ($packages as $package){
-                    $packagesArray->push($package);
-                }
-            }
-        }
-
-        return $packagesArray;
-    }
-
-    /**
-     * @param Package $package
-     *
-     * @return array
-     */
-    public function map($package): array
-    {
-        $packinglist = ($package->packingList()->first()->owner->owner_type == Order::class) ? $package->packingList()->first(): $package->packingList->owner;
-        $order = $packinglist->owner;
-
-        return [
-            Carbon::parse($package->created_at)->format('d-m-Y'),
-            '',
-            $order->reference,
-            $package->packingList->reference,
-            $package->description,
-            $package->quantity,
-            $package->length,
-            $package->height,
-            $package->width,
-            ((($package->length / 100) * ($package->height / 100) * ($package->width / 100)) *  $package->quantity)
-        ];
-    }
-}

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

@@ -60,15 +60,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
 
         $query = Transaction::query();
 
-        // paidInvoiceSection
-        $approvalStatus = ApprovalStatus::COMPLETED;
-
-        if ($this->request->route('section') == 'pendingPaymentSection') {
-            // pendingPaymentSection
-            $approvalStatus = ApprovalStatus::APPROVED;
-        }
-
-        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::COMPLETED]);
 
         if($start_date && $end_date) {
             $query->whereBetween('updated_at', [

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

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Exports\Services;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\Order;
-use App\Models\State;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
@@ -32,10 +31,8 @@ class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadin
      */
     public function query()
     {
-        $johor_state_id = State::where('name', 'johor')->first()->id;
-
-        return Order::whereHas('addresses', function($address) use ($johor_state_id){
-            $address->where('status', ApprovalStatus::APPROVED)->where('state_id', $johor_state_id);
+        return Order::whereHas('addresses', function($address) {
+            $address->where('status', ApprovalStatus::APPROVED);
         })->whereHas('packingLists', function($packingLists) {
             $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports');
         });

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

@@ -7,7 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
@@ -40,8 +39,6 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
-    /** @var NewLeadTaskToPerfexCRMProcessor */
-    private $newLeadTaskToPerfexCRMProcessor;
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -49,24 +46,22 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
-     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
-        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
     }
 
 
     public function logic(Request $request) : JsonResponse {
 
-
+        
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
+        
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
@@ -81,10 +76,6 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
-        if(config('perfexcrm.is_enabled') == 'true'){
-            $this->newLeadTaskToPerfexCRMProcessor->execute($company);
-        }
-
         return $this->resourceResponse(new OrderResource($order));
     }
 }

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

@@ -14,11 +14,12 @@ class FetchesDataFromYDPortal
      * @return \Psr\Http\Message\ResponseInterface
      */
     public function clientRequest(string $url, string $method, $body){
-
+        
         $client = new \GuzzleHttp\Client();
+
         $body['apicode'] = env('YD_API_CODE');
 
-        $request = $client->requestAsync($method, $url, ['query' => $body, 'timeout' => 15]);
+        $request = $client->requestAsync($method, $url, ['query' => $body]);
 
         return $request->wait();
     }
@@ -31,7 +32,6 @@ class FetchesDataFromYDPortal
         $content = $request->getBody()->getContents();
         $content =  str_replace("\r",'', $content);
         $content =  str_replace("\n",'', $content);
-        $content =  str_replace("\t",'', $content);
         return json_decode($content);
     }
-}
+}

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\PackingLists\Processors;
 
 
 use App\Classes\General\Interfaces\Packable;
-use App\Classes\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
@@ -26,20 +25,16 @@ class CreatePackingListProcessor
     /** @var CreatesPackingList */
     private $createsPackingList;
 
-    /** @var PackingListToPerfexCRMProcessor */
-    private $packingListToPerfexCRMProcessor;
 
     /**
      * CreatePackingListProcessor constructor.
      * @param CanCreatePackingList $canCreatePackingList
      * @param CreatesPackingList $createsPackingList
-     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList)
     {
         $this->canCreatePackingList = $canCreatePackingList;
         $this->createsPackingList = $createsPackingList;
-        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
     /**
@@ -56,19 +51,15 @@ class CreatePackingListProcessor
         /** @var PackingList $packingList */
         $packingList = $this->createsPackingList->execute($object, $packable);
 
-        $appointee_id = $packingList->owner_id == 1 ? 2307 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+        $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);
-
-        if(config('perfexcrm.is_enabled') == 'true'){
-            $this->packingListToPerfexCRMProcessor->execute($packingList);
-        }
-
+        
         return $packingList;
     }
 
-}
+}

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

@@ -1,160 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\AccessForbiddenException;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Exceptions\RequestValidationException;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
-
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
-use App\Classes\Modules\Steps\Services\CreatesStep;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
-use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
-use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
-use App\Classes\Modules\Unity\Services\CreatesContract;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
-use App\Classes\Notifications\ShipmentDepartureEmail;
-use App\Classes\Notifications\ShipmentRescheduleEmail;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\ContainerTypes;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
-use App\Classes\ValueObjects\Constants\WarehouseReferences;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-
-class FetchContainersFromYdPortalProcessor
-{
-    /** @var FetchesDataFromYDPortal */
-    private $fetchesDataFRomYDPortal;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /** @var CreateContainerProcessor */
-    private $createContainerProcessor;
-
-    /**
-     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
-     * @param CreatesTransport $createsTransport
-     * @param CreatesSchedule $createsSchedule
-     * @param FetchesContainer $fetchesContainer
-     * @param CreateContainerProcessor $createContainerProcessor
-     */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, CreateContainerProcessor $createContainerProcessor)
-    {
-        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-        $this->fetchesContainer = $fetchesContainer;
-        $this->createContainerProcessor = $createContainerProcessor;
-    }
-
-
-    /**
-     * @return void
-     * @throws MalformedRequestException
-     * @throws AccessForbiddenException
-     * @throws RequestValidationException
-     */
-    public function execute()
-    {
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->doesntHave('containers')->get();
-
-        foreach ($packingLists as $packingList) {
-            $time_start = microtime(true);
-
-            $containerReference = null;
-            $loadingDate = null;
-            $etd = null;
-            $eta = null;
-
-            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                'trakingno' => $packingList->reference
-            ]);
-
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
-            if(!$rows->data){
-                continue;
-            }
-
-            foreach (array_reverse($rows->data) as $trackingRow) {
-                if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                    $tracking = explode(':', $trackingRow->tracking);
-                    $containerReference = explode('预计到港时间', $tracking[1])[0];
-                    $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                    $etd = Carbon::parse($tracking[2])->subDays(5);
-                    $eta = Carbon::parse($tracking[2])->addDays(2);
-                }
-            }
-
-            if($containerReference) {
-                try {
-                    $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                    $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
-                } catch (ResourceNotFoundException $exception){
-
-                    if(!($packingList->owner instanceof Order)) continue;
-
-                    $originWarehouse = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
-
-
-                    $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-
-                    /** @var Container $container */
-                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
-
-                    $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
-
-                    $transport = $container->transports()->first();
-
-                    if(!$transport){
-                        $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
-                        /** @var Transport $transport */
-                        $transport = $this->createsTransport->execute($transportObject, $container);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
-                    }
-                }
-            }
-
-            $time_end = microtime(true);
-
-            $execution_time = ($time_end - $time_start)/60;
-
-            echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-        }
-
-    }
-}
-

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

@@ -1,162 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
-
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
-use App\Classes\Notifications\ShipmentRescheduleEmail;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\PackingList;
-use Carbon\Carbon;
-
-class FetchContainersUpdatesFromYdPortalProcessor
-{
-    /** @var FetchesDataFromYDPortal */
-    private $fetchesDataFRomYDPortal;
-
-    /** @var UpdatesContractObligation */
-    private $updatesContractObligations;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /**
-     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
-     * @param UpdatesContractObligation $updatesContractObligations
-     * @param CreatesSchedule $createsSchedule
-     */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, UpdatesContractObligation $updatesContractObligations, CreatesSchedule $createsSchedule)
-    {
-        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
-        $this->updatesContractObligations = $updatesContractObligations;
-        $this->createsSchedule = $createsSchedule;
-    }
-
-
-    /**
-     * @return void
-     * @throws MalformedRequestException
-     */
-    public function execute()
-    {
-        $containers = Container::where('status', ApprovalStatus::PENDING_VERIFICATION)->get();
-
-        foreach ($containers as $container) {
-            $time_start = microtime(true);
-
-            $packingList = $container->packingLists()->random();
-
-            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                'trakingno' => $packingList->reference
-            ]);
-
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
-            if(!$rows->data){
-                continue;
-            }
-
-            $unstuffingDate = null;
-            $delayDate = null;
-
-            foreach (array_reverse($rows->data) as $trackingRow) {
-                $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
-                $rescheduleETA = strpos($trackingRow->remark, '到港');
-                if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
-                    preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
-                    $dates = collect();
-
-                    foreach($matches[0] as $date){
-                        try {
-                            $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
-                        } catch (\Exception $exception) {
-                            continue;
-                        }
-
-                    }
-
-                    $rescheduleDate = $dates->sortDesc()->first();
-
-                    if(!$delayDate || $rescheduleDate > $delayDate){
-                        /** @var Carbon $delayDate */
-                        $delayDate = $rescheduleDate;
-
-                        if($rescheduleETA === false && $delayDate) {
-                            $delayDate = $delayDate->addDays('5');
-                        }
-                    }
-
-                }
-
-                if ($trackingRow->tracking === '到港') {
-                    $delayDate = Carbon::parse($trackingRow->trackingtime);
-                }
-
-                if ($trackingRow->tracking === '已开船') {
-                    $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
-                }
-
-                if ($trackingRow->tracking === '货物已进目的港仓库') {
-                    $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                }
-            }
-
-            if($delayDate){
-                $delayDate = $delayDate->addDays(2);
-                $transport = $container->transports()->first();
-
-                if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
-                    $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
-                    $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
-                    $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
-                    foreach ($container->packingLists as $packingList){
-                        if(!($packingList->owner instanceof Order)) continue;
-                        $user = $packingList->owner->companyModule->employees()->first();
-                        if(app()->environment(['production'])) {
-                            $user->notify(new ShipmentRescheduleEmail($user, $packingList));
-                        }
-                    }
-                }
-
-            }
-
-            if($unstuffingDate){
-                $container->update(['status' => ApprovalStatus::COMPLETED]);
-                $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
-
-                /** @var PackingList $packingList */
-                foreach($container->packingLists as $packingList){
-
-                    if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                        $packingList->status = ApprovalStatus::APPROVED;
-                        $packingList->save();
-                    }
-
-                    if(!($packingList->owner instanceof Order)) continue;
-
-                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                    foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
-                        $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
-                        $step->update(['status' => ApprovalStatus::COMPLETED]);
-                    }
-
-                }
-            }
-
-            $time_end = microtime(true);
-
-            $execution_time = ($time_end - $time_start)/60;
-
-            echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-        }
-
-    }
-}
-

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

@@ -1,115 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\MalformedRequestException;
-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\Classes\ValueObjects\Constants\WarehouseReferences;
-use App\Models\CompanyModule;
-use App\Models\Order;
-use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-
-class FetchDeliveryUpdatesFromYdPortalProcessor
-{
-
-    /** @var UpdatesContractObligation */
-    private $updatesContractObligations;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /**
-     * @param UpdatesContractObligation $updatesContractObligations
-     * @param CreatesTransport $createsTransport
-     * @param CreatesSchedule $createsSchedule
-     */
-    public function __construct(UpdatesContractObligation $updatesContractObligations, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
-    {
-        $this->updatesContractObligations = $updatesContractObligations;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-    }
-
-
-    /**
-     * @return void
-     * @throws MalformedRequestException
-     * @throws GuzzleException
-     */
-    public function execute()
-    {
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereRaw('LENGTH(reference) > 12')->whereHas('containers', function ($container){
-            return $container->where('status', 3);
-        })->doesntHave('transports')->get()->reverse();
-        foreach ($packingLists->chunk(50) as $chunk) {
-
-
-            foreach ($chunk as $packingList){
-                if(!$packingList->reference) continue;
-                $time_start = microtime(true);
-
-                $deliveryDate = null;
-
-                try {
-                    $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
-
-                    $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$packingList->reference.'&sOrgId=sti', ['timeout' => 3]);
-                    $deliveryTracking = json_decode($request->getBody()->getContents());
-                    foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
-                        $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
-                        if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
-                            $deliveryDate = $trackingDate;
-                        }
-                    }
-                } catch (\Exception $exception){
-                    dump($exception);
-                    Log::debug('failed to fetch delivery tracking');
-                }
-
-                if($deliveryDate){
-                    $packingList->status = ApprovalStatus::COMPLETED;
-                    $packingList->save();
-
-                    $deliveryDate = Carbon::parse($deliveryDate);
-                    $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
-                    /** @var Transport $transport */
-                    $transport = $this->createsTransport->execute($transportObject, $packingList);
-                    $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
-
-                    if(!($packingList->owner instanceof Order)) continue;
-
-                    $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
-                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                    $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
-                    $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
-
-                }
-
-                $time_end = microtime(true);
-
-                $execution_time = ($time_end - $time_start)/60;
-
-                echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-            }
-
-        }
-
-    }
-}
-

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

@@ -264,7 +264,7 @@ class FetchLoadedContainersFromVTPortalProcessor
 //
 //                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
                         } else {
-                            $appointee_id = 2307;
+                            $appointee_id = 2037;
                         }
 
                         $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, null);

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

@@ -139,360 +139,336 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        ini_set('max_execution_time', '900');
-//        $missingOrders = ['M202302161513122', 'YW202302161027442', 'YW202302151637022', 'M202302151605025', 'M202302151527103', 'M202302151527356', 'M202302151556019', 'YW202302151520241', 'YW202302151445068', 'M202302151359169', 'YW202302151349223', 'YW202302151336520', 'M202302151334316', 'YW202302151148129', 'M202302151145379', 'M202302151142411', 'M202302151037036', 'M202302151036398', 'M202302150919406', 'M202302141535009', 'YW202302141532318', 'M202302141319463', 'M202302141319045', 'YW202302141405471', 'M202302141334494', 'YW202302141321569', 'YW202302141323005', 'M202302141309053', 'M202302140905116', 'M202302141039558', 'M202302141022333', 'YW202302140943182', 'YW202302140923485', 'YW202302131728233', 'YW202302131702040', 'M202302131649417', 'M202302131638056', 'YW202302131601110', 'YW202302131530436', 'YW202302131411338', 'YW202302131355161', 'YW202302131312526', 'M202302130859076', 'M202302111708070', 'M202302111455134', 'M202302111457501', 'M202302111444041', 'M202302111506514', 'M202302111440286', 'M202302111354585', 'M202302111055551', 'M202302110900216', 'YW202302101743112', 'M202302091559443', 'M202302101716374', 'M202302101700402', 'M202302101633570', 'M202302101612095', 'M202302101611408', 'M202302101542340', 'M202302101408370', 'M202302101323341', 'M202302101129532', 'M202302101025109', 'M202302101006595', 'M202302091706357', 'YW202302091255022', 'YW202302091448196', 'YW202302091446431', 'M202302091138154', 'M202302091129396', 'YW202302091028175', 'M202302091006545', 'YW202302090942033', 'YW202302081743094', 'M202302081530599', 'M202302081531210', 'M202302081508571', 'YW202302081530492', 'M202302081500361', 'M202302081253105', 'M202302081303370', 'M202302071636303', 'M202302071741187', 'YW202302071735407', 'M202302071706323', 'M202302071537501', 'M202302071538092', 'YW202302071516453', 'M202302071311314', 'M202302071148154', 'YW202302071136018', 'M202302071036027', 'M202302071008010', 'M202302061742178', 'M202302061615198', 'M202302061502093', 'M202302061458532', 'M202302061552141', 'M202302061548431', 'M202302061555033', 'YW202302061404567', 'M202302061322463', 'M202302061042556', 'M202302061021277', 'M202302060917276', 'M202302041551570', 'M202302041552382', 'YW202302041515257', 'M202302041405502', 'M202302041030185', 'YW202302041215576', 'YW202302041058469', 'YW202302041024459', 'YW202302040939568', 'M202302031701053', 'M202302031700316', 'M202302031430562', 'M202302031431535', 'M202302031147213', 'YW202302031406529', 'YW202302031322256', 'M202302021718554', 'M202302021417415', 'YW202302021404542', 'M202302021055324', 'YW202302021037462', 'M202302011613381', 'M202302011347586', 'M202302011348245', 'M202301151635132', 'M202301141803516', 'YW202301141653536', 'M202301131504477', 'M202301131538220', 'M202301121327453', 'YW202301111153183', 'M202301091649543', 'M202212311641071', 'YW202212211532191', 'YW202212191605226'];
+        try {
+            $start = $start ? $start : Carbon::today()->subDays(30);
 
-        $from = $end ? Carbon::today()->diff($end)->days : 0;
-        $to = $start ? Carbon::today()->diff($start)->days : 10;
+            $startLimit = Carbon::parse('01-12-2021');
 
-        for ($x = $from; $x <= $to; $x++) {
-            try {
-                $startDate = Carbon::today()->subDays($x);
+            if($start->isBefore($startLimit)){
+                $start = $startLimit;
+            }
 
-                $startLimit = Carbon::parse('01-12-2021');
+            $end = $end ? $end : Carbon::today()->addDay();
 
-                if($startDate->isBefore($startLimit)){
-                    $startDate = $startLimit;
-                }
+            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                'begintime' => $start->timestamp,
+                'endtime' => $end->timestamp,
+            ]);
 
-                $endDate = Carbon::today()->subDays($x - 1);
+            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
-                $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                    'begintime' => $startDate->timestamp,
-                    'endtime' => $endDate->timestamp,
+            foreach($rows->data as $row){
+
+                $containerReference = null;
+                $loadingDate = null;
+                $unstuffingDate = null;
+                $deliveryDate = null;
+                $etd = null;
+                $eta = null;
+                $delayDate = null;
+
+                $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
+                    'trakingno' => $row->expressno
                 ]);
 
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
-                if(!$rows->data) continue;
+                if(!$rows){
+                    continue;
+                }
 
-                foreach($rows->data as $row){
-                    $time_start = microtime(true);
-
-                    $containerReference = null;
-                    $loadingDate = null;
-                    $unstuffingDate = null;
-                    $deliveryDate = null;
-                    $etd = null;
-                    $eta = null;
-                    $delayDate = null;
-                    $status = $row->status;
-
-                    if($status >= 3){
-                        $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
-                            'trakingno' => $row->expressno
-                        ]);
-
-                        $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-
-                        if(!$rows){
-                            continue;
-                        }
-
-                        foreach (array_reverse($rows->data) as $trackingRow) {
-                            if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
-                                $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-
-                            if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
-                                $tracking = explode(':', $trackingRow->tracking);
-                                $containerReference = explode('预计到港时间', $tracking[1])[0];
-                                $loadingDate = Carbon::parse($trackingRow->trackingtime);
-                                $etd = Carbon::parse($tracking[2])->subDays(5);
-                                $eta = Carbon::parse($tracking[2])->addDays(2);
-                            }
-
-                            $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
-                            $rescheduleETA = strpos($trackingRow->remark, '到港');
-                            if (($rescheduleETD !== false || $rescheduleETA !== false) && strpos($trackingRow->tracking, '货物装柜完成。') === false) {
-                                preg_match_all('/([0-9]+.{3})/', $trackingRow->remark, $matches);
-                                $dates = collect();
-
-                                foreach($matches[0] as $date){
-                                    try {
-                                        $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
-                                    } catch (\Exception $exception) {
-                                        continue;
-                                    }
-
-                                }
-
-                                $rescheduleDate = $dates->sortDesc()->first();
-
-                                if(!$delayDate || $rescheduleDate > $delayDate){
-                                    /** @var Carbon $delayDate */
-                                    $delayDate = $rescheduleDate;
-
-                                    if($rescheduleETA === false && $delayDate) {
-                                        $delayDate = $delayDate->addDays('5');
-                                    }
-                                }
-
-                            }
-
-                            if ($trackingRow->tracking === '到港') {
-                                $delayDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-
-                            if ($trackingRow->tracking === '已开船') {
-                                $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
-                            }
-
-                            if ($trackingRow->tracking === '货物已进目的港仓库') {
-                                $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-
-                            if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
-                                $deliveryDate = Carbon::parse($trackingRow->trackingtime);
-                            }
-                        }
+                foreach (array_reverse($rows->data) as $trackingRow) {
+                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
+                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if($status >= 5){
-                        $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
-
-                        try {
-                            $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
-                            $deliveryTracking = json_decode($request->getBody()->getContents());
-                            foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
-                                $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
-                                if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
-                                    $unstuffingDate = $trackingDate;
-                                }
-
-                                if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
-                                    $deliveryDate = $trackingDate;
-                                }
-                            }
-                        } catch (\Exception $exception){
-                            Log::debug('failed to fetch delivery tracking');
-                        }
+                    if (strpos($trackingRow->tracking, '货物装柜完成。') !== false) {
+                        $tracking = explode(':', $trackingRow->tracking);
+                        $containerReference = explode('预计到港时间', $tracking[1])[0];
+                        $loadingDate = Carbon::parse($trackingRow->trackingtime);
+                        $etd = Carbon::parse($tracking[2])->subDays(5);
+                        $eta = Carbon::parse($tracking[2])->addDays(2);
                     }
 
-                    $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+                    $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();
 
-                    $orderNumber = $customerno[array_key_last($customerno)];
-                    $allow_contract = true;
+                        foreach($matches[0] as $date){
+                            try {
+                                $dates->push(Carbon::parse(str_replace('.', '/', $date).Carbon::now()->format('Y')));
+                            } catch (\Exception $exception) {
+                                continue;
+                            }
 
+                        }
+
+                        $rescheduleDate = $dates->sortDesc()->first();
+
+                        if(!$delayDate || $rescheduleDate > $delayDate){
+                            /** @var Carbon $delayDate */
+                            $delayDate = $rescheduleDate;
+
+                            if($rescheduleETA === false && $delayDate) {
+                                $delayDate = $delayDate->addDays('5');
+                            }
+                        }
+
+                    }
+
+                    if ($trackingRow->tracking === '到港') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if ($trackingRow->tracking === '已开船') {
+                        $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
+                    }
+
+                    if ($trackingRow->tracking === '货物已进目的港仓库') {
+                        $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+
+                    if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
+                        $deliveryDate = Carbon::parse($trackingRow->trackingtime);
+                    }
+                }
+
+                $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
+
+                try {
+                    $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
+                    $deliveryTracking = json_decode($request->getBody()->getContents());
+                    foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
+                        $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
+                        if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
+                            $unstuffingDate = $trackingDate;
+                        }
+
+                        if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
+                            $deliveryDate = $trackingDate;
+                        }
+                    }
+                } catch (\Exception $exception){
+                    Log::debug('failed to fetch delivery tracking');
+                }
+
+                $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+
+                $orderNumber = $customerno[array_key_last($customerno)];
+                $allow_contract = true;
+
+                try {
+                    $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                } catch (ResourceNotFoundException $exception) {
                     try {
-                        $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                        $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
                     } catch (ResourceNotFoundException $exception) {
-                        try {
-                            $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
-                        } catch (ResourceNotFoundException $exception) {
-                            $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                            $allow_contract = false;
-                        }
-
+                        $order = $this->fetchesCompanyModule->execute(['id' => 1]);
+                        $allow_contract = false;
                     }
 
-                    $packingListReference = $row->expressno;
-
-                    try{
-                        $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-
-                        $packingList->packages()->delete();
-                        $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                        $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
-                        $warehouseReceiveList->packages()->delete();
-                        $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                    } catch (ResourceNotFoundException $exception) {
-
-                        if (!$allow_contract) {
-                            $appointee_id = 2307;
-                        } else {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-                        }
-
-                        $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-
-                        /** @var PackingList $warehouseReceiveList */
-                        $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-
-                        $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-                        $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-
-                        if ($allow_contract) {
-
-                            $contract = $this->unityCreateContract->execute();
-
-                            $contractReference = $contract->hash_id;
-                            $contractObligations = $contract->contract_obligation_list;
-
-                            $this->unityActivateContract->execute($contractReference);
-
-                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
-                        }
-
-                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
-
-                        /** @var PackingList $packingList */
-                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                        if ($allow_contract) {
-                            foreach ($contractObligations as $obligation) {
-                                $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                                $this->createsStep->execute($packingList, $stepObject);
-                            }
-                        }
-                    }
-
-                    foreach($row->deliverysize as $package) {
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    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'));
-
-                    if($overWeightCbm > 0){
-                        $measurement = round($overWeightCbm ** (1/3) * 100, 2);
-                        $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    if($order instanceof Order){
-                        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                        if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
-                            $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
-                                'expressno' => $row->expressno
-                            ]);
-                        }
-                    }
-
-
-                    if($containerReference) {
-                        try {
-                            $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                            $container->packingLists()->detach($packingList);
-                            $container->packingLists()->attach($packingList);
-                        } catch (ResourceNotFoundException $exception){
-
-                            if (!$allow_contract) {
-                                $appointee_id = 2307;
-                            }
-                            else {
-                                $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
-                            }
-
-                            $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
-
-                            $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-                            /** @var Container $container */
-                            $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
-
-                            $container->packingLists()->detach($packingList);
-                            $container->packingLists()->attach($packingList);
-
-                            $transport = $container->transports()->first();
-
-                            if(!$transport){
-                                $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
-                                /** @var Transport $transport */
-                                $transport = $this->createsTransport->execute($transportObject, $container);
-                                $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
-                            }
-                        }
-
-                        if($delayDate){
-                            $delayDate = $delayDate->addDays(2);
-                            $transport = $container->transports()->first();
-
-                            if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
-                                $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
-                                $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
-                                $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
-                                foreach ($container->packingLists as $packingList){
-                                    if(!($packingList->owner instanceof Order)) continue;
-                                    $user = $packingList->owner->companyModule->employees()->first();
-                                    if(app()->environment(['production'])) {
-                                        $user->notify(new ShipmentRescheduleEmail($user, $packingList));
-                                    }
-                                }
-                            }
-
-                        }
-
-                        if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
-                            $container->update(['status' => ApprovalStatus::COMPLETED]);
-                            $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
-
-                            /** @var PackingList $packingList */
-                            foreach($container->packingLists as $packingList){
-
-                                if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                                    $packingList->status = ApprovalStatus::APPROVED;
-                                    $packingList->save();
-                                }
-
-                                if ($allow_contract) {
-                                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                                    foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
-                                        $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
-                                        $step->update(['status' => ApprovalStatus::COMPLETED]);
-                                    }
-                                }
-
-                            }
-                        }
-                    }
-
-                    if($deliveryDate && !$packingList->transports()->exists()){
-                        $packingList->status = ApprovalStatus::COMPLETED;
-                        $packingList->save();
-
-                        $deliveryDate = Carbon::parse($deliveryDate);
-                        $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
-                        /** @var Transport $transport */
-                        $transport = $this->createsTransport->execute($transportObject, $packingList);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
-
-
-                        if ($allow_contract) {
-                            $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
-                            $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                            $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
-                            $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
-                        }
-
-                    }
-
-                    $time_end = microtime(true);
-
-                    $execution_time = ($time_end - $time_start)/60;
-
-                    echo '<b>Total Execution Time:</b> '.$execution_time.' Mins';
-                    echo 'successful';
-
                 }
 
-            } catch (\Exception $exception) {
-                Log::debug($exception);
-            }
-        }
+                $packingListReference = $row->expressno;
 
+                try{
+                    $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+
+                    $packingList->packages()->delete();
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
+                    $warehouseReceiveList->packages()->delete();
+                    $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                } catch (ResourceNotFoundException $exception) {
+
+                    if (!$allow_contract) {
+                        $appointee_id = 2037;
+                    } else {
+                        $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+                    }
+
+                    $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
+                    /** @var PackingList $warehouseReceiveList */
+                    $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
+
+                    $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+                    $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
+
+                    if ($allow_contract) {
+
+                        $contract = $this->unityCreateContract->execute();
+
+                        $contractReference = $contract->hash_id;
+                        $contractObligations = $contract->contract_obligation_list;
+
+                        $this->unityActivateContract->execute($contractReference);
+
+                        $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                        $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                        $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+                    }
+
+                    $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
+
+                    /** @var PackingList $packingList */
+                    $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+                    if ($allow_contract) {
+                        foreach ($contractObligations as $obligation) {
+                            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                            $this->createsStep->execute($packingList, $stepObject);
+                        }
+                    }
+                }
+
+                foreach($row->deliverysize as $package) {
+                    $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                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'));
+
+                if($overWeightCbm > 0){
+                    $measurement = round($overWeightCbm ** (1/3) * 100, 2);
+                    $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
+                    $this->createPackageProcessor->execute($packageObject, $packingList);
+                }
+
+                if($order instanceof Order){
+                    $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+                    if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
+                        $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
+                            'expressno' => $row->expressno
+                        ]);
+                    }
+                }
+
+
+                if($containerReference) {
+                    try {
+                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+                    } catch (ResourceNotFoundException $exception){
+
+                        if (!$allow_contract) {
+                            $appointee_id = 2037;
+                        }
+                        else {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
+                        }
+
+                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
+
+                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
+                        /** @var Container $container */
+                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+
+                        $container->packingLists()->detach($packingList);
+                        $container->packingLists()->attach($packingList);
+
+                        $transport = $container->transports()->first();
+
+                        if(!$transport){
+                            $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
+                            /** @var Transport $transport */
+                            $transport = $this->createsTransport->execute($transportObject, $container);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
+                        }
+                    }
+
+                    if($delayDate){
+                        $delayDate = $delayDate->addDays(2);
+                        $transport = $container->transports()->first();
+
+                        if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
+                            $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
+                            $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
+                            $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
+                            foreach ($container->packingLists as $packingList){
+                                if(!($packingList->owner instanceof Order)) continue;
+                                $user = $packingList->owner->companyModule->employees()->first();
+                                if(app()->environment(['production'])) {
+                                    $user->notify(new ShipmentRescheduleEmail($user, $packingList));
+                                }
+                            }
+                        }
+
+                    }
+
+                    if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
+                        $container->update(['status' => ApprovalStatus::COMPLETED]);
+                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+
+                        /** @var PackingList $packingList */
+                        foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
+                            if ($allow_contract) {
+                                $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                                foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
+                                    $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
+                                    $step->update(['status' => ApprovalStatus::COMPLETED]);
+                                }
+                            }
+
+                        }
+                    }
+                }
+
+                if($deliveryDate && !$packingList->transports()->exists()){
+                    $packingList->status = ApprovalStatus::COMPLETED;
+                    $packingList->save();
+
+                    $deliveryDate = Carbon::parse($deliveryDate);
+                    $transportObject = new TransportObject(TransportType::LAND, null, null,  $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
+                    /** @var Transport $transport */
+                    $transport = $this->createsTransport->execute($transportObject, $packingList);
+                    $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+
+
+                    if ($allow_contract) {
+                        $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                        $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                        $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                        $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
+                    }
+
+                }
+
+                echo 'successful';
+
+            }
+        } catch (\Exception $exception) {
+            Log::debug($exception);
+        }
 
 
     }
 }
-

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

@@ -66,6 +66,7 @@ class FetchPackingListFromVTPortalProcessor
                 }
 
             } catch (GuzzleException $exception) {
+                dd($exception);
                 Log::error($exception);
                 continue;
             }

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

@@ -1,267 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
-
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
-use App\Classes\Modules\Steps\Services\CreatesStep;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
-use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
-use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
-use App\Classes\Modules\Unity\Services\CreatesContract;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
-use App\Models\Order;
-use App\Models\PackingList;
-use Carbon\Carbon;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-class FetchPackingListsFromYdPortalProcessor
-{
-    /** @var FetchesDataFromYDPortal */
-    private $fetchesDataFRomYDPortal;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesCompanyModule */
-
-    private $fetchesCompanyModule;
-    /** @var CreatesContract */
-    private $unityCreateContract;
-
-    /** @var AssignContractEntityProcessor */
-    private $unityAssignContractEntity;
-
-    /** @var CreateContractEntityProcessor */
-    private $unityCreateContractEntity;
-
-    /** @var CreatesStep */
-    private $createsStep;
-
-    /** @var ActivateContractProcessor */
-    private $unityActivateContract;
-
-    /**
-     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
-     * @param FetchesOrder $fetchesOrder
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param CreatePackageProcessor $createPackageProcessor
-     * @param CreatesTransport $createsTransport
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreatesContract $unityCreateContract
-     * @param AssignContractEntityProcessor $unityAssignContractEntity
-     * @param CreateContractEntityProcessor $unityCreateContractEntity
-     * @param CreatesStep $createsStep
-     * @param ActivateContractProcessor $unityActivateContract
-     */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, FetchesOrder $fetchesOrder, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
-    {
-        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->unityCreateContract = $unityCreateContract;
-        $this->unityAssignContractEntity = $unityAssignContractEntity;
-        $this->unityCreateContractEntity = $unityCreateContractEntity;
-        $this->createsStep = $createsStep;
-        $this->unityActivateContract = $unityActivateContract;
-    }
-
-
-    /**
-     * @param Carbon|null $start
-     * @param Carbon|null $end
-     * @return void
-     * @throws GuzzleException
-     */
-    public function execute(?Carbon $start = null, ?Carbon $end = null)
-    {
-        $from = $end ? Carbon::today()->diff($end)->days : 0;
-        $to = $start ? Carbon::today()->diff($start)->days : 10;
-
-        for ($x = $from; $x <= $to; $x++) {
-            try {
-                $startDate = Carbon::today()->subDays($x);
-
-                $startLimit = Carbon::parse('01-12-2021');
-
-                if($startDate->isBefore($startLimit)){
-                    $startDate = $startLimit;
-                }
-
-                $endDate = Carbon::today()->subDays($x - 1);
-                $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                    'begintime' => $startDate->timestamp,
-                    'endtime' => $endDate->timestamp,
-                ]);
-
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
-                if(!$rows->data) continue;
-
-                foreach($rows->data as $row){
-
-                    $time_start = microtime(true);
-
-                    $receiveDate = Carbon::parse(substr(preg_replace("/[^0-9]/", "", $row->expressno), 0, 8));
-
-                    $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
-
-                    $orderNumber = $customerno[array_key_last($customerno)];
-                    $allow_contract = true;
-
-                    try {
-                        $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-                    } catch (ResourceNotFoundException $exception) {
-                        try {
-                            $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
-                        } catch (ResourceNotFoundException $exception) {
-                            $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                            $allow_contract = false;
-                        }
-
-                    }
-
-                    $packingListReference = $row->expressno;
-
-                    try{
-                        $packingList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
-
-                        $packingList->packages()->delete();
-                        $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                        $warehouseReceiveList = $this->fetchesPackingList->execute(['reference' => $row->expressno, 'type' => PackingListType::WAREHOUSE_RECEIVE_LIST]);
-                        $warehouseReceiveList->packages()->delete();
-                        $replica = $warehouseReceiveList->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST_REPLICA)->first();
-                        if($replica) $replica->packages()->delete();
-
-                    } catch (ResourceNotFoundException $exception) {
-
-                        if (!$allow_contract) {
-                            $appointee_id = 2307;
-                        } else {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-                        }
-
-                        $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-
-                        /** @var PackingList $warehouseReceiveList */
-                        $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
-
-                        $transportObject = new TransportObject(TransportType::LAND, null, $row->kuaidilist, Carbon::parse($receiveDate), Carbon::parse($receiveDate), $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-                        $transport = $this->createsTransport->execute($transportObject, $warehouseReceiveList);
-
-                        if ($allow_contract) {
-
-                            $contract = $this->unityCreateContract->execute();
-
-                            $contractReference = $contract->hash_id;
-                            $contractObligations = $contract->contract_obligation_list;
-
-                            $this->unityActivateContract->execute($contractReference);
-
-                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-
-                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-
-                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-
-                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
-                        }
-
-                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
-
-                        /** @var PackingList $packingList */
-                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-                        if ($allow_contract) {
-                            foreach ($contractObligations as $obligation) {
-                                $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                                $this->createsStep->execute($packingList, $stepObject);
-                            }
-                        }
-                    }
-
-                    foreach($row->deliverysize as $package) {
-                        $packageObject = new PackageObject(PackageType::CARTON, $row->goodname, (float) $package->width, (float) $package->height, (float) $package->length, 0, (float) $package->num, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $warehouseReceiveList);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    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'));
-
-                    if($overWeightCbm > 0){
-                        $measurement = round($overWeightCbm ** (1/3) * 100, 2);
-                        $packageObject = new PackageObject(PackageType::OVER_WEIGHT, 'Overweight CBM', (float) $measurement, (float) $measurement, (float) $measurement, 0, 1, ApprovalStatus::APPROVED);
-                        $this->createPackageProcessor->execute($packageObject, $packingList);
-                    }
-
-                    if($order instanceof Order){
-                        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                        if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
-                            $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
-                                'expressno' => $row->expressno
-                            ]);
-                        }
-                    }
-
-                    $time_end = microtime(true);
-
-                    $execution_time = ($time_end - $time_start)/60;
-
-                    echo 'successful => <b>Total Execution Time:</b> '.$execution_time.' Mins<br>';
-
-                }
-
-            } catch (\Exception $exception) {
-                Log::debug($exception);
-            }
-        }
-
-
-
-    }
-}
-

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

@@ -152,7 +152,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 } catch (ResourceNotFoundException $exception) {
                     $allow_contract = false;
                     $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                    $appointee_id = 2307;
+                    $appointee_id = 2037;
                 }
 
                 $packingListReference = $parcel[0];

app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateLeadPerfexCRMObject.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CreateLeadPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $email;
-
-    /** @var string */
-    private $phone;
-
-    /** @var string */
-    private $companyName;
-
-    public function __construct(string $name, string $email, string $phone, string $companyName)
-    {
-
-        $this->name = $name;
-        $this->email = $email;
-        $this->phone = $phone;
-        $this->companyName = $companyName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPhone(): string
-    {
-        return $this->phone;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyName(): string
-    {
-        return $this->companyName;
-    }
-
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateTaskPerfexCRMObject.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CreateTaskPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $email;
-
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $description;
-
-    /** @var string */
-    private $leadId;
-
-    /** @var string */
-    private $milestoneId;
-
-    /** @var string */
-    private $projectId;
-
-    /** @var string */
-    private $reference;
-
-    /** @var string */
-    private $onTaskCompletion;
-
-    /** @var string */
-    private $status;
-
-
-    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status)
-    {
-        $this->email = $email;
-        $this->name = $name;
-        $this->description = $description;
-        $this->leadId = $leadId;
-        $this->projectId = $projectId;
-        $this->milestoneId = $milestoneId;
-        $this->reference = $reference;
-        $this->onTaskCompletion = $onTaskCompletion;
-        $this->status = $status;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLeadId(): string
-    {
-        return $this->leadId;
-    }
-
-    public function setLeadId(string $leadId)
-    {
-        $this->leadId = $leadId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectId(): string
-    {
-        return $this->projectId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMilestoneId(): string
-    {
-        return $this->milestoneId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getReference(): string
-    {
-        return $this->reference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOnTaskCompletion(): string
-    {
-        return $this->onTaskCompletion;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStatus(): string
-    {
-        return $this->status;
-    }
-
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/CustomerContactObject.php

@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CustomerContactObject implements DataTransferObject
-{
-    /** @var int */
-    private $customerId;
-
-    /** @var string */
-    private $firstname;
-
-    /** @var string */
-    private $lastname;
-
-    /** @var string  */
-    private $email;
-
-    /** @var string */
-    private $password;
-
-    /** @var string */
-    private $isPrimary;
-
-    /** @var string */
-    private $sendSetPasswordEmail;
-
-
-    public function __construct(string $customerId, string $firstname, string $lastname, string $email, string $password, string $isPrimary, string $sendSetPasswordEmail)
-    {
-
-        $this->customerId = $customerId;
-        $this->firstname = $firstname;
-        $this->lastname = $lastname;
-        $this->email = $email;
-        $this->password = $password;
-        $this->isPrimary = $isPrimary;
-        $this->sendSetPasswordEmail = $sendSetPasswordEmail;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCustomerId(): int
-    {
-        return $this->customerId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFirstName(): string
-    {
-        return $this->firstname;
-    }
-
-     /**
-     * @return string
-     */
-    public function getLastName(): string
-    {
-        return $this->lastname;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPassword(): string
-    {
-        return $this->password;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIsPrimary(): string
-    {
-        return $this->isPrimary;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSendSetPasswordEmail(): string
-    {
-        return $this->sendSetPasswordEmail;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InitialPerfexCRMObject.php

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InitialPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $companyName;
-
-    /** @var string */
-    private $companyReference;
-
-    /** @var string */
-    private $contactName;
-
-    /** @var string */
-    private $contactEmail;
-
-    /** @var string */
-    private $bookingMarking;
-
-    /** @var string */
-    private $projectName;
-
-    /** @var int */
-    private $projectStatus;
-
-    /** @var array */
-    private $milestoneNames;
-
-    /** @var array */
-    private $taskNames;
-
-
-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $taskNames)
-    {
-
-        $this->companyName = $companyName;
-        $this->companyReference = $companyReference;
-        $this->contactName = $contactName;
-        $this->contactEmail = $contactEmail;
-        $this->bookingMarking = $bookingMarking;
-        $this->projectName = $projectName;
-        $this->projectStatus = $projectStatus;
-        $this->milestoneNames = $milestoneNames;
-        $this->taskNames = $taskNames;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyName(): string
-    {
-        return $this->companyName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyReference(): string
-    {
-        return $this->companyReference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContactName(): string
-    {
-        return $this->contactName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContactEmail(): string
-    {
-        return $this->contactEmail;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBookingMarking(): string
-    {
-        return $this->bookingMarking;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectName(): string
-    {
-        return $this->projectName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectStatus(): int
-    {
-        return $this->projectStatus;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMilestoneNames(): array
-    {
-        return $this->milestoneNames;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTaskNames(): array
-    {
-        return $this->taskNames;
-    }
-
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InvoicePaymentPerfexCRMObject.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InvoicePaymentPerfexCRMObject implements DataTransferObject
-{
-    /** @var int */
-    private $invoiceId;
-
-    /** @var float */
-    private $amount;
-
-    /** @var string */
-    private $date;
-
-    /** @var int */
-    private $paymentMode;
-
-    /** @var string */
-    private $transactionId;
-
-    /** @var string */
-    private $note;
-
-
-    public function __construct(int $invoiceId, float $amount, string $date, int $paymentMode, string $transactionId, string $note)
-    {
-        $this->invoiceId = $invoiceId;
-        $this->amount = $amount;
-        $this->date = $date;
-        $this->paymentMode = $paymentMode;
-        $this->transactionId = $transactionId;
-        $this->note = $note;
-    }
-
-    /**
-     * @return int
-     */
-    public function getInvoiceId(): int
-    {
-        return $this->invoiceId;
-    }
-
-    /**
-     * @return float
-     */
-    public function getAmount(): float
-    {
-        return $this->amount;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDate(): string
-    {
-        return $this->date;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPaymentMode(): int
-    {
-        return $this->paymentMode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTransactionId(): string
-    {
-        return $this->transactionId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNote(): string
-    {
-        return $this->note;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InvoicePerfexCRMObject.php

@@ -1,145 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InvoicePerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $clientId;
-
-    /** @var string */
-    private $number;
-
-    /** @var string */
-    private $date;
-
-    /** @var string */
-    private $dueDate;
-
-    /** @var string */
-    private $currency;
-
-    /** @var float */
-    private $subTotal;
-
-    /** @var float */
-    private $total;
-
-    /** @var string */
-    private $billingStreet;
-
-    /** @var string */
-    private $projectId;
-
-    /** @var array */
-    private $allowedPaymentModes;
-
-    /** @var array */
-    private $invoiceItems;
-
-    public function __construct(string $clientId, string $number, string $date, string $dueDate, string $currency, float $subTotal, float $total, string $billingStreet, string $projectId, array $allowedPaymentModes, array $invoiceItems)
-    {
-        $this->clientId = $clientId;
-        $this->number = $number;
-        $this->date = $date;
-        $this->dueDate = $dueDate;
-        $this->currency = $currency;
-        $this->subTotal = $subTotal;
-        $this->total = $total;
-        $this->billingStreet = $billingStreet;
-        $this->projectId = $projectId;
-        $this->allowedPaymentModes = $allowedPaymentModes;
-        $this->invoiceItems = $invoiceItems;
-    }
-
-    /**
-     * @return string
-     */
-    public function getClientId(): string
-    {
-        return $this->clientId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNumber(): string
-    {
-        return $this->number;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDate(): string
-    {
-        return $this->date;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDueDate(): string
-    {
-        return $this->dueDate;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCurrency(): string
-    {
-        return $this->currency;
-    }
-
-    /**
-     * @return float
-     */
-    public function getSubTotal(): float
-    {
-        return $this->subTotal;
-    }
-
-    /**
-     * @return float
-     */
-    public function getTotal(): float
-    {
-        return $this->total;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillingStreet(): string
-    {
-        return $this->billingStreet;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectId(): string
-    {
-        return $this->projectId;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAllowedPaymentModes(): array
-    {
-        return $this->allowedPaymentModes;
-    }
-
-    /**
-     * @return array
-     */
-    public function getInvoiceItems(): array
-    {
-        return $this->invoiceItems;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InvoiceSingleItemPerfexCRMObject.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
-{
-
-    /** @var string */
-    public $description;
-
-    /** @var string */
-    public $longDescription;
-
-    /** @var float */
-    public $qty;
-
-    /** @var float */
-    public $rate;
-
-    /** @var int */
-    public $order;
-
-    /** @var string */
-    public $unit;
-
-    public function __construct(string $description, string $longDescription, float $qty, float $rate, int $order, string $unit)
-    {
-        $this->description = $description;
-        $this->longDescription = $longDescription;
-        $this->qty = $qty;
-        $this->rate = $rate;
-        $this->order = $order;
-        $this->unit = $unit;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLongDescription(): string
-    {
-        return $this->longDescription;
-    }
-
-    /**
-     * @return float
-     */
-    public function getQty(): float
-    {
-        return $this->qty;
-    }
-
-    /**
-     * @return float
-     */
-    public function getRate(): float
-    {
-        return $this->rate;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOrder(): int
-    {
-        return $this->order;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUnit(): string
-    {
-        return $this->unit;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMInvoiceObject.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-use App\Models\Transaction;
-
-class UpdatePerfexCRMInvoiceObject implements DataTransferObject
-{
-    /** @var string */
-    private $email;
-
-    /** @var Transaction */
-    private $transaction;
-
-    /** @var bool */
-    private $isPaid;
-
-    public function __construct(string $email, Transaction $transaction, bool $isPaid)
-    {
-        $this->email = $email;
-        $this->transaction = $transaction;
-        $this->isPaid = $isPaid;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return Transaction
-     */
-    public function getTransaction(): Transaction
-    {
-        return $this->transaction;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getIsPaid(): bool
-    {
-        return $this->isPaid;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UpdatePerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $companyName;
-
-    /** @var string */
-    private $companyReference;
-
-    /** @var string */
-    private $contactName;
-
-    /** @var string */
-    private $contactEmail;
-
-    /** @var string */
-    private $bookingMarking;
-
-    /** @var string */
-    private $projectName;
-
-    /** @var int */
-    private $projectStatus;
-
-    /** @var array */
-    private $milestoneNames;
-
-    /** @var array */
-    private $taskNames;
-
-
-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $taskNames)
-    {
-
-        $this->companyName = $companyName;
-        $this->companyReference = $companyReference;
-        $this->contactName = $contactName;
-        $this->contactEmail = $contactEmail;
-        $this->bookingMarking = $bookingMarking;
-        $this->projectName = $projectName;
-        $this->projectStatus = $projectStatus;
-        $this->milestoneNames = $milestoneNames;
-        $this->taskNames = $taskNames;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyName(): string
-    {
-        return $this->companyName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyReference(): string
-    {
-        return $this->companyReference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContactName(): string
-    {
-        return $this->contactName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContactEmail(): string
-    {
-        return $this->contactEmail;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBookingMarking(): string
-    {
-        return $this->bookingMarking;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectName(): string
-    {
-        return $this->projectName;
-    }
-
-    /**
-     * @return int
-     */
-    public function getProjectStatus(): int
-    {
-        return $this->projectStatus;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMilestoneNames(): array
-    {
-        return $this->milestoneNames;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTaskNames(): array
-    {
-        return $this->taskNames;
-    }
-}

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Models\Transaction;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoiceSingleItemPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Models\PackingList;
-use Carbon\Carbon;
-
-class CreatePerfexCRMInvoiceProcessor
-{
-
-    /** @var CreatesPerfexCRMInvoice */
-    private $createsPerfexCRMInvoice;
-
-    /** @var CreatesPerfexCRMInvoicePayment */
-    private $createsPerfexCRMInvoicePayment;
-
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /** @var FetchesPerfexCRMProject */
-    private $fetchesPerfexCRMProject;
-
-    /** @var CreatesPerfexCRMCustomerProject */
-    private $createsPerfexCRMCustomerProject;
-
-    /**
-     * CreatePerfexCRMInvoiceProcessor constructor.
-     * @param CreatesPerfexCRMInvoice $createsPerfexCRMInvoice
-     */
-    public function __construct(CreatesPerfexCRMInvoice $createsPerfexCRMInvoice,
-    CreatesPerfexCRMInvoicePayment $createsPerfexCRMInvoicePayment,
-    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-    FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-    CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject)
-    {
-        $this->createsPerfexCRMInvoice = $createsPerfexCRMInvoice;
-        $this->createsPerfexCRMInvoicePayment = $createsPerfexCRMInvoicePayment;
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
-        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
-    }
-
-    /**
-     * @param Transaction $transaction
-     * @param bool $isPaid, default: false
-     * @return null|object
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Transaction $transaction, bool $isPaid = false) {
-        $clientId = "";
-        $number = $transaction->bill_no;
-        $prefix = "INV-";
-
-        //This will remove the prefix if prefix already exist in the string
-        if (substr($number, 0, strlen($prefix)) == $prefix) {
-            $number = substr($number, strlen($prefix));
-        }
-
-        $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
-        $dueDate = Carbon::parse($transaction->created_at)->format('Y-m-d');
-        $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
-        $subTotal = 0.00;
-        $total = 0.00;
-
-        $companyModule = $transaction->owner->owner->companyModule;
-        $billingStreet = "";
-        $addresses = $companyModule
-                    ->addresses()
-                    ->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)
-                    ->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
-
-        $billingStreet = $billingStreet.$addresses->street_one;
-        $billingStreet = $billingStreet.$addresses->street_two.',';
-        $billingStreet = $billingStreet.$addresses->district()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->postcode;
-        $billingStreet = $billingStreet.$addresses->state()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->country()->first()->name;
-
-        $allowedPaymentModes = [];
-        $invoiceItems = [];
-
-        $employee = $companyModule->employees()->first();
-        $email = $employee->email;
-
-        $result = $this->convertsPerfexCRMLeadToCustomer->execute($email);
-        if(isset($result->payload)){
-            $clientId = $result->payload['client_id'];
-        }
-
-        //get project
-        $projectId = ""; //Project only exist in CRM if the customer already made payment
-        if($isPaid){
-            if($transaction->owner instanceof PackingList){
-                $orderReference = $transaction->owner->owner->reference;
-                $packingListReference = $transaction->owner->reference;
-                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-                $project = $this->fetchesPerfexCRMProject->execute($projectName, $clientId);
-                if(!is_null($project)){
-                    $projectId = $project->id;
-                }
-                else{
-                    $result = $this->createsPerfexCRMCustomerProject->execute($projectName, PerfexCRMProjectStatus::NOT_STARTED, $clientId);
-                    if(isset($result->payload)){  //Here means project creation successful
-                        $projectId = $result->payload['project_id'];
-                    }
-                }
-            }
-        }
-
-        //newitems
-        foreach ($transaction->transactionDetails as $key => $transaction_detail){
-            $order = $key + 1;
-            $description = $transaction_detail->name;
-            $quantity = $transaction_detail->quantity;
-            $unitPrice = $transaction_detail->price;
-
-            $subTotal = $subTotal + $transaction_detail->amount;
-
-            //string $description, string $longDescription, int $qty, int $rate, int $order, string $unit
-            $invoiceSingleItem = new InvoiceSingleItemPerfexCRMObject(
-                $description,
-                "",
-                $quantity,
-                $unitPrice,
-                $order,
-                ""
-            );
-            array_push($invoiceItems, $invoiceSingleItem);
-        }
-
-        $total = $transaction->amount;
-
-        //This setting is similar to Setup > Leads > Sources, Setup > Leads > Statuses
-        //Can be found at Finance > Payment Modes
-        array_push($allowedPaymentModes, 1, 2);
-        $invoicePerfexCRMObject = new InvoicePerfexCRMObject(
-            $clientId,
-            $number,
-            $date,
-            $dueDate,
-            $currency,
-            $subTotal,
-            $total,
-            $billingStreet,
-            $projectId,
-            $allowedPaymentModes,
-            $invoiceItems
-        );
-
-        $result = $this->createsPerfexCRMInvoice->execute($invoicePerfexCRMObject);
-
-        return $result;
-    }
-
-}

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMLeadProcessor.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-// use App\Classes\Modules\PerfexCRM\DataTransferObjects\ContactObject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMLead;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-
-class CreatePerfexCRMLeadProcessor
-{
-
-    /** @var CreatesPerfexCRMLead */
-    private $createsPerfexCRMLead;
-
-    /**
-     * CreatePerfexCRMLeadProcessor constructor.
-     * @param CreatesPerfexCRMLead $createsPerfexCRMLead
-     */
-    public function __construct(CreatesPerfexCRMLead $createsPerfexCRMLead)
-    {
-        $this->createsPerfexCRMLead = $createsPerfexCRMLead;
-    }
-
-    /**
-     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
-     * @return null|object
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject) {
-        return $this->createsPerfexCRMLead->execute($createLeadPerfexCRMObject);
-    }
-
-}

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-
-class CreatePerfexCRMTaskProcessor
-{
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /**
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-    */
-    public function __construct(CreatesPerfexCRMTask $createsPerfexCRMTask)
-    {
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-    }
-
-   /**
-    * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
-    * @return true
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-   public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
-        $this->createsPerfexCRMTask->execute(
-            $createTaskPerfexCRMObject->getName(),
-            $createTaskPerfexCRMObject->getDescription(),
-            $createTaskPerfexCRMObject->getLeadId(),
-            $createTaskPerfexCRMObject->getMilestoneId(),
-            $createTaskPerfexCRMObject->getProjectId(),
-            $createTaskPerfexCRMObject->getReference(),
-            $createTaskPerfexCRMObject->getOnTaskCompletion(),
-            $createTaskPerfexCRMObject->getStatus(),
-        );
-        return true;
-   }
-
-}

app/Classes/Modules/PerfexCRM/Processors/InitializePerfexCRMProcessor.php

@@ -1,195 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Http\Request;
-
-class InitializePerfexCRMProcessor
-{
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /** @var CreatesPerfexCRMCustomerProject */
-    private $createsPerfexCRMCustomerProject;
-
-    /** @var CreatesPerfexCRMMilestone */
-    private $createsPerfexCRMMilestone;
-
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /** @var FetchesPerfexCRMProject */
-    private $fetchesPerfexCRMProject;
-
-    /** @var FetchesPerfexCRMMilestone */
-    private $fetchesPerfexCRMMilestone;
-
-    /** @var FetchesPerfexCRMTask */
-    private $fetchesPerfexCRMTask;
-
-    /** @var CreatesPerfexCRMCustomer */
-    private $createsPerfexCRMCustomer;
-
-    /** @var CreatesPerfexCRMCustomerContact */
-    private $createsPerfexCRMCustomerContact;
-
-    /** @var UpdatesPerfexCRM */
-    private $updatePerfexCRM;
-
-    /** @var UpdatesPerfexCRMCustomer */
-    private $updatesPerfexCRMCustomer;
-
-   /**
-     * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
-     * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
-     * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-     * @param FetchesPerfexCRMProject $fetchesPerfexCRMProject
-     * @param FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone
-     * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
-     * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
-     * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
-     * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
-    */
-    public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-        CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-        CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-        CreatesPerfexCRMTask $createsPerfexCRMTask,
-        FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-        FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-        FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-        CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-        CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-        UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer)
-   {
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
-        $this->createsPerfexCRMMilestone = $createsPerfexCRMMilestone;
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
-        $this->fetchesPerfexCRMMilestone = $fetchesPerfexCRMMilestone;
-        $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
-        $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
-        $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
-        $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
-    }
-
-   /**
-    * @param InitialPerfexCRMObject $initialPerfexCRMObject
-    * @return null|object
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-   public function execute(InitialPerfexCRMObject $initialPerfexCRMObject) {
-
-       // Customer has to exist first before Project can appear under it
-       // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
-       $crmCompany = $initialPerfexCRMObject->getCompanyName();
-       $result = $this->convertsPerfexCRMLeadToCustomer->execute($initialPerfexCRMObject->getContactEmail());
-       if(isset($result->payload)){
-           $crmClientId = $result->payload['client_id'];
-           if (isset($result->payload['company'])) {
-               $crmCompany = $result->payload['company'];
-           }
-       }
-       else{
-           //if reach this point, this means this user is not a official customer nor is a lead in crm
-           //Create Customer has 2 parts: Create Company (client), Create Contact
-           $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           if(is_null($result)){
-                $crmCompany = $crmCompany." 2";
-                $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           }
-
-           $crmClientId = $result->payload['clientId'];
-
-           $customerContactObject = new CustomerContactObject(
-               $crmClientId,
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactEmail(),
-               "pU^T@sC#9Q",
-               "on",
-               "on"
-           );
-           $result = $this->createsPerfexCRMCustomerContact->execute($customerContactObject);
-       }
-
-       //Update custom fields to identify company reference from exchange or shipping portal
-       $value_exists = false;
-       if (isset($result->payload['customfields'])) {
-           foreach ($result->payload['customfields'] as $element) {
-               if ($element['value'] === $initialPerfexCRMObject->getCompanyReference()) {
-                   $value_exists = true;
-                   break;
-               }
-           }
-       }
-       if(!$value_exists);
-       {
-           $result = $this->updatesPerfexCRMCustomer->execute($crmClientId, $crmCompany, $initialPerfexCRMObject->getCompanyReference());
-       }
-
-       // Get existing or create project, project has to exist first before milestone can appear under it
-       $result = $this->createsPerfexCRMCustomerProject->execute($initialPerfexCRMObject->getProjectName(), $initialPerfexCRMObject->getProjectStatus(), $crmClientId);
-       if(isset($result->payload)){  //Here means project creation successful
-            $projectId = $result->payload['project_id'];
-       }
-       else{
-            $projectId = $this->fetchesPerfexCRMProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId)->id;
-       }
-
-       $tasks = $initialPerfexCRMObject->getTaskNames();
-       if(count($tasks) > 0){
-
-            //Create tasks with milestone
-            for($count=0; $count < count($tasks); $count++) {
-                $milestoneId = 0; //By default milestoneId is 0, having this set at individual task is optional
-                if($tasks[$count]['milestone'] != "") //Create milestone only if it is defined
-                {
-                    // Get existing or create milestone, milestone has to exist first before task can appear under it
-                    $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
-                    if(isset($result->payload)){
-                        $milestoneId = $result->payload['milestone_id'];
-                    }
-                    else{
-                        $milestone = $this->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
-                        $array = json_decode(json_encode($milestone), true);
-                        $milestoneId = $array[0]['id'];
-                    }
-                }
-
-                $taskStatus = PerfexCRMTaskStatus::NOT_STARTED;
-                if($tasks[$count]['status'] != ''){
-                    $taskStatus = $tasks[$count]['status'];
-                }
-
-                // Get existing or create task
-                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $taskStatus);
-                if(is_null($result)){
-                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
-                }
-            }
-        }
-        return true;
-   }
-
-}

app/Classes/Modules/PerfexCRM/Processors/NewLeadTaskToPerfexCRMProcessor.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-use App\Classes\Jobs\CreatePerfexCRMSingleTask;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Models\Company;
-
-class NewLeadTaskToPerfexCRMProcessor
-{
-    /**
-     * @param Company $company
-     * @return true
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Company $company)
-    {
-        $companyModule = $company->companyModules()->first();
-        $employee = $companyModule->employees()->first();
-        $contactEmail = $employee->email;
-
-        $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
-            $contactEmail,
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['name'],
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['description'],
-            "",
-            "",
-            "",
-            "",
-            "",
-            PerfexCRMTasks::TASK_IDENTIFICATION_1['status']
-        );
-
-        CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
-        return true;
-    }
-
-}

app/Classes/Modules/PerfexCRM/Processors/PackingListToPerfexCRMProcessor.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\Jobs\UpdatePerfexCRM;
-use App\Models\PackingList;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-
-class PackingListToPerfexCRMProcessor
-{
-    /**
-     * @param PackingList $packingList
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(PackingList $packingList)
-    {
-        $order = $packingList->owner;
-        $companyModule  = $order->companyModule()->first();
-        $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
-        $companyName = $companyModule->name;
-        $companyReference = $connection ? $connection->pivot->invitee_reference:'';
-        $employee = $companyModule->employees()->first();
-        $contactEmail = $employee->email;
-        $contactName = $employee->name;
-
-        $orderReference = $packingList->owner->reference;
-        $packingListReference = $packingList->reference;
-        $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-
-        $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-            $companyName,
-            $companyReference,
-            $contactName,
-            $contactEmail,
-            "",
-            $projectName,
-            PerfexCRMProjectStatus::NOT_STARTED,
-            [],
-            [
-                PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
-                PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
-            ]
-        );
-        UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
-
-        return true;
-    }
-}

app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php

@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Services\Init;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Jobs\UpdatePerfexCRMInvoice;
-use App\Classes\Jobs\UpdatePerfexCRM;
-use App\Models\Transaction;
-
-class TransactionToPerfexCRMProcessor
-{
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var UpdatePerfexCRMProcessor */
-    private $updatePerfexCRMProcessor;
-
-    /** @var InitializePerfexCRMProcessor */
-    private $initializePerfexCRMProcessor;
-
-    /**
-     * TransactionToPerfexCRMProcessor constructor.
-     * @param UpdatePerfexCRMProcessor $updatePerfexCRMProcessor
-     * @param InitializePerfexCRMProcessor $initializePerfexCRMProcessor
-     * @param FetchesCompany $fetchesCompany
-     */
-    public function __construct(UpdatePerfexCRMProcessor $updatePerfexCRMProcessor, InitializePerfexCRMProcessor $initializePerfexCRMProcessor, FetchesCompany $fetchesCompany)
-    {
-        $this->updatePerfexCRMProcessor = $updatePerfexCRMProcessor;
-        $this->initializePerfexCRMProcessor = $initializePerfexCRMProcessor;
-        $this->fetchesCompany = $fetchesCompany;
-    }
-
-
-    /**
-     * @param Transaction $model
-     * @param int $status
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Transaction $model, int $status)
-    {
-        if($model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED)
-        {
-            $packingList = $model->owner->owner;
-            $order = $packingList->owner()->first();
-            $companyModule = $order->companyModule()->first();
-            $companyName = $companyModule->name;
-            $companyReference = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-            $employee = $companyModule->employees()->first();
-            $contactEmail = $employee->email;
-            $contactName = $employee->name;
-
-            $orderReference = $order->reference;
-            $packingListReference = $packingList->reference;
-            $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-
-            $bookingMarking = $packingList->id."-".$packingList->owner->id;
-            $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                $companyName,
-                $companyReference,
-                $contactName,
-                $contactEmail,
-                $bookingMarking,
-                $projectName,
-                PerfexCRMProjectStatus::IN_PROGRESS,
-                [],
-                [
-                    PerfexCRMTasks::TASK_1,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_1,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_2,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_3,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_4,
-                ]
-            );
-
-            UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
-
-            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
-                $contactEmail,
-                $model,
-                true
-            );
-            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
-        }
-
-        return true;
-    }
-}

app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php

@@ -1,206 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Http\Request;
-
-class UpdatePerfexCRMProcessor
-{
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /** @var CreatesPerfexCRMCustomerProject */
-    private $createsPerfexCRMCustomerProject;
-
-    /** @var CreatesPerfexCRMMilestone */
-    private $createsPerfexCRMMilestone;
-
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /** @var FetchesPerfexCRMProject */
-    private $fetchesPerfexCRMProject;
-
-    /** @var FetchesPerfexCRMMilestone */
-    private $fetchesPerfexCRMMilestone;
-
-    /** @var FetchesPerfexCRMTask */
-    private $fetchesPerfexCRMTask;
-
-    /** @var CreatesPerfexCRMCustomer */
-    private $createsPerfexCRMCustomer;
-
-    /** @var CreatesPerfexCRMCustomerContact */
-    private $createsPerfexCRMCustomerContact;
-
-    /** @var UpdatesPerfexCRM */
-    private $updatePerfexCRM;
-
-    /** @var UpdatesPerfexCRMCustomer */
-    private $updatesPerfexCRMCustomer;
-
-    /** @var UpdatesPerfexCRMProject */
-    private $updatesPerfexCRMProject;
-
-   /**
-     * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
-     * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
-     * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-     * @param FetchesPerfexCRMProject $fetchesPerfexCRMProject
-     * @param FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone
-     * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
-     * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
-     * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
-     * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
-     * @param UpdatesPerfexCRMProject $updatesPerfexCRMProject
-    */
-    public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-        CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-        CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-        CreatesPerfexCRMTask $createsPerfexCRMTask,
-        FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-        FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-        FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-        CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-        CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-        UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer,
-        UpdatesPerfexCRMProject $updatesPerfexCRMProject)
-   {
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
-        $this->createsPerfexCRMMilestone = $createsPerfexCRMMilestone;
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
-        $this->fetchesPerfexCRMMilestone = $fetchesPerfexCRMMilestone;
-        $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
-        $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
-        $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
-        $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
-        $this->updatesPerfexCRMProject = $updatesPerfexCRMProject;
-    }
-
-   /**
-    * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-    * @return null|object
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-   public function execute(UpdatePerfexCRMObject $updatePerfexCRMObject) {
-
-       // Customer has to exist first before Project can appear under it
-       // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
-       $crmCompany = $updatePerfexCRMObject->getCompanyName();
-       $result = $this->convertsPerfexCRMLeadToCustomer->execute($updatePerfexCRMObject->getContactEmail());
-       if(isset($result->payload)){
-           $crmClientId = $result->payload['client_id'];
-           if (isset($result->payload['company'])) {
-               $crmCompany = $result->payload['company'];
-           }
-       }
-       else{
-           //if reach this point, this means this user is not a official customer nor is a lead in crm
-           //Create Customer has 2 parts: Create Company (client), Create Contact
-           $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           if(is_null($result)){
-                $crmCompany = $crmCompany." 2";
-                $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           }
-
-           $crmClientId = $result->payload['clientId'];
-
-           $customerContactObject = new CustomerContactObject(
-               $crmClientId,
-               $updatePerfexCRMObject->getContactName(),
-               $updatePerfexCRMObject->getContactName(),
-               $updatePerfexCRMObject->getContactEmail(),
-               "pU^T@sC#9Q",
-               "on",
-               "on"
-           );
-           $result = $this->createsPerfexCRMCustomerContact->execute($customerContactObject);
-       }
-
-       //Update custom fields to identify company reference from exchange or shipping portal
-       $value_exists = false;
-       if (isset($result->payload['customfields'])) {
-           foreach ($result->payload['customfields'] as $element) {
-               if ($element['value'] === $updatePerfexCRMObject->getCompanyReference()) {
-                   $value_exists = true;
-                   break;
-               }
-           }
-       }
-       if(!$value_exists);
-       {
-           $result = $this->updatesPerfexCRMCustomer->execute($crmClientId, $crmCompany, $updatePerfexCRMObject->getCompanyReference());
-       }
-
-       // Get existing or create project, project has to exist first before milestone can appear under it
-       $result = $this->createsPerfexCRMCustomerProject->execute($updatePerfexCRMObject->getProjectName(), $updatePerfexCRMObject->getProjectStatus(), $crmClientId);
-       if(isset($result->payload)){  //Here means project creation successful
-            $projectId = $result->payload['project_id'];
-       }
-       else{
-            $project = $this->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
-            $projectId = $project->id;
-            //if the project status is anything but PerfexCRMProjectStatus::NOT_STARTED, update the project
-            if($updatePerfexCRMObject->getProjectStatus() != PerfexCRMProjectStatus::NOT_STARTED)
-            {
-                $this->updatesPerfexCRMProject->execute($project, $updatePerfexCRMObject->getProjectStatus());
-            }
-       }
-
-       $tasks = $updatePerfexCRMObject->getTaskNames();
-       if(count($tasks) > 0){
-
-            //Create tasks with milestone
-            for($count=0; $count < count($tasks); $count++) {
-                $milestoneId = 0; //By default milestoneId is 0, having this set at individual task is optional
-                if($tasks[$count]['milestone'] != "") //Create milestone only if it is defined
-                {
-                    // Get existing or create milestone, milestone has to exist first before task can appear under it
-                    $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
-                    if(isset($result->payload)){
-                        $milestoneId = $result->payload['milestone_id'];
-                    }
-                    else{
-                        $milestone = $this->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
-                        $array = json_decode(json_encode($milestone), true);
-                        $milestoneId = $array[0]['id'];
-                    }
-                }
-
-                $taskStatus = PerfexCRMTaskStatus::NOT_STARTED;
-                if($tasks[$count]['status'] != ''){
-                    $taskStatus = $tasks[$count]['status'];
-                }
-
-                // Get existing or create task
-                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $taskStatus);
-                if(is_null($result)){
-                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
-                }
-            }
-        }
-        return true;
-   }
-
-}

app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class ConvertsPerfexCRMLeadToCustomer
-{
-    /**
-     * @param string $email
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $email) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/leads/convertocustomer/'.$email);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMCustomer
-{
-    /**
-     * @param string $companyName
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $companyName) {
-        try{
-            $data = [
-                'company' => $companyName
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/customers',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMCustomerContact
-{
-    /**
-     * @param CustomerContactObject $customerContactObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(CustomerContactObject $customerContactObject) {
-        try{
-            $data = [
-                'customer_id' => $customerContactObject->getCustomerId(),
-                'firstname' => $customerContactObject->getFirstName(),
-                'lastname' => $customerContactObject->getLastName(),
-                'email' => $customerContactObject->getEmail(), //$email
-                'password' => $customerContactObject->getPassword(),
-                'is_primary' => $customerContactObject->getIsPrimary(),
-                //'send_set_password_email' => $customerContactObject->getSendSetPasswordEmail(),
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/contacts',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMCustomerProject
-{
-    /**
-     * @param string $projectName
-     * @param string $clientId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $projectName, int $status, string $clientId) {
-        try{
-            $data = [
-                'name' => $projectName,
-                'rel_type' => 'customer',
-                'billing_type' => 1,
-                'clientid' => $clientId,
-                'start_date' => date('Y-m-d'),
-                'status' => $status
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/projects',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
-
-class CreatesPerfexCRMInvoice
-{
-    /**
-     * @param InvoicePerfexCRMObject $invoicePerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(InvoicePerfexCRMObject $invoicePerfexCRMObject) {
-        try{
-            $data = [
-                'clientid' => $invoicePerfexCRMObject->getClientId(),
-                'number' => $invoicePerfexCRMObject->getNumber(),
-                'date' => $invoicePerfexCRMObject->getDate(),
-                'duedate' => $invoicePerfexCRMObject->getDueDate(),
-                'currency' => $invoicePerfexCRMObject->getCurrency(),
-                'subtotal' => number_format($invoicePerfexCRMObject->getSubTotal(), 2, '.', ''),
-                'total' => number_format($invoicePerfexCRMObject->getTotal(), 2, '.', ''),
-                'billing_street' => $invoicePerfexCRMObject->getBillingStreet(),
-                'project_id' => $invoicePerfexCRMObject->getProjectId(),
-                'allowed_payment_modes[0]' => 1,
-                'allowed_payment_modes[1]' => 2,
-            ];
-
-            for($count=0; $count < count($invoicePerfexCRMObject->getInvoiceItems()); $count++) {
-                $oneItem = [
-                    "newitems[".$count."][description]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->description,
-                    "newitems[".$count."][long_description]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->longDescription,
-                    "newitems[".$count."][qty]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->qty,
-                    "newitems[".$count."][rate]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->rate,
-                    "newitems[".$count."][order]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->order,
-                    "newitems[".$count."][unit]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->unit,
-                ];
-                $data = array_merge($data, $oneItem);
-            }
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/invoices',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
-
-class CreatesPerfexCRMInvoicePayment
-{
-    /**
-     * @param InvoicePaymentPerfexCRMObject $invoicePaymentPerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(InvoicePaymentPerfexCRMObject $invoicePaymentPerfexCRMObject) {
-        try{
-            $data = [
-                'invoiceid' => $invoicePaymentPerfexCRMObject->getInvoiceId(),
-                'amount' => number_format($invoicePaymentPerfexCRMObject->getAmount(), 2, '.', ''),
-                'date' => $invoicePaymentPerfexCRMObject->getDate(),
-                'paymentmode' => $invoicePaymentPerfexCRMObject->getPaymentMode(),
-                'transactionid' => $invoicePaymentPerfexCRMObject->getTransactionId(),
-                'note' => $invoicePaymentPerfexCRMObject->getNote(),
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/invoices/recordpayment',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-
-class CreatesPerfexCRMLead
-{
-    /**
-     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject) {
-        try{
-            $data = [
-                'name' => $createLeadPerfexCRMObject->getName(),
-                'email' => $createLeadPerfexCRMObject->getEmail(),
-                'phonenumber' => $createLeadPerfexCRMObject->getPhone(),
-                'company' => $createLeadPerfexCRMObject->getCompanyName(),
-                'source' => 2, //1: Exchange, 2: Shipping Portal
-                'status' => 2 //2: Lead, 1: Customer
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/leads/byemail',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMMilestone
-{
-    /**
-     * @param string $$milestoneName
-     * @param string $projectId
-     * @param string $milestoneOrder
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $milestoneName, string $projectId, string $milestoneOrder =  "") {
-        try{
-            $data = [
-                'name' => $milestoneName,
-                'project_id' => $projectId,
-                'due_date' => date('Y-m-d'),
-                'start_date' => date('Y-m-d')
-            ];
-
-            if($milestoneOrder != ""){
-                $data['milestone_order'] = $milestoneOrder;
-            }
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/milestones',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMTask
-{
-    /**
-     * @param string $taskName
-     * @param string $taskDescription
-     * @param string $leadId
-     * @param string $milestoneId
-     * @param string $projectId
-     * @param string $reference, default: ''
-     * @param string $on_task_completion, default: ''
-     * @param string $status, default: 1
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $taskName, string $taskDescription, string $leadId, string $milestoneId, string $projectId, string $reference = '', string $on_task_completion = '', string $status = "1") {
-        try{
-            $data = [
-                'name' => $taskName,
-                'description' => $taskDescription,
-                'milestone' => $milestoneId,
-                'startdate' => date('Y-m-d'),
-                'rel_type' => 'project',
-                'rel_id' => $projectId,
-                'status' => $status,
-                'is_system_created' => 1,
-                'reference' => $reference,
-                'on_task_completion' => $on_task_completion
-            ];
-
-            if($leadId != '') {
-                $data = [
-                    'name' => $taskName,
-                    'description' => $taskDescription,
-                    'milestone' => $milestoneId,
-                    'startdate' => date('Y-m-d'),
-                    'rel_type' => 'lead',
-                    'rel_id' => $leadId,
-                    'status' => $status,
-                    'is_system_created' => 1,
-                    'reference' => $reference,
-                    'on_task_completion' => $on_task_completion
-                ];
-            }
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/tasks',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMCustomer
-{
-    /**
-     * @param string $email
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $email) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/customers/byemail/'.$email);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMInvoice.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMInvoice
-{
-    /**
-     * @param string $clientId
-     * @param string $invoicePrefix
-     * @param string $invoiceNumber
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $clientId, string $invoicePrefix, string $invoiceNumber) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/invoices/customsearch/'.$clientId.'/'.$invoicePrefix.'/'.$invoiceNumber);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMLead
-{
-    /**
-     * @param string $email
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $email) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/leads/byemail/'.$email);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMMilestone
-{
-    /**
-     * @param string $milestoneName
-     * @param string $projectId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $milestoneName, string $projectId) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/milestones/bynameandprojectid/'.rawurlencode($milestoneName).'/'.$projectId);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMProject
-{
-    /**
-     * @param string $projectName
-     * @param string $clientId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $projectName, string $clientId) {
-        try{
-            $data = [
-                'name' => $projectName,
-                'clientid' => $clientId,
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/projects/bynameandclientid', $data);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMTask
-{
-    /**
-     * @param string $taskName
-     * @param string $milestoneId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $taskName, string $milestoneId) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/tasks/bynameandmilestoneid/'.rawurlencode($taskName).'/'.$milestoneId);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class UpdatesPerfexCRMCustomer
-{
-
-    /**
-     * @param string $customerId
-     * @param string $companyReference
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $customerId, string $companyName, string $companyReference) {
-        try{
-            $custom_fields = [
-                "customers" => [
-                    2 => $companyReference
-                ]
-            ];
-
-            $data = [
-                'company' => $companyName,
-                'custom_fields' => $custom_fields
-            ];
-
-            $response = Http::asJson()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->put(config('perfexcrm.base_url').'/api/customers/'.$customerId, $data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMInvoice.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class UpdatesPerfexCRMInvoice
-{
-
-    /**
-     * @param $invoice
-     * @param string $projectId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute($invoice, string $projectId) {
-        try{
-            // <p>The Invoice number field is required.<\/p>
-            // <p>The Invoice date field is required.<\/p>
-            // <p>The Currency field is required.<\/p>
-            // <p>The Items field is required.<\/p>
-            // <p>The Allow Payment Mode field is required.<\/p>
-            // <p>The Billing Street field is required.<\/p>
-            // <p>The Sub Total field is required.<\/p>
-            // <p>The Total field is required.<\/p>
-
-            $newInvoiceItems = [];
-            foreach ($invoice->items as $item) {
-                $item['itemid'] = $item['id'];
-                unset($item['id']);
-                $item['order'] = $item['item_order'];
-                unset($item['item_order']);
-                array_push($newInvoiceItems,$item);
-            }
-
-            $data = [
-                'number' => $invoice->number,
-                'date' => $invoice->date,
-                'duedate' => $invoice->date,
-                'currency' => $invoice->currency,
-                'subtotal' => $invoice->subtotal,
-                'total' => $invoice->total,
-                'billing_street' => $invoice->billing_street,
-                'shipping_street' => $invoice->billing_street,
-                'project_id' => $projectId,
-                'items' => $newInvoiceItems,
-                'allowed_payment_modes' => $invoice->allowed_payment_modes,
-            ];
-
-            $response = Http::asJson()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->put(config('perfexcrm.base_url').'/api/invoices/'.$invoice->id, $data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class UpdatesPerfexCRMProject
-{
-    /**
-     * @param $project
-     * @param int $status
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute($project, int $status) {
-        try{
-            $data = [
-                'name' => $project->name,
-                'clientid' => $project->clientid,
-                // 'rel_type' => 'customer',
-                'billing_type' => 1,
-                'start_date' => $project->start_date,
-                'status' => $status
-            ];
-
-            $response = Http::asJson()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->put(config('perfexcrm.base_url').'/api/projects/'.$project->id, $data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class UpdatesPerfexCRMTask
-{
-
-    /**
-     * @param string $taskName
-     * @param string $milestoneId
-     * @param string $projectId
-     * @param string $status, default: 1
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $taskId, string $taskName, string $milestoneId, string $projectId, string $status = "1") {
-        try{
-            $data = [
-                'name' => $taskName,
-                'milestone' => $milestoneId,
-                'startdate' => date('Y-m-d'),
-                'duedate' => date('Y-m-d'),
-                'rel_type' => 'project',
-                'rel_id' => $projectId,
-                'status' => $status,
-                'repeat_every' => '',
-            ];
-
-            $response = Http::asJson()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->put(config('perfexcrm.base_url').'/api/tasks/'.$taskId, $data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

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

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
 use App\Classes\Notifications\InvoiceIssuedEmail;
 use Illuminate\Http\Request;
 
@@ -37,17 +36,29 @@ class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-    /** @var ApproveShippingInvoiceTransactionProcessor */
-    private $approveShippingInvoiceTransactionProcessor;
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
 
     /**
+     * ApprovePaymentVerificationLogic constructor.
      * @param FetchesPackingList $fetchesPackingList
-     * @param ApproveShippingInvoiceTransactionProcessor $approveShippingInvoiceTransactionProcessor
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, ApproveShippingInvoiceTransactionProcessor $approveShippingInvoiceTransactionProcessor)
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
     {
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->approveShippingInvoiceTransactionProcessor = $approveShippingInvoiceTransactionProcessor;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
     }
 
     /**
@@ -58,8 +69,29 @@ class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-        $this->approveShippingInvoiceTransactionProcessor->execute($packing_list);
 
+        $invoice_transaction = $packing_list->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
+
+        $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
+
+        $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->createsFiles->execute($document, $document_object);
+        $user = $packing_list->owner->companyModule->employees()->first();
+        if(app()->environment(['production'])) {
+            $user->notify(new InvoiceIssuedEmail($user, $packing_list));
+        }
         return $this->response([]);
     }
 

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

@@ -5,15 +5,41 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+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\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionDetailType;
+
+use App\Models\CompanyModule;
+use App\Models\Document;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
 
 
-
     /**
      * @return array
      */
@@ -27,26 +53,214 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-    /** @var CreateInvoiceTransactionProcessor */
-    private $createInvoiceTransactionProcessor;
+    /** @var FetchesSegmentConstant */
+    private $fetchesSegmentConstant;
 
-    /**
-     * @param FetchesPackingList $fetchesPackingList
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
-     */
-    public function __construct(FetchesPackingList $fetchesPackingList, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor)
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    public function __construct(
+        FetchesPackingList $fetchesPackingList,
+        FetchesSegmentConstant $fetchesSegmentConstant,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        CreatesTransaction $createsTransaction,
+        CreatesTransactionDetail $createsTransactionDetail,
+        CreatesDocument $createsDocument,
+        CreatesFiles $createsFile
+    )
     {
+
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
+        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
     }
 
     public function logic(Request $request) : JsonResponse
     {
-
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
-        $this->createInvoiceTransactionProcessor->execute($packing_list);
+        $packing_list = PackingList::where('reference', $packing_list->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
+
+        $billable_packing_list = $packing_list->packingLists()->first();
+
+        $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packing_list;
+
+        $cbm = round($billable_packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        }), 3);
+
+        $over_weight_cbm = round($billable_packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
+            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+        }), 3);
+
+        $order =  $packing_list->owner;
+        $companyModule = $order->companyModule;
+        $connection = $companyModule->connections()->first();
+        $address = $order->addresses()->first();
+
+        $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
+        $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::WAREHOUSE_RATE]);
+        $state_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::STATE_RATE]);
+        $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
+        $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
+
+        $noMinimumCharge = $connection->segments()->where('segments.id', 2)->first();
+
+        $minimum_cbm = 0.3;
+        $state_select = '';
+
+        $segment_price = $connection->segments()->whereHas('constants', function($query){
+            return $query->where('reference', SegmentConstants::CUSTOM_PRICE);
+        })->get()->map(function($segment){
+            return (float) $segment->constants()->first()->value[0];
+        })->sort()->first();
+        $segment_price = $segment_price ? $segment_price : 0;
+
+        $packing_list_drop_date = PackingList::where('reference', $packing_list->reference)->where('type', 1)->first()->transports->first()->drop_date->format('Y-m-d');
+        $base_price = $this->getConstantByKey($base_price_constant, $packing_list_drop_date);
+
+        $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
+        $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
+        $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
+
+        $stateId = $address->state_id;
+        $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId);
+
+        // get $state_rate
+        $postcode = $address->postcode;
+        $this->checkPostcodeExistInConstant($center_postcode_constant, $postcode) === true ? $state_select = 'center' : '' ;
+        $this->checkPostcodeExistInConstant($outstation_postcode_constant, $postcode) === true ? $state_select = 'outstation' : '' ;
+        $state_rate_constant = (array)$state_rate_constant;
+        $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
+
+        $container = $packing_list->containers()->first();
+        $containerPackingLists = collect();
+        $hasMinimumCharge = null;
+
+        foreach ($container->packingLists as $packingList){
+            if($packingList->owner instanceof CompanyModule) continue;
+            if($packingList->owner->companyModule->id !== $companyModule->id) continue;
+            $containerPackingLists->push($packingList);
+
+            if(!$hasMinimumCharge) {
+                $hasMinimumCharge = $packingList->transactions()->whereHas('transactionDetails', function ($query){
+                    $query->where('reference', 'MIN_CBM_CHARGES');
+                })->first();
+            }
+
+        }
+
+        $totalContainerCbm = $containerPackingLists->sum(function($packingList){
+            $billable_packing_list = $packingList->packingLists()->first();
+            $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packingList;
+            return $billable_packing_list->packages->sum(function($package) {
+                return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
+            });
+        });
+
+        $minimum_charge = $minimum_cbm - $totalContainerCbm;
+        $minimum_charge = ($minimum_charge < 0) ? 0 : $minimum_charge;
+        $minimum_charge = $noMinimumCharge ? 0 : $minimum_charge;
+
+        $minimum_charge = $noMinimumCharge ? 0 : round($minimum_charge, 3);
+
+
+        if($hasMinimumCharge) {
+            $minimum_charge = 0;
+        }
+
+        $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
+
+        $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
+
+        $object = new TransactionObject(
+            $billNumber,
+            TransactionType::SHIPPING_INVOICE,
+            1,
+            $order->company_module_id,
+            1,
+            PaymentMethodType::CASH,
+            $total_cbm,
+            $total_cbm,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+
+        /** @var Transaction $invoice_transaction */
+        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
+
+        $object_detail = new TransactionDetailObject(
+            'SHIPPING_FEE',
+            TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
+            $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);
+        }
+
+        if ($minimum_charge > 0) {
+            $object_detail = new TransactionDetailObject(
+                'MIN_CBM_CHARGES',
+                TransactionDetailType::MIN_CBM_CHARGES,
+                $minimum_charge,
+                $price_cbm
+            );
+
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }
 
         return $this->response([]);
     }
 
+    function getConstantByKey($segmentConstantObject, $key) {
+        if ($segmentConstantObject) {
+            $base_rate = (array) $segmentConstantObject->value;
+            $base_rate = array_key_exists($key, $base_rate) === true ? $base_rate[$key] : 0;
+
+            return $base_rate;
+        }
+    }
+
+    function checkPostcodeExistInConstant($segmentConstantObject, $postcode) {
+        $segmentConstantObject = $segmentConstantObject->value;
+        if (!empty($segmentConstantObject)) {
+            return in_array($postcode, $segmentConstantObject);
+        } else {
+            return false;
+        }
+    }
+
 }

app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Processors;
-
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Notifications\InvoiceIssuedEmail;
-use App\Models\Document;
-use App\Models\PackingList;
-use App\Models\Transaction;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Jobs\CreatePerfexCRMInvoice;
-
-class ApproveShippingInvoiceTransactionProcessor
-{
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-
-    /**
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-
-    /**
-     * @param PackingList $packingList
-     * @throws MalformedRequestException
-     */
-    public function execute(PackingList $packingList)
-    {
-
-        /** @var Transaction $invoice_transaction */
-        $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
-
-        $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
-
-        $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->createsFiles->execute($document, $document_object);
-        $user = $packingList->owner->companyModule->employees()->first();
-        if(app()->environment(['production'])) {
-            $user->notify(new InvoiceIssuedEmail($user, $packingList));
-        }
-
-        // update perfex crm
-        if(config('perfexcrm.is_enabled') == 'true'){
-            CreatePerfexCRMInvoice::dispatch($invoice_transaction);
-        }
-
-        return;
-    }
-
-}

app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php

@@ -1,247 +1,229 @@
 <?php
 
-
 namespace App\Classes\Modules\Transactions\Processors;
 
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-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\Bookings\Services\CalculatesBookingTransferredAmount;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+
 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\PackingListType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionDetailType;
-
-use App\Models\CompanyModule;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Booking;
 use App\Models\Document;
-use App\Models\PackingList;
-use App\Models\Transaction;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
+use App\Models\SegmentConstant;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateInvoiceTransactionProcessor
 {
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNumber;
+    /** @var ListsTransactions */
+    private $listsTransactions;
 
     /** @var CreatesTransaction */
     private $createsTransaction;
 
-    /** @var CreatesTransactionDetail */
-    private $createsTransactionDetail;
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CalculatesBookingPaidAmount */
+    private $calculatesBookingPaidAmount;
+
+    /** @var CalculatesBookingTransferredAmount */
+    private $calculatesBookingTransferredAmount;
+
+    /** @var FetchesServiceConfigurations */
+    private $fetchesServiceConfigurations;
+
+    /** @var CalculatesBookingCurrencyAverageRate */
+    private $calculatesBookingCurrencyAverageRate;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
+    /** @var UpdatesBookingStatus */
+    private $updatesBookingStatus;
 
     /**
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesSegmentConstant $fetchesSegmentConstant
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * CreateInvoiceTransactionProcessor constructor.
+     * @param ListsTransactions $listsTransactions
      * @param CreatesTransaction $createsTransaction
-     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CalculatesBookingPaidAmount $calculatesBookingPaidAmount
+     * @param CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount
+     * @param FetchesServiceConfigurations $fetchesServiceConfigurations
+     * @param CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFile
+     * @param UpdatesBookingStatus $updatesBookingStatus
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, FetchesSegmentConstant $fetchesSegmentConstant, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail)
+    public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount, FetchesServiceConfigurations $fetchesServiceConfigurations, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesBookingStatus $updatesBookingStatus)
     {
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->listsTransactions = $listsTransactions;
         $this->createsTransaction = $createsTransaction;
-        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->calculatesBookingPaidAmount = $calculatesBookingPaidAmount;
+        $this->calculatesBookingTransferredAmount = $calculatesBookingTransferredAmount;
+        $this->fetchesServiceConfigurations = $fetchesServiceConfigurations;
+        $this->calculatesBookingCurrencyAverageRate = $calculatesBookingCurrencyAverageRate;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsDocument = $createsDocument;
+        $this->createsFile = $createsFile;
+        $this->updatesBookingStatus = $updatesBookingStatus;
     }
 
+
     /**
-     * @throws MalformedRequestException
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(PackingList $packingList)
+    public function execute(Booking $booking) 
     {
-        $packing_list = PackingList::where('reference', $packingList->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
-
-        $billable_packing_list = $packing_list->packingLists()->first();
-
-        $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packing_list;
-
-        $cbm = round($billable_packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        }), 3);
-
-        $over_weight_cbm = round($billable_packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        }), 3);
-
-        $order =  $packing_list->owner;
-        $companyModule = $order->companyModule;
-        $connection = $companyModule->connections()->first();
-        $address = $order->addresses()->first();
-
-        $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
-        $warehouse_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::WAREHOUSE_RATE]);
-        $state_rate_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::STATE_RATE]);
-        $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
-        $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
-
-        $noMinimumCharge = $connection->segments()->where('segments.id', 2)->first();
-
-        $minimum_cbm = 0.3;
-        $state_select = '';
-
-        $segment_price = $connection->segments()->whereHas('constants', function($query){
-            return $query->where('reference', SegmentConstants::CUSTOM_PRICE);
-        })->get()->map(function($segment){
-            return (float) $segment->constants()->first()->value[0];
-        })->sort()->first();
-        $segment_price = $segment_price ? $segment_price : 0;
-
-        $arrivalTransport = PackingList::where('reference', $packing_list->reference)->where('type', 1)->first()->transports->first();
-        if(!$arrivalTransport) {
-            throw new MalformedRequestException('Arrival date is unknow can\'t generate invoice');
-        }
-        $packing_list_drop_date = $arrivalTransport->drop_date->format('Y-m-d');
-        $base_price = $this->getConstantByKey($base_price_constant, $packing_list_drop_date);
-
-        $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
-        $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
-        $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
-
-        $stateId = $address->state_id;
-        $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId);
-
-        // get $state_rate
-        $postcode = $address->postcode;
-        $this->checkPostcodeExistInConstant($center_postcode_constant, $postcode) === true ? $state_select = 'center' : '' ;
-        $this->checkPostcodeExistInConstant($outstation_postcode_constant, $postcode) === true ? $state_select = 'outstation' : '' ;
-        $state_rate_constant = (array)$state_rate_constant;
-        $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
-
-        $container = $packing_list->containers()->first();
-        $containerPackingLists = collect();
-        $hasMinimumCharge = null;
-
-        foreach ($container->packingLists as $packingList){
-            if($packingList->owner instanceof CompanyModule) continue;
-            if($packingList->owner->companyModule->id !== $companyModule->id) continue;
-            $containerPackingLists->push($packingList);
-
-            if(!$hasMinimumCharge) {
-                $hasMinimumCharge = $packingList->transactions()->whereHas('transactionDetails', function ($query){
-                    $query->where('reference', 'MIN_CBM_CHARGES');
-                })->first();
-            }
+        $payment_amount = $this->calculatesBookingTransferredAmount->execute($booking, $booking->fix_currency_id);
+        $booking_amount = $booking->fix_amount;
 
+        if ((float) $booking_amount !== (float) $payment_amount) {
+            return;
         }
 
-        $totalContainerCbm = $containerPackingLists->sum(function($packingList){
-            $billable_packing_list = $packingList->packingLists()->first();
-            $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packingList;
-            return $billable_packing_list->packages->sum(function($package) {
-                return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-            });
-        });
+        $po_order_transaction = $booking->transactions()
+            ->where('type', TransactionType::PURCHASE_ORDER)
+            ->complete()
+            ->first();
 
-        $minimum_charge = $minimum_cbm - $totalContainerCbm;
-        $minimum_charge = ($minimum_charge < 0) ? 0 : $minimum_charge;
-        $minimum_charge = $noMinimumCharge ? 0 : $minimum_charge;
+        $constants = SegmentConstant::where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->id', $booking->service->id)->first();
 
-        $minimum_charge = $noMinimumCharge ? 0 : round($minimum_charge, 3);
-
-
-        if($hasMinimumCharge) {
-            $minimum_charge = 0;
+        if($constants->detail->is_billable && !$po_order_transaction) {
+            return;
         }
 
-        $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
+        $transaction = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->first();
 
-        $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
+        $billNumber = $this->generatesTransactionBillNumber->execute('INV-');
 
-        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
+        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT);
 
-        $object = new TransactionObject(
+        $total_service_charge = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+            ->sum('service_charge');
+
+        $total_tax = $booking->transactions()
+            ->where('type', TransactionType::PAYMENT)
+            ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+            ->sum('tax');
+
+        $transaction_object = new TransactionObject(
             $billNumber,
-            TransactionType::SHIPPING_INVOICE,
-            1,
-            $order->company_module_id,
-            1,
-            PaymentMethodType::CASH,
-            $total_cbm,
-            $total_cbm,
-            1,
-            1,
-            0,
-            0,
-            0,
+            TransactionType::INVOICE,
+            $transaction->issuer,
+            $transaction->receiver,
+            $transaction->recipient_bank_account_id,
+            $transaction->payment_method,
+            $payment_amount,
+            $booking_amount,
+            $transaction->currency_id,
+            $transaction->original_currency_id,
+            $booking_currency_average_rate,
+            $total_tax,
+            $total_service_charge,
             null,
-            ApprovalStatus::PENDING_SUBMISSION
+            ApprovalStatus::APPROVED
+        );
+        $invoice_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
+
+        $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
+
+        $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.purchase_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::PURCHASE_ORDER,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'purchase_orders'
+        );
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
+
+        $deliver_order_pdf = LaravelMpdf::loadView('pages.pdfs.deliver_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::DELIVER_ORDER,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($deliver_order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'delivery_orders'
         );
 
-        /** @var Transaction $invoice_transaction */
-        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
 
-        $object_detail = new TransactionDetailObject(
-            'SHIPPING_FEE',
-            TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
-            $cbm,
-            $price_cbm
+
+        $invoice_pdf = LaravelMpdf::loadView('pages.pdfs.invoice', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($invoice_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'invoices'
         );
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
 
-        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        $billNumber = $this->generatesTransactionBillNumber->execute('SPDO-');
 
-        if ($over_weight_cbm > 0) {
-            $object_detail = new TransactionDetailObject(
-                'OVER_WEIGHT_CHARGES',
-                TransactionDetailType::OVER_WEIGHT_CHARGES,
-                $over_weight_cbm,
-                $price_cbm
-            );
+        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::BILL);
 
-            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-        }
+        $transaction_object = new TransactionObject(
+            $billNumber,
+            TransactionType::SUPPLIER_DELIVER,
+            $transaction->issuer,
+            $transaction->receiver,
+            $transaction->recipient_bank_account_id,
+            $transaction->payment_method,
+            $payment_amount,
+            $booking_amount,
+            $transaction->currency_id,
+            $transaction->original_currency_id,
+            $booking_currency_average_rate,
+            $total_tax,
+            $total_service_charge,
+            null,
+            ApprovalStatus::APPROVED
+        );
+        $supplier_deliver_order_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
 
-        if ($minimum_charge > 0) {
-            $object_detail = new TransactionDetailObject(
-                'MIN_CBM_CHARGES',
-                TransactionDetailType::MIN_CBM_CHARGES,
-                $minimum_charge,
-                $price_cbm
-            );
+        $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $supplier_deliver_order_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+        $document_object = new DocumentObject(
+            DocumentType::SUPPLIER_DELIVER_ORDER,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'supplier_delivery_orders'
+        );
+        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+        $this->createsFile->execute($document, $document_object);
 
-            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-        }
-
-        return;
+        $this->updatesBookingStatus->execute($booking, ApprovalStatus::COMPLETED);
     }
-
-    function getConstantByKey($segmentConstantObject, $key) {
-        if ($segmentConstantObject) {
-            $base_rate = (array) $segmentConstantObject->value;
-            $base_rate = array_key_exists($key, $base_rate) === true ? $base_rate[$key] : 0;
-
-            return $base_rate;
-        }
-    }
-
-    function checkPostcodeExistInConstant($segmentConstantObject, $postcode) {
-        $segmentConstantObject = $segmentConstantObject->value;
-        if (!empty($segmentConstantObject)) {
-            return in_array($postcode, $segmentConstantObject);
-        } else {
-            return false;
-        }
-    }
-
 }

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

@@ -4,27 +4,9 @@ namespace App\Classes\Modules\Transactions\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\Transaction;
-use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 
 class UpdatesTransactionStatus extends AbstractUpdateRecord
 {
-    /** @var TransactionToPerfexCRMProcessor */
-    private $transactionToPerfexCRMProcessor;
-
-    /** @var NewLeadTaskToPerfexCRMProcessor */
-    private $newLeadTaskToPerfexCRMProcessor;
-
-    /**
-     * UpdatesTransactionStatus constructor.
-     * @param TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor
-     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
-     */
-    public function __construct(TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor, NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
-    {
-        $this->transactionToPerfexCRMProcessor = $transactionToPerfexCRMProcessor;
-        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
-    }
 
     /**
      * @param Transaction $model
@@ -34,11 +16,7 @@ class UpdatesTransactionStatus extends AbstractUpdateRecord
      */
     public function execute(Transaction $model, int $status)
     {
-        if(config('perfexcrm.is_enabled') == 'true'){
-            $this->transactionToPerfexCRMProcessor->execute($model, $status);
-            // $this->newLeadTaskToPerfexCRMProcessor->execute();
-        }
         $model->status = $status;
         return $this->handler($model);
     }
-}
+}

app/Classes/ValueObjects/Constants/ApprovalStatus.php

@@ -18,14 +18,4 @@ final class ApprovalStatus {
 
     public const EXPIRED = 6;
 
-    public const APPROVAL_STATUS_ID = [
-        self::PENDING_SUBMISSION     => "Pending Submission",
-        self::PENDING_VERIFICATION   => "Pending Verification",
-        self::APPROVED               => "Approved",
-        self::COMPLETED              => "Completed",
-        self::REJECTED               => "Rejected",
-        self::SUSPENDED              => "Suspended",
-        self::EXPIRED                => "Expired",
-    ];  
-
 }

app/Classes/ValueObjects/Constants/PerfexCRMInvoiceStatus.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class PerfexCRMInvoiceStatus {
-
-    public const UNPAID = 1;
-
-    public const PAID = 2;
-
-    public const PARTIALLY_PAID = 3;
-
-    public const OVERDUE = 4;
-}

app/Classes/ValueObjects/Constants/PerfexCRMMilestones.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-class PerfexCRMMilestones
-{
-    public const MILESTONE_1 = 'MILESTONE 1 - Customer Paid';
-    public const MILESTONE_2 = 'MILESTONE 2 - Order Placed';
-    public const MILESTONE_3 = 'MILESTONE 3 - Purchase Order Approved';
-    public const MILESTONE_4 = 'MILESTONE 4';
-    public const MILESTONE_5 = 'MILESTONE 5';
-}

app/Classes/ValueObjects/Constants/PerfexCRMProjectStatus.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class PerfexCRMProjectStatus {
-
-    public const NOT_STARTED = 1;
-
-    public const IN_PROGRESS = 2;
-
-    public const ON_HOLD = 3;
-
-    public const FINISHED = 4;
-
-    public const CANCELLED = 5;
-}

app/Classes/ValueObjects/Constants/PerfexCRMTaskStatus.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class PerfexCRMTaskStatus {
-
-    public const NOT_STARTED = 1;
-
-    public const AWAITING_FEEDBACK = 2;
-
-    public const TESTING = 3;
-
-    public const IN_PROGRESS = 4;
-
-    public const COMPLETED = 5;
-
-}

app/Classes/ValueObjects/Constants/PerfexCRMTasks.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-class PerfexCRMTasks
-{
-    //IMPORTANT NOTE: TASK NAME MUST BE UNIQUE ACCORDING TO REL_TYPE
-    //e.g. rel_type: lead, project
-
-    public const TASK_1 = [
-        'name' => 'Customer Paid',
-        'description' => '',
-        'milestone' => 'MILESTONE 1 - Customer Paid',
-        'reference' => '',
-        'on_task_completion' => '',
-        'status' => PerfexCRMTaskStatus::COMPLETED
-    ];
-
-    public const TASK_POST_PAYMENT_1 = [
-        'name' => 'Map Bank Transaction Record',
-        'description' => '○ Purpose: To map a transaction to bank transaction in the bank statement<br>
-        ○ Initial Status: In Progress<br>
-        ○ Deadline: Same day<br>
-        ○ Responsible department: Accounts<br>
-        ○ Next step: Change the status of the Approve payment status to "In Progress" upon successful completion of the operation.<br>
-        ○ Additional details: ** Any specific requirements or notes for the operation.**<br>
-        ○ Dependencies: None<br>
-        ○ Outcomes: Bank transaction is mapped successfully, allowing the next steps in the process to be initiated.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_1',
-        'on_task_completion' => 'TASK_POST_PAYMENT_2',
-        'status' => PerfexCRMTaskStatus::IN_PROGRESS
-    ];
-    public const TASK_POST_PAYMENT_2 = [
-        'name' => 'Approve Payment',
-        'description' => '○ Purpose: To verify and approve the customer\'s payment on IZYIM<br>
-        ○ Initial Status: Not Started<br>
-        ○ Deadline:Same day<br>
-        ○ Responsible department: Accounts<br>
-        ○ Next step: Change the status of the Issue Shipping Autocount Invoice operation to "In Progress"<br>
-        ○ Additional details: When the payment method is FPX or Wallet this task is performed automatically by the system.<br>
-        ○ Dependencies: Map Transaction operation must be completed before this operation can begin.<br>
-        ○ Outcomes: The payment will be approved in IZYIM, which will release the customer’s goods for delivery.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_2',
-        'on_task_completion' => 'TASK_POST_PAYMENT_3',
-        'status' => ''
-    ];
-    public const TASK_POST_PAYMENT_3 = [
-        'name' => 'Issue Shipping Autocount Invoince',
-        'description' => '○ Purpose: To issue an invoice for the customer\'s payment in accounting software.<br>
-        ○ Initial Status: Not Started<br>
-        ○ Deadline: Next day<br>
-        ○ Responsible department: Accounts<br>
-        ○ Next step: Change the status of the Knockoff Invoice operation to "In Progress" upon successful completion.<br>
-        ○ Additional details: ** Any specific requirements or notes for the operation.**<br>
-        ○ Dependencies: Approve Payment operation must be completed before this operation can begin.<br>
-        ○ Outcomes: An invoice will be issued in accounting software for the customer\'s payment.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_3',
-        'on_task_completion' => 'TASK_POST_PAYMENT_4',
-        'status' => ''
-    ];
-    public const TASK_POST_PAYMENT_4 = [
-        'name' => 'Knockoff Invoice',
-        'description' => '○ Purpose: The purpose of this operation is to issue the official receipt and knockoff with invoice for the customer\'s payment.<br>
-        ○ Initial Status: Not Started<br>
-        ○ Deadline: Next day.<br>
-        ○ Responsible Department: Accounts<br>
-        ○ Next Step: None<br>
-        ○ Additional Details: ** Any specific requirements or notes for the operation.**<br>
-        ○ Dependencies: Issue Shipping Autocount Invoice operation must be completed before this operation can begin.<br>
-        ○ Outcomes: The customer’s payment is applied to the accounting software invoice and invoice is marked as paid.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_4',
-        'on_task_completion' => '',
-        'status' => ''
-    ];
-
-    public const TASK_LOADED_CONTAINER_1 = [
-        'name' => 'Generate Shipping Invoices',
-        'description' => '○ Purpose: -<br>
-        ○ Initial Status: In Progress<br>
-        ○ Deadline: Next day<br>
-        ○ Responsible department: Operation<br>
-        ○ Assignee: -<br>
-        ○ Next step: Approve Shipping Invoice change to in progress.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_LOADED_CONTAINER_1',
-        'on_task_completion' => 'TASK_LOADED_CONTAINER_2',
-        'status' => PerfexCRMTaskStatus::IN_PROGRESS
-    ];
-
-    public const TASK_LOADED_CONTAINER_2 = [
-        'name' => 'Approve Shipping Invoices',
-        'description' => '○ Purpose: -<br>
-        ○ Initial Status: Not Starteds<br>
-        ○ Deadline: Next day<br>
-        ○ Responsible department: Customer Services<br>
-        ○ Next step: -<br>',
-        'milestone' => '',
-        'reference' => 'TASK_LOADED_CONTAINER_2',
-        'on_task_completion' => '',
-        'status' => ''
-    ];
-
-
-    public const TASK_IDENTIFICATION_1 = [
-        'name' => 'Approve Identification Verification (Shipping)',
-        'description' => '○ Purpose: To ensure the customer submit information matches the information in their identification document.<br>
-        ○ Initial Status: In Progress<br>
-        ○ Deadline: Same Day<br>
-        ○ Responsible department: Operation<br>
-        ○ Next step: None<br>
-        ○ Additional details: ** Any specific requirements or notes for the operation.**<br>
-        ○ Dependencies: None<br>
-        ○ Outcomes: Customer account identification is verified<br>',
-        'milestone' => '',
-        'reference' => 'TASK_IDENTIFICATION_1',
-        'on_task_completion' => '',
-        'status' => PerfexCRMTaskStatus::IN_PROGRESS
-    ];
-}

app/Console/Commands/AutoGenerateInvoice.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Order;
-use Carbon\Carbon;
-use Exception;
-use Illuminate\Console\Command;
-
-class AutoGenerateInvoice extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'invoice:generate';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Auto generate invoice';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $packingLists = (App()->make(ListsPackingLists::class))->execute(['does_not_have_transaction_type' => 1, 'type' => 2]);
-
-        if (count($packingLists)) {
-            $this->info(Carbon::now() . ' : Auto generate invoice cron started.');
-            $start   = new Carbon();
-
-            foreach ($packingLists as $packingList) {
-                $order = $packingList->owner;
-                if (!($order instanceof Order)) {
-                    $this->info('Failed to generate invoice for reference' . $order->reference . '. It is not an instance of Order.');
-                    continue;
-                }
-
-                $companyModule = $order->companyModule;
-                $billingAddress = $companyModule->addresses()->where('type', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
-                $deliveryAddress = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-
-                $postCodes = \App\Models\SegmentConstant::whereIn('reference', ['CENTER_POSTCODE', 'OUTSTATION_POSTCODE'])->get()->pluck('value')->flatten();
-
-                if (!!$billingAddress && in_array($deliveryAddress->postcode, $postCodes->toArray())) {
-                    try {
-                        (App()->make(CreateInvoiceTransactionProcessor::class))->execute($packingList);
-                        $this->info('Invoice generated for reference ' . $order->reference . '.');
-                    } catch (Exception $exception) {
-                        $this->info('Failed to generate invoice for reference ' . $order->reference . '. Exception: ' . $exception->getMessage());
-                    }
-                }
-                $this->info('Failed to generate invoice for reference ' . $order->reference . '. Billing Address is not defined / Postcode area is not defined.');
-            }
-
-            $end = new Carbon();
-            $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-
-            $this->info(Carbon::now() . ' : Done generating invoice. ElapsedTime: ' . $elapsedTime . '.');
-        }
-    }
-}

app/Console/Commands/FixInvoice.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-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\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\CompanyConnection;
-use App\Models\Order;
-use Carbon\Carbon;
-use Exception;
-use Illuminate\Console\Command;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-
-class FixInvoice extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'invoice:fix {--marking=}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fix Invoice By Company Module Marking';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $connection = CompanyConnection::where('invitee_reference', $this->option('marking'))->first();
-        $company_module_id = $connection->invitee->id;
-
-        $orders = Order::where('company_module_id', $company_module_id)->get();
-
-        foreach ($orders as $order){
-            $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
-            foreach ($invoices as $invoice){
-    
-                dump($invoice->id);
-                
-                $invoice->documents()->delete();
-    
-                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
-    
-                $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 = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
-    
-                (App()->make(CreatesFiles::class))->execute($document, $document_object);
-            }
-        }
-    }
-}

app/Console/Commands/approveInvoice.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Exception;
-use Illuminate\Console\Command;
-
-class approveInvoice extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'approve:invoice';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::PENDING_SUBMISSION)->get();
-
-        foreach ($invoices as $invoice) {
-            $packingList = $invoice->owner;
-            $order = $packingList->owner;
-
-            try {
-                (App()->make(ApproveShippingInvoiceTransactionProcessor::class))->execute($packingList);
-                $this->info('Invoice Approved for reference ' . $order->reference . '.');
-            } catch (Exception $exception) {
-                $this->info('Failed to Approve invoice for reference ' . $order->reference . '. Exception: ' . $exception->getMessage());
-            }
-        }
-    }
-}

app/Console/Kernel.php

@@ -43,10 +43,7 @@ class Kernel extends ConsoleKernel
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/departure_email.log');
 
-        $schedule->command('invoice:generate')
-            ->hourly()
-            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/auto_generate_invoice.log');
+
     }
 
     /**

app/Http/Controllers/Addresses/CreateBillingAddressController.php

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

app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Exports;
 
 use App\Classes\Modules\Exports\Services\ExportsCompanyModuleSummary;
-use App\Classes\Modules\Exports\Services\ExportsOrderSummaryByMarking;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -28,13 +27,4 @@ class ExportCompanyModuleSummaryController
         ob_end_clean();
         return $response;
     }
-
-    public function exportOrderSummaryByMarking(Request $request) {
-        $exportsOrderSummaryByMarking = new ExportsOrderSummaryByMarking($request);
-        $customer_marking = $request->route('marking');
-        $exportsOrderSummaryByMarking->setParameters($customer_marking, $request->input('dateFrom'), $request->input('dateTo'));
-        $response = $exportsOrderSummaryByMarking->download($customer_marking . '_order_summary.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-        ob_end_clean();
-        return $response;
-    }
 }

config/perfexcrm.php

@@ -1,7 +0,0 @@
-<?php
-
-return [
-    'base_url' => env('PERFEXCRM_BASE_URL', 'http://192.168.1.100:8084'), //cief todo: Update crm api domain here
-    'api_key' => env('PERFEXCRM_API_KEY', ''),
-    'is_enabled' => env('PERFEXCRM_IS_ENABLED', 'true'),
-];

docker-setup/Dockerfile

@@ -1,28 +0,0 @@
-FROM php:7.4-fpm
-
-WORKDIR /var/www/html
-
-RUN docker-php-ext-install pdo pdo_mysql
-
-RUN apt-get update && apt-get install -y \
-        libfreetype6-dev \
-        libjpeg62-turbo-dev \
-        libpng-dev \
-        libzip-dev \
-        zip \
-        cron \
-        supervisor \
-        nano \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install -j$(nproc) gd \
-  	&& docker-php-ext-install zip \
-  	&& docker-php-ext-install bcmath
-
-COPY --from=composer:1.9.3 /usr/bin/composer /usr/bin/composer
-
-#NODEJS & NPM
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get -y install nodejs
-
-RUN chown -R www-data:www-data /var/www
-RUN chmod 755 /var/www

docker-setup/docker-compose.yml

@@ -1,54 +0,0 @@
-version: '3'
-
-networks:
-  shipping-portal-staging:
-
-services:
-  #################################################################
-  nginx:
-    image: nginx:stable-alpine
-    container_name: shipping-portal-ngnix
-    ports:
-      - "8081:80"
-    volumes:
-      - ../:/var/www/html
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-    depends_on:
-      - php
-      - mysql
-    networks:
-      - shipping-portal-staging
-  #################################################################
-  mysql:
-    image: mysql:5.7.29
-    container_name: shipping-portal-mysql
-    restart: unless-stopped
-    tty: true
-    ports:
-      - 3307:3306
-    environment:
-      MYSQL_ROOT_USER: root
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: shipping-portal-db
-      MYSQL_USER: master
-      MYSQL_PASSWORD: cDe7gcrRBWetaAP
-    volumes:
-      - mysql-data:/var/lib/mysql
-    networks:
-      - shipping-portal-staging
-  #################################################################
-  php:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: shipping-portal-php
-    volumes:
-      - ../:/var/www/html
-    ports:
-      - "9001:9000"
-    networks:
-      - shipping-portal-staging
-  #################################################################
-
-volumes:
-  mysql-data:

docker-setup/nginx/default.conf

@@ -1,27 +0,0 @@
-server {
-    listen 80;
-    index index.php index.html;
-    server_name localhost;
-    error_log  /var/log/nginx/error.log;
-    access_log /var/log/nginx/access.log;
-    root /var/www/html/public;
-
-    server_name localhost;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location ~ \.php$ {
-        try_files $uri =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass php:9000;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-        fastcgi_intercept_errors on;
-        fastcgi_keep_conn on;
-        fastcgi_param PHP_VALUE "auto_prepend_file= \n allow_url_include=Off \n  output_buffering=Off \n output_buffering=4096";
-    }
-}

resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue

@@ -208,12 +208,12 @@
                                                 <input class="form-control" v-model="parameters.email">
                                             </validation-wrapper-component>
                                         </div>
-                                        <!-- <div class="col-4 p-l-5">
+                                        <div class="col-4 p-l-5">
                                             <validation-wrapper-component :validator="$v.parameters.wechat_id">
                                                 <label>WeChat ID</label>
                                                 <input class="form-control" v-model="parameters.wechat_id">
                                             </validation-wrapper-component>
-                                        </div> -->
+                                        </div>
                                     </div>
 
                                     <div class="row m-b-15">

resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue

@@ -1,123 +0,0 @@
-<style>
-    @media screen and (min-width: 570px) {
-        .extend-modal-body{
-            width: 700px;
-            max-width: calc(100% - 20px);
-        }
-    }
-</style>
-<template>
-    <div class="row m-b-20 bg-white text-black padding-15 rounded extend-modal-body">
-        <div class="col">
-            <div class="row m-b-20 text-info">
-                <div class="col text-center">
-                    <h3>Please select the <b>Billing Address</b></h3>
-                </div>
-            </div>
-            <div class="row b-rounded justify-content-center m-b-15" @click="updateBillingAddressFilters">
-                <div class="col col-md-10 bg-master-lightest margin-auto padding-15">
-                    <div class="row justify-content-center">
-                        <div class="col pointer d-flex justtify-content-center align-items-center">
-                            <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !useDeliveryAddress, 'fa-check-square': useDeliveryAddress, 'text-primary':useDeliveryAddress}" ></i>
-                            <p class="m-b-0">Use Delivery Address</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row justify-content-center m-b-15" v-if="error">
-                <div class="col-10">
-                    <small class="text-danger">{{error}}</small>
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col col-md-10">
-                    <list-component :key="currentKey" style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="billingAddressFilters">
-                        <template slot="list" slot-scope="{data}">
-                            <select-address-component :data="data" :value="parameters.billing_address_id" v-model="parameters.billing_address_id"></select-address-component>
-                        </template>
-                    </list-component>
-                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
-                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.billing_address_id, 'b-grey': parameters.billing_address_id}" @click="parameters.billing_address_id = null">
-                            <div class="row align-items-center">
-                                <div class="col-auto p-r-0">
-                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.billing_address_id, 'fa-check-circle': !parameters.billing_address_id, 'text-primary': !parameters.billing_address_id}"></i>
-                                </div>
-                                <div class="col-auto semi-bold">New Address</div>
-                            </div>
-                            <div class="row" v-show="!parameters.billing_address_id">
-                                <div class="col">
-                                    <address-form-component :type="1" :id="company_module_id" section="addressList" @input="parameters.billing_address_id = $event"></address-form-component>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col"></div>
-                <div class="col-auto">
-                    <button type="button" class="btn btn-lg rounded btn-primary" v-if="parameters.billing_address_id" @click="submitForm()">Confirm</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        props: {
-            section: {
-                type: String,
-                default: 'addressList'
-            },
-            company_module_id: {
-                type: Number,
-                default: 1
-            },
-        },
-        data(){
-            return {
-                useDeliveryAddress: false,
-                isLoading: false,
-                error: '',
-                billingAddressFilters: {
-                    per_page: 10, 
-                    HasMorphCompanyModule: this.company_module_id,
-                    type: 1
-                },
-                parameters : {
-                    company_module_id: this.company_module_id,
-                    billing_address_id: '',
-                },
-                item:{
-                    id:null
-                },
-                currentKey: 1,
-            }
-        },
-        methods: {
-            updateBillingAddressFilters(){
-                if(this.useDeliveryAddress) {
-                    // if use delivery address
-                    this.billingAddressFilters = {
-                        per_page: 10, 
-                        HasMorphCompanyModule: this.company_module_id,
-                        type: 1
-                    }
-                    this.parameters.billing_address_id = '';
-                } else {
-                    this.billingAddressFilters = {per_page: 10, HasMorphCompanyModule: this.company_module_id,};
-                }
-                this.useDeliveryAddress = !this.useDeliveryAddress;
-                this.currentKey++;
-            },
-            submitForm(){
-                this.submit(this.route('api.address.billingAddress.create'), 'post', this.section, true, true)
-            },
-            successHandler(response){
-                this.closeModal();
-                location.reload();
-            },
-        }
-    }
-</script>

resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue

@@ -58,12 +58,6 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-auto">
-                                                                    <div class="btn-lg btn-primary b-a b-white pointer fs-14 position-relative bg-transparent requestModal" data-type="billingAddressComponent" style="z-index: 2;">Change Billing Address</div>
-                                                                </div>
-                                                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingAddressComponent">
-                                                                    <billing-address-section-component :company_module_id="company.company_module.id" :section="section"></billing-address-section-component>
-                                                                </modal-component>
                                                             </div>
                                                         </div>
                                                     </div>

resources/assets/vue/components/containers/elements/ContainerComponent.vue

@@ -20,15 +20,15 @@
                         </div>
                         <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">ETD</p>
-                            <p class="no-margin">{{item.transport ? (item.transport.current_schedule ? item.transport.current_schedule.etd : 'n/a') : 'n/a'}}</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}</p>
                         </div>
                         <div class="col-auto">
                             <p class="no-margin fs-10 all-caps">ETA</p>
-                            <p class="no-margin">{{item.transport ? (item.transport.current_schedule ? item.transport.current_schedule.eta : 'n/a') : 'n/a'}}</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
                         </div>
                         <div class="col">
                             <div class="row hide" v-if="item.transport">
-                                <div class="col" v-if="item.transport.current_schedule">
+                                <div class="col">
                                     <p class="no-margin fs-10 all-caps">Days Ago</p>
                                     <p class="no-margin" :class="[{'text-success': item.transport.current_schedule.billing_days_left.value === '+'}, {'text-danger': item.transport.current_schedule.billing_days_left.value === '-'}]">
                                         {{item.transport.current_schedule.billing_days_left.value}}

resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue

@@ -53,7 +53,7 @@
             parameters: {
                 name: { 
                     required,
-                    // minLength: minLength(8)
+                    minLength: minLength(8)
                 },
                 debtor: { 
                 },

resources/assets/vue/components/orders/forms/OrderFormComponent.vue

@@ -51,9 +51,11 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row text-center justify-content-center d-none">
+                            <div class="row text-center justify-content-center">
                                 <div class="col-8">
-                                    <!-- set warning text here -->
+                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 3">疫情因管控松动飙升，其中几位仓库人员也不幸感染，整个操作可能会受到影响，我们会尽快跟进并恢复。<br>The pandemic spread due to the loosening of movement controls. Some warehouse employees were unfortunately infected and the entire operation may be disrupted. We will do our best to follow up and revert as soon as possible.</p>
+                                    <p class="m-b-0 text-danger m-t-15" v-if="false">由于义乌船期不稳定，建议发广州仓库。<br>Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.</p>
+                                    <p class="m-b-0 text-danger m-t-15" v-if="parameters.warehouse_id === 4">由于义乌船期不稳定，建议发广州仓库。<br>Due to unexpected shipping delays for Yiwu warehouse, you may select an alternative warehouse.</p>
                                 </div>
                             </div>
                         </div>

resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue

@@ -120,7 +120,7 @@
                                             <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
                                                 <div class="row">
                                                     <div class="col bg-white">
-                                                        <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
+                                                        <address-form-component :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
                                                     </div>
                                                 </div>
                                             </modal-component>

resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingWithSearchComponent.vue

@@ -1,84 +0,0 @@
-<template>
-    <div class="row m-t-20" @keyup.enter="search">
-        <div class="col">
-            <div class="row">
-                <div class="col-12 col-md">
-                    <div class="row m-b-15">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col p-r-0">
-                                    <div class="form-group no-margin form-group-default b-rad-none">
-                                        <label class="text-primary">Order Number Like</label>
-                                        <input type="text" class="form-control" v-model="marking" />
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-auto p-l-0 p-r-0">
-                            <div class="btn btn-primary b-rad-none" @click="search">
-                                <i class="fa fa-search lh-40"></i>
-                            </div>
-                        </div>
-                        <div class="col-auto p-l-0">
-                            <div class="btn btn-secondary b-rad-none" @click="reset">
-                                <i class="fa fa-remove lh-40"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-md">
-                    <div class="row" v-if="with_export">
-                        <div class="col">
-                            <download-billing-with-dates-component :section="section"></download-billing-with-dates-component>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-component>
-        </div>
-    </div>
-</template>
-<script>
-    export default {
-        props: {
-            invoice_status: {
-                type: String,
-                required: true
-            },
-            options: {
-                default () {
-                    return {}
-                }
-            },
-            section:{
-                type: String,
-                required: true
-            },
-            with_export:{
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                marking: '',
-                currentKey: 1,
-            }
-        },
-        methods: {
-            search() {
-                this.options['order_marking_in'] = this.marking;
-                this.currentKey+=1;
-            },
-            reset() {
-                this.marking = '';
-                delete(this.options['order_marking_in']);
-                this.currentKey+=1;
-            },
-        },
-    }
-</script>

resources/assets/vue/components/paymentsBilling/forms/BillingAddressFormComponent.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="row bg-white padding-25">
+        <div class="col">
+            <div class="row m-b-20 text-info">
+                <div class="col text-center">
+                    <h3>Please select the address where you want to receive this order</h3>
+                </div>
+            </div>
+            <div class="row justify-content-center m-b-15" v-if="error">
+                <div class="col-10">
+                    <small class="text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col col-md-10">
+                    <list-component style="min-height: 50px;" class="m-b-20" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 5, HasMorphCompanyModule: data.order.company_module.id}">
+                        <template slot="list" slot-scope="{data}">
+                            <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
+                        </template>
+                    </list-component>
+                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.address_id, 'b-grey': parameters.address_id}" @click="parameters.address_id = null">
+                            <div class="row align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.address_id, 'fa-check-circle': !parameters.address_id, 'text-primary': !parameters.address_id}"></i>
+                                </div>
+                                <div class="col-auto semi-bold">New Address</div>
+                            </div>
+                            <div class="row" v-show="!parameters.address_id">
+                                <div class="col">
+                                    <address-form-component :id="data.order.company_module.id" section="addressList" @input="parameters.address_id = $event"></address-form-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row m-t-15 justify-content-center">
+                <div class="col-6 col-md-4 p-r-5">
+                    <div class="btn btn-default w-100 btn-lg b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col-6 col-md-4 p-l-5">
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.update.postcode', 1), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        data() {
+            return {
+                error: '',
+                parameters : {
+                    warehouse_id: '',
+                    address_id: '',
+                }
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>

resources/assets/vue/components/paymentsBilling/forms/DownloadBillingWithDatesComponent.vue

@@ -1,24 +1,28 @@
 <template>
-    <div class="row m-b-20" @keyup.enter="downloadReport()">
+    <div class="row m-b-20">
         <div class="col">
-            <div class="row m-l-0 m-r-0">
-                <div class="col p-l-0 p-r-0">
-                    <validation-wrapper-component :validator="$v.parameters.startDate">
-                        <label class="all-caps">Start Date</label>
-                        <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
-                    </validation-wrapper-component>
-                </div>
-                <div class="col p-l-0 p-r-0">
-                    <validation-wrapper-component :validator="$v.parameters.endDate">
-                        <label class="all-caps">End Date</label>
-                        <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
-                    </validation-wrapper-component>
-                </div>
-                <div class="col-auto p-l-0 p-r-0">
-                    <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="downloadReport()">
-                        <span>
-                            Export
-                        </span>
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0">
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.startDate">
+                                <label class="all-caps">Start Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.endDate">
+                                <label class="all-caps">End Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md-auto p-l-3 p-r-3 p-md-0">
+                            <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="downloadReport()">
+                                <span>
+                                    Export
+                                </span>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -60,11 +64,8 @@ export default {
             var apiRoute = '';
             if(!this.validate()){ return; }
             switch(this.section) {
-                case 'pendingPaymentSection':
-                    apiRoute = route('paymentTransactions.export', 'pendingPaymentSection');
-                    break;
-                case 'paidInvoiceSection':
-                    apiRoute = route('paymentTransactions.export', 'paidInvoiceSection');
+                case 'paymentsReportSection':
+                    apiRoute = route('paymentTransactions.export');
                     break;
                 case 'walletsReportSection':
                     apiRoute = route('walletTransactions.export');

resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue

@@ -102,23 +102,44 @@
                 <div class="col bg-master-lightest p-1 p-sm-4">
                     <div class="row tabsContainer tabContent" tab-name="pendingInvoice">
                         <div class="col">
-                            <admin-payments-billing-with-search-component :options="{does_not_have_transaction_type: 1, type: 2, per_page: 5}" section="pendingInvoiceSection" invoice_status="Pending Invoice"></admin-payments-billing-with-search-component>
+                            <list-component section="pendingInvoiceSection" :endpoint="route('api.packing_list.list')" :options="{does_not_have_transaction_type: 1, type: 2}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Pending Invoice" section="pendingInvoiceSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                     <div class="row tabsContainer tabContent hide" tab-name="pendingApproval">
                         <div class="col">
-                            <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [0, 1], per_page: 5}" section="pendingApprovalSection" invoice_status="Pending Approval"></admin-payments-billing-with-search-component>
+                            <list-component section="pendingApprovalSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [0, 1]}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Pending Approval" section="pendingApprovalSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                     <div class="row tabsContainer tabContent hide" tab-name="pendingPayment">
                         <div class="col">
                             <payment-filter-component :endpoint="route('api.packing_list.list')" :data="data"></payment-filter-component>
-                            <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [2], packing_list_ordered_by_invoice_date: true, per_page: 5}" section="pendingPaymentSection" invoice_status="Pending Payment" :with_export="true"></admin-payments-billing-with-search-component>
+                            <list-component section="pendingPaymentSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [2], packing_list_ordered_by_invoice_date: true}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Pending Payment" section="pendingPaymentSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                     <div class="row tabsContainer tabContent hide" tab-name="paidInvoice">
                         <div class="col">
-                            <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [3], per_page: 5}" section="paidInvoiceSection" invoice_status="Paid Invoice" :with_export="true"></admin-payments-billing-with-search-component>
+                            <div class="row">
+                                <div class="col-12 col-md-6 no-padding">
+                                    <download-billing-with-dates-component section="paymentsReportSection" ></download-billing-with-dates-component>
+                                </div>
+                            </div>
+                            <list-component section="paidInvoiceSection" :endpoint="route('api.packing_list.list')" :options="{has_invoice_status_in: [3]}">
+                                <template slot="list" slot-scope="{data}">
+                                    <admin-payments-billing-component :data="data" invoice_status="Paid Invoice" section="paidInvoiceSection" ></admin-payments-billing-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
                 </div>

resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js

@@ -17,9 +17,9 @@ export default {
                 required: requiredIf(function () { return this.step === 2 }),
                 numeric
             },
-            // wechat_id: {
-            //     required: requiredIf(function () { return this.step === 2 }),
-            // },
+            wechat_id: {
+                required: requiredIf(function () { return this.step === 2 }),
+            },
             password: {
                 required: requiredIf(function () { return this.step === 2 }),
             },

resources/views/pages/admin/dashboard.blade.php

@@ -51,7 +51,7 @@
                                 <h6>Unclaimed Packing Lists</h6>
                             </div>
                         </div>
-                        <list-component section="unclaimedPackingListSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2307, owner_id: 1}">
+                        <list-component section="unclaimedPackingListSection" :endpoint="route('api.packing_list.list')" :options="{claimant_id: 2037, owner_id: 1}">
                             <template slot="list" slot-scope="{data}">
                                 <unclaimed-packinglist-component :data="data"></unclaimed-packinglist-component>
                             </template>
@@ -62,4 +62,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

routes/address.php

@@ -14,8 +14,6 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
     Route::get('state/list', 'ListStatesController@list')->name('state.list');
 
     Route::post('/create', 'CreateAddressController@create')->name('create');
-    
-    Route::post('billingAddress/create', 'CreateBillingAddressController@create')->name('billingAddress.create');
 
     Route::put('/update/{id}', 'UpdateAddressController@update')->name('update');
 

routes/web.php

@@ -8,35 +8,18 @@ use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 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\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
 use App\Models\Document;
-use App\Models\Order;
 use App\Models\PackingList;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
 use App\Models\Transaction;
@@ -189,10 +172,10 @@ Route::get('/customer/{marking}/payment-and-billing', function ($marking) {
     return view('pages.customers.paymentsBilling', ['company_module_id' => $company_module_id]);
 })->name('customer.payment-and-billing');
 
-Route::get('/orders/refresh', function(Request $request){
-    $packingLists = PackingList::where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
+Route::get('/orders/refresh', function(\Illuminate\Http\Request $request){
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->has('containers')->get();
     dd($packingLists);
-    $packingLists->each(function (PackingList $packingList) {
+    $packingLists->each(function (\App\Models\PackingList $packingList) {
         $packingList->containers()->detach();
     });
     FetchWarehouseReceiveListFromVTPortalJob::withChain([
@@ -206,7 +189,7 @@ Route::get('/orders/refresh', function(Request $request){
 
 Route::get('/containers/refresh', function(){
 
-    dd((App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute());
+    dd((App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute());
 //    FetchLoadedContainersFromVTPortalJob::dispatch();
 //    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
 
@@ -237,8 +220,8 @@ Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
 });
 
 Route::get('/yiwu', function () {
-    $orders = Order::whereHas('OrderRoles', function($query){
-        return $query->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 2358);
+    $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
+        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 2358);
     })->get();
 
     foreach ($orders as $order){
@@ -248,10 +231,10 @@ Route::get('/yiwu', function () {
 });
 
 Route::get('/guangzhou', function () {
-    $orders = Order::whereHas('OrderRoles', function($query){
-        return $query->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 3);
+    $orders = \App\Models\Order::whereHas('OrderRoles', function($query){
+        return $query->where('role_id', \App\Classes\ValueObjects\Constants\OrderRoleTypes::ORIGIN_WAREHOUSE)->where('company_module_id', 3);
     })->whereHas('addresses', function($query){
-        return $query->where('status', ApprovalStatus::APPROVED)->whereIn('state_id', [5, 13, 14]);
+        return $query->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->whereIn('state_id', [5, 13, 14]);
     })->get();
 
     foreach ($orders as $order){
@@ -261,7 +244,7 @@ Route::get('/guangzhou', function () {
 });
 
 Route::get('/debug', function (){
-    $orders = Order::all();
+    $orders = \App\Models\Order::all();
 
     $issues = [];
     foreach ($orders as $order){
@@ -279,39 +262,18 @@ Route::get('/debug', function (){
     dd($issues);
 });
 
-Route::group(['prefix' => 'yd', 'as' => 'yd.'], function () {
-    Route::get('/packingLists', function (Request $request){
-        $start = $request->input('start_date') ? Carbon::parse($request->input('start_date')): null;
-        $end = $request->input('end_date') ? Carbon::parse($request->input('end_date')): null;
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
-    });
-
-    Route::get('/containers', function (){
-        (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-    });
-
-    Route::get('/deliveries', function (){
-        (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-    });
-
-});
-Route::get('/yd', function (Request $request){
-//    $start = $request->input('start_date') ? Carbon::parse($request->input('start_date')): null;
-//    $end = $request->input('end_date') ? Carbon::parse($request->input('end_date')): null;
-//    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute($start, $end);
-//    (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
-//    (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor::class))->execute();
-//    (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-//    (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-//    (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
+Route::get('/yd', function (\Illuminate\Http\Request $request){
+    $start = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date')): null;
+    $end = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date')): null;
+    (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute($start, $end);
+    (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
 })->name('yd.refresh');
 
 Route::get('/container/{reference}/refresh/', function (string $reference){
     $container = Container::where('reference', $reference)->first();
     $supplier = in_array($container->owner_id, [3, 4]) ? 'VT' : 'YD';
 
-    $arrivalDates = PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
+    $arrivalDates = \App\Models\PackingList::whereIn('reference', $container->packingLists->pluck('reference'))->where('type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->get()->map(function($packingList){
         return $packingList->transports()->first()->drop_date;
     })->sortBy(function($date){
         return $date;
@@ -321,7 +283,7 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
     $endDate = $arrivalDates->last()->addDay()->format('d-m-Y');
 
     if($supplier === 'VT'){
-        return (App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute(Carbon::parse($endDate), Carbon::parse($endDate)->addDays(5));
+        return (App()->make(\App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor::class))->execute(\Carbon\Carbon::parse($endDate), \Carbon\Carbon::parse($endDate)->addDays(5));
     }
 
     if($supplier === 'YD'){
@@ -331,10 +293,10 @@ Route::get('/container/{reference}/refresh/', function (string $reference){
 })->name('container.refresh');
 
 Route::get('/min_cbm', function (){
-    $companies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orders', function ($query){
+    $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orders', function ($query){
         return $query->whereHas('packingLists')->whereDoesntHave('packingLists', function($query){
             return $query->whereHas('packages', function($query){
-                return $query->selectRaw('sum((width/100) * (height/100) * (length/100) * quantity) as cbm')->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', '!=', 5)->having('cbm', '>', 0.3);
+                return $query->selectRaw('sum((width/100) * (height/100) * (length/100) * quantity) as cbm')->where('type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->where('status', '!=', 5)->having('cbm', '>', 0.3);
             });
         });
     })->limit(1)->get();
@@ -373,17 +335,12 @@ Route::get('/settings', function () {
 })->name('settings');
 
 Route::get('/customer/{company_module_id}/summary', 'Exports\ExportCompanyModuleSummaryController@export')->name('customer.summary.export');
-Route::get('/export-customer-order/{marking}', 'Exports\ExportCompanyModuleSummaryController@exportorderSummaryByMarking')->name('customer.orderSummary.export');
 
 Route::get('/customer/summary/monthly', function () {
-    // $containers = Container::whereMonth('loading_date', '>=', ((float)Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)Carbon::now()->format('Y'))->get();
-    $containers = Container::whereMonth('loading_date', '>=', 9)->whereYear('loading_date', 2022)->get();
-    $marking = '769SMC';
-    $connection = CompanyConnection::where('invitee_reference', $marking)->first();
-    $companyModuleId = $connection->invitee->id;
+    $containers = Container::whereMonth('loading_date', '>=', ((float)\Carbon\Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)\Carbon\Carbon::now()->format('Y'))->get();
     foreach ($containers as $container){
-        $packingLists = $container->packingLists()->get()->filter(function ($packingList) use ($companyModuleId){
-            return $packingList->owner->company_module_id === $companyModuleId;
+        $packingLists = $container->packingLists()->get()->filter(function ($packingList) {
+            return $packingList->owner->company_module_id === 248;
         });
 
         if (!count($packingLists)) continue;
@@ -408,7 +365,7 @@ Route::get('/customer/summary/monthly', function () {
             foreach ($packages as $package){
                 echo '<tr>
                         <td>'.$container->loading_date->format('d-m-Y').'</td>
-                        <td>MS/CIEF/769SMC/'.$packingList->owner->owner->reference.'</td>
+                        <td>MS/CIEF/769SMC/'.$packingList->owner->reference.'</td>
                         <td>'.$container->reference.'</td>
                         <td>'.$package->description.'</td>
                         <td>'.$package->quantity.'</td>
@@ -427,19 +384,19 @@ Route::get('/customer/summary/monthly', function () {
 });
 
 Route::get('/customers/active/{active_start}/{active_end}/{inactive_start?}/{inactive_end?}/{with_cbm?}', function ($active_start, $active_end, $inactive_start=null, $inactive_end=null, $with_cbm = false) {
-    $activeCompanies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
-        return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
-            return $query->where('drop_date', '>=', Carbon::parse($inactive_start))->where('drop_date', '<=', Carbon::parse($inactive_end)->addDay());
+    $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', BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
-        return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
-            return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
+    $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();
 
-    echo '<h4>List of customers active between <span style="color: green; font-weight: bold">'. Carbon::parse($active_start)->format('d/m/Y'). ' - '. Carbon::parse($active_end)->format('d/m/Y').'</span> & inactive between <span style="color: red; font-weight: bold">'. Carbon::parse($inactive_start)->format('d/m/Y'). ' - '. Carbon::parse($inactive_end)->format('d/m/Y').'</span></h4>';
+    echo '<h4>List of customers active between <span style="color: green; font-weight: bold">'.\Carbon\Carbon::parse($active_start)->format('d/m/Y'). ' - '.\Carbon\Carbon::parse($active_end)->format('d/m/Y').'</span> & inactive between <span style="color: red; font-weight: bold">'.\Carbon\Carbon::parse($inactive_start)->format('d/m/Y'). ' - '.\Carbon\Carbon::parse($inactive_end)->format('d/m/Y').'</span></h4>';
     echo '<table>
           <tr>
             <th>#</th>
@@ -453,7 +410,7 @@ Route::get('/customers/active/{active_start}/{active_end}/{inactive_start?}/{ina
         $packingList = collect();
         $totalCbm = 0;
         if($with_cbm){
-            $packingList = $company->orderPackingLists()->where('packing_lists.type', PackingListType::SHIPPING_PACKING_LIST)->get();
+            $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){
@@ -488,12 +445,12 @@ Route::get('billplz/bills/{bill_no}', function($bill_no){
  })->name('billplz.bill');
 
 Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor')->name('newDebtor.export');
-Route::get('/export/payment-transactions/{section}/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions')->name('paymentTransactions.export');
+Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions')->name('paymentTransactions.export');
 
 Route::get('/delayed_container/customers', function(){
     $containers = Container::whereHas('transports', function($query){
         return $query->whereHas('Schedules', function($query){
-            return $query->where('etd', '>', Carbon::parse('15-10-2022'));
+            return $query->where('etd', '>', \Carbon\Carbon::parse('15-10-2022'));
         });
     })->get();
 
@@ -515,7 +472,7 @@ Route::get('/delayed_container/customers', function(){
 
 
 Route::get('/container/billing/{month}/{year}', function($month, $year){
-    $containers = Container::whereDate('loading_date', '>=', Carbon::parse('01-'.$month.'-'.$year))->whereDate('loading_date', '<', Carbon::parse('01-'.$month.'-'.$year)->addMonth())->get();
+    $containers = Container::whereDate('loading_date', '>=', \Carbon\Carbon::parse('01-'.$month.'-'.$year))->whereDate('loading_date', '<', \Carbon\Carbon::parse('01-'.$month.'-'.$year)->addMonth())->get();
 
     $totalBillable = 0;
     $billed = 0;
@@ -548,7 +505,7 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
 
         foreach ($packingLists as $packingList) {
             $invoice = $packingList->transactions()
-                ->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->where('type', \App\Classes\ValueObjects\Constants\TransactionType::SHIPPING_INVOICE)->whereIn('status', [\App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED, \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED])
                 ->first();
 
 
@@ -560,7 +517,7 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
             }
 
             $order = $packingList->owner;
-            $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+            $address = $order->addresses()->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->first();
             $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
 
             $cbm = round($packingList->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
@@ -574,14 +531,14 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
 
             if($warehouseId === 2358){
                 $price += $yiwuCost;
-                if($packing_list_drop_date >= Carbon::parse('19-9-2022')){
+                if($packing_list_drop_date >= \Carbon\Carbon::parse('19-9-2022')){
                     $price += $yiwuDiscount;
                 }
             } else {
                 if($cbm >= 2 && in_array($address->state_id, [4, 15])){
                     $price += $bigParcelDiscount;
                 }
-                if($packing_list_drop_date >= Carbon::parse('19-9-2022')){
+                if($packing_list_drop_date >= \Carbon\Carbon::parse('19-9-2022')){
                     $price += $discount;
                 }
             }
@@ -607,7 +564,7 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
             }
 
             $payments = $invoice->transactions()
-                ->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->whereIn('status', [\App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED, \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED])
                 ->get();
 
             $billed += 1;
@@ -640,14 +597,14 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){
 });
 
 Route::get('/yd/fix', function(){
-    $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED)->where('claimant_id', 2307)->get();
+    $packingLists = \App\Models\PackingList::where('type', \App\Classes\ValueObjects\Constants\PackingListType::SHIPPING_PACKING_LIST)->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('claimant_id', 2307)->get();
     $i = 0;
     echo count($packingLists).'<br><br>';
     foreach ($packingLists as $packingList){
         try {
             (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList);
             echo 'success'.'<br>';
-        } catch (Exception $exception){
+        } catch (\Exception $exception){
             echo '<span style="color:red;">'.$packingList->reference.'</span>';
         }
 
@@ -655,7 +612,7 @@ Route::get('/yd/fix', function(){
 });
 
 Route::get('/billplz/fix', function(){
-    $payments = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->get();
+    $payments = \App\Models\Transaction::where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->where('payment_method',\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_GATEWAY)->get();
     echo '<h3>fixed orders</h3>';
     foreach ($payments as $payment){
         $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$payment->payment_reference);
@@ -670,19 +627,19 @@ Route::get('/billplz/fix', function(){
             $order  = $packingList->owner;
 
             $orderNumber = $order->reference;
-            if(!$data['paid'] && $payment->status === ApprovalStatus::APPROVED) {
+            if(!$data['paid'] && $payment->status === \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED) {
                 echo '<br><span style="color: red">Fraude: <a href="'.route('order.show', $orderNumber).'" target="_blank">'.$orderNumber.'</a></span><br>';
                 continue;
             }
 
             if($data['paid']){
-                if($payment->status !== ApprovalStatus::APPROVED){
+                if($payment->status !== \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED){
                     echo '<a href="'.route('order.show', $orderNumber).'" target="_blank">'.$orderNumber.'</a><br>';
                 }
-                $payment->status = ApprovalStatus::APPROVED;
+                $payment->status = \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED;
                 $payment->save();
 
-                $invoice->status = ApprovalStatus::COMPLETED;
+                $invoice->status = \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED;
                 $invoice->save();
 
                 $packingList = $payment->owner->owner;
@@ -690,7 +647,7 @@ Route::get('/billplz/fix', function(){
                     try {
                         (App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList);
                         (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList);
-                    } catch (Exception $exception){
+                    } catch (\Exception $exception){
                         echo '<br><span style="color: red">Malformed Address: <a href="'.route('order.show', $orderNumber).'" target="_blank">'.$orderNumber.'</a></span><br>';
                     }
                 }
@@ -703,12 +660,12 @@ Route::get('/billplz/fix', function(){
 });
 
 
-Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
+Route::get('/invoices/fix', function(){
 
-    $orders = Order::whereIn('company_module_id', json_decode($company_module_id))->get();
+    $orders = \App\Models\Order::whereIn('company_module_id', [294, 2703])->get();
 
     foreach ($orders as $order){
-        $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
+        $invoices = $order->transactions()->where('transactions.type', \App\Classes\ValueObjects\Constants\TransactionType::SHIPPING_INVOICE)->get();
         foreach ($invoices as $invoice){
 
             $invoice->documents()->delete();
@@ -724,11 +681,9 @@ Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
             );
 
             /** @var Document $document */
-            $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
+            $document = (App()->make(\App\Classes\Modules\Documents\Services\CreatesDocument::class))->execute($invoice, $document_object);
 
-            (App()->make(CreatesFiles::class))->execute($document, $document_object);
-
-            dump($document);
+            (App()->make(\App\Classes\Modules\Documents\Services\CreatesFiles::class))->execute($document, $document_object);
         }
     }
 
@@ -744,214 +699,4 @@ Route::get('/invoices/combine/{ids}', function($ids){
     return $pdf->download('combined_invoice_.pdf');
 })->name('invoice.combined_summary');
 
-// Route::get('/generate/invoices', function(){
-//     $packingLists = (App()->make(ListsPackingLists::class))->execute(['does_not_have_transaction_type' => 1, 'type' => 2]);
-//     foreach ($packingLists as $packingList){
-//         $order = $packingList->owner;
-//         if(!($order instanceof Order)) {
-//             echo '<span style="color: red;">failed to generate...</span><br>';
-//             continue;
-//         }
 
-//         $companyModule = $order->companyModule;
-//         $billingAddress = $companyModule->addresses()->where('type', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
-//         $deliveryAddress = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-
-//         $postCodes = \App\Models\SegmentConstant::whereIn('reference', ['CENTER_POSTCODE', 'OUTSTATION_POSTCODE'])->get()->pluck('value')->flatten();
-
-//         if(!!$billingAddress && in_array($deliveryAddress->postcode, $postCodes->toArray())){
-//             try {
-//                 (App()->make(CreateInvoiceTransactionProcessor::class))->execute($packingList);
-//                 echo '<span style="color: green;">Invoice Generated...</span><br>';
-
-//             } catch (Exception $exception){
-//                 echo '<span style="color: red;">failed to generate...</span><br>';
-//             }
-//         }
-//         echo '<span style="color: red;">failed to generate...</span><br>';
-//     }
-// })->name('generate.invoices');
-
-Route::get('/invoices/approve', function(Request $request){
-//    whereDoesntHave
-    $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::PENDING_SUBMISSION)->get();
-
-    foreach ($invoices as $invoice) {
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-
-        if ($request->input('exclude')){
-            if(in_array($order->reference, json_decode($request->input('exclude')))){
-                continue;
-            }
-        }
-
-        try {
-            (App()->make(ApproveShippingInvoiceTransactionProcessor::class))->execute($packingList);
-            echo '<span style="color: green;">Invoice Approved...</span><br>';
-
-        } catch (Exception $exception){
-            echo '<span style="color: red;">failed to approve...</span><br>';
-
-        }
-    }
-
-
-})->name('invoices.approve');
-
-Route::get('/invoices/show-duplicated', function(Request $request){
-    $transactionWithMultipleInvoice = DB::table('transactions')
-        ->where('type', TransactionType::SHIPPING_INVOICE)
-        ->where('status', '!=' , ApprovalStatus::EXPIRED)
-        ->where('deleted_at', null)
-        ->select('owner_id', DB::raw('count(*) as count'))
-        ->groupBy('owner_id')
-        ->having('count', '>', 1)
-        ->get();
-
-    echo 'Total Duplicates: ' . count($transactionWithMultipleInvoice) . '<br>';
-
-    $duplicatedOrderId = [];
-    $duplicatedOrderArray = [];
-    foreach($transactionWithMultipleInvoice as $invoice) {
-        $duplicatedOrderId[] = $invoice->owner_id;
-        $duplicatedOrderArray[$invoice->owner_id] = $invoice->count;
-    }
-
-    $duplicatedInvoice = Transaction::whereIn('owner_id', $duplicatedOrderId)->orderByDesc('owner_id')->get();
-    echo '<br>';
-    echo '<table>';
-    echo "<tr>";
-    echo "<td style='border:1px solid'>Order Reference</td>";
-    echo "<td  style='border:1px solid'>Status</td>";
-    echo "<td  style='border:1px solid'>Invoice Owner ID</td>";
-    echo "<td  style='border:1px solid'>Amount</td>";
-    echo "<td  style='border:1px solid'>Count</td>";
-    echo "</tr>";
-
-    foreach($duplicatedInvoice as $invoice) {
-        $order = $invoice->owner->owner;
-        echo "<tr>";
-        echo '<td style="border:1px solid"><a target="_blank" href="'.route('order.show', $order->reference).'">'. $order->reference.' - </a>' . $order->created_at . '</td>';
-        echo "<td style='border:1px solid'>".ApprovalStatus::APPROVAL_STATUS_ID[$invoice->status]."</td>";
-        echo "<td style='border:1px solid'>$invoice->owner_id</td>";
-        echo "<td style='border:1px solid'>$invoice->amount</td>";
-        echo "<td style='border:1px solid'>".$duplicatedOrderArray[$invoice->owner_id]."</td>";
-        echo "</tr>";
-    }
-    echo '</table>';
-});
-
-Route::get('/invoices/delete-duplicated', function(Request $request){
-    $duplicatedInvoices = DB::table('transactions')
-        ->where('type', TransactionType::SHIPPING_INVOICE)
-        ->where('status', '!=' , ApprovalStatus::EXPIRED)
-        ->where('deleted_at', null)
-        ->select('owner_id', DB::raw('count(*) as count'))
-        ->groupBy('owner_id')
-        ->having('count', '>', 1)
-        ->get();
-
-    $duplicatedInvoices = Transaction::whereIn('owner_id', $duplicatedInvoices->pluck('owner_id'))->get()->groupBy('owner_id');
-
-    foreach($duplicatedInvoices as $invoice) {
-        $packingList = $invoice->first()->owner;
-        $order = $packingList->owner;
-
-        $paidInvoice = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED)->get();
-
-        // if have completed invoice (verified payment)
-        if (count($paidInvoice)) {
-            $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::COMPLETED)->delete();
-            continue;
-        } else {
-            dump($order->reference . ' -no');
-        }
-
-        // if have unverified payment 
-        // $paymentHistory = $packingList->transactions()->whereHas('transactions', function($query){
-        //     return $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION ,ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
-        // })->get();
-        // if (count($paymentHistory)) {
-        //     $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('id', '!=', $paymentHistory->first()->id)->delete();
-        //     continue;
-        // }
-
-        // // delete duplicated invoices
-        // $unpaidInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->orderBy('id', 'desc')->get();
-
-        // $unpaidInvoicesIds = $unpaidInvoices->pluck('id')->toArray();
-        // array_shift($unpaidInvoicesIds);
-        // Transaction::whereIn('id', $unpaidInvoicesIds)->delete();
-
-        // // delete expired invoices
-        // $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::EXPIRED)->delete();
-
-        // // delete suspended invoices
-        // $suspendedInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::SUSPENDED)->orderBy('id', 'desc')->get();
-        // $suspendedInvoicesIds = $suspendedInvoices->pluck('id')->toArray();
-        // array_shift($suspendedInvoicesIds);
-        // Transaction::whereIn('id', $suspendedInvoicesIds)->delete();
-    }
-});
-
-Route::get('/packing-lists/show-duplicated', function(Request $request){
-    $results = PackingList::select('reference', 'type', DB::raw('count(*) as total'))
-            ->groupBy('reference', 'type')
-            ->having('total', '>', 1)
-            ->get()
-            ->toArray();
-
-    echo '<table>';
-    echo "<tr>";
-    echo "<td style='border:1px solid'>reference</td>";
-    echo "<td  style='border:1px solid'>type</td>";
-    echo "<td  style='border:1px solid'>count</td>";
-    echo "</tr>";
-
-    foreach($results as $result) {
-        // dd($result);
-        echo "<tr>";
-        echo "<td style='border:1px solid'>" . $result['reference'] . "</td>";
-        echo "<td style='border:1px solid'>" . $result['type'] . "</td>";
-        echo "<td style='border:1px solid'>" . $result['total'] . "</td>";
-        echo "</tr>";
-    }
-    echo '</table>';
-});
-
-Route::get('/packing-lists/delete-duplicated', function(Request $request){
-    $results = PackingList::select('reference', 'type', DB::raw('count(*) as total'))
-        ->groupBy('reference', 'type')
-        ->having('total', '>', 1)
-        ->get()
-        ->toArray();
-
-    foreach($results as $result) {
-        $duplicatedPackingList = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->orderBy('id', 'desc')->get();
-
-        // if packinglist has paid inivoice
-        $paidPackinglist = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->whereHas('transactions', function($query){
-            return $query->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED);
-        })->get();
-
-        if (count($paidPackinglist)) {
-            // delete all the other packing list
-            $paidPackinglistID = $paidPackinglist->first()->id;
-            $duplicatedPackingList = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->where('id', '!=', $paidPackinglistID)->get();
-            // $duplicatedPackingList->delete();
-            foreach ($duplicatedPackingList as $p) {
-                $p->delete();
-                dump('have paid packinglist, deleting id:' . $p->id);
-            }
-        } else {
-            // delete all but left the latest packing list
-            $firstItem = $duplicatedPackingList->shift();
-            // dump('dont have paid packinglist, keep first and delete others');
-            foreach ($duplicatedPackingList as $p) {
-                $p->delete();
-                dump('dont have paid packinglist, keep latest id:' . $firstItem->id . ', and deleting id:' . $p->id);
-            }
-        }
-    }
-});

tests/acceptance/DashboardCest.php

@@ -0,0 +1,49 @@
+<?php
+
+class DashboardCest
+{
+    public function _before(AcceptanceTester $I)
+    {
+
+        $I->wantTo('Test All Dashboard Data is Loaded');
+        $I->amOnPage('/dashboard');
+    }
+
+    /**
+     * test if the sidebar was loaded
+     * @param AcceptanceTester $I
+     * @return void
+     */
+    public function tryToTestIfAllAdminSidebarAreLoaded(AcceptanceTester $I)
+    {
+        $I->amOnPage('/dashboard');
+        $I->see('DASHBOARD');
+        $I->see('CUSTOMERS');
+        $I->see('DELIVERY LIST');
+        $I->see('CONTAINERS');
+        $I->see('PAYMENT AND BILLING');
+
+    }
+
+
+    /**
+     * test if the dashboard content is Loaded
+     * @param AcceptanceTester $I
+     * @return void
+     */
+    public function tryToTestAllDashboardComponentLoaded(AcceptanceTester $I)
+    {
+        $I->amOnPage('/dashboard');
+        $I->see('Dashboard');
+        $I->see('NEW CUSTOMERS');
+        $I->see('Unclaimed Packing Lists');
+        $I->see('Identification Verification');
+        $I->see('ACTIVATED ORDERS');
+        $I->see('PENDING SHIPMENT');
+
+        //delay a few second
+        $I->wait(5); // 2 seconds delay
+
+        $I->see('Unclaimed Packing Lists');
+    }
+}