Sync code fix from exchange

Fix a problem in invoice where rounding issue cause an invoice that is fully...

See merge request CIEFWorldwideSdnBhd/shipping-portal!154

.env.example

@@ -55,3 +55,7 @@ EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
 MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
+
+PERFEXCRM_BASE_URL=""
+PERFEXCRM_API_KEY=""
+PERFEXCRM_IS_ENABLED="false"

.gitignore

@@ -21,7 +21,6 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
-docker-compose.yml
 package-lock.json
 public/*
 /public/*

.yarnrc.yml

@@ -1 +0,0 @@
-yarnPath: ".yarn/releases/yarn-berry.cjs"

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -95,4 +95,4 @@ abstract class AbstractControllerLogic
         return $this->response(json_decode($collection->response()->getContent(), true));
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractUpdateRecord.php

@@ -18,10 +18,7 @@ abstract class AbstractUpdateRecord
     public function handler(Model $model){
         try{
 
-            if($model->save()) {
-                
-                return $model;
-             }
+            if($model->save()){ return $model; }
 
         } catch (QueryException $exception){
             throw new MalformedRequestException($exception);

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);
+            $query->where('type', $value)->whereIn('status', [0,1,2,3]);
         })->whereHas('containers', function ($query){
             return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
         });

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

@@ -0,0 +1,21 @@
+<?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/General/Eloquent/Filters/Receiver.php

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

app/Classes/General/Eloquent/LogData.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent;
-use Illuminate\Support\Facades\Schema;
-use DB;
-
-trait logData
-{
- 
-  public static function boot()
-  {
-      parent::boot();
-
-     
-      static::updating(function($model)
-      {
-
-        if (!Schema::hasTable(''.$model->table.'log')) {
-          DB::statement('CREATE TABLE '.$model->table.'log LIKE '.$model->table);  
-          DB::statement('ALTER TABLE '.$model->table.'log DROP COLUMN id');  
-          DB::statement('ALTER TABLE '.$model->table.'log ADD  id INTEGER FIRST');  
-        }
-    
-        DB::table(''.$model->table.'log')->insert($model->getRawOriginal());  
-      
-      });
-  }
-
-
-    public function logs($model){
-      $result = DB::table(''.$model->table.'log')
-       ->where('id',  $model->id)
-       ->get();
-        return $result;
-     }
-}

app/Classes/General/Traits/LogData.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\General\Traits;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+trait LogData
+{
+
+    public static function boot()
+    {
+        parent::boot();
+
+
+        static::updating(function($model)
+        {
+
+            $tableName = Str::singular($model->table).'_logs';
+            $relationshipColumn = Str::singular($model->table).'_id';
+
+            $originalData = $model->getRawOriginal();
+
+            $originalData[$relationshipColumn] = $originalData['id'];
+            unset($originalData['id']);
+
+            if (!Schema::hasTable($tableName)) {
+                DB::statement('CREATE TABLE '.$tableName.' LIKE '.$model->table);
+
+                $indexs = DB::select('SHOW INDEX FROM '.$tableName.';');
+
+                $removedIndexes = [];
+                foreach ($indexs as $index){
+                    if($index->Column_name === 'id' || in_array($index->Key_name, $removedIndexes)) continue;
+                    DB::statement('ALTER TABLE '.$tableName.' drop index '.$index->Key_name);
+                    $removedIndexes[] = $index->Key_name;
+                }
+
+                DB::statement('ALTER TABLE '.$tableName.' ADD COLUMN `'.$relationshipColumn.'` BIGINT NOT NULL AFTER `id`');
+            }
+
+            DB::table($tableName)->insert($originalData);
+
+        });
+    }
+}

app/Classes/Jobs/CreatePerfexCRMCustomer.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMLead;
+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()
+    {
+        $lead = (App()->make(FetchesPerfexCRMLead::class))->execute($this->createLeadPerfexCRMObject->getEmail());
+        if(!is_null($lead)){
+            (App()->make(UpdatesPerfexCRMLead::class))->execute($lead, $this->createLeadPerfexCRMObject->getCompanyReference());
+        }
+        else{
+            (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
+        }
+    }
+}

app/Classes/Jobs/CreatePerfexCRMInvoice.php

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

@@ -0,0 +1,42 @@
+<?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,8 +2,12 @@
 
 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;
@@ -25,8 +29,12 @@ 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/UpdatePerfexCRM.php

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

@@ -0,0 +1,108 @@
+<?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;
+use Illuminate\Support\Facades\Log;
+
+
+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 = "";
+                $projectName = "";
+                if($transaction->owner instanceof Transaction){
+                    $orderReference = $transaction->owner->owner->owner()->first()->reference;
+                    $packingListReference = $transaction->owner->owner->reference;
+                    $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                    $result = (App()->make(FetchesPerfexCRMProject::class))->execute($projectName, $customer->userid);
+                    if(isset($result->payload)){
+                        $project = $result->payload[0];
+                        $projectId = $project['id'];
+                    }
+                }
+
+                if($projectId == ""){
+                    Log::error(json_encode('UpdatePerfexCRMInvoice debug: '.$projectName));
+                    Log::error(json_encode($transaction->owner));
+                }
+
+                //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);
+        }
+    }
+
+    public function delay($delay)
+    {
+        // Add delay in seconds to the job
+        $this->delay = $delay;
+        return $this;
+    }
+}

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Models\PackingList;
+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 Illuminate\Support\Facades\Log;
+
+
+class UpdatePerfexCRMPrelude implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var */
+    private $packingList;
+
+    /** @var */
+    private $transaction;
+
+    /** @var UpdatePerfexCRMObject */
+    private $updatePerfexCRMObject;
+
+    /** @var */
+    private $nextJob;
+
+    /**
+     * UpdatePerfexCRMPrelude constructor.
+     * @param $packingList
+     * @param $transaction
+     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param $nextJob
+     */
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob)
+    {
+        $this->packingList = $packingList;
+        $this->transaction = $transaction;
+        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->nextJob = $nextJob;
+    }
+
+    public function handle()
+    {
+        if(is_null($this->packingList)){
+            $this->packingList = $this->transaction->owner->owner;
+        }
+        $amount = 0.00;
+        if(!is_null($this->transaction)){
+            $amount = $this->transaction->amount;
+        }
+        $data = [
+            'amount' => number_format($amount, 2, '.', ''),
+            'link_order' => config('app.url').'/order/show/'.$this->packingList->owner->reference,
+            'link_autocount_or' => 'https://docs.google.com/spreadsheets/d/1Q3rJBGQ9Bo04HZp5WR9zbLp7pIW2kfDYsabxG7JON-4/edit#gid=2013983170',
+            'link_perfex' => 'https://perfex.cief-malaysia.com/admin/projects/view/89',
+        ];
+
+
+        $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
+        $this->updatePerfexCRMObject->setTasks($result);
+        $this->nextJob::dispatch($this->updatePerfexCRMObject);
+    }
+
+    function replacePlaceholders($template, $data, $prefix = '')
+    {
+        foreach ($template as $key => $value) {
+            foreach ($data as $dataKey => $dataValue) {
+                if (is_array($dataValue)) {
+                    $template[$key] = $this->replacePlaceholders($template[$key], $dataValue, $dataKey);
+                } else {
+                    if ($prefix != '') {
+                        $template[$key] = str_replace('{' .$prefix. "." .$dataKey . '}', $dataValue, $template[$key]);
+                    } else {
+                        $template[$key] = str_replace('{' . $dataKey . '}', $dataValue, $template[$key]);
+                    }
+                }
+            }
+        }
+
+        return $template;
+    }
+
+}

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

@@ -8,23 +8,27 @@ 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\DataTransferObjects\ContactObject;
 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\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;
@@ -80,6 +84,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var FetchesCompanyModule */
     private $fetchesCompanyModule;
 
+    /** @var CreatePerfexCRMLeadProcessor */
+    private $createPerfexCRMLeadProcessor;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -93,8 +100,9 @@ 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)
+    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)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -107,6 +115,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -146,6 +155,18 @@ 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'),
+                $connection->invitee_reference
+            );
+            CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
+        }
+
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanFetchUser;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Http\Resources\UserCompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchUserByEmailLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Users',
+            'message' => 'You have successfully retrieved the user by email'
+        ];
+    }
+
+    /** @var CanFetchUser */
+    private $canFetchUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /**
+     * FetchUserByEmailLogic constructor.
+     * @param CanFetchUser $canFetchUser
+     * @param FetchesUser $fetchessUser
+     */
+    public function __construct(CanFetchUser $canFetchUser, FetchesUser $fetchesUser)
+    {
+        $this->canFetchUser = $canFetchUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchUser->passes();
+
+            $query = $this->fetchesUser->execute(['email' => $request->route('email')]);
+
+            return $this->resourceResponse(new UserCompanyResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}

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

@@ -0,0 +1,86 @@
+<?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/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -6,8 +6,6 @@ use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-use App\Classes\Modules\Transactions\ControllersLogic\multipleInvoicesWithOnePaymentLogic;
-
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
@@ -25,6 +23,7 @@ use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -46,10 +45,6 @@ class CallbackBillplzLogic
     /** @var UpdateDoFromYDPortalProcessor */
     private $updateDoFromYDPortalProcessor ;
 
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $multipleInvoicesWithOnePaymentLogic ;
-
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -58,14 +53,13 @@ class CallbackBillplzLogic
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,multipleInvoicesWithOnePaymentLogic $multipleInvoicesWithOnePaymentLogic)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->multipleInvoicesWithOnePaymentLogic= $multipleInvoicesWithOnePaymentLogic;
     }
 
 
@@ -91,19 +85,12 @@ class CallbackBillplzLogic
 
         $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
 
-
-        if ($transaction->type == 'topUp') {
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
-        $this->multipleInvoicesWithOnePaymentLogic->verifypayment($transaction->id, $transaction->amount);
-        }
-
         $invoice = $transaction->owner;
         $packingList = $invoice->owner;
         $order = $packingList->owner;
 
         $status = ApprovalStatus::PENDING_VERIFICATION;
 
-        
         if($billPlz->state === 'paid') {
             $status = ApprovalStatus::APPROVED;
         }
@@ -115,9 +102,11 @@ class CallbackBillplzLogic
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        $this->updatesTransactionStatus->execute($transaction, $status);
 
-        if(($invoice->amount - $transaction->amount) < 0.01) {
+        $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+        if(($invoice->amount - $totalPaidAmount) < 0.01) {
             $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
             $packingList->status = ApprovalStatus::APPROVED;
@@ -132,7 +121,6 @@ class CallbackBillplzLogic
 
 
 
-
         return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
     }
 }

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

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyDebtor;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Company Name and Debtor',
+            'message' => 'You have successfully updated the Company'
+        ];
+    }
+
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+ 
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyDebtor */
+    private $updatesCompanyDebtor;
+
+    /** @var UpdatesCompanyModuleName */
+    private $updatesCompanyModuleName;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyDebtor $updatesCompanyDebtor
+     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
+     */
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany, UpdatesCompanyDebtor $updatesCompanyDebtor, UpdatesCompanyModuleName $updatesCompanyModuleName)
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyDebtor = $updatesCompanyDebtor;
+        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        if ($request->input('debtor') || $query->first()->debtor !== null) {
+            $this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
+        }
+
+        return $this->resourceResponse(new CompanyResource($query));
+    }
+
+}

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Models\Company;
+
+class UpdatesCompanyDebtor extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param CompanyObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, ?string $debtor) 
+    {
+        $model->debtor = $debtor;
+
+        return $this->handler($model);
+    }
+}

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

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Models\CompanyModule;
+use App\Models\Company;
+use App\Models\PackingList;
+use Carbon\Carbon;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+
+class ExportsCustomerTotalOrderByYear implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'CompanyId',
+            'CompanyName',
+            'CompanyReference',
+            'TotalCbm'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function collection()
+    {
+        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($container){
+            return $container->where('loading_date', '>=', Carbon::parse('01-01-' . $this->request->route('year')))
+                ->where('loading_date', '<=', Carbon::parse('31-12-' . $this->request->route('year')));
+        })->get();
+
+        $packingLists = $packingLists->groupBy(function ($packingList){
+            return $packingList->owner->company_module_id;
+        })->sortByDesc(function($companyModule){
+            return $companyModule->sum(function($packingList){
+                return $packingList->packages->sum(function ($package){
+                    return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+                });
+            });
+        })->take(10);
+        return $packingLists;
+    }
+
+    /**
+     * @param $row
+     * @return array
+     */
+    public function map($row): array
+    {
+
+        $companyModule = $row[0]->owner->companyModule;
+        $marking = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        $cbm = $row->sum(function($packingList){
+            return $packingList->packages->sum(function ($package){
+                return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+            });
+        });
+
+        return [
+            $companyModule->company_id,
+            $companyModule->name,
+            $marking,
+            $cbm
+        ];
+    }
+}

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

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

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

@@ -0,0 +1,58 @@
+<?php
+
+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;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Carbon\Carbon;
+
+class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+
+    use Exportable;
+
+    public function headings(): array
+    {
+        return [
+            'Customer Marking',
+            'Order Number'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    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);
+        })->whereHas('packingLists', function($packingLists) {
+            $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports');
+        });
+    }
+
+    /**
+     * @param Order $order
+     *
+     * @return array
+     */
+    public function map($order): array
+    {
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+
+        return [
+            $marking,
+            $order->reference,
+        ];
+    }
+}

app/Classes/Modules/Imports/Services/Importorder.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Imports\Services;
-
-use Illuminate\Support\Collection;
-use Maatwebsite\Excel\Concerns\ToCollection;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromExcel;
-
-class Importorder implements ToCollection
-{
-    /**
-    * @param Collection $collection
-    */
-    public function collection(Collection $collection)
-    {
-        // dd($collection);
-        (App()->make(FetchOrderListsFromExcel::class))->execute($collection);
-    }
-}

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

@@ -7,6 +7,7 @@ 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;
@@ -39,6 +40,8 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
+    /** @var NewLeadTaskToPerfexCRMProcessor */
+    private $newLeadTaskToPerfexCRMProcessor;
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -46,22 +49,24 @@ 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)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
     {
         $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')]);
@@ -76,6 +81,10 @@ 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,12 +14,11 @@ class FetchesDataFromYDPortal
      * @return \Psr\Http\Message\ResponseInterface
      */
     public function clientRequest(string $url, string $method, $body){
-        
-        $client = new \GuzzleHttp\Client();
 
+        $client = new \GuzzleHttp\Client();
         $body['apicode'] = env('YD_API_CODE');
 
-        $request = $client->requestAsync($method, $url, ['query' => $body]);
+        $request = $client->requestAsync($method, $url, ['query' => $body, 'timeout' => 15]);
 
         return $request->wait();
     }
@@ -32,6 +31,7 @@ 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,6 +4,7 @@ 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;
@@ -25,16 +26,20 @@ 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)
+    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
     {
         $this->canCreatePackingList = $canCreatePackingList;
         $this->createsPackingList = $createsPackingList;
+        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
     /**
@@ -51,15 +56,19 @@ class CreatePackingListProcessor
         /** @var PackingList $packingList */
         $packingList = $this->createsPackingList->execute($object, $packable);
 
-        $appointee_id = $packingList->owner_id == 1 ? 2037 : $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
+        $appointee_id = $packingList->owner_id == 1 ? 2307 : $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

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

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

@@ -0,0 +1,115 @@
+<?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 = 2037;
+                            $appointee_id = 2307;
                         }
 
                         $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, null);

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

@@ -1,488 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-use App\Classes\Exceptions\MalformedRequestException;
-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\Models\Container;
-use App\Models\Order;
-use App\Models\PackingList;
-use App\Models\Transport;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-
-class FetchOrderListsFromExcel
-{
-    /** @var FetchesDataFromYDPortal */
-    private $fetchesDataFRomYDPortal;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var UpdatesContractObligation */
-    private $updatesContractObligations;
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var CreateContainerProcessor */
-    private $createContainerProcessor;
-
-    /** @var CreatesContract */
-    private $unityCreateContract;
-
-    /** @var AssignContractEntityProcessor */
-    private $unityAssignContractEntity;
-
-    /** @var CreateContractEntityProcessor */
-    private $unityCreateContractEntity;
-
-    /** @var CreatesStep */
-    private $createsStep;
-
-    /** @var ActivateContractProcessor */
-    private $unityActivateContract;
-
-    /**
-     * FetchOrderListsFromYdPortalProcessor constructor.
-     * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
-     * @param FetchesOrder $fetchesOrder
-     * @param UpdatesContractObligation $updatesContractObligations
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param CreatePackageProcessor $createPackageProcessor
-     * @param CreatesTransport $createsTransport
-     * @param CreatesSchedule $createsSchedule
-     * @param FetchesContainer $fetchesContainer
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreateContainerProcessor $createContainerProcessor
-     * @param CreatesContract $unityCreateContract
-     * @param AssignContractEntityProcessor $unityAssignContractEntity
-     * @param CreateContractEntityProcessor $unityCreateContractEntity
-     * @param CreatesStep $createsStep
-     * @param ActivateContractProcessor $unityActivateContract
-     */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal , FetchesOrder $fetchesOrder, UpdatesContractObligation $updatesContractObligations, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreateContainerProcessor $createContainerProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
-    {
-        $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->updatesContractObligations = $updatesContractObligations;
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-        $this->fetchesContainer = $fetchesContainer;
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createContainerProcessor = $createContainerProcessor;
-        $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 \GuzzleHttp\Exception\GuzzleException
-     */
-    public function execute( $excelData )
-    {
-        try {
-            // dd($start);
-            // $start = $start ? $start : Carbon::today()->subDays(30);
-
-            // $startLimit = Carbon::parse('01-12-2021');
-
-            // if($start->isBefore($startLimit)){
-            //     $start = $startLimit;
-            // }
-
-            // $end = $end ? $end : Carbon::today()->addDay();
-
-            // $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-            //     'begintime' => $start->timestamp,
-            //     'endtime' => $end->timestamp,
-            // ]);
-
-            // $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
-
-            foreach($excelData as $row){
-
-                if("expressno"!= $row[0] && $row[0] != null){
-                    // dd($row[0]);
-              
-
-                $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[0]
-                ]);
-
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
-                if($rows->data == null){
-                    continue;
-                }else{
-
-                    dd($rows);
-                }
-            }else{
-                continue;
-            }
-                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);
-                    }
-                }
-
-                $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' => 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 = 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/FetchOrderListsFromYdPortalProcessor.php

@@ -139,336 +139,360 @@ class FetchOrderListsFromYdPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
-        try {
-            $start = $start ? $start : Carbon::today()->subDays(30);
+        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'];
 
-            $startLimit = Carbon::parse('01-12-2021');
+        $from = $end ? Carbon::today()->diff($end)->days : 0;
+        $to = $start ? Carbon::today()->diff($start)->days : 10;
 
-            if($start->isBefore($startLimit)){
-                $start = $startLimit;
-            }
+        for ($x = $from; $x <= $to; $x++) {
+            try {
+                $startDate = Carbon::today()->subDays($x);
 
-            $end = $end ? $end : Carbon::today()->addDay();
+                $startLimit = Carbon::parse('01-12-2021');
 
-            $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
-                'begintime' => $start->timestamp,
-                'endtime' => $end->timestamp,
-            ]);
+                if($startDate->isBefore($startLimit)){
+                    $startDate = $startLimit;
+                }
 
-            $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
+                $endDate = Carbon::today()->subDays($x - 1);
 
-            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
+                $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
+                    'begintime' => $startDate->timestamp,
+                    'endtime' => $endDate->timestamp,
                 ]);
 
-                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
+                $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
-                if(!$rows){
-                    continue;
-                }
+                if(!$rows->data) continue;
 
-                foreach (array_reverse($rows->data) as $trackingRow) {
-                    if ($trackingRow->tracking === '货物已送达仓库准备入库中') {
-                        $receiveDate = Carbon::parse($trackingRow->trackingtime);
-                    }
+                foreach($rows->data as $row){
+                    $time_start = microtime(true);
 
-                    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);
-                    }
+                    $containerReference = null;
+                    $loadingDate = null;
+                    $unstuffingDate = null;
+                    $deliveryDate = null;
+                    $etd = null;
+                    $eta = null;
+                    $delayDate = null;
+                    $status = $row->status;
 
-                    $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);
-                    }
-                }
-
-                $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' => 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 = 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($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);
+                            }
+                        }
                     }
-                }
 
+                    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');
+                        }
+                    }
+
+                    $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
+
+                    $orderNumber = $customerno[array_key_last($customerno)];
+                    $allow_contract = true;
 
-                if($containerReference) {
                     try {
-                        $container = $this->fetchesContainer->execute(['reference' => $containerReference]);
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
-                    } catch (ResourceNotFoundException $exception){
+                        $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 = 2037;
-                        }
-                        else {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id;
+                            $appointee_id = 2307;
+                        } else {
+                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
                         }
 
-                        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $appointee_id]);
+                        $warehouseReceiveObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-                        $containerObject = new ContainerObject($containerReference, '', '', ContainerTypes::FORTY_FEET_DRY_CONTAINER, $loadingDate, ApprovalStatus::PENDING_VERIFICATION);
-                        /** @var Container $container */
-                        $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
+                        /** @var PackingList $warehouseReceiveList */
+                        $warehouseReceiveList = $this->createPackingListProcessor->execute($warehouseReceiveObject, $order);
 
-                        $container->packingLists()->detach($packingList);
-                        $container->packingLists()->attach($packingList);
+                        $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);
 
-                        $transport = $container->transports()->first();
+                        if ($allow_contract) {
 
-                        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));
-                        }
-                    }
+                            $contract = $this->unityCreateContract->execute();
 
-                    if($delayDate){
-                        $delayDate = $delayDate->addDays(2);
-                        $transport = $container->transports()->first();
+                            $contractReference = $contract->hash_id;
+                            $contractObligations = $contract->contract_obligation_list;
 
-                        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));
-                                }
-                            }
+                            $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);
                         }
 
-                    }
-
-                    if($unstuffingDate && $container->status !== ApprovalStatus::COMPLETED){
-                        $container->update(['status' => ApprovalStatus::COMPLETED]);
-                        $container->transports()->first()->update(['drop_date' => $unstuffingDate, 'status' => ApprovalStatus::COMPLETED]);
+                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, !$allow_contract ? null : $contractReference);
 
                         /** @var PackingList $packingList */
-                        foreach($container->packingLists as $packingList){
+                        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
-                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                                $packingList->status = ApprovalStatus::APPROVED;
-                                $packingList->save();
+                        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;
                             }
 
-                            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]);
+                            $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();
+                    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));
+                        $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]);
+                        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';
+
                 }
 
-                echo 'successful';
-
+            } catch (\Exception $exception) {
+                Log::debug($exception);
             }
-        } catch (\Exception $exception) {
-            Log::debug($exception);
         }
 
 
+
     }
 }
+

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

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

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

@@ -0,0 +1,267 @@
+<?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 = 2037;
+                    $appointee_id = 2307;
                 }
 
                 $packingListReference = $parcel[0];

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

@@ -0,0 +1,74 @@
+<?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;
+
+    /** @var string */
+    private $companyReference;
+
+    public function __construct(string $name, string $email, string $phone, string $companyName, string $companyReference)
+    {
+
+        $this->name = $name;
+        $this->email = $email;
+        $this->phone = $phone;
+        $this->companyName = $companyName;
+        $this->companyReference = $companyReference;
+    }
+
+    /**
+     * @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;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCompanyReference(): string
+    {
+        return $this->companyReference;
+    }
+}

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

@@ -0,0 +1,161 @@
+<?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;
+
+    /** @var string */
+    private $department;
+
+    /** @var string */
+    private $priority;
+
+    /** @var string */
+    private $duedate;
+
+    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate)
+    {
+        $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;
+        $this->department = $department;
+        $this->priority = $priority;
+        $this->duedate = $duedate;
+    }
+
+    /**
+     * @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;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDepartment(): string
+    {
+        return $this->department;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPriority(): string
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDuedate(): string
+    {
+        return $this->duedate;
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,128 @@
+<?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 $tasks;
+
+
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $tasks)
+    {
+
+        $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->tasks = $tasks;
+    }
+
+    /**
+     * @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 getTasks(): array
+    {
+        return $this->tasks;
+    }
+
+    public function setTasks($tasks)
+    {
+        $this->tasks = $tasks;
+    }
+}

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

@@ -0,0 +1,178 @@
+<?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;
+use Illuminate\Support\Facades\Log;
+
+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)->addDays(6)->startOfDay()->format('Y-m-d');
+        $currency = 1;
+        $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();
+
+        if ($addresses !== null) {
+            $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;
+        }
+        else{
+            $billingStreet = "[Pending Billing Details by user]";
+        }
+
+        $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
+        $projectName = "";
+        if($isPaid){
+            if($transaction->owner instanceof PackingList){
+                $orderReference = $transaction->owner->owner->reference;
+                $packingListReference = $transaction->owner->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $result = $this->fetchesPerfexCRMProject->execute($projectName, $clientId);
+                if(isset($result->payload)){
+                    $project = $result->payload[0];
+                    $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'];
+                    }
+                }
+            }
+
+            if($projectId == ""){
+                Log::error(json_encode('CreatePerfexCRMInvoiceProcessor debug: '.$projectName));
+                Log::error(json_encode($transaction->owner));
+            }
+        }
+
+        //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

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

@@ -0,0 +1,44 @@
+<?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->getDepartment(),
+            $createTaskPerfexCRMObject->getStatus(),
+            $createTaskPerfexCRMObject->getPriority(),
+            $createTaskPerfexCRMObject->getDuedate()
+        );
+        return true;
+   }
+
+}

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Processors;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
+use App\Classes\Jobs\CreatePerfexCRMSingleTask;
+use App\Classes\ValueObjects\Constants\PerfexCRMTaskPriority;
+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'],
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['department'],
+            PerfexCRMTaskPriority::DEFAULT,
+            "0"
+        );
+
+        CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
+        return true;
+    }
+
+}

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

@@ -0,0 +1,60 @@
+<?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\Classes\Jobs\UpdatePerfexCRMPrelude;
+use App\Models\PackingList;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use Illuminate\Support\Facades\Log;
+
+class PackingListToPerfexCRMProcessor
+{
+    /**
+     * @param PackingList $packingList
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $packingList)
+    {
+        try {
+            if($packingList->owner instanceof \App\Models\Order) {
+                $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,
+                    ]
+                );
+                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class);
+            }
+        } catch (\Exception $exception){
+            Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));
+            Log::error(json_encode($packingList));
+            Log::error($exception);
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Processors;
+
+use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
+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\Classes\Jobs\UpdatePerfexCRMPrelude;
+use App\Classes\Jobs\CreatePerfexCRMInvoice;
+use App\Models\Transaction;
+use Illuminate\Support\Facades\Log;
+
+class TransactionToPerfexCRMProcessor
+{
+    /** @var FetchesCompany  */
+    private $fetchesCompany;
+
+    /** @var UpdatePerfexCRMProcessor */
+    private $updatePerfexCRMProcessor;
+
+
+    /**
+     * TransactionToPerfexCRMProcessor constructor.
+     * @param UpdatePerfexCRMProcessor $updatePerfexCRMProcessor
+     * @param FetchesCompany $fetchesCompany
+     */
+    public function __construct(UpdatePerfexCRMProcessor $updatePerfexCRMProcessor, FetchesCompany $fetchesCompany)
+    {
+        $this->updatePerfexCRMProcessor = $updatePerfexCRMProcessor;
+        $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)
+    {
+        try
+        {
+            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,
+                        ]
+                );
+
+                UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, UpdatePerfexCRM::class);
+
+                $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
+                    $contactEmail,
+                    $model,
+                    true
+                );
+                UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject)->delay(6);
+            }
+            else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
+            {
+                CreatePerfexCRMInvoice::dispatch($model);
+            }
+        }
+        catch (\Exception $exception) {
+            Log::error('TransactionToPerfexCRMProcessor debug:');
+            Log::error($exception);
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,227 @@
+<?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\UpdatesPerfexCRMTask;
+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 UpdatesPerfexCRMTask */
+    private $updatesPerfexCRMTask;
+
+    /** @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 UpdatesPerfexCRMTask $updatesPerfexCRMTask
+     * @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,
+        UpdatesPerfexCRMTask $updatesPerfexCRMTask,
+        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->updatesPerfexCRMTask = $updatesPerfexCRMTask;
+        $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->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
+
+        if(isset($result->payload)){
+            $project = $result->payload[0];
+            $projectId = $project['id'];
+
+            //if the project status is anything but PerfexCRMProjectStatus::NOT_STARTED, update the project
+            if($updatePerfexCRMObject->getProjectStatus() != PerfexCRMProjectStatus::NOT_STARTED && $project['status'] == PerfexCRMProjectStatus::NOT_STARTED)
+            {
+                $this->updatesPerfexCRMProject->execute($project, $updatePerfexCRMObject->getProjectStatus());
+            }
+        }
+        else{
+            $result = $this->createsPerfexCRMCustomerProject->execute($updatePerfexCRMObject->getProjectName(), $updatePerfexCRMObject->getProjectStatus(), $crmClientId);
+            if(isset($result->payload)){  //Here means project creation successful
+                    $projectId = $result->payload['project_id'];
+            }
+        }
+
+
+       $tasks = $updatePerfexCRMObject->getTasks();
+       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->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
+                    if(isset($result->payload)){
+                        $array = json_decode(json_encode($result->payload[0]), true);
+                        $milestoneId = $array['id'];
+                    }
+                    else{
+                        $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
+                        if(isset($result->payload)){
+                            $milestoneId = $result->payload['milestone_id'];
+                        }
+                    }
+                }
+
+                $taskStatus = PerfexCRMTaskStatus::NOT_STARTED;
+                if($tasks[$count]['status'] != ''){
+                    $taskStatus = $tasks[$count]['status'];
+                }
+
+                // Get existing or create task
+                $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId);
+                if(isset($result->payload)){
+                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
+                    //The following are code not needed at Shipping Portal, Exchange need certain task's status to be updated dynamically
+                    // if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED && $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED)
+                    // {
+                    //     $task = $result->payload[0];
+                    //     $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus, $task['startdate'], is_null($task['duedate']) ? '': $task['duedate']);
+                    // }
+                }
+                else{
+                    $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus, $tasks[$count]['priority'], $tasks[$count]['duedate']);
+                }
+            }
+        }
+        return true;
+   }
+
+}

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

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

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

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

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

@@ -0,0 +1,63 @@
+<?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{
+            $subtotal = floor($invoicePerfexCRMObject->getSubTotal() * 100) / 100;
+            $total = floor($invoicePerfexCRMObject->getTotal() * 100) / 100;
+
+            $data = [
+                'clientid' => $invoicePerfexCRMObject->getClientId(),
+                'number' => $invoicePerfexCRMObject->getNumber(),
+                'date' => $invoicePerfexCRMObject->getDate(),
+                'duedate' => $invoicePerfexCRMObject->getDueDate(),
+                'currency' => $invoicePerfexCRMObject->getCurrency(),
+                'subtotal' => number_format($subtotal, 2, '.', ''),
+                'total' => number_format($total, 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

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

@@ -0,0 +1,50 @@
+<?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{
+            $custom_fields = [
+                "leads" => [
+                    4 => $createLeadPerfexCRMObject->getCompanyReference()
+                ]
+            ];
+
+            $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
+                'custom_fields' => $custom_fields
+            ];
+
+            $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

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

@@ -0,0 +1,87 @@
+<?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\ValueObjects\Constants\PerfexCRMCustomFields;
+
+class CreatesPerfexCRMTask
+{
+    /**
+     * @param string $taskName
+     * @param string $taskDescription
+     * @param string $leadId
+     * @param string $milestoneId
+     * @param string $projectId
+     * @param string $reference
+     * @param string $on_task_completion
+     * @param string $department
+     * @param string $status
+     * @param string $priority
+     * @param string $duedate
+     * @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 $department, string $status, string $priority, string $duedate) {
+        try{
+            $custom_fields = [];
+            if($department != ""){
+                $custom_fields = [
+                    "tasks" => [
+                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $department
+                    ]
+                ];
+            }
+
+            $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,
+                'custom_fields' => $custom_fields,
+                'priority' => $priority,
+                'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
+            ];
+
+            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,
+                    'custom_fields' => $custom_fields,
+                    'priority' => $priority,
+                    'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
+                ];
+            }
+
+            $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

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

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

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

@@ -0,0 +1,40 @@
+<?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{
+            $data = [
+                'name' => $milestoneName,
+                'project_id' => $projectId,
+            ];
+
+            $response = Http::asForm()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->post(config('perfexcrm.base_url').'/api/milestones/bynameandprojectid', $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/FetchesPerfexCRMProject.php

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

@@ -0,0 +1,48 @@
+<?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
+     * @param string $relType
+     * @param string $relId
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $taskName, string $milestoneId, string $relType, string $relId) {
+        try{
+            $data = [
+                'name' => $taskName,
+                'rel_type' => $relType,
+                'rel_id' => $relId,
+            ];
+
+            if($milestoneId != '') {
+                $newItem = ['milestone' =>  $milestoneId ];
+                $data = array_merge($data, $newItem);
+            }
+
+            $response = Http::asForm()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->post(config('perfexcrm.base_url').'/api/tasks/customsearch', $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/UpdatesPerfexCRMCustomer.php

@@ -0,0 +1,47 @@
+<?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\ValueObjects\Constants\PerfexCRMCustomFields;
+
+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" => [
+                    PerfexCRMCustomFields::CUSTOMERS_SHIPPING_PORTAL_REFERENCE => $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

@@ -0,0 +1,70 @@
+<?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);
+            }
+
+            $allowedPaymentModes = [];
+            array_push($allowedPaymentModes, 1, 2);
+
+            $data = [
+                'number' => $invoice->number,
+                'date' => $invoice->date,
+                'duedate' => $invoice->duedate,
+                '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' => $allowedPaymentModes,
+            ];
+
+            $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/UpdatesPerfexCRMLead.php

@@ -0,0 +1,51 @@
+<?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\ValueObjects\Constants\PerfexCRMCustomFields;
+
+class UpdatesPerfexCRMLead
+{
+    /**
+     * @param $lead
+     * @param string $companyReference
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute($lead, string $companyReference) {
+        try{
+            $custom_fields = [
+                "leads" => [
+                    PerfexCRMCustomFields::LEADS_SHIPPING_PORTAL_REFERENCE => $companyReference
+                ]
+            ];
+
+            $data = [
+                'name' => $lead->name,
+                'email' => $lead->email,
+                'phonenumber' => $lead->phonenumber,
+                'company' => $lead->company,
+                'custom_fields' => $custom_fields,
+                'source' => $lead->source,
+                'status' => $lead->status,
+            ];
+
+            $response = Http::asJson()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->put(config('perfexcrm.base_url').'/api/leads/'.$lead->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

@@ -0,0 +1,43 @@
+<?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['íd'], $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

@@ -0,0 +1,48 @@
+<?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,12 +3,13 @@
 namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 
+use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
 use App\Classes\Notifications\InvoiceIssuedEmail;
 use Illuminate\Http\Request;
 
 
 use Illuminate\Http\JsonResponse;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
@@ -36,29 +37,17 @@ class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
+    /** @var ApproveShippingInvoiceTransactionProcessor */
+    private $approveShippingInvoiceTransactionProcessor;
 
     /**
-     * ApprovePaymentVerificationLogic constructor.
      * @param FetchesPackingList $fetchesPackingList
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     * @param ApproveShippingInvoiceTransactionProcessor $approveShippingInvoiceTransactionProcessor
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    public function __construct(FetchesPackingList $fetchesPackingList, ApproveShippingInvoiceTransactionProcessor $approveShippingInvoiceTransactionProcessor)
     {
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
+        $this->approveShippingInvoiceTransactionProcessor = $approveShippingInvoiceTransactionProcessor;
     }
 
     /**
@@ -69,29 +58,8 @@ 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/CreatePaymentTransactionLogic.php

@@ -23,7 +23,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreatePaymentTransactionLogic extends AbstractControllerLogic
 {

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

@@ -5,40 +5,15 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 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\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\Document;
-use App\Models\PackingList;
-use App\Models\Transaction;
-use Carbon\Carbon;
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
 
 
+
     /**
      * @return array
      */
@@ -52,217 +27,26 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
+    /** @var CreateInvoiceTransactionProcessor */
+    private $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
-    )
+    /**
+     * @param FetchesPackingList $fetchesPackingList
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor)
     {
-
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransaction = $createsTransaction;
-        $this->createsTransactionDetail = $createsTransactionDetail;
-        $this->createsDocument = $createsDocument;
-        $this->createsFile = $createsFile;
+        $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
     }
 
     public function logic(Request $request) : JsonResponse
     {
+
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
-        $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();
-
-        $base_price = 0;
-        $warehouse_rate = 0;
-        $state_rate = 0;
-        $minimum_cbm = 0.3;
-        $segment_price = 0;
-        $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->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->where('type', '!=', PackageType::OVER_WEIGHT)->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);
-        }
+        $this->createInvoiceTransactionProcessor->execute($packing_list);
 
         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/ControllersLogic/CreateSupplierTransactionLogic.php

@@ -27,7 +27,7 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 
 use Meneses\LaravelLaravelMpdf\Facades\LaravelLaravelMpdf;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateSupplierTransactionLogic extends AbstractControllerLogic
 {

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

@@ -7,7 +7,7 @@ use App\Models\Transaction;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Storage;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;

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

@@ -1,204 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransaction;
-use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransactionDetail;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Http\Resources\TransactionResource;
-use App\Http\Resources\TransactionDetailResource;
-
-use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceipt;
-use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceiptDetail;
-use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptObject;
-use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptDetailObject;
-use App\Classes\Modules\Receipts\Services\CreatesReceipt;
-use App\Classes\Modules\Receipts\Services\CreatesReceiptDetail;
-use App\Classes\Modules\Receipts\Services\GeneratesReceiptBillNo;
-
-use App\Classes\Modules\Currencies\Services\FetchesCurrency;
-use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
-
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\FetchesTransactionDetail;
-
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-
-
-use App\Models\Transaction;
-use App\Models\multipleInvoicesWithOnePayment;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use APP\models\PackingList;
-
-
-
-class multipleInvoicesWithOnePaymentLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Transaction',
-            'message' => 'You have successfully created a transaction'
-        ];
-    }
-
-    
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNo;
-
-    /** @var CanCreateTransaction */
-    private $canCreateTransaction;
-    
-    private $fetchesCurrency;
-   
-    private $rateCalculatesCurrency;
-    
-    private $fetchesCompany;
-
-    private $createsTransaction;
-    
-    private $canCreateTransactionDetail;
-    
-    private $createsTransactionDetail;
-    
-    private $fetchesTransaction;
-    
-    private $fetchesTransactionDetail;
-    
-    private $generatesReceiptBillNo;
-
-    /** @var CanCreateReceipt */
-    private $canCreateReceipt;
-    
-    private $createsReceipt;
-    
-    private $canCreateReceiptDetail;
-    
-    private $createsReceiptDetail;
-
-   
-    public function __construct(
-        GeneratesTransactionBillNumber $generatesTransactionBillNo, CanCreateTransaction $canCreateTransaction,
-        FetchesCurrency $fetchesCurrency, RateCalculatesCurrency $rateCalculatesCurrency, FetchesCompany $fetchesCompany,
-        CreatesTransaction $createsTransaction,
-        CanCreateTransactionDetail $canCreateTransactionDetail, CreatesTransactionDetail $createsTransactionDetail,
-        FetchesTransaction $fetchesTransaction , FetchesTransactionDetail $fetchesTransactionDetail,
-        GeneratesReceiptBillNo $generatesReceiptBillNo, CanCreateReceipt $canCreateReceipt,
-        CreatesReceipt $createsReceipt,
-        CanCreateReceiptDetail $canCreateReceiptDetail, CreatesReceiptDetail $createsReceiptDetail
-    ){
-        $this->generatesTransactionBillNo = $generatesTransactionBillNo;
-        $this->canCreateTransaction = $canCreateTransaction;
-        $this->fetchesCurrency = $fetchesCurrency;
-        $this->rateCalculatesCurrency = $rateCalculatesCurrency;
-        $this->fetchesCompany = $fetchesCompany;
-        $this->createsTransaction =$createsTransaction;
-        $this->canCreateTransactionDetail =$canCreateTransactionDetail;
-        $this->createsTransactionDetail = $createsTransactionDetail;
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->fetchesTransactionDetail = $fetchesTransactionDetail;
-        
-        $this->generatesReceiptBillNo = $generatesReceiptBillNo;
-        $this->canCreateReceipt = $canCreateReceipt;
-        $this->createsReceipt =$createsReceipt;
-        $this->canCreateReceiptDetail =$canCreateReceiptDetail;
-        $this->createsReceiptDetail = $createsReceiptDetail;
-        
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-
-    
-    public function logic( $transactionsArray) : JsonResponse
-    {
-        // dd($request);
-        try {
-
-               
-        // dd(json_decode($transactionsArray));
-        $transactions = Transaction::whereIn('id', json_decode($transactionsArray))->where('type', TransactionType::SHIPPING_INVOICE)->get();
-        $total = $transactions->sum('amount');
-        $packingList =$transactions[1]->owner;
-        $order = $packingList->owner;
-        $companyModule = $order->companyModule;
-        $company = $companyModule->company;
-        $wallet = $company->wallets()->first();
-        
-        if (!$wallet) {
-            $object = new WalletObject($company->id, 1, (App()->make(GeneratesWalletCode::class))->execute());
-            /** @var Wallet $wallet */
-            $wallet = (App()->make(CreatesWallet::class))->execute($object, $company);
-        }
-
-        $billNumber = (App()->make(GeneratesTransactionBillNumber::class))->execute('TOPUP-');
-
-        if($total < 0) {
-            throw new MalformedRequestException('Top up credit value must be greater than zero.');
-        }
-        $billPlzBill = (App()->make(CreatesBillplzBill::class))->execute($company->name, 'example@gmail.com', 'This payment is credit topup for company ref. ' . $company->reference, $total, $billNumber, 'bank code', true);
-
-        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $total, $total, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], 'test');
-        
-        // $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-        
-        $transaction = (App()->make(CreatesTransaction::class))->execute($wallet, $transaction_object);
-        $result= (App()->make(UpdatesWalletBalance::class))->execute($wallet, $total);
-
-      foreach ($transactions as $key => $value) {
-        multipleInvoicesWithOnePayment::create([ 'topUp_request_id' => $transaction->id, 'transaction_id' => $value->id  ]);
-            
-            }
-            return $this->response([]); ;
-            
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-    public function verifypayment( $topUp_transaction_id, $amount) : JsonResponse
-    {
-        $totalamount =0;
-       $topup = multipleInvoicesWithOnePayment::where('topUp_request_id',$topUp_transaction_id)->get();
-       
-       foreach ($topup as $key => $value) {
-           $transaction =  Transaction::where('id',$value->transaction_id)->frist();
-           $totalamount += $transaction->amount;  
-           (App()->make(updatesTransactionStatus::class))->execute($transaction, ApprovalStatus::APPROVED);
-           
-        $transaction_object = new TransactionObject($transaction->bill_no, TransactionType::PAYMENT, 1, $topUp_transaction_id, 1, PaymentMethodType::PAYMENT_GATEWAY, $transaction->amount, $transaction->amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], 'test');
-        $transaction = (App()->make(CreatesTransaction::class))->execute($transaction, $transaction_object);
-           
-        }
-        $amount = $amount - $totalamount;
-        Transaction::where('id', $topUp_transaction_id)->update(['amount'=> $amount]);  
-
-    }
-}

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

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

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

@@ -1,229 +1,247 @@
 <?php
 
+
 namespace App\Classes\Modules\Transactions\Processors;
 
-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\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\CalculatesBookingPaidAmount;
-use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
+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\Bookings\Services\UpdatesBookingStatus;
-
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
+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\DocumentType;
-use App\Models\Booking;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+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\Models\Document;
-use App\Models\SegmentConstant;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateInvoiceTransactionProcessor
 {
-    /** @var ListsTransactions */
-    private $listsTransactions;
 
-    /** @var CreatesTransaction */
-    private $createsTransaction;
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesSegmentConstant */
+    private $fetchesSegmentConstant;
 
     /** @var GeneratesTransactionBillNumber */
     private $generatesTransactionBillNumber;
 
-    /** @var CalculatesBookingPaidAmount */
-    private $calculatesBookingPaidAmount;
+    /** @var CreatesTransaction */
+    private $createsTransaction;
 
-    /** @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;
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
 
     /**
-     * CreateInvoiceTransactionProcessor constructor.
-     * @param ListsTransactions $listsTransactions
-     * @param CreatesTransaction $createsTransaction
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesSegmentConstant $fetchesSegmentConstant
      * @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
+     * @param CreatesTransaction $createsTransaction
+     * @param 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)
+    public function __construct(FetchesPackingList $fetchesPackingList, FetchesSegmentConstant $fetchesSegmentConstant, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail)
     {
-        $this->listsTransactions = $listsTransactions;
-        $this->createsTransaction = $createsTransaction;
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
         $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;
+        $this->createsTransaction = $createsTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
     }
 
-
     /**
-     * @param Booking $booking
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws MalformedRequestException
      */
-    public function execute(Booking $booking) 
+    public function execute(PackingList $packingList)
     {
-        $payment_amount = $this->calculatesBookingTransferredAmount->execute($booking, $booking->fix_currency_id);
-        $booking_amount = $booking->fix_amount;
+        $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();
+            }
 
-        if ((float) $booking_amount !== (float) $payment_amount) {
-            return;
         }
 
-        $po_order_transaction = $booking->transactions()
-            ->where('type', TransactionType::PURCHASE_ORDER)
-            ->complete()
-            ->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);
+            });
+        });
 
-        $constants = SegmentConstant::where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->id', $booking->service->id)->first();
+        $minimum_charge = $minimum_cbm - $totalContainerCbm;
+        $minimum_charge = ($minimum_charge < 0) ? 0 : $minimum_charge;
+        $minimum_charge = $noMinimumCharge ? 0 : $minimum_charge;
 
-        if($constants->detail->is_billable && !$po_order_transaction) {
-            return;
+        $minimum_charge = $noMinimumCharge ? 0 : round($minimum_charge, 3);
+
+
+        if($hasMinimumCharge) {
+            $minimum_charge = 0;
         }
 
-        $transaction = $booking->transactions()
-            ->where('type', TransactionType::PAYMENT)
-            ->first();
+        $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
 
-        $billNumber = $this->generatesTransactionBillNumber->execute('INV-');
+        $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
 
-        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT);
+        $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
 
-        $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(
+        $object = new TransactionObject(
             $billNumber,
-            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,
+            TransactionType::SHIPPING_INVOICE,
+            1,
+            $order->company_module_id,
+            1,
+            PaymentMethodType::CASH,
+            $total_cbm,
+            $total_cbm,
+            1,
+            1,
+            0,
+            0,
+            0,
             null,
-            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'
+            ApprovalStatus::PENDING_SUBMISSION
         );
 
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-        $this->createsFile->execute($document, $document_object);
+        /** @var Transaction $invoice_transaction */
+        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
 
-
-        $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'
+        $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
         );
-        $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-        $this->createsFile->execute($document, $document_object);
 
-        $billNumber = $this->generatesTransactionBillNumber->execute('SPDO-');
+        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
 
-        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::BILL);
+        if ($over_weight_cbm > 0) {
+            $object_detail = new TransactionDetailObject(
+                'OVER_WEIGHT_CHARGES',
+                TransactionDetailType::OVER_WEIGHT_CHARGES,
+                $over_weight_cbm,
+                $price_cbm
+            );
 
-        $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);
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }
 
-        $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);
+        if ($minimum_charge > 0) {
+            $object_detail = new TransactionDetailObject(
+                'MIN_CBM_CHARGES',
+                TransactionDetailType::MIN_CBM_CHARGES,
+                $minimum_charge,
+                $price_cbm
+            );
 
-        $this->updatesBookingStatus->execute($booking, ApprovalStatus::COMPLETED);
+            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+        }
+
+        return;
     }
+
+    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/CreatesTransaction.php

@@ -15,7 +15,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute( $packing_list, TransactionObject $object) {
+    public function execute(PackingList $packing_list, TransactionObject $object) {
         $model = new Transaction();
         $model->bill_no = $object->getBillNo();
         $model->type = $object->getTransactionType();

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

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

app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateWalletLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Company Wallet',
-            'message' => 'You have successfully created a company wallet'
-        ];
-    }
-
-    /** @var CreatesWallet  */
-   private $createsWallet;
-
-   /** @var GeneratesWalletCode */
-   private $generatesWalletCode;
-
-   /** @var CanCreateCompanyWallet */
-   private $canCreateCompanyWallet;
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompany $fetchesCompany)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->createsWallet = $createsWallet;
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->canCreateCompanyWallet = $canCreateCompanyWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute());
-
-        $this->canCreateCompanyWallet->passes($object);
-
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        $wallet = $this->createsWallet->execute($object, $company);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php

@@ -1,132 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\Standards\Rules\CanCreateWalletTransaction;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
-use App\Classes\Modules\Wallets\Services\CreatesWalletTransaction;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletTransactionBillNo;
-use App\Http\Resources\WalletTransactionResource;
-use App\Classes\Modules\Wallets\Services\FetchesWallet;
-
-use App\Classes\Modules\Currencies\Services\FetchesCurrency;
-use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
-/*
-use App\Classes\Modules\Accounts\Standards\Rules\CanCreateUser;
-use App\Classes\Modules\Accounts\Services\CreatesUser;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
-use App\Http\Resources\UserResource;
-
-use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
-use App\Classes\Modules\Companies\Services\CreatesCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-
-use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
-use App\Classes\Modules\Contacts\Services\CreatesContact;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-
-use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompanyEmployee;
-use App\Classes\Modules\Companies\Services\CreatesCompanyEmployee;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyEmployeeObject;
-
-use App\Classes\Modules\SegmentCompanies\Standards\Rules\CanCreateSegmentCompany;
-use App\Classes\Modules\SegmentCompanies\Services\CreatesSegmentCompany;
-use App\Classes\Modules\SegmentCompanies\DataTransferObjects\SegmentCompanyObject;
-*/
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateWalletTransactionLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Wallet Transaction',
-            'message' => 'You have successfully created a wallet transaction'
-        ];
-    }
-
-    /** @var CreatesWalletTransaction  */
-   private $createsWalletTransaction;
-
-   /** @var GeneratesWalletTransactionBillNo */
-   private $generatesWalletTransactionBillNo;
-
-   /** @var CanCreateWalletTransaction */
-   private $canCreateWalletTransaction;
-   
-   private $fetchesCurrency;
-   
-   private $rateCalculatesCurrency;
-   
-   private $fetchesWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWalletTransaction $createsWalletTransaction
-     * @param GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo
-     * @param CanCreateWalletTransaction $canCreateWalletTransaction
-     * @param FetchesCurrency $fetchesCurrency
-     * @param RateCalculatesCurrency $rateCalculatesCurrency
-     * @param FetchesWallet $fetchesWallet
-     */
-    public function __construct(
-            CreatesWalletTransaction $createsWalletTransaction, GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo, CanCreateWalletTransaction $canCreateWalletTransaction,
-            FetchesCurrency $fetchesCurrency,RateCalculatesCurrency $rateCalculatesCurrency, FetchesWallet $fetchesWallet
-        )
-    {
-        $this->createsWalletTransaction = $createsWalletTransaction;
-        $this->generatesWalletTransactionBillNo = $generatesWalletTransactionBillNo;
-        $this->canCreateWalletTransaction = $canCreateWalletTransaction;
-        $this->fetchesCurrency = $fetchesCurrency;
-        $this->rateCalculatesCurrency = $rateCalculatesCurrency;
-        $this->fetchesWallet = $fetchesWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-
-            DB::beginTransaction();
-            
-            $wallet =  $this->fetchesWallet->execute(['id' => $request->route('id')]);
-            $conversion_currency = $this->fetchesCurrency->execute(['id' => $request->input('currency_id')]);
-            $convertable_currency = $this->fetchesCurrency->execute(['id' => $wallet->currency_id]);//MYR
-            
-            $convert_amount = $this->rateCalculatesCurrency->execute($conversion_currency, $convertable_currency, $request->input('amount'));
-            $convert_rate = $this->rateCalculatesCurrency->execute_rate($conversion_currency, $convertable_currency);
-            
-
-            $object = new WalletTransactionObject(
-                $wallet->id, $this->generatesWalletTransactionBillNo->execute(),$request->input('trans_type'),
-                number_format( (float) $convert_amount, 5, '.', ''), $wallet->currency_id , number_format( (float) $request->input('amount'), 5, '.', ''),
-                $request->input('currency_id'),number_format( (float) $convert_rate, 5, '.', '')
-            );
-
-            $this->canCreateWalletTransaction->passes($object);
-
-            $wallet_transaction = $this->createsWalletTransaction->execute($object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new WalletTransactionResource($wallet_transaction));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-
-class CreditWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Credit into Company Wallet',
-            'message' => 'You have successfully credit company wallet'
-        ];
-    }
-
-
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var GeneratesWalletCode */
-    private $generatesWalletCode;
-
-    /** @var CreatesWallet  */
-    private $createsWallet;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-    /** @var UpdatesWallet */
-    private $updatesWallet;
-
-    /** @var CreditWalletProcessor */
-    private $creditWalletProcessor;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesTransaction $createsTransaction
-     * @param UpdatesWallet $updatesWallet
-     * @param CreditWalletProcessor $creditWalletProcessor
-     */
-    public function __construct(
-        FetchesCompany $fetchesCompany,
-        GeneratesWalletCode $generatesWalletCode,
-        CreatesWallet $createsWallet,
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-        CreatesTransaction $createsTransaction,
-        UpdatesWallet $updatesWallet,
-        CreditWalletProcessor $creditWalletProcessor
-    )
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->createsWallet = $createsWallet;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransaction = $createsTransaction;
-        $this->updatesWallet = $updatesWallet;
-        $this->creditWalletProcessor = $creditWalletProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $amount = floatval(str_replace(',', '', $request->input('amount')));
-
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        $reference = $request->input('reference');
-
-        $type = $request->input('transaction_type');
-
-        $wallet = $this->creditWalletProcessor->execute($company, $type, $amount, $reference);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/DebitWalletLogic.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\WalletResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class DebitWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Debit into Company Wallet',
-            'message' => 'You have successfully debit company wallet'
-        ];
-    }
-
-
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-    /** @var UpdatesWallet */
-    private $updatesWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesTransaction $createsTransaction
-     * @param UpdatesWallet $updatesWallet
-     */
-    public function __construct(
-        FetchesCompany $fetchesCompany,
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-        CreatesTransaction $createsTransaction,
-        UpdatesWallet $updatesWallet
-    )
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransaction = $createsTransaction;
-        $this->updatesWallet = $updatesWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $amount = floatval(str_replace(',', '', $request->input('amount')));
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-        $reference = $request->input('reference');
-
-        if (!$company->wallets()->first()) {
-            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
-            $wallet = $this->createsWallet->execute($object, $company);
-        }
-
-        $wallet = $company->wallets()->first();
-
-        $billNumber = $this->generatesTransactionBillNumber->execute('DEBIT-NOTE-');
-        
-        $transaction_object = new TransactionObject(
-            $billNumber, 
-            TransactionType::DEBIT_NOTE, 
-            1, 
-            $wallet->company->id,
-            1, 
-            PaymentMethodType::CASH,
-            $amount, 
-            $amount, 
-            1,
-            1, 
-            1,
-            0, 
-            0, 
-            null, 
-            ApprovalStatus::APPROVED,
-            [],
-            $reference
-        );
-
-        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-        $updateWalletAmount = $wallet->amount - $transaction->amount;
-
-        $walletOject = new WalletObject($wallet->company->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
-
-        $wallet = $this->updatesWallet->execute($wallet, $walletOject);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\ListsWallet;
-use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
-use App\Http\Resources\WalletResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class ListWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'List Company Wallet',
-            'message' => 'You have successfully list company wallet'
-        ];
-    }
-
-    /** @var ListWallet  */
-   private $listsWallet;
-
-   /** @var CanCreateCompanyWallet */
-   private $canListWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet)
-    {
-        $this->canListWallet = $canListWallet;
-        $this->listsWallet = $listsWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        //$this->canListWallet->passes();
-
-        $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(WalletResource::collection($query));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php

@@ -1,113 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\CreatesWalletTransaction;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\WalletResource;
-use App\Http\Resources\WalletTransactionResource;
-use App\Models\Wallet;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class TopUpWalletLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'TopUp into Company Wallet',
-            'message' => 'You have successfully created a topup request for company\'s wallet'
-        ];
-    }
-
-
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var GeneratesWalletCode */
-    private $generatesWalletCode;
-
-    /** @var CreatesWallet  */
-    private $createsWallet;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-
-    /**
-     * TopUpWalletLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesBillplzBill $createsBillplzBill
-     * @param CreatesTransaction $createsTransaction
-     */
-    public function __construct(FetchesCompany $fetchesCompany, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransaction $createsTransaction)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->createsWallet = $createsWallet;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsBillplzBill = $createsBillplzBill;
-        $this->createsTransaction = $createsTransaction;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $amount = floatval(str_replace(',', '', $request->input('amount')));
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        /** @var Wallet $wallet */
-        $wallet = $company->wallets()->first();
-
-        if (!$wallet) {
-            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
-            /** @var Wallet $wallet */
-            $wallet = $this->createsWallet->execute($object, $company);
-        }
-
-        $user = $company->employees()->first();
-        $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
-
-        if($amount < 0) {
-            throw new MalformedRequestException('Top up credit value must be greater than zero.');
-        }
-
-        $billPlzBill = $this->createsBillplzBill->execute($company->name, $user->email, 'This payment is credit topup for company ref. ' . $company->reference, $amount, $billNumber, $request->input('bank_code'), true);
-
-        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
-
-        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-
-        return $this->resourceResponse(new WalletTransactionResource($transaction));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\ListsWallet;
-use App\Classes\Modules\Wallets\Services\FetchesWallet;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Transactions\Processors\UpdateWalletTransactionProcessor;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateStatusWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Status Transaction Company Wallet',
-            'message' => 'You have successfully status transaction company wallet'
-        ];
-    }
-
-    /** @var ListWallet  */
-   private $fetchesWallet;
-
-   /** @var CanCreateCompanyWallet */
-   private $canListWallet;
-
-    /** @var UpdateWalletTransactionProcessor */
-    private $updateWalletTransactionProcessor;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(FetchesWallet $fetchesWallet, UpdateWalletTransactionProcessor $updateWalletTransactionProcessor)
-    {
-        $this->fetchesWallet = $fetchesWallet;
-        $this->updateWalletTransactionProcessor = $updateWalletTransactionProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $status = ($request->route('status')=='approve') ? 2 : 4;
-
-        $wallet = $this->updateWalletTransactionProcessor->execute($request->route('transaction_id'), $status);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\ListsWallet;
-use App\Classes\Modules\Wallets\Services\FetchesWallet;
-use App\Classes\ValueObjects\Constants\TransactionType;
-
-use App\Classes\Modules\Wallets\Standards\Rules\CanWithdrawWallet;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class WithdrawWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Withdraw from Company Wallet',
-            'message' => 'You have successfully withdraw company wallet'
-        ];
-    }
-
-    /** @var FetchesWallet  */
-   private $fetchesWallet;
-
-   /** @var CanWithdrawWallet */
-   private $canWithdrawWallet;
-
-    /** @var CreateWalletTransactionProcessor */
-    private $createWalletTransactionProcessor;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(CanWithdrawWallet $canWithdrawWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
-    {
-        $this->canWithdrawWallet = $canWithdrawWallet;
-        $this->fetchesWallet = $fetchesWallet;
-        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
-
-        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
-
-        $this->canWithdrawWallet->passes($walletOject);
-
-        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class WalletObject implements DataTransferObject
-{
-
-    /** @var int */
-    private $company_id;
-
-    /** @var int */
-	private $currency_id;
-
-	/** @var int */
-	private $code;
-
-    private $amount;
-
-    /**
-     * WalletObject constructor.
-     * @param int $company_id
-     * @param int $currency
-     * @param int $code
-     */
-    public function __construct(int $company_id, int $currency, int $code, float $amount=0)
-    {
-        $this->company_id = $company_id;
-        $this->currency_id = $currency;
-        $this->code = $code;
-        $this->amount = $amount;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCompanyId(): int
-    {
-        return $this->company_id;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCurrency(): int
-    {
-        return $this->currency_id;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCode(): int
-    {
-        return $this->code;
-    }
-
-    public function getAmount(): float
-    {
-        return $this->amount;
-    }
-
-
-}

app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class WalletTransactionObject implements DataTransferObject
-{
-
-    private $wallet_id;
-
-    private $bill_no;
-    
-    private $trans_type;
-    
-    private $amount;
-    
-    private $currency_id;
-    
-    private $original_amount;
-    
-    private $original_currency_id;
-
-    private $currency_rate;
-    
-    public function __construct(
-        int $wallet_id, int $bill_no,int $trans_type,
-        float $amount, int $currency_id, int $original_amount,
-        int $original_currency_id, float $currency_rate
-    ){
-        $this->wallet_id = $wallet_id;
-        $this->bill_no = $bill_no;
-        $this->trans_type = $trans_type;
-        $this->amount= $amount;
-        $this->currency_id = $currency_id;
-        $this->original_amount = $original_amount;
-        $this->original_currency_id = $original_currency_id;
-        $this->currency_rate = $currency_rate;
-    }
-
-    /**
-     * @return int
-     */
-    public function getWalletId(): int
-    {
-        return $this->wallet_id;
-    }
-    
-    /**
-     * @return int
-     */
-    public function getBillNo(): int
-    {
-        return $this->bill_no;
-    }
-    
-    /**
-     * @return int
-     */
-    public function getTransType(): int
-    {
-        return $this->trans_type;
-    }
-    
-    
-    public function getAmount(): float
-    {
-        return $this->amount;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCurrency(): int
-    {
-        return $this->currency_id;
-    }
-    
-    
-    public function getOriginalAmount(): float
-    {
-        return $this->original_amount;
-    }
-    
-    public function getOriginalCurrency(): int
-    {
-        return $this->original_currency_id;
-    }
-    
-    public function getCurrencyRate(): float
-    {
-        return $this->currency_rate;
-    }
-}

app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php

@@ -1,90 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Processors;
-
-use App\Models\Wallet;
-use App\Models\Company;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-
-class CreditWalletProcessor
-{
-    /** @var GeneratesWalletCode */
-    private $generatesWalletCode;
-
-    /** @var CreatesWallet  */
-    private $createsWallet;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-    /** @var UpdatesWallet */
-    private $updatesWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesTransaction $createsTransaction
-     * @param UpdatesWallet $updatesWallet
-     */
-    public function __construct(
-        GeneratesWalletCode $generatesWalletCode,
-        CreatesWallet $createsWallet,
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-        CreatesTransaction $createsTransaction,
-        UpdatesWallet $updatesWallet
-    )
-    {
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->createsWallet = $createsWallet;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransaction = $createsTransaction;
-        $this->updatesWallet = $updatesWallet;
-    }
-
-
-    /**
-     * @param Company $company
-     * @param int $transactionType
-     * @param float $amount
-     * @param string $reference
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Company $company, int $transactionType, float $amount, string $reference)
-    {
-        if (!$company->wallets()->first()) {
-            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
-            $this->createsWallet->execute($object, $company);
-        }
-
-        /** @var Wallet $wallet */
-        $wallet = $company->wallets()->first();
-
-        $billNumber = $this->generatesTransactionBillNumber->execute($transactionType === 2 ? 'DEBIT-NOTE-' : 'CREDIT-NOTE-');
-        
-        $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
-        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-        
-        $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
-
-        $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
-
-        $wallet = $this->updatesWallet->execute($wallet, $walletObject);
-
-        return $wallet;
-    }
-}

app/Classes/Modules/Wallets/Services/ChecksIfWalletCodeExists.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-
-use App\Models\Wallet;
-
-class ChecksIfWalletCodeExists
-{
-
-    /** @var wallet */
-    private $repository;
-
-
-    /**
-     * ChecksIfWalletCodeExists constructor.
-     * @param Wallet $repository
-     */
-    public function __construct(wallet $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    public function execute(int $code): bool {
-        return $this->repository->where('code', $code)->exists();
-    }
-
-}

app/Classes/Modules/Wallets/Services/ChecksIfWalletTransactionBillNoExists.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-
-use App\Models\WalletTransaction;
-
-class ChecksIfWalletTransactionBillNoExists
-{
-
-    private $repository;
-
-    public function __construct(WalletTransaction $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    public function execute(int $bill_no): bool {
-        return $this->repository->where('bill_no', $bill_no)->exists();
-    }
-
-}