Working for replicate support as like exchage 2.0

.env.example

@@ -55,7 +55,3 @@ 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,6 +21,7 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
+docker-compose.yml
 package-lock.json
 public/*
 /public/*

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

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

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

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

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

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

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

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

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

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

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

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class DoesNotHavePaymentStatusIn implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', TransactionType::PAYMENT)->whereIn('status', $value);
-        });
-    }
-}

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

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

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

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

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

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class HavePaymentStatusNotIn implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('transactions', function (Builder $query) use($value) {
-            $query->where('type', TransactionType::PAYMENT)->whereNotIn('status', $value);
-        });
-    }
-}

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

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

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

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

app/Classes/General/Helper.php

@@ -2,8 +2,8 @@
 
 namespace App\Classes\General;
 
+
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Log;
 
 class Helper
 {
@@ -24,20 +24,4 @@ class Helper
         return array_slice(get_class_methods($className), 1);
     }
 
-    /**
-     * @param $log
-     */
-    static function debugLogger($log){
-        if($log && isset($log['message'])){
-            $message = $log['message'];
-            $substring = 'No data were found';
-            if (isset($message)) {
-                if (strpos($message, $substring) !== false) {
-                    // Log::info('Message exist');
-                } else {
-                    Log::info($log['message']);
-                }
-            }
-        }
-    }
-}
+}

app/Classes/Jobs/CreatePerfexCRMCustomer.php

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

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

app/Classes/Jobs/CreatePerfexCRMSingleTask.php

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

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\FetchPerfexCRMInvoiceProcessor;
-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 App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject;
-
-
-class UpdatePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMObject */
-    private $updatePerfexCRMObject;
-
-    /** @var */
-    private $transaction;
-
-    /** @var bool|null */
-    private $shouldCreateInvoice;
-
-    /**
-     * UpdatePerfexCRM constructor.
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param Transaction $transaction
-     * @param bool|null $shouldCreateInvoice
-     */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, ?bool $shouldCreateInvoice = false)
-    {
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->transaction = $transaction;
-        $this->shouldCreateInvoice = $shouldCreateInvoice;
-    }
-
-    public function handle()
-    {
-        //To use invoice as a reference to decide whether more tasks should be created
-        $this->updatePerfexCRMObject->setInvoiceId($this->getInvoiceIdOrCreateInvoice());
-
-        $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
-        if($this->transaction != null && $this->shouldCreateInvoice){
-            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
-                $this->updatePerfexCRMObject->getContactEmail(),
-                $result->projectId,
-                $this->transaction,
-                true
-            );
-            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
-        }
-    }
-
-    private function getInvoiceIdOrCreateInvoice(){
-        if($this->transaction != null){
-            $fetchPerfexCRMInvoiceObject = new FetchPerfexCRMInvoiceObject(
-                $this->updatePerfexCRMObject->getContactEmail(),
-                $this->transaction
-            );
-            $invoiceId = (App()->make(FetchPerfexCRMInvoiceProcessor::class))->execute($fetchPerfexCRMInvoiceObject);
-            return $invoiceId;
-        }
-        return 0;
-    }
-}

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
-use App\Models\Transaction;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
-use App\Classes\General\Helper;
-
-class UpdatePerfexCRMInvoice implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMInvoiceObject */
-    private $updatePerfexCRMInvoiceObject;
-
-    /**
-     * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject
-     */
-    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);
-        Log::error('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
-
-        if(is_null($invoice)){
-            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
-            if ($result) {
-                $invoiceId = $result->payload['id'];
-            } else {
-                // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
-            }
-        }
-        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){
-                //update invoice
-                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $this->updatePerfexCRMInvoiceObject->getProjectId());
-            }
-        }
-
-        //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

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-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 bool|null */
-    private $shouldCreateInvoice;
-
-    /**
-     * UpdatePerfexCRMPrelude constructor.
-     * @param $packingList
-     * @param Transaction $transaction
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param bool|null $shouldCreateInvoice
-     */
-    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
-    {
-        $this->packingList = $packingList;
-        $this->transaction = $transaction;
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->shouldCreateInvoice = $shouldCreateInvoice;
-    }
-
-    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);
-        UpdatePerfexCRM::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->shouldCreateInvoice);
-    }
-
-    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,27 +8,23 @@ use App\Classes\General\Services\GeneratesInitials;
 use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
 use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
 use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
 use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
 use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
-use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 
-use App\Classes\Jobs\CreatePerfexCRMCustomer;
-
 use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\User;
@@ -84,9 +80,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var FetchesCompanyModule */
     private $fetchesCompanyModule;
 
-    /** @var CreatePerfexCRMLeadProcessor */
-    private $createPerfexCRMLeadProcessor;
-
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -100,9 +93,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule, CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor)
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -115,7 +107,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -155,18 +146,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
-        if(config('perfexcrm.is_enabled') == 'true'){
-            // $this->createPerfexCRMLeadProcessor->execute($request);
-            $createLeadPerfexCRMObject = new CreateLeadPerfexCRMObject(
-                $request->input('name'),
-                $request->input('email'),
-                $request->input('phone'),
-                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'),
-                $connection->invitee_reference
-            );
-            CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
-        }
-
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

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

@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Services\UpdatesUserFullName;
+use App\Classes\Modules\Accounts\Services\UpdatesUser;
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
 use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
@@ -29,8 +29,8 @@ class UpdateUserLogic extends AbstractControllerLogic
     /** @var CanUpdateUser */
     private $canUpdateUser;
 
-    /** @var UpdatesUserFullName */
-    private $updatesUserFullName;
+    /** @var UpdatesUser */
+    private $updatesUser;
 
     /** @var FetchesUser */
     private $fetchesUser;
@@ -38,13 +38,13 @@ class UpdateUserLogic extends AbstractControllerLogic
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateUser $canUpdateUser
-     * @param UpdatesUserFullName $updatesUserFullName
+     * @param UpdatesUser $updatesUser
      * @param FetchesUser $fetchesUSer
      */
-    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUserFullName $updatesUserFullName, FetchesUser $fetchesUser)
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
     {
         $this->canUpdateUser = $canUpdateUser;
-        $this->updatesUserFullName = $updatesUserFullName;
+        $this->updatesUser = $updatesUser;
         $this->fetchesUser = $fetchesUser;
     }
 
@@ -64,7 +64,7 @@ class UpdateUserLogic extends AbstractControllerLogic
 
             $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
 
-            $query = $this->updatesUserFullName->execute($query, $object);
+            $query = $this->updatesUser->execute($query, $object);
 
             return $this->resourceResponse(new UserResource($query));
 

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

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Services\UpdatesUser;
-use App\Classes\Modules\Accounts\Services\FetchesUser;
-use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
-use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
-use App\Http\Resources\UserResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateUserRoleLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Admin Role',
-            'message' => 'You have successfully updated the Admin Role'
-        ];
-    }
-
-    /** @var CanUpdateUser */
-    private $canUpdateUser;
-
-    /** @var UpdatesUser */
-    private $updatesUser;
-
-    /** @var FetchesUser */
-    private $fetchesUser;
-
-    /**
-     * UpdateAddressLogic constructor.
-     * @param CanUpdateUser $canUpdateUser
-     * @param UpdatesUser $updatesUser
-     * @param FetchesUser $fetchesUSer
-     */
-    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
-    {
-        $this->canUpdateUser = $canUpdateUser;
-        $this->updatesUser = $updatesUser;
-        $this->fetchesUser = $fetchesUser;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
-
-        $object = new UserObject($query->name, $request->input('type'));
-
-        $this->canUpdateUser->passes($object);
-
-        $query = $this->updatesUser->execute($query, $object);
-
-        return $this->resourceResponse(new UserResource($query));
-    }
-
-}

app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UserObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var int */
-    private $type;
-
-    /**
-     * FullNameObject constructor.
-     * @param string $name
-     */
-    public function __construct(string $name, int $type)
-    {
-        $this->name = $name;
-        $this->type = $type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-}

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

@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
 use App\Models\User;
 
 class UpdatesUser extends AbstractUpdateRecord
@@ -11,14 +11,13 @@ class UpdatesUser extends AbstractUpdateRecord
 
     /**
      * @param User $model
-     * @param UserObject $object
+     * @param FullNameObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(User $model, UserObject $object) {
+    public function execute(User $model, FullNameObject $object) {
 
         $model->name = $object->getName();
-        $model->type = $object->getType();
         return $this->handler($model);
 
     }

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

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

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

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

app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php

@@ -10,7 +10,7 @@ use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
 use App\Classes\Modules\Announcements\Services\UpdatesAnnouncement;
 
 use App\Http\Resources\AnnouncementResource;
-use Carbon\Carbon;
+
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -66,8 +66,8 @@ class UpdateAnnouncementLogic extends AbstractControllerLogic
         $annoucement_object = new AnnouncementObject(
             $request->input('title'),
             $request->input('description'),
-            Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
-            Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
+            $request->input('starting_on'),
+            $request->input('ending_on')
         );
 
         $this->canUpdateAnnouncement->passes($annoucement_object);

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

@@ -4,24 +4,28 @@ namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
 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\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Http\Resources\TransactionResource;
+use App\Models\Booking;
 use App\Models\User;
 use App\Models\Wallet;
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
@@ -40,12 +44,6 @@ class CallbackBillplzLogic
     /** @var UpdateDoFromYDPortalProcessor */
     private $updateDoFromYDPortalProcessor ;
 
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
-
-    /** @var CreatePaymentTransactionProcessor */
-    private $createPaymentTransactionProcessor;
-
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -53,17 +51,14 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
-     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
+    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->updatesWalletBalance = $updatesWalletBalance;
-        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
     }
 
 
@@ -106,51 +101,23 @@ class CallbackBillplzLogic
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        // check if is wallet top up
-        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-        }
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
 
-        // group payment
-        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
+        if(($invoice->amount - $transaction->amount) < 0.01) {
+            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
-            foreach($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
-            }
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
 
-            $group->status = $status;
-            $group->save();
-        }
-
-        $this->updatesTransactionStatus->execute($transaction, $status);
-
-        if (!$transaction->owner instanceof Wallet) {
-            $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;
-                $packingList->save();
-    
-                if(app()->environment('production')){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
+            if(app()->environment('production')){
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
             }
         }
 
-        $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
 
-        if ($transaction->owner instanceof Wallet) {
-            $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
-        } else {
 
-            $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
-        }
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
     }
 }

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\App;
 
 class CreatesBillplzBill
 {
@@ -26,7 +25,7 @@ class CreatesBillplzBill
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
                 'collection_id' => config('billplz.collection_id'),
                 'name' => $name,
-                'email' => App::environment('production') ? $email : 'development@cief-malaysia.com',
+                'email' => $email,
                 'description' => $description,
                 'amount' => $this->finalizeAmount($amount),
                 'redirect_url' => route('online_payment.redirect'),

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

@@ -1,69 +0,0 @@
-<?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\FetchesCompany;
-use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-use App\Http\Resources\CompanyResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCompanyTypeLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Company Type',
-            'message' => 'You have successfully updated the Company Tyoe'
-        ];
-    }
-
-    /** @var CanUpdateCompany */
-    private $canUpdateCompany;
- 
-    /** @var UpdatesCompany */
-    private $updatesCompany;
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /**
-     * UpdateCompanyControllersLogic constructor.
-     * @param CanUpdateCompany $canUpdateCompany
-     * @param UpdatesCompany $updatesCompany
-     * @param FetchesCompany $fetchesCompany
-     */
-    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany)
-    {
-        $this->canUpdateCompany = $canUpdateCompany;
-        $this->updatesCompany = $updatesCompany;
-        $this->fetchesCompany = $fetchesCompany;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $object = new CompanyObject($query->name, $query->reference, $request->input('type'));
-
-        $this->canUpdateCompany->passes($object);
-
-        $query = $this->updatesCompany->execute($query, $object);
-
-        return $this->resourceResponse(new CompanyResource($query));
-    }
-
-}

app/Classes/Modules/Contacts/ControllersLogic/UpdateContactLogic.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Contacts\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Contacts\Services\UpdatesContact;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Services\FetchesContact;
-use App\Http\Resources\ContactResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateContactLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Contact',
-            'message' => 'You have successfully updated the Contact'
-        ];
-    }
-
-    /** @var UpdatesContact */
-    private $updatesContact;
-
-    /** @var FetchesContact */
-    private $fetchesContact;
-
-    /**
-     * UpdateContactLogic constructor.
-     * @param UpdatesContact $updatesContact
-     * @param FetchesContact $fetchesContact
-     */
-    public function __construct(UpdatesContact $updatesContact, FetchesContact $fetchesContact)
-    {
-        $this->updatesContact = $updatesContact;
-        $this->fetchesContact = $fetchesContact;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $object = new ContactObject(
-            $request->input('reference'),
-            $request->input('phone'),
-            $request->input('email'),
-            $request->input('wechat_id')
-        );
-
-        // $this->canUpdateContact->passes($object);
-
-        $query = $this->fetchesContact->execute(['id' => $request->route('id')]);
-
-        $query = $this->updatesContact->execute($query, $object);
-
-        return $this->resourceResponse(new ContactResource($query));
-    }
-
-}

app/Classes/Modules/Contacts/Services/FetchesContact.php

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

app/Classes/Modules/Contacts/Services/UpdatesContact.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Contacts\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Models\Contact;
-
-class UpdatesContact extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Contact $model
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Contact $model, ContactObject $object) 
-    {
-        $model->reference = $object->getReference();
-        $model->phone = $object->getPhone();
-        $model->email = $object->getEmail();
-        $model->wechat_id = $object->getWechatId();
-
-        return $this->handler($model);
-    }
-}

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

@@ -15,17 +15,9 @@ use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 
 class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
 {
+
     use Exportable;
 
-    private $start_date;
-    private $end_date;
-
-    public function __construct($start_date = null, $end_date = null)
-    {
-        $this->start_date = $start_date;
-        $this->end_date = $end_date;
-    }
-
     public function headings(): array
     {
         return [
@@ -34,66 +26,48 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
             'Warehouse',
             'Cbm',
             'Description',
-            'Quantity',
+            'quantity',
             'Received Date',
-            'Recorded On',
-            'Days to Record',
             'Remarks'
         ];
     }
 
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
     public function query()
     {
-        $query = PackingList::with([
-            // 'owner.companyModule.inviters',
-            // 'owner.orderRoles',
-            'packages',
-            'transports'
-        ])
-            ->where('type', '=', 1);
-        // ->where('status', '=', 2)
-        // ->where('owner_type', Order::class);
-
-        if (!is_null($this->start_date) && !is_null($this->end_date)) {
-            $query->whereHas('transports', function ($q) {
-                $q->whereBetween('drop_date', [
-                    Carbon::parse($this->start_date)->startOfDay(),
-                    Carbon::parse($this->end_date)->endOfDay()
-                ]);
-            });
-        }
-
-        return $query;
+        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
     }
 
+    /**
+     * @param $packingList
+     * @return array
+     */
     public function map($packingList): array
     {
-        $order = null;
-        $marking = null;
-        $warehouse = null;
-        if ($packingList->owner instanceof Order) {
-            $order = $packingList->owner;
-            $marking = $order->companyModule->getMarking();
-            $warehouse = $order->orderRoles->firstWhere('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->appointee;
-        }
-        $cbm = $packingList->packages->sum(function ($package) {
-            return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
+        $order = $packingList->owner;
+
+        $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first();
+        $marking = $connection ? $connection->pivot->invitee_reference:'';
+
+        $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee;
+
+        $cbm = $packingList->packages->sum(function($package){
+           return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
         });
-        $arrival_date = $packingList->transports->first()->drop_date->format('d-m-Y');
-        $recorded_on = $packingList->created_at->format('d-m-Y');
-        $days_to_record = Carbon::parse($arrival_date)->diffInDays(Carbon::parse($recorded_on));
+
+        $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y');
 
         return [
-            $order ? $order->reference : 'Unclaimed',
-            $marking ? $marking : 'Unclaimed',
-            $warehouse ? $warehouse->reference : 'Unclaimed',
+            $packingList->owner->reference,
+            $marking,
+            $warehouse->reference,
             $cbm,
             $packingList->packages->implode('description', ', '),
             $packingList->packages->sum('quantity'),
             $arrival_date,
-            $recorded_on,
-            $days_to_record,
             ''
         ];
     }
-}
+}

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

@@ -32,7 +32,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DocNo',
             'DocDate',
             'DebtorCode',
-            'Ref',
             'ShipInfo',
             'AccNo',
             'DetailDescription',
@@ -40,12 +39,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'ProjNo',
             'DeptNo',
             'Qty',
-            'UnitPrice',
-//            'marking',
-//            'contact person',
-//            'contact number',
-//            'link',
-//            'amount'
+            'UnitPrice'
         ];
     }
 
@@ -103,10 +97,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         $order = $transaction->owner->owner;
         $company = $order->companyModule->company;
         $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
-        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-        $contact = $order->companyModule->company->contacts->first();
-        $userName = $order->companyModule->employees()->first();
-        $link = route('customer.payment-and-billing', $marking);
 
         $furtherDescription = '';
 
@@ -127,19 +117,13 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $transaction->created_at->format('m/d/Y H:m'),
             $company->debtor,
             $order->reference,
-            $order->reference,
             '500-0000',
             'X1 Freight Service Charge',
             $furtherDescription,
             $container->reference,
             'CIEF',
             $shippingTransactionDetails->quantity,
-            $shippingTransactionDetails->price,
-//            $marking,
-//            $contact ? $contact->phone : '',
-//            $userName->name,
-//            $link,
-//            $transaction->amount
+            $shippingTransactionDetails->price
         ];
         return [
             '<<New>>',

app/Classes/Modules/Groups/DataTransferObjects/GroupObject.php

@@ -1,187 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Groups\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use Carbon\Carbon;
-
-class GroupObject implements DataTransferObject
-{
-
-    /** @var int */
-    private $issuer;
-
-    /** @var int */
-    private $receiver;
-
-    /** @var float */
-    private $amount;
-
-    /** @var  float */
-    private $originalAmount;
-
-    /** @var int */
-    private $currencyId;
-
-    /** @var int */
-    private $originalCurrencyId;
-
-    /** @var float */
-    private $currencyRate;
-
-    /** @var float */
-    private $tax;
-
-    /** @var float */
-    private $serviceCharge;
-
-    /** @var int|null */
-    private $status;
-
-    /** @var string */
-    private $reference;
-
-    /** @var int */
-    private $paymentMethod;
-
-    /**
-     * GroupObject constructor.
-     * @param int $issuer
-     * @param int $receiver
-     * @param float $amount
-     * @param float $originalAmount
-     * @param int $currencyId
-     * @param int $originalCurrencyId
-     * @param float $currencyRate
-     * @param float $tax
-     * @param float $serviceCharge
-     * @param string $reference
-     * @param int|null $status
-     * @param int $paymentMethod
-     */
-    public function __construct(
-        int $issuer,
-        int $receiver,
-        float $amount,
-        float $originalAmount,
-        int $currencyId,
-        int $originalCurrencyId,
-        float $currencyRate,
-        float $tax,
-        float $serviceCharge,
-        int $paymentMethod,
-        ?string $reference,
-        ?int $status = ApprovalStatus::PENDING_SUBMISSION
-    )
-    {
-        $this->issuer = $issuer;
-        $this->receiver = $receiver;
-        $this->amount = $amount;
-        $this->originalAmount = $originalAmount;
-        $this->currencyId = $currencyId;
-        $this->originalCurrencyId = $originalCurrencyId;
-        $this->currencyRate = $currencyRate;
-        $this->tax = $tax;
-        $this->serviceCharge = $serviceCharge;
-        $this->paymentMethod = $paymentMethod;
-        $this->reference = $reference;
-        $this->status = $status;
-    }
-
-    /**
-     * @return int
-     */
-    public function getIssuer(): int
-    {
-        return $this->issuer;
-    }
-
-    /**
-     * @return int
-     */
-    public function getReceiver(): int
-    {
-        return $this->receiver;
-    }
-
-    /**
-     * @return float
-     */
-    public function getAmount(): float
-    {
-        return $this->amount;
-    }
-
-    /**
-     * @return float
-     */
-    public function getOriginalAmount(): float
-    {
-        return $this->originalAmount;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCurrencyId(): int
-    {
-        return $this->currencyId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOriginalCurrencyId(): int
-    {
-        return $this->originalCurrencyId;
-    }
-
-    /**
-     * @return float
-     */
-    public function getCurrencyRate(): float
-    {
-        return $this->currencyRate;
-    }
-
-    /**
-     * @return float
-     */
-    public function getTax(): float
-    {
-        return $this->tax;
-    }
-
-    /**
-     * @return float
-     */
-    public function getServiceCharge(): float
-    {
-        return $this->serviceCharge;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStatus(): ?int
-    {
-        return $this->status;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getReference(): ?string
-    {
-        return $this->reference;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPaymentMethod(): int
-    {
-        return $this->paymentMethod;
-    }
-}

app/Classes/Modules/Groups/Services/CreatesGroup.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Groups\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Groups\DataTransferObjects\GroupObject;
-use App\Models\Group;
-
-class CreatesGroup extends AbstractUpdateRecord
-{
-    /**
-     * @param GroupObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(GroupObject $object) {
-        $model = new Group();
-        $model->issuer                  = $object->getIssuer();
-        $model->receiver                = $object->getReceiver();
-        $model->amount                  = $object->getAmount();
-        $model->original_amount         = $object->getOriginalAmount();
-        $model->currency_id             = $object->getCurrencyId();
-        $model->original_currency_id    = $object->getOriginalCurrencyId();
-        $model->currency_rate           = $object->getCurrencyRate();
-        $model->tax                     = $object->getTax();
-        $model->service_charge          = $object->getServiceCharge();
-        $model->status                  = $object->getStatus();
-        $model->reference               = $object->getReference();
-        $model->payment_method          = $object->getPaymentMethod();
-
-        return $this->handler($model);
-    }
-}

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

@@ -7,7 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
@@ -18,8 +17,7 @@ use Illuminate\Http\JsonResponse;
 class CreateOrderLogic extends AbstractControllerLogic
 {
 
-    protected function notification(): array
-    {
+    protected function notification():array {
         return [
             'title' => 'Created Order',
             'message' => 'You have successfully created a new Order'
@@ -41,8 +39,6 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
-    /** @var NewLeadTaskToPerfexCRMProcessor */
-    private $newLeadTaskToPerfexCRMProcessor;
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -50,41 +46,28 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
-     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
-        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
     }
 
 
-    public function logic(Request $request): JsonResponse
-    {
-
+    public function logic(Request $request) : JsonResponse {
 
+        
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
+        
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
 
-        // todo-new: fix this
-        // if select warehouse foshan
-        if ($request->input('warehouse_id') === 'foshan') {
-            // 13 - sabah, 14 - sarawak
-            if (in_array($address->state->id, [13, 14])) {
-                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_FS_WEST_MALAYSIA]);
-            } else {
-                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_FS_WEST_MALAYSIA]);
-            }
-        } else {
-            $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
+        $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
+        if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
             $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
-//            if (!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST))
         }
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
@@ -93,10 +76,6 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
-        if(config('perfexcrm.is_enabled') == 'true'){
-            $this->newLeadTaskToPerfexCRMProcessor->execute($company);
-        }
-
         return $this->resourceResponse(new OrderResource($order));
     }
 }

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

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Orders\Standards\Rules\CanFetchOrder;
-use App\Http\Resources\OrderV2Resource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchOrderV2Logic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Order',
-            'message' => 'You have successfully retrieved an order'
-        ];
-    }
-
-    /** @var CanFetchOrder */
-    private $canFetchOrder;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /**
-     * FetchOrderLogic constructor.
-     * @param CanFetchOrder $canFetchOrder
-     * @param FetchesOrder $fetchesOrder
-     */
-    public function __construct(CanFetchOrder $canFetchOrder, FetchesOrder $fetchesOrder)
-    {
-        $this->canFetchOrder = $canFetchOrder;
-        $this->fetchesOrder = $fetchesOrder;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $this->canFetchOrder->passes();
-
-        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
-
-        return $this->resourceResponse(new OrderV2Resource($query));
-
-    }
-
-}

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

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

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

@@ -32,7 +32,6 @@ class FetchesDataFromYDPortal
         $content =  str_replace("\r",'', $content);
         $content =  str_replace("\n",'', $content);
         $content =  str_replace("\t",'', $content);
-        $content = str_replace('"data":}', '"data":""}', $content);
         return json_decode($content);
     }
 }

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

@@ -1,131 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
-use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-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\Http\Resources\PackingListResource;
-use App\Models\PackingList;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class CreateWarehouseTransportLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Created Warehouse PackingList',
-            'message' => 'You have successfully created a Warehouse PackingList'
-        ];
-    }
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-    /** @var GeneratesPackingListReferenceNumber */
-    private $generatesPackingListReferenceNumber;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
-    public function __construct(
-        FetchesPackingList $fetchesPackingList,
-        CreatePackingListProcessor $createPackingListProcessor,
-        CreatesTransport $createsTransport,
-        CreatesSchedule $createsSchedule,
-        CreatePackageProcessor $createPackageProcessor,
-        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber
-    ) {
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
-    }
-
-    /**
-     * @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
-    {
-        $packing_list = $this->fetchesPackingList->execute([
-            'id' => $request->route('id'),
-        ]);
-
-        $count_warehouse_packing_list = PackingList::where('reference', $packing_list->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->count();
-
-        if ($count_warehouse_packing_list) {
-            throw new MalformedRequestException('Warehouse Receive List Exists');
-        }
-
-        $order = $packing_list->owner;
-
-        $reference_number = $this->generatesPackingListReferenceNumber->execute();
-
-        $packingListObject = new PackingListObject(
-            $packing_list->reference,
-            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id,
-            PackingListType::WAREHOUSE_RECEIVE_LIST,
-            ApprovalStatus::PENDING_SUBMISSION
-        );
-        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-
-        $transportObject = new TransportObject(TransportType::LAND, null, $request->input('tracking'), Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
-        $transport = $this->createsTransport->execute($transportObject, $packingList);
-
-        $scheduleObject = new ScheduleObject(Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
-        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-        $packages = $packing_list->packages;
-
-        foreach ($packages as $key => $row) {
-            $packageObject = new PackageObject(
-                $row['type'],
-                $row['description'],
-                $row['width'],
-                $row['height'],
-                $row['length'],
-                $row['weight'],
-                $row['quantity'],
-                ApprovalStatus::APPROVED,
-                $row['reference'],
-            );
-            $this->createPackageProcessor->execute($packageObject, $packingList);
-        }
-
-        return $this->resourceResponse(new PackingListResource($packingList));
-    }
-}

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

@@ -1,81 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
-use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\PackingList;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeletePackingListByPackageIdLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Deleted PackingList',
-            'message' => 'You have successfully deleted a PackingList'
-        ];
-    }
-
-
-    /** @var CanDeletePackingList */
-    private $canDeletePackingList;
-
-    /** @var DeletesPackingList */
-    private $deletesPackingList;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesPackage */
-    private $fetchesPackage;
-
-    /**
-     * DeletePackingListByPackageIdLogic constructor.
-     * @param CanDeletePackingList $canDeletePackingList
-     * @param DeletesPackingList $deletesPackingList
-     * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesPackage $fetchesPackage
-     */
-    public function __construct(CanDeletePackingList $canDeletePackingList, DeletesPackingList $deletesPackingList, FetchesPackingList $fetchesPackingList, FetchesPackage $fetchesPackage)
-    {
-        $this->canDeletePackingList = $canDeletePackingList;
-        $this->deletesPackingList = $deletesPackingList;
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesPackage = $fetchesPackage;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $this->canDeletePackingList->passes();
-
-        $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
-
-        $packingList = $package->packingList;
-
-        $packingList = PackingList::where('reference', $packingList->reference)->get();
-
-        $childPackingList = PackingList::where('owner_type', PackingList::class)->whereIn('owner_id', $packingList->pluck('id'))->get();
-
-        $packingList->each->delete();
-
-        $childPackingList->each->delete();
-
-        return $this->response([]);
-    }
-
-}

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

@@ -4,14 +4,12 @@ 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;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Models\Order;
 use App\Models\PackingList;
@@ -27,20 +25,16 @@ class CreatePackingListProcessor
     /** @var CreatesPackingList */
     private $createsPackingList;
 
-    /** @var PackingListToPerfexCRMProcessor */
-    private $packingListToPerfexCRMProcessor;
 
     /**
      * CreatePackingListProcessor constructor.
      * @param CanCreatePackingList $canCreatePackingList
      * @param CreatesPackingList $createsPackingList
-     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList)
     {
         $this->canCreatePackingList = $canCreatePackingList;
         $this->createsPackingList = $createsPackingList;
-        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
     /**
@@ -65,10 +59,6 @@ class CreatePackingListProcessor
         $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, PerfexCRMTasksYDStages::DEFAULT);
-        }
-
         return $packingList;
     }
 

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

@@ -2,9 +2,7 @@
 
 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;
@@ -26,7 +24,6 @@ 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\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Notifications\ShipmentDepartureEmail;
 use App\Classes\Notifications\ShipmentRescheduleEmail;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -36,13 +33,11 @@ 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\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 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;
@@ -52,6 +47,18 @@ class FetchContainersFromYdPortalProcessor
     /** @var FetchesDataFromYDPortal */
     private $fetchesDataFRomYDPortal;
 
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
     /** @var CreatesTransport */
     private $createsTransport;
 
@@ -61,41 +68,79 @@ class FetchContainersFromYdPortalProcessor
     /** @var FetchesContainer */
     private $fetchesContainer;
 
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
     /** @var CreateContainerProcessor */
     private $createContainerProcessor;
 
-    /** @var PackingListToPerfexCRMProcessor */
-    private $packingListToPerfexCRMProcessor;
+    /** @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 PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
+     * @param CreatesContract $unityCreateContract
+     * @param AssignContractEntityProcessor $unityAssignContractEntity
+     * @param CreateContractEntityProcessor $unityCreateContractEntity
+     * @param CreatesStep $createsStep
+     * @param ActivateContractProcessor $unityActivateContract
      */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, CreateContainerProcessor $createContainerProcessor, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    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->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
+        $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 MalformedRequestException
-     * @throws AccessForbiddenException
-     * @throws RequestValidationException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute()
     {
-        $maxFetchTime = Carbon::now()->subMonths(4);
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDate('created_at', '>=', $maxFetchTime)->doesntHave('containers')->get();
+        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->doesntHave('containers')->get();
 
         foreach ($packingLists as $packingList) {
             $time_start = microtime(true);
@@ -145,10 +190,6 @@ class FetchContainersFromYdPortalProcessor
                     $container->packingLists()->detach($packingList);
                     $container->packingLists()->attach($packingList);
 
-                    if(config('perfexcrm.is_enabled') == 'true'){
-                        $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::LOAD_CONTAINER);
-                    }
-
                     $transport = $container->transports()->first();
 
                     if(!$transport){

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

@@ -8,11 +8,9 @@ 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\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Notifications\ShipmentRescheduleEmail;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 use App\Models\Container;
 use App\Models\Order;
 use App\Models\PackingList;
@@ -29,21 +27,16 @@ class FetchContainersUpdatesFromYdPortalProcessor
     /** @var CreatesSchedule */
     private $createsSchedule;
 
-    /** @var PackingListToPerfexCRMProcessor */
-    private $packingListToPerfexCRMProcessor;
-
     /**
      * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
      * @param UpdatesContractObligation $updatesContractObligations
      * @param CreatesSchedule $createsSchedule
-     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, UpdatesContractObligation $updatesContractObligations, CreatesSchedule $createsSchedule, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, UpdatesContractObligation $updatesContractObligations, CreatesSchedule $createsSchedule)
     {
         $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
         $this->updatesContractObligations = $updatesContractObligations;
         $this->createsSchedule = $createsSchedule;
-        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -72,14 +65,10 @@ class FetchContainersUpdatesFromYdPortalProcessor
 
             $unstuffingDate = null;
             $delayDate = null;
-            $checkShipSailDate = null;
-            $checkShipArrivalDate = 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();
@@ -108,12 +97,10 @@ class FetchContainersUpdatesFromYdPortalProcessor
 
                 if ($trackingRow->tracking === '到港') {
                     $delayDate = Carbon::parse($trackingRow->trackingtime);
-                    $checkShipArrivalDate = Carbon::parse($trackingRow->trackingtime);
                 }
 
                 if ($trackingRow->tracking === '已开船') {
                     $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
-                    $checkShipSailDate = Carbon::parse($trackingRow->trackingtime);
                 }
 
                 if ($trackingRow->tracking === '货物已进目的港仓库') {
@@ -121,32 +108,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
                 }
             }
 
-            dump($delayDate, $unstuffingDate);
-
-            if($checkShipSailDate){
-                //check if ship has sailed
-                if($checkShipSailDate->isPast()){
-                    foreach ($container->packingLists as $packingList){
-                        if(config('perfexcrm.is_enabled') == 'true'){
-                            $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::SHIP_SAILED);
-                        }
-                    }
-                }
-            }
-
-            if($checkShipArrivalDate){
-                //check if ship has arrived at destination
-                if($checkShipArrivalDate->isPast()){
-                    foreach ($container->packingLists as $packingList){
-                        if(config('perfexcrm.is_enabled') == 'true'){
-                            $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::SHIP_ARRIVED);
-                        }
-                    }
-                }
-            }
-
             if($delayDate){
-
                 $delayDate = $delayDate->addDays(2);
                 $transport = $container->transports()->first();
 
@@ -162,6 +124,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
                         }
                     }
                 }
+
             }
 
             if($unstuffingDate){
@@ -183,9 +146,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
                         $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
                         $step->update(['status' => ApprovalStatus::COMPLETED]);
                     }
-                    if(config('perfexcrm.is_enabled') == 'true'){
-                        $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::UNSTUFFING);
-                    }
+
                 }
             }
 

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

@@ -8,8 +8,6 @@ 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\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
@@ -36,21 +34,16 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
     /** @var CreatesSchedule */
     private $createsSchedule;
 
-    /** @var PackingListToPerfexCRMProcessor */
-    private $packingListToPerfexCRMProcessor;
-
     /**
      * @param UpdatesContractObligation $updatesContractObligations
      * @param CreatesTransport $createsTransport
      * @param CreatesSchedule $createsSchedule
-     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
      */
-    public function __construct(UpdatesContractObligation $updatesContractObligations, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
+    public function __construct(UpdatesContractObligation $updatesContractObligations, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
     {
         $this->updatesContractObligations = $updatesContractObligations;
         $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
-        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
     }
 
 
@@ -106,9 +99,6 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
                     $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
 
-                    if(config('perfexcrm.is_enabled') == 'true'){
-                        $this->packingListToPerfexCRMProcessor->execute($packingList, PerfexCRMTasksYDStages::DELIVERY);
-                    }
                 }
 
                 $time_end = microtime(true);

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

@@ -121,7 +121,6 @@ class FetchPackingListsFromYdPortalProcessor
                 }
 
                 $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,
@@ -132,7 +131,6 @@ class FetchPackingListsFromYdPortalProcessor
                 if(!$rows->data) continue;
 
                 foreach($rows->data as $row){
-                    if(!is_numeric($row->goodcount)) continue;
 
                     $time_start = microtime(true);
 

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

@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CreateLeadPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $email;
-
-    /** @var string */
-    private $phone;
-
-    /** @var string */
-    private $companyName;
-
-    /** @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

@@ -1,173 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CreateTaskPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $email;
-
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $description;
-
-    /** @var string */
-    private $leadId;
-
-    /** @var string */
-    private $milestoneId;
-
-    /** @var string */
-    private $projectId;
-
-    /** @var string */
-    private $reference;
-
-    /** @var string */
-    private $onTaskCompletion;
-
-    /** @var string */
-    private $status;
-
-    /** @var string */
-    private $department;
-
-    /** @var string */
-    private $priority;
-
-    /** @var string */
-    private $duedate;
-
-    /** @var int */
-    private $invoiceId;
-
-    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, int $invoiceId)
-    {
-        $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;
-        $this->invoiceId = $invoiceId;
-    }
-
-    /**
-     * @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;
-    }
-
-    /**
-     * @return int
-     */
-    public function getInvoiceId(): int
-    {
-        return $this->invoiceId;
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,145 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UpdatePerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $companyName;
-
-    /** @var string */
-    private $companyReference;
-
-    /** @var string */
-    private $contactName;
-
-    /** @var string */
-    private $contactEmail;
-
-    /** @var string */
-    private $bookingMarking;
-
-    /** @var string */
-    private $projectName;
-
-    /** @var int */
-    private $projectStatus;
-
-    /** @var int */
-    private $invoiceId = 0;
-
-    /** @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, int $invoiceId, 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->$invoiceId = $invoiceId;
-        $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 int
-     */
-    public function getInvoiceId(): int
-    {
-        return $this->invoiceId;
-    }
-
-    /**
-     * @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;
-    }
-
-    public function setInvoiceId($invoiceId)
-    {
-        $this->invoiceId = $invoiceId;
-    }
-}

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

@@ -1,179 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Models\Transaction;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoiceSingleItemPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Models\PackingList;
-use Carbon\Carbon;
-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;
-        $total = number_format($transaction->amount, 2,'.','') * 1;
-
-        //This setting is similar to Setup > Leads > Sources, Setup > Leads > Statuses
-        //Can be found at Finance > Payment Modes
-        array_push($allowedPaymentModes, 1, 2);
-        $invoicePerfexCRMObject = new InvoicePerfexCRMObject(
-            $clientId,
-            $number,
-            $date,
-            $dueDate,
-            $currency,
-            $subTotal,
-            $total,
-            $billingStreet,
-            $projectId,
-            $allowedPaymentModes,
-            $invoiceItems
-        );
-
-        $result = $this->createsPerfexCRMInvoice->execute($invoicePerfexCRMObject);
-
-        return $result;
-    }
-
-}

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

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

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

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

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

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject;
-use Illuminate\Support\Facades\Log;
-use App\Classes\General\Helper;
-
-class FetchPerfexCRMInvoiceProcessor
-{
-    private $fetchesPerfexCRMCustomer;
-    /** @var FetchesPerfexCRMCustomer */
-
-    /** @var FetchesPerfexCRMInvoice */
-    private $fetchesPerfexCRMInvoice;
-
-    /** @var CreatePerfexCRMInvoiceProcessor */
-    private $createPerfexCRMInvoiceProcessor;
-
-    /**
-     *
-     * FetchPerfexCRMInvoiceProcessor constructor.
-    * @param FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer
-    * @param FetchesPerfexCRMInvoice $fetchesPerfexCRMInvoice
-    * @param CreatePerfexCRMInvoiceProcessor $createPerfexCRMInvoiceProcessor
-    */
-    public function __construct(FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer,
-        FetchesPerfexCRMInvoice $fetchesPerfexCRMInvoice,
-        CreatePerfexCRMInvoiceProcessor $createPerfexCRMInvoiceProcessor)
-    {
-        $this->fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer;
-        $this->fetchesPerfexCRMInvoice = $fetchesPerfexCRMInvoice;
-        $this->createPerfexCRMInvoiceProcessor = $createPerfexCRMInvoiceProcessor;
-    }
-
-    public function execute(FetchPerfexCRMInvoiceObject $fetchPerfexCRMInvoiceObject)
-    {
-        //invoiceId to be returned - fetch or create
-        $invoiceId = 0;
-
-        //get the client id
-        $customer = $this->fetchesPerfexCRMCustomer->execute($fetchPerfexCRMInvoiceObject->getEmail());
-        $transaction = $fetchPerfexCRMInvoiceObject->getTransaction();
-
-        $number = $transaction->owner->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));
-        }
-
-        $invoice = $this->fetchesPerfexCRMInvoice->execute($customer->userid,"INV-", $number);
-        if(is_null($invoice)){
-            $result = $this->createPerfexCRMInvoiceProcessor->execute($transaction->owner);
-            if ($result) {
-                $invoiceId = $result->payload['id'];
-            } else {
-                $log['message'] = 'FetchPerfexCRMInvoiceProcessor failed for transaction > bill_no: '.$number;
-                Helper::debugLogger($log);
-            }
-        }
-        else{
-            $invoiceId = $invoice->id;
-        }
-
-        return $invoiceId;
-    }
-}

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

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-use App\Classes\Jobs\CreatePerfexCRMSingleTask;
-use App\Classes\ValueObjects\Constants\PerfexCRMTaskPriority;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Models\Company;
-use Illuminate\Support\Facades\Log;
-
-
-class NewLeadTaskToPerfexCRMProcessor
-{
-    /**
-     * @param Company $company
-     * @return true
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Company $company)
-    {
-        try {
-            $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",
-                0
-            );
-
-            CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
-
-        } catch (\Exception $exception){
-            Log::error($exception);
-        }
-        return true;
-    }
-
-}

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

@@ -1,163 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\Jobs\UpdatePerfexCRMPrelude;
-use App\Models\PackingList;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasksYDStages;
-use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
-use Illuminate\Support\Facades\Log;
-
-class PackingListToPerfexCRMProcessor
-{
-    /**
-     * @param PackingList $packingList
-     * @return bool
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(PackingList $packingList, int $stage = PerfexCRMTasksYDStages::DEFAULT): bool
-    {
-        try {
-            if($packingList->owner instanceof \App\Models\Order) {
-                $info = $this->extractInfo($packingList);
-                $tasks = $this->defineTasks($stage);
-
-                $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                    $info['companyName'],
-                    $info['companyReference'],
-                    $info['contactName'],
-                    $info['contactEmail'],
-                    $info['bookingMarking'], //For Exchange-2.0
-                    $info['projectName'],
-                    PerfexCRMProjectStatus::NOT_STARTED,
-                    0,
-                    [],
-                    $tasks
-                );
-                $this->dispatchUpdateJob($packingList, $updatePerfexCRMObject);
-            }
-        } catch (\Exception $exception){
-            Log::error('PackingListToPerfexCRMProcessor: ' . json_encode($packingList));
-            Log::error($exception);
-        }
-        return true;
-    }
-
-     //Level 1
-    private function extractInfo(PackingList $packingList): array
-    {
-        $order = $packingList->owner;
-        $companyModule  = $order->companyModule()->first();
-        $employee = $companyModule->employees()->first();
-
-        $info = [];
-        $info['companyName'] = $companyModule->name;
-        $info['companyReference'] = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-        $info['contactName'] = $employee->name;
-        $info['contactEmail'] = $employee->email;
-        $info['bookingMarking'] = ''; //For Exchange-2.0
-        $info['projectName'] = 'IZYIM | X1 Shipping | '.$packingList->owner->reference.' | '.$packingList->reference;
-
-        return $info;
-    }
-
-    private function defineTasks(int $stage): array
-    {
-        $tasks = [];
-
-        if ($stage === PerfexCRMTasksYDStages::DEFAULT) {
-            $tasks = $this->defineAllYDStagesTasks();
-        }
-        else if ($stage === PerfexCRMTasksYDStages::LOAD_CONTAINER) {
-            $tasks = $this->updateLoadContainerTasks();
-        }
-        else if ($stage === PerfexCRMTasksYDStages::SHIP_SAILED) {
-            $tasks = $this->updateShipSailedTasks();
-        }
-        else if ($stage === PerfexCRMTasksYDStages::SHIP_ARRIVED) {
-            $tasks = $this->updateShipArrivedTasks();
-        }
-        else if ($stage === PerfexCRMTasksYDStages::UNSTUFFING) {
-            $tasks = $this->updateUnstuffingTasks();
-        }
-        else if ($stage === PerfexCRMTasksYDStages::DELIVERY) {
-            $tasks = $this->updateDeliveryTasks();
-        }
-
-        return $tasks;
-    }
-
-    private function dispatchUpdateJob(PackingList $packingList, UpdatePerfexCRMObject $updatePerfexCRMObject)
-    {
-        UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, false);
-    }
-
-
-     //Level Others: Nested
-    private function defineAllYDStagesTasks(): array
-    {
-        $tasks = [
-            PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_1,
-            PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_2,
-            PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_3,
-            PerfexCRMTasks::TASK_YD_SHIPPING_1,
-            PerfexCRMTasks::TASK_YD_UNSTUFFING_1,
-            PerfexCRMTasks::TASK_YD_DELIVERY_1,
-        ];
-
-        return $tasks;
-    }
-
-    private function updateLoadContainerTasks(): array
-    {
-        $tasks = [];
-        $tasks = $this->completeTask(null, PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_3);
-        return $tasks;
-    }
-
-    private function updateShipSailedTasks(): array
-    {
-        $tasks = [];
-        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_LOADED_CONTAINER_3, PerfexCRMTasks::TASK_YD_SHIPPING_1);
-        return $tasks;
-    }
-
-    private function updateShipArrivedTasks(): array
-    {
-        $tasks = [];
-        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_SHIPPING_1, PerfexCRMTasks::TASK_YD_UNSTUFFING_1);
-        return $tasks;
-    }
-
-    private function updateUnstuffingTasks(): array
-    {
-        $tasks = [];
-        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_UNSTUFFING_1, PerfexCRMTasks::TASK_YD_DELIVERY_1);
-        return $tasks;
-    }
-
-    private function updateDeliveryTasks(): array
-    {
-        $tasks = [];
-        $tasks = $this->completeTask(PerfexCRMTasks::TASK_YD_DELIVERY_1, null);
-        return $tasks;
-    }
-
-    private function completeTask($startTask, $endTask) {
-        $resultArray = [];
-        if($startTask){
-            $startTask['status'] = PerfexCRMTaskStatus::COMPLETED;
-            array_push($resultArray, $startTask);
-        }
-        if($endTask){
-            $endTask['status'] = PerfexCRMTaskStatus::IN_PROGRESS;
-            array_push($resultArray, $endTask);
-        }
-
-        return $resultArray;
-    }
-
-}

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

@@ -1,145 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
-use App\Classes\Jobs\UpdatePerfexCRMPrelude;
-use App\Classes\Jobs\CreatePerfexCRMInvoice;
-use App\Models\Booking;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-class TransactionToPerfexCRMV2Processor
-{
-    public function execute(Transaction $model, int $status)
-    {
-        try {
-            if($model->owner instanceof \App\Models\Transaction && in_array($model->type, [TransactionType::PAYMENT])) {
-                //
-                $transaction = $model;
-                $info = $this->extractInfo($transaction);
-                $tasks = $this->defineTasks($model, $status);
-
-                //if(count($tasks) > 0) { //commented, otherwise when customer paid, invoice payment will not get created at crm because there is no tasks attached
-                    $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                        $info['companyName'],
-                        $info['companyReference'],
-                        $info['contactName'],
-                        $info['contactEmail'],
-                        $info['bookingMarking'],
-                        $info['projectName'],
-                        PerfexCRMProjectStatus::IN_PROGRESS,
-                        0,      //invoiceId
-                        [],     //milestoneNames
-                        $tasks
-                    );
-
-                    $this->dispatchUpdateJob($transaction, $status, $updatePerfexCRMObject);
-                //}
-            }
-            else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
-            {
-                CreatePerfexCRMInvoice::dispatch($model);
-            }
-        } catch (\Exception $exception) {
-            Log::error($exception);
-        }
-        return true;
-    }
-
-    //Level 1
-    private function extractInfo(Transaction $model): array
-    {
-        $packingList = $model->owner->owner;
-        $order = $packingList->owner()->first();
-        $companyModule = $order->companyModule()->first();
-        $employee = $companyModule->employees()->first();
-
-        $info = [];
-        $info['companyName'] = $companyModule->name;
-        $info['companyReference'] = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-        $info['contactName'] = $employee->name;
-        $info['contactEmail'] = $employee->email;
-        $info['bookingMarking'] = $packingList->id."-".$packingList->owner->id;
-        $info['projectName'] = 'IZYIM | X1 Shipping | '.$order->reference.' | '.$packingList->reference;
-
-        return $info;
-    }
-
-    private function defineTasks(Transaction $model, int $status): array
-    {
-        $tasks = [];
-
-        if ($status === ApprovalStatus::PENDING_SUBMISSION) {
-            $tasks = $this->defineTasks_handlePendingVerificationStatus($model);
-        } elseif ($status === ApprovalStatus::APPROVED) {
-            $tasks = $this->defineTasks_handleApprovedStatus($model);
-        }
-
-        return $tasks;
-    }
-
-    private function dispatchUpdateJob(Transaction $model, int $status, UpdatePerfexCRMObject $updatePerfexCRMObject)
-    {
-        $withInvoice = ($model->type === TransactionType::PAYMENT && $model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED);
-        UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, $withInvoice);
-    }
-
-
-
-
-    //Level Others: Nested
-    private function defineTasks_handlePendingVerificationStatus(Transaction $model): array
-    {
-        $tasks = [];
-        switch($model->type) {
-            case TransactionType::PAYMENT:
-                $tasks = $this->definePaymentTasks($model);
-                break;
-        }
-
-        return $tasks;
-    }
-
-    private function defineTasks_handleApprovedStatus(Transaction $model): array
-    {
-        $tasks = [];
-        switch($model->type) {
-            case TransactionType::PAYMENT:
-                $tasks = $this->defineTasks_handleApprovedStatus_handlePaymentApprovedStatus();
-                break;
-        }
-
-        return $tasks;
-    }
-
-
-    private function definePaymentTasks(Transaction $model): array //cief todo: to comfirm what tasks need to be created
-    {
-        $tasks = [];
-        return $tasks;
-    }
-
-    private function defineTasks_handleApprovedStatus_handlePaymentApprovedStatus(): array //cief todo: to comfirm what tasks need to be created
-    {
-        $tasks = [];
-        // $tasks = [
-        //     PerfexCRMTasks::TASK_POST_PAYMENT_1,
-        //     PerfexCRMTasks::TASK_POST_PAYMENT_2,
-        //     PerfexCRMTasks::TASK_POST_PAYMENT_3,
-        //     PerfexCRMTasks::TASK_POST_PAYMENT_4,
-        // ];
-        return $tasks;
-    }
-
-    private function completeTask($startTask, $endTask) {
-        $startTask['status'] = PerfexCRMTaskStatus::COMPLETED;
-        $endTask['status'] = PerfexCRMTaskStatus::IN_PROGRESS;
-        return [$startTask, $endTask];
-    }
-}

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

@@ -1,260 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
-use App\Classes\Modules\PerfexCRM\Services\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\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Classes\Exceptions\MalformedRequestException;
-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) {
-        $projectId = "";
-
-       // 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
-                $taskName = $tasks[$count]['name'];
-                $taskReference = $tasks[$count]['reference'];
-                $taskOnTaskCompletion = $tasks[$count]['on_task_completion'];
-                $taskIsAllowMultiple = $tasks[$count]['is_allow_multiple'];
-                $taskIsOnTaskCompletionUpdate = $tasks[$count]['is_on_task_completion_update'];
-                if($updatePerfexCRMObject->getInvoiceId() != 0 && $taskIsAllowMultiple){
-                    $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")";
-                    $taskReference = $taskReference."_".$updatePerfexCRMObject->getInvoiceId();
-                    if($taskOnTaskCompletion && $taskIsOnTaskCompletionUpdate){
-                        $taskOnTaskCompletion = $taskOnTaskCompletion."_".$updatePerfexCRMObject->getInvoiceId();
-                    }
-                }
-
-                $result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId());
-
-                if(isset($result->payload)){
-                    //Check to make sure that task that is already completed do not get updated again
-                    if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED && $result->payload[0]['status'] != PerfexCRMTaskStatus::COMPLETED && $result->payload[0]['status'] != $taskStatus)
-                    {
-                        $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{
-                    $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
-                        "",
-                        $taskName,
-                        $tasks[$count]['description'],
-                        "",
-                        $projectId,
-                        $milestoneId,
-                        $taskReference,
-                        $taskOnTaskCompletion,
-                        $taskStatus,
-                        $tasks[$count]['department'],
-                        $tasks[$count]['priority'],
-                        $tasks[$count]['duedate'],
-                        $updatePerfexCRMObject->getInvoiceId()
-                    );
-                    $result = $this->createsPerfexCRMTask->execute($createTaskPerfexCRMObject);
-                }
-            }
-        }
-
-        $payload = [];
-        $payload['projectId'] = $projectId;
-        return (object) $payload;
-   }
-
-}

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

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

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

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

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

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

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

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

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

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
-
-class CreatesPerfexCRMInvoice
-{
-    /**
-     * @param InvoicePerfexCRMObject $invoicePerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(InvoicePerfexCRMObject $invoicePerfexCRMObject) {
-        try{
-            $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('CreatesPerfexCRMInvoice: '.$response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

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

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

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

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-
-class CreatesPerfexCRMLead
-{
-    /**
-     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject) {
-        try{
-            $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('CreatesPerfexCRMLead: '.$response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server ' . $exception->getMessage());
-        }
-    }
-}

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

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

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

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-
-class CreatesPerfexCRMTask
-{
-    /**
-     * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-
-    public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
-        try{
-            $custom_fields = [];
-            if($createTaskPerfexCRMObject->getDepartment() != ""){
-                $custom_fields = [
-                    "tasks" => [
-                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $createTaskPerfexCRMObject->getDepartment()
-                    ]
-                ];
-            }
-
-            $data = [
-                'name' => $createTaskPerfexCRMObject->getName(),
-                'description' => $createTaskPerfexCRMObject->getDescription(),
-                'milestone' => $createTaskPerfexCRMObject->getMilestoneId(),
-                'startdate' => date('Y-m-d'),
-                'rel_type' => 'project',
-                'rel_id' => $createTaskPerfexCRMObject->getProjectId(),
-                'status' => $createTaskPerfexCRMObject->getStatus(),
-                'is_system_created' => 1,
-                'reference' => $createTaskPerfexCRMObject->getReference(),
-                'on_task_completion' => $createTaskPerfexCRMObject->getOnTaskCompletion(),
-                'custom_fields' => $custom_fields,
-                'priority' => $createTaskPerfexCRMObject->getPriority(),
-                'duedate' => date('Y-m-d', strtotime('+' . $createTaskPerfexCRMObject->getDuedate() . ' days')),
-                'invoice_id' => $createTaskPerfexCRMObject->getInvoiceId(),
-            ];
-
-            if($createTaskPerfexCRMObject->getLeadId() != '') {
-                $data['rel_type'] = 'lead';
-                $data['rel_id'] = $createTaskPerfexCRMObject->getLeadId();
-            }
-
-            $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('CreatesPerfexCRMTask: '.$response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

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

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

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

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

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

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

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

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class 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('FetchesPerfexCRMMilestone: '.$response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

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

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

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

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\General\Helper;
-
-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, string $invoiceId) {
-        try{
-            $data = [
-                'name' => $taskName,
-                'rel_type' => $relType,
-                'rel_id' => $relId,
-            ];
-
-            if($milestoneId != '') {
-                $newItem = ['milestone' =>  $milestoneId ];
-                $data = array_merge($data, $newItem);
-            }
-
-            if($invoiceId != 0) {
-                $newItem = ['invoice_id' =>  $invoiceId ];
-                $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{
-                Helper::debugLogger($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

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

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
-use App\Classes\General\Helper;
-
-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{
-                // Helper::debugLogger($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

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

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class UpdatesPerfexCRMInvoice
-{
-
-    /**
-     * @param $invoice
-     * @param string $projectId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute($invoice, string $projectId) {
-        try{
-            // <p>The Invoice number field is required.<\/p>
-            // <p>The Invoice date field is required.<\/p>
-            // <p>The Currency field is required.<\/p>
-            // <p>The Items field is required.<\/p>
-            // <p>The Allow Payment Mode field is required.<\/p>
-            // <p>The Billing Street field is required.<\/p>
-            // <p>The Sub Total field is required.<\/p>
-            // <p>The Total field is required.<\/p>
-
-            $newInvoiceItems = [];
-            foreach ($invoice->items as $item) {
-                $item['itemid'] = $item['id'];
-                unset($item['id']);
-                $item['order'] = $item['item_order'];
-                unset($item['item_order']);
-                array_push($newInvoiceItems,$item);
-            }
-
-            $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('UpdatesPerfexCRMInvoice: '.$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

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\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('UpdatesPerfexCRMLead: '.$response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
-        }
-    }
-}

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

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

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

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

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

@@ -5,8 +5,17 @@ namespace App\Classes\Modules\Segments\ControllersLogic;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use App\Http\Resources\ConstantResource;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Processors\UpdatePostcodeSegmentProcessor;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
+use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
 
 class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
 {
@@ -21,18 +30,54 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
         ];
     }
 
-    /** @var UpdatePostcodeSegmentProcessor */
-    private $updatePostcodeSegmentProcessor;
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var AddItemToConstantValueArray */
+    private $addItemToConstantValueArray;
+
+    /** @var RemoveItemFromConstantValueArray */
+    private $removeItemFromConstantValueArray;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
 
     /**
      * UpdateConstantLogic constructor.
-     * @param UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param AddItemToConstantValueArray $addItemToConstantValueArray
+     * @param CreatesConstant $createsConstant
+     * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
      */
     public function __construct(
-        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
+        CanUpdateConstant $canUpdateConstant, 
+        UpdatesConstant $updatesConstant, 
+        FetchesSegment $fetchesSegment, 
+        FetchesConstant $fetchesConstant,
+        AddItemToConstantValueArray $addItemToConstantValueArray, 
+        RemoveItemFromConstantValueArray $removeItemFromConstantValueArray,
+        CreatesConstant $createsConstant
     )
     {
-        $this->updatePostcodeSegmentProcessor = $updatePostcodeSegmentProcessor;
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
+        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
+        $this->createsConstant = $createsConstant;
     }
     /**
      * @param Request $request
@@ -43,9 +88,44 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $constant = $this->updatePostcodeSegmentProcessor->execute($request->route('id'), $request->input('reference'), $request->input('postcode'));
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
+
+            $constantValue = $this->addItemToConstantValueArray->execute($constant->value, $request->input('postcode'));
+
+            $object = new ConstantObject($request->input('reference'), $constantValue);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $constantObject = [$request->input('postcode')];
+
+            $object = new ConstantObject(
+                $request->input('reference'),
+                $constantObject
+            );
+
+            $constant = $this->createsConstant->execute($segment, $object);
+        }
+
+        try {
+            // check if postcode exist in the opposite constant, and delete it
+            $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
+
+            $oppositeConstantValue = $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $request->input('postcode'));
+
+            $oppositeObject = new ConstantObject($request->input('reference') == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $oppositeConstantValue);
+
+            $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
+
+        } catch (ResourceNotFoundException $exception){
+            // if opposite constant does not exist, do nothing
+        }
+
+        $constant = $this->updatesConstant->execute($constant, $object);
 
         return $this->resourceResponse(new ConstantResource($constant));
     }
 
-}
+}

app/Classes/Modules/Segments/Processors/UpdatePostcodeSegmentProcessor.php

@@ -1,122 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Processors;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use App\Http\Resources\ConstantResource;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Services\FetchesConstant;
-use App\Classes\Modules\Segments\Services\UpdatesConstant;
-use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
-use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
-use App\Classes\Modules\Segments\Services\AddItemToConstantValueArray;
-use App\Classes\Modules\Segments\Services\RemoveItemFromConstantValueArray;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Segments\Services\CreatesConstant;
-
-class UpdatePostcodeSegmentProcessor
-{
-    /** @var CanUpdateConstant */
-    private $canUpdateConstant;
-
-    /** @var UpdatesConstant */
-    private $updatesConstant;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var FetchesConstant */
-    private $fetchesConstant;
-
-    /** @var AddItemToConstantValueArray */
-    private $addItemToConstantValueArray;
-
-    /** @var RemoveItemFromConstantValueArray */
-    private $removeItemFromConstantValueArray;
-
-    /** @var CreatesConstant */
-    private $createsConstant;
-    /**
-     * UpdatePostcodeSegmentProcessor constructor.
-     * @param CanUpdateConstant $canUpdateConstant
-     * @param UpdatesConstant $updatesConstant
-     * @param FetchesSegment $fetchesSegment
-     * @param FetchesConstant $fetchesConstant
-     * @param AddItemToConstantValueArray $addItemToConstantValueArray
-     * @param CreatesConstant $createsConstant
-     * @param RemoveItemFromConstantValueArray $removeItemFromConstantValueArray
-     */
-    public function __construct(
-        CanUpdateConstant $canUpdateConstant, 
-        UpdatesConstant $updatesConstant, 
-        FetchesSegment $fetchesSegment, 
-        FetchesConstant $fetchesConstant,
-        AddItemToConstantValueArray $addItemToConstantValueArray, 
-        RemoveItemFromConstantValueArray $removeItemFromConstantValueArray,
-        CreatesConstant $createsConstant
-    )
-    {
-        $this->canUpdateConstant = $canUpdateConstant;
-        $this->updatesConstant = $updatesConstant;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->fetchesConstant = $fetchesConstant;
-        $this->addItemToConstantValueArray = $addItemToConstantValueArray;
-        $this->removeItemFromConstantValueArray = $removeItemFromConstantValueArray;
-        $this->createsConstant = $createsConstant;
-    }
-
-
-    /**
-     * @param string $name
-     * @param int $companyModuleId
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute($segment_id, $reference, $postcode){
-
-        $segment = $this->fetchesSegment->execute(['id' => $segment_id]);
-
-        try {
-            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $reference]);
-
-            $constantValue = $this->addItemToConstantValueArray->execute($constant->value, $postcode);
-
-            $object = new ConstantObject($reference, $constantValue);
-
-        } catch (ResourceNotFoundException $exception){
-
-            $constantObject = [$postcode];
-
-            $object = new ConstantObject(
-                $reference,
-                $constantObject
-            );
-
-            $constant = $this->createsConstant->execute($segment, $object);
-        }
-
-        try {
-            // check if postcode exist in the opposite constant, and delete it
-            $oppositeConstant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $reference == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE]);
-
-            $oppositeConstantValue = $this->removeItemFromConstantValueArray->execute($oppositeConstant->value, $postcode);
-
-            $oppositeObject = new ConstantObject($reference == SegmentConstants::CENTER_POSTCODE ? SegmentConstants::OUTSTATION_POSTCODE : SegmentConstants::CENTER_POSTCODE, $oppositeConstantValue);
-
-            $this->updatesConstant->execute($oppositeConstant, $oppositeObject);
-
-        } catch (ResourceNotFoundException $exception){
-            // if opposite constant does not exist, do nothing
-        }
-
-        $constant = $this->updatesConstant->execute($constant, $object);
-
-        return $constant;
-
-    }
-
-}

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

@@ -1,179 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Groups\DataTransferObjects\GroupObject;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
-use App\Models\Group;
-use App\Classes\Modules\Groups\Services\CreatesGroup;
-use App\Models\Transaction;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\Wallets\Processors\CreateWalletTopUpTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\GroupTransaction;
-use App\Http\Resources\WalletTransactionResource;
-use App\Models\Wallet;
-
-class CreateGroupsLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Create Group Transaction',
-            'message' => 'You have successfully created a group transaction'
-        ];
-    }
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNumber;
-
-
-    /** @var FetchesCompanyModule  */
-    private $fetchesCompanyModule;
-
-    /** @var CreateWalletTopUpTransactionProcessor */
-    private $createWalletTopUpTransactionProcessor;
-
-    /** @var CreatePaymentTransactionProcessor */
-    private $createPaymentTransactionProcessor;
-
-    /** @var CreatesGroup */
-    private $createsGroup;
-
-    public function __construct(
-        FetchesTransaction $fetchesTransaction, 
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
-        FetchesCompanyModule $fetchesCompanyModule,
-        CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor,
-        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
-        CreatesGroup $createsGroup
-    )
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
-        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
-        $this->createsGroup = $createsGroup;
-    }
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
-        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
-
-        $invoice_ids    = json_decode($request->route('transaction_ids'));
-        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
-
-        // todo-new: check why is this not working
-        // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
-        $invoices       = Transaction::whereIn('id', $invoice_ids)->get();
-
-        if ($payment_method == PaymentMethodType::WALLET) {
-
-            $companyModuleId = $invoices->first()->receiver;
-
-            $wallet = Wallet::where('owner_id', $companyModuleId)->first();
-
-            // todo-new: verify currently checking wallet amount based on 'amount' value passed by frontend
-            if((float) number_format(($wallet->amount - $request->input('amount')),2) < 0){
-                throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
-            }
-
-            $groupPyamentStatus = ApprovalStatus::APPROVED;
-        }
-
-        $issuer                 = 0;
-        $receiver               = 0;
-        $amount                 = 0;
-        $original_amount        = 0;
-        $currency_id            = 0;
-        $original_currency_id   = 0;
-        $currency_rate          = 0;
-        $tax                    = 0;
-        $service_charge         = 0;
-
-        $group = new GroupObject(
-            $issuer,
-            $receiver,
-            $amount,
-            $original_amount,
-            $currency_id,
-            $original_currency_id,
-            $currency_rate,
-            $tax,
-            $service_charge,
-            $payment_method,
-            '-',
-            $groupPyamentStatus,
-        );
-
-        $group = $this->createsGroup->execute($group);
-
-        foreach ($invoices as $invoice) {
-            if ($payment_method == PaymentMethodType::WALLET) {
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'));
-            }
-
-            $issuer                 = $invoice->issuer;
-            $receiver               = $invoice->receiver;
-            $amount                 += $invoice->amount;
-            $original_amount        += $invoice->original_amount;
-            $currency_id            = $invoice->currency_id;
-            $original_currency_id   = $invoice->original_currency_id;
-            $currency_rate          = $invoice->currency_rate;
-            $tax                    += $invoice->tax;
-            $service_charge         += $invoice->service_charge;
-
-            // creates group transaction
-            $groupTransaction = new GroupTransaction();
-            $groupTransaction->group_id = $group->id;
-            $groupTransaction->transaction_id = $invoice->id;
-            $groupTransaction->save();
-        }
-
-        if (in_array($payment_method, [PaymentMethodType::PAYMENT_GATEWAY, PaymentMethodType::CASH])) {
-            // create only one billplz payment for wallet top up
-            $amount = floatval(str_replace(',', '', $request->input('amount')));
-            $companyModuleId = $invoice->receiver;
-            $companyModule = $this->fetchesCompanyModule->execute(['id' => $companyModuleId]);
-
-            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'), true, $payment_method);
-        }
-
-        $group->issuer                  = $issuer;
-        $group->receiver                = $receiver;
-        $group->reference               = $payment_method === PaymentMethodType::PAYMENT_GATEWAY ? $topUpTransaction->payment_reference : $billNumber;
-        $group->amount                  = $amount;
-        $group->original_amount         = $original_amount;
-        $group->currency_id             = $currency_id;
-        $group->original_currency_id    = $original_currency_id;
-        $group->currency_rate           = $currency_rate;
-        $group->tax                     = $tax;
-        $group->service_charge          = $service_charge;
-        $group->status                  = $groupPyamentStatus;
-        $group->save();
-
-        if ($payment_method === PaymentMethodType::PAYMENT_GATEWAY) {
-            return $this->resourceResponse(new WalletTransactionResource($topUpTransaction));
-
-        } else {
-            return $this->response([]);
-        }
-    }
-}

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

@@ -5,15 +5,30 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
+
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
 use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreatePaymentTransactionLogic extends AbstractControllerLogic
 {
 
+
     /**
      * @return array
      */
@@ -27,39 +42,83 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
-    /** @var CreatePaymentTransactionProcessor */
-    private $createPaymentTransactionProcessor;
+    /** @var FetchesSegmentConstant */
+    private $fetchesSegmentConstant;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesPaymentTransaction */
+    private $createsPaymentTransaction;
+
+    /** @var CreatesBillplzBill */
+    private $createsBillplzBill;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
 
     public function __construct(
-        FetchesTransaction $fetchesTransaction,
-        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+        FetchesTransaction $fetchesTransaction, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        CreatesPaymentTransaction $createsPaymentTransaction,
+        CreatesTransactionDetail $createsTransactionDetail,
+        CreatesBillplzBill $createsBillplzBill
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
-        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsPaymentTransaction = $createsPaymentTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->createsBillplzBill = $createsBillplzBill;
     }
 
     public function logic(Request $request) : JsonResponse
     {
-        $payment_method = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
-
         $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);
+        $amount = $request->input('amount');
+        $company_module = $invoice_transaction->owner()->first()->owner()->first()->companyModule()->first();
 
-        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'));
+        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+        $payment_reference = null;
+        if ($request->input('payment_method') == 5) {
+            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
+            $billPlzBill = $this->createsBillplzBill->execute(
+                $company_module->name, 
+                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
+                'This payment is for the invoice number . ' . $invoice_transaction->bill_no,
+                $amount,
+                $billNumber, 
+                $request->input('bank_code'), 
+                true
+            );
 
-        //cief todo: at exchange there is a transition step
-        // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
-        //     $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
-        // }
+            $payment_reference = $billPlzBill->id;
+        }
+        else {
+            $payment_method = PaymentMethodType::CASH;
+        }
 
-        // if(config('perfexcrm.is_enabled') == 'true'){
-        //     $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
-        // }
-
-        //To use
-        //ApprovalStatus::PENDING_VERIFICATION;
-        //use this to trigger  $this->transactionToPerfexCRMV2Processor->execute > defineTasks > defineTasks_handlePendingVerificationStatus > definePaymentTasks
+        $object = new TransactionObject(
+            $billNumber, 
+            TransactionType::PAYMENT, 
+            $company_module->id,
+            1,
+            1, 
+            $payment_method,
+            $request->input('amount'),
+            $request->input('amount'),
+            1,
+            1, 
+            0, 
+            0, 
+            0,
+            null, 
+            ApprovalStatus::PENDING_SUBMISSION,
+            null,
+            $payment_reference
+        );
 
+        $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
 
         return $this->resourceResponse(new TransactionResource($payment_transaction));
     }

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

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\FetchesGroup;
-use App\Classes\Modules\Transactions\Services\DeletesTransaction;
-use App\Classes\Modules\Transactions\Services\DeletesGroup;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteGroupLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Delete Group Transaction',
-            'message' => 'You have successfully deleted this Group Transaction'
-        ];
-    }
-
-    /** @var FetchesGroup */
-    private $fetchesGroup;
-
-    /** @var DeletesGroup */
-    private $deletesGroup;
-
-    /**
-     * DeleteGroupLogic constructor.
-     * @param updatesTransactionStatus $updatesTransactionStatus
-     * @param FetchesGroup $fetchesGroup
-     * @param DeletesTransaction $deletesTransaction
-     */
-    public function __construct(FetchesGroup $fetchesGroup, DeletesGroup $deletesGroup)
-    {
-        $this->fetchesGroup = $fetchesGroup;
-        $this->deletesGroup = $deletesGroup;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
-
-        $this->deletesGroup->execute($group);
-
-        return $this->response([]);
-    }
-
-}

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

@@ -1,52 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteTransactionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Delete Transaction',
-            'message' => 'You have successfully deleted the transaction'
-        ];
-    }
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-
-    /**
-     * SuspendTransactionLogic constructor.
-     * @param FetchesTransaction $fetchesTransaction
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-    }
-
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
-
-        $transaction->delete();
-
-        return $this->response([]);
-    }
-}

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

@@ -1,48 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\ValueObjects\Constants\TransactionType;
-
-class GenerateCreditNotePdfLogic
-{
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /**
-     * GenerateCreditNotePdfLogic constructor.
-     * @param FetchesTransaction $fetchesTransaction
-     * @param FetchesCompany $fetchesCompany
-     */
-    public function __construct(FetchesTransaction $fetchesTransaction, FetchesCompanyModule $fetchesCompanyModule)
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-    }
-
-    /**
-     * @param Request $request
-     * @return string|\Symfony\Component\HttpFoundation\Response
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Request $request)
-    {
-        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
-
-        $supplier = $this->fetchesCompanyModule->execute(['id' => $transaction->receiver]);
-
-        $pdf = LaravelMpdf::loadView('pages.pdfs.credit_note', ['transaction' => $transaction, 'supplier' => $supplier]);
-
-        return $pdf->stream('CreditNote.pdf');
-    }
-}

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

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\ListsGroups;
-use App\Http\Resources\GroupResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListGroupsLogic extends AbstractControllerLogic
-{
-    /**
-     * ListTransactionsLogic constructor.
-     * @param ListsGroups $listsGroups
-     */
-    public function __construct(ListsGroups $listsGroups)
-    {
-        $this->listsGroups = $listsGroups;
-    }
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Groups',
-            'message' => 'You have successfully retrieved a list of groups'
-        ];
-    }
-
-    /** @var ListsGroups */
-    private $listsGroups;
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->listsGroups->execute($this->listsGroups->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(GroupResource::collection($query));
-    }
-
-}

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

@@ -1,56 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\MappableTransactionWithDetailsResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class ListMappableTransactionWithDetailsLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Transactions With Details',
-            'message' => 'You have successfully retrieved a list of transactions'
-        ];
-    }
-
-
-    /** @var ListsTransactions */
-    private $listsTransactions;
-
-    /**
-     * ListTransactionsLogic constructor.
-     * @param ListsTransactions $listsTransactions
-     */
-    public function __construct(ListsTransactions $listsTransactions)
-    {
-        $this->listsTransactions = $listsTransactions;
-    }
-
-
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $filePath     = storage_path('logs/list_mappable_transaction_with_details.log');
-        $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $request->input('filters') . PHP_EOL;
-        
-        file_put_contents($filePath, $textToAppend, FILE_APPEND);
-
-        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(MappableTransactionWithDetailsResource::collection($query));
-
-    }
-
-
-
-}

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

@@ -1,53 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\BookingResource;
-use App\Http\Resources\MappableTransactionResource;
-use App\Http\Resources\TransactionResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListMappableTransactionsLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Transactions',
-            'message' => 'You have successfully retrieved a list of transactions'
-        ];
-    }
-
-
-    /** @var ListsTransactions */
-    private $listsTransactions;
-
-    /**
-     * ListTransactionsLogic constructor.
-     * @param ListsTransactions $listsTransactions
-     */
-    public function __construct(ListsTransactions $listsTransactions)
-    {
-        $this->listsTransactions = $listsTransactions;
-    }
-
-
-
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(MappableTransactionResource::collection($query));
-
-    }
-
-
-
-}

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

@@ -1,78 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Models\Document;
-
-class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Regenerate Shipping Invoice',
-            'message' => 'You have successfully regenerated shipping invoice'
-        ];
-    }
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-    /**
-     * @param CreatesDocument $createsDocument
-     */
-    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $orders = Order::where('company_module_id', $request->route('company_module_id'))->get();
-
-        foreach ($orders as $order){
-            $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
-            foreach ($invoices as $invoice){
-    
-                $invoice->documents()->delete();
-    
-                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
-    
-                $document_object = new DocumentObject(
-                    DocumentType::SHIPPING_INVOICE,
-                    [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-                    '',
-                    ApprovalStatus::COMPLETED,
-                    'shipping_invoice'
-                );
-    
-                $document =$this->createsDocument->execute($invoice, $document_object);
-    
-                $this->createsFiles->execute($document, $document_object);
-    
-                // dump($document);
-            }
-        }
-
-        return $this->response([]);
-    }
-
-}

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

@@ -1,185 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Http\Resources\GroupResource;
-use App\Models\Document;
-use App\Models\SegmentConstant;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Transactions\Services\CalculatesTransactionServiceCharge;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\Services\FetchesGroup;
-use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
-use App\Classes\Modules\Transactions\Services\CalculatesTransactionTransferFee;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use ErrorException;
-use Illuminate\Support\Facades\DB;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-
-class UpdateGroupLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Group Transaction',
-            'message' => 'You have successfully updated this Group Transaction'
-        ];
-    }
-
-    /** @var FetchesGroup */
-    private $fetchesGroup;
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var CalculatesTransactionServiceCharge */
-    private $calculatesTransactionServiceCharge;
-
-    /** @var UpdatesTransaction */
-    private $updatesTransaction;
-
-    /** @var CalculatesTransactionTransferFee */
-    private $calculatesTransactionTransferFee;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFile;
-
-    /**
-     * UpdateGroupLogic constructor.
-     * @param FetchesGroup $fetchesGroup
-     * @param FetchesCompany $fetchesCompany
-     * @param CalculatesTransactionServiceCharge $calculatesTransactionServiceCharge
-     * @param UpdatesTransaction $updatesTransaction
-     * @param CalculatesTransactionTransferFee $calculatesTransactionTransferFee
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFile
-     */
-    public function __construct(FetchesGroup $fetchesGroup, FetchesCompany $fetchesCompany, CalculatesTransactionServiceCharge $calculatesTransactionServiceCharge, UpdatesTransaction $updatesTransaction, CalculatesTransactionTransferFee $calculatesTransactionTransferFee, CreatesDocument $createsDocument, CreatesFiles $createsFile)
-    {
-        $this->fetchesGroup = $fetchesGroup;
-        $this->fetchesCompany = $fetchesCompany;
-        $this->calculatesTransactionServiceCharge = $calculatesTransactionServiceCharge;
-        $this->updatesTransaction = $updatesTransaction;
-        $this->calculatesTransactionTransferFee = $calculatesTransactionTransferFee;
-        $this->createsDocument = $createsDocument;
-        $this->createsFile = $createsFile;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
-
-        $transactions = $group->transactions()->get();
-
-        $rate = $request->input('rate');
-
-        $supplier = $this->fetchesCompany->execute(['id' => $request->input('supplier_id')]);
-
-//        $group->transactions()->update(['issuer' => $supplier->id, 'currency_rate' => $rate]);
-//        $group->transactions()->update(['amount' => DB::raw('(original_amount * (1 / currency_rate)) + service_charge + tax')]);
-
-
-        foreach($transactions as $transaction) {
-
-            $constant = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $supplier->id)->first();
-            $serviceCharge = $this->calculatesTransactionServiceCharge->execute($transaction->original_amount, $rate, $constant);
-
-            $object = new TransactionObject(
-                $transaction->bill_no,
-                TransactionType::BILL,
-                $supplier->id,
-                1,
-                $supplier->banks()->where('default', true)->first()->id,
-                PaymentMethodType::CASH,
-                $transaction->original_amount * (1 / $rate),
-                $transaction->original_amount,
-                1,
-                $transaction->original_currency_id,
-                $rate,
-                0,
-                $serviceCharge,
-                null,
-                ApprovalStatus::PENDING_VERIFICATION
-            );
-
-            $billTransaction = $this->updatesTransaction->execute($transaction, $object);
-
-            $transferTransaction = $transaction->transactions()->where('type', TransactionType::TRANSFER_FEE)->first();
-
-            $transferFee = $this->calculatesTransactionTransferFee->execute($billTransaction->original_amount, $constant);
-
-            $object = new TransactionObject(
-                $transferTransaction->bill_no,
-                TransactionType::TRANSFER_FEE,
-                $supplier->id,
-                1,
-                $supplier->banks()->where('default', true)->first()->id,
-                PaymentMethodType::CASH,
-                $transaction->original_amount,
-                $transaction->original_amount,
-                $transaction->original_currency_id,
-                $transaction->original_currency_id,
-                1,
-                0,
-                $transferFee,
-                null,
-                ApprovalStatus::PENDING_VERIFICATION
-            );
-
-            $this->updatesTransaction->execute($transferTransaction, $object);
-        }
-
-        $group->issuer = $supplier->id;
-        $group->amount = $group->transactions()->sum('amount');
-        $group->currency_rate = $rate;
-        $group->tax = $group->transactions()->sum('tax');
-        $group->service_charge = $group->transactions()->sum('service_charge');
-
-        $group->save();
-
-        $group->documents()->delete();
-
-        $transferFeeTransactions = $group->transactions()->with([
-            'transactions' => function ($transaction) {
-                return $transaction->where('type', TransactionType::TRANSFER_FEE);
-            }])->get()->pluck('transactions')->flatten();
-
-        $pdf = LaravelMpdf::loadView('pages.pdfs.currency_vendor_order', ['transactions' => $group->transactions, 'transferFeeTransactions' => $transferFeeTransactions, 'supplier' => $supplier]);
-
-        $object = new DocumentObject(
-            DocumentType::CURRENCY_VENDOR_ORDER,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'currency_vendor_order'
-        );
-
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($group, $object);
-        $this->createsFile->execute($document, $object);
-
-        return $this->resourceResponse(new GroupResource($group));
-    }
-
-}

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

@@ -16,7 +16,6 @@ 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
 {
@@ -30,7 +29,6 @@ class ApproveShippingInvoiceTransactionProcessor
     /** @var CreatesFiles */
     private $createsFiles;
 
-
     /**
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param CreatesDocument $createsDocument
@@ -74,7 +72,6 @@ class ApproveShippingInvoiceTransactionProcessor
         if(app()->environment(['production'])) {
             $user->notify(new InvoiceIssuedEmail($user, $packingList));
         }
-
         return;
     }