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

.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/Abstracts/AbstractControllerLogic.php

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

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -39,11 +39,6 @@ abstract class AbstractListRecord extends AbstractGetRecord
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
-        if($filters->has('group_by')){
-            $query = $query->groupBy($filters->get('group_by')->column);
-        }
-
-        //dd($query->toSql());
         return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
 
     }

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/ClaimantId.php

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

app/Classes/General/Eloquent/Filters/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/CreditTerm.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Illuminate\Database\Eloquent\Builder;
-
-class CreditTerm implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder;
-
-        return $builder->whereHas('packingLists.owner', function($query) use($value) {
-             $query->whereHas('companyModule.connections', function($query) use($value){
-                if ($value) {
-                     $query->whereHas('segments', function($query) {
-                         $query->where('segments.id' , 3);
-                    });
-                }else{
-                     $query->whereDoesntHave('segments', function($query) {
-                         $query->where('segments.id' , 3);
-                    });
-                }
-            });
-        });
-    }
-
-}

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class DoesNotHaveTransactionType 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', $value)->whereIn('status', [0,1,2,3]);
-        })->whereHas('containers', function ($query){
-            return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
-        });
-    }
-}

app/Classes/General/Eloquent/Filters/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/HasInvoiceStatusIn.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class HasInvoiceStatusIn 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', 1)->whereIn('status', $value);
-        });
-    }
-}

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

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class HasTransactionType 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', $value);
-        });
-    }
-}

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

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class IsPublished implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereDate('starting_on', '<=', Carbon::now())
-            ->whereDate('ending_on', '>=', Carbon::now());
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\PackingList;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\DB;
-
-class PackingListOrderedByInvoiceDate implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->select('packing_lists.*')->join('transactions', function($join){
-            $join->on('transactions.owner_id', '=', 'packing_lists.id');
-            $join->where('transactions.owner_type', '=', PackingList::class);
-            $join->where('transactions.status', '=', ApprovalStatus::APPROVED);
-        })->orderBy('transactions.updated_at', 'DESC');
-    }
-
-}

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

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class PaymentDay 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('transactions.type', 1)->where('status', ApprovalStatus::APPROVED)->whereDate('updated_at', '<=', Carbon::now()->subdays($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/PaymentReference.php

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

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

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

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

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

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

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

app/Classes/General/ExcelHandel.php

@@ -1,87 +0,0 @@
-<?php
-namespace App\Classes\General;
-
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Cache;
-
-class ExcelHandel
-{
-	function __construct()
-	{
-
-	}
-
-	public static function generateFolder($path = '')
-    {
-    	$folder = \Storage::disk('public')->makeDirectory($path);
-        return $folder;
-    }
-
-	public static function insertExcel($path = '', $base64Set = [])
-	{
-    	$file_info = [];
-        $folder_path = ExcelHandel::generateFolder('excels/' . $path);
-
-        foreach ($base64Set as $key => $row) {
-
-	    	$exceldata = $row;
-	        $filename = (string) Str::uuid();
-
-	        $f = finfo_open();
-	        $mime_type = finfo_file($f, $exceldata, FILEINFO_MIME_TYPE);
-
-	        $extension = 'xls';
-
-	        switch ($mime_type) {
-	            case 'application/vnd.ms-excel':
-	                $extension = 'xls';
-	                break;
-	            case 'application/zip':
-	                $extension = 'xlsx';
-	                break;
-	        }
-
-	        if (empty($extension)) {
-	            return false;
-	        }
-
-	        $exceldata = explode('base64,', $exceldata);
-	        $exceldata = base64_decode($exceldata[1]);
-
-	        $filename_with_ext = $filename . '.' . $extension;
-
-	        $file = ExcelHandel::generateExcel($path, $exceldata, $filename, $extension);
-
-	        $file_info[] = [
-	            'path' => $path,
-	            'filename' => $filename_with_ext,
-	            'mime_type' => $mime_type,
-	            'extension' => $extension,
-	            'file_info' => empty($file) ? [] : $file,
-	        ];
-    	}
-
-        return $file_info;
-	}
-
-	public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
-    {
-        $file_info = [];
-        $file = \Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
-        $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
-        
-        return $file_info;
-    }
-
-    public static function removeExcel($excel_info = [])
-    {
-        $excel_info = json_decode(json_encode($excel_info), true);
-        foreach ($excel_info as $key => $row) {
-        	if (!empty($row['path'])) {
-	            \File::delete([$row['file_info']['original']['file']]);
-           }
-        }
-        return true;
-    }
-
-}

app/Classes/General/Interfaces/Notifiable.php

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

app/Classes/General/Traits/LogData.php

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

app/Classes/Jobs/CreatePerfexCRMCustomer.php

@@ -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/FetchOrdersFromYDPortalJob.php

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

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
-
-class UpdatePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMObject */
-    private $updatePerfexCRMObject;
-
-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob;
-
-    /** @var */
-    private $transaction;
-
-    /**
-     * UpdatePerfexCRM constructor.
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRMInvoice $nextJob
-     * @param $transaction
-     */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, $nextJob)
-    {
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob = $nextJob;
-        $this->transaction = $transaction;
-    }
-
-    public function handle()
-    {
-        $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
-        if($this->nextJob != null && $this->transaction != null){
-            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
-                $this->updatePerfexCRMObject->getContactEmail(),
-                $result->projectId,
-                $this->transaction,
-                true
-            );
-            /** @var UpdatePerfexCRMInvoice $nextJob */
-            $this->nextJob::dispatch($updatePerfexCRMInvoiceOject);
-        }
-    }
-}

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -1,91 +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;
-
-
-class UpdatePerfexCRMInvoice implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMInvoiceObject */
-    private $updatePerfexCRMInvoiceObject;
-
-    /**
-     * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
-     */
-    public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
-    {
-        $this->updatePerfexCRMInvoiceObject = $updatePerfexCRMInvoiceObject;
-    }
-
-    public function handle()
-    {
-        //get the client id
-        $customer = (App()->make(FetchesPerfexCRMCustomer::class))->execute($this->updatePerfexCRMInvoiceObject->getEmail());
-        $transaction = $this->updatePerfexCRMInvoiceObject->getTransaction();
-
-        //get the invoice id
-        $invoiceId = 0;
-        $invoiceStatus = 0;
-        $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        Log::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
-
-        if(is_null($invoice)){
-            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
-            $invoiceId = $result->payload['id'];
-        }
-        else{
-            $invoiceId = $invoice->id;
-            $invoiceStatus = $invoice->status;
-
-            //This only run when invoice already exist and the invoice does not have a PAID status
-            if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
-                Log::error(json_encode('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId()));
-                //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,96 +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 UpdatePerfexCRM */
-    private $nextJob1;
-
-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob2;
-
-    /**
-     * UpdatePerfexCRMPrelude constructor.
-     * @param $packingList
-     * @param $transaction
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRM $nextJob1
-     * @param UpdatePerfexCRMInvoice $nextJob2
-     */
-    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
-    {
-        $this->packingList = $packingList;
-        $this->transaction = $transaction;
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob1 = $nextJob1;
-        $this->nextJob2 = $nextJob2;
-    }
-
-    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);
-        /** @var UpdatePerfexCRM $nextJob1 */
-        /** @var UpdatePerfexCRMInvoice $nextJob2 */
-        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
-    }
-
-    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,22 @@ 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;
@@ -81,12 +76,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var CreatePerfexCRMLeadProcessor */
-    private $createPerfexCRMLeadProcessor;
-
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -99,10 +88,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
      * @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)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -114,8 +101,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -141,9 +126,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
 
-        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
-
-        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');
+        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
 
         $connection = $this->createsCompanyConnection->execute($connectionObject);
 
@@ -155,18 +138,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/FetchUserByEmailLogic.php

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

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

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

app/Classes/Modules/Accounts/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/Processors/AuthenticationProcessor.php

@@ -67,4 +67,4 @@ class AuthenticationProcessor
 
     }
 
-}
+}

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

@@ -23,4 +23,4 @@ class AuthenticatesUser
 
     }
 
-}
+}

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

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

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

@@ -68,11 +68,7 @@ class GeneratesAuthenticationToken {
             $companyModule = $user->companyModule()->first();
 
             $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id,
-                'company_module_id' => $companyModule->id,
-                'company_module_type' => $companyModule->type,
-                'company_name' => $companyModule->name,
-                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
+                'company_id' => $companyModule->company_id
             ]);
         }
 

app/Classes/Modules/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/CreateAddressLogic.php

@@ -14,7 +14,6 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use ErrorException;
@@ -83,7 +82,7 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('type'), ApprovalStatus::APPROVED, $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
 
         $this->canCreateAddress->passes($object);
 

app/Classes/Modules/Addresses/ControllersLogic/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/Addresses/ControllersLogic/UpdateAddressLogic.php

@@ -13,8 +13,6 @@ use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use Illuminate\Http\JsonResponse;
@@ -81,7 +79,7 @@ class UpdateAddressLogic extends AbstractControllerLogic
     {
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
 
         $this->canUpdateAddress->passes($object);
 

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

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

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

@@ -10,8 +10,6 @@ namespace App\Classes\Modules\Addresses\Services;
 
 
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\District;
 use App\Models\OldAddress;
 
@@ -33,7 +31,7 @@ class CleansOldAddress
             return null;
         }
 
-        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, AddressType::DELIVERY, ApprovalStatus::APPROVED, 'Delivery Address');
+        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Delivery Address');
 
     }
 

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

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

app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Announcements\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
 use App\Models\Announcement;
-use DateTime;
 
 class CreatesAnnouncement extends AbstractUpdateRecord
 {
@@ -19,17 +18,9 @@ class CreatesAnnouncement extends AbstractUpdateRecord
         $model = new Announcement();
         $model->title = $object->getTitle();
         $model->description = $object->getDescription();
-        // $model->starting_on = $object->getStartingOn();
-        $model->starting_on = $this->convertDateFormat($object->getStartingOn());
-        // $model->ending_on = $object->getEndingOn();
-        $model->ending_on = $this->convertDateFormat($object->getEndingOn());
+        $model->starting_on = $object->getStartingOn();
+        $model->ending_on = $object->getEndingOn();
 
         return $this->handler($model);
     }
-
-    public function convertDateFormat($value) {
-        $value = DateTime::createFromFormat('d-m-Y', $value)->format('Y-m-d H:i:s');
-
-        return $value;
-    }
 }

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

@@ -1,126 +0,0 @@
-<?php
-
-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\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class CallbackBillplzLogic
-{
-    /** @var GetBillplzBill */
-    private $getBillplzBill;
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
-
-    /**
-     * CallbackBillplzLogic constructor.
-     * @param GetBillplzBill $getBillplzBill
-     * @param FetchesTransaction $fetchesTransaction
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
-     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
-     */
-    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;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     * @throws MalformedRequestException
-     * @throws ResourceNotFoundException
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function execute(Request $request)
-    {
-        $billplzXSignatureObject = new BillplzXSignatureObject($request);
-
-        if(!$billplzXSignatureObject->isValidSignature()){
-            throw new MalformedRequestException('Billplz Payment validation failed.');
-        }
-
-        $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
-
-        if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
-
-        $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
-
-        $invoice = $transaction->owner;
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-
-        $status = ApprovalStatus::PENDING_VERIFICATION;
-
-        if($billPlz->state === 'paid') {
-            $status = ApprovalStatus::APPROVED;
-        }
-
-        if($billPlz->state === 'due') {
-            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
-        }
-
-        $token = Auth::fromUser(User::find(1));
-        $request->headers->set('Authorization', 'Bearer '.$token);
-
-        $this->updatesTransactionStatus->execute($transaction, $status);
-
-        $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);
-            }
-        }
-
-
-
-
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -14,8 +14,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
-use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
-Use App\Classes\Modules\Notifications\Processors\CreateNotificationProcessor;
 
 use App\Models\Document;
 use Illuminate\Http\JsonResponse;
@@ -52,9 +50,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
     /** @var UpdatesOrdersStatus */
     private $updatesOrdersStatus;
 
-    /** @var CreateNotificationProcessor */
-    private $createNotificationProcessor;
-
     /**
      * ApproveIdentificationDocumentLogic constructor.
      * @param CanApproveDocument $canApproveDocument
@@ -63,9 +58,8 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
      * @param FetchesDocument $fetchesDocument
      * @param UpdatesCompanyStatus $updatesCompanyStatus
      * @param UpdatesOrdersStatus $updatesOrdersStatus
-     * @param CreateNotificationProcessor $createNotificationProcessor
      */
-    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus, CreateNotificationProcessor $createNotificationProcessor)
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus)
     {
         $this->canApproveDocument = $canApproveDocument;
         $this->approvesDocument = $approvesDocument;
@@ -73,7 +67,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
         $this->fetchesDocument = $fetchesDocument;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
         $this->updatesOrdersStatus = $updatesOrdersStatus;
-        $this->createNotificationProcessor = $createNotificationProcessor;
     }
 
     /**
@@ -97,16 +90,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-//        $object = new NotificationObject(
-//            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ),
-//            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ),
-//            $document->owner,
-//            $document->owner->companyModules()->first()->employees()->first(),
-//            $document,
-//        );
-//
-//        $this->createNotificationProcessor->execute($object);
-
         if($status === 'approve'){
             $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
         }

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

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

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

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

app/Classes/Modules/Companies/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/Companies/DataTransferObjects/CompanyConnectionObject.php

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

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Companies\Services;
 
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Models\Company;
 use App\Models\Segment;
 use Illuminate\Database\QueryException;
@@ -20,9 +19,8 @@ class AssignsCompanyToSegment extends AbstractUpdateRecord
     public function execute(Company $company, Segment $segment)
     {
         try {
-            $companyModule = $company->companyModules()->where('type', BusinessType::IMPORTER)->first();
-            $connection = $companyModule->connections()->where('inviter_reference', 'CIEF');
-            $connection->segments()->attach($segment);
+
+            $company->segments()->attach($segment);
 
             return $company;
 

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

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

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

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

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

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

app/Classes/Modules/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/Delivery/ControllersLogic/CancelDeliveryOrderLogic.php

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

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

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

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

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

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

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

app/Classes/Modules/Documents/DataTransferObjects/FileObject.php

@@ -28,7 +28,7 @@ class FileObject implements DataTransferObject
      */
     public function getData()
     {
-        return in_array($this->getExtension(), ['pdf', 'excel'])  ? $this->data : (new imageManager())->make($this->data);
+        return $this->getExtension() === 'pdf' ? $this->data : (new imageManager())->make($this->data);
     }
 
     /**
@@ -66,7 +66,7 @@ class FileObject implements DataTransferObject
      */
     public function getDecodedData(): string
     {
-        return in_array($this->getExtension(), ['pdf', 'excel']) ?
+        return $this->getExtension() === 'pdf' ?
             base64_decode((explode('base64,', $this->getData()))[1]):
             $this->getData()->encode('data-url')->encoded;
     }
@@ -78,4 +78,9 @@ class FileObject implements DataTransferObject
     {
         $this->data = $data;
     }
-}
+
+
+
+
+
+}

app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php

@@ -36,7 +36,7 @@ class ConvertsBase64ToFile
         foreach ($files as $file) {
 
             $object = new FileObject($file);
-            in_array($object->getExtension(), ['pdf', 'excel']) ? $this->generatePDF($object) : $this->generateImage($object);
+            $object->getExtension() === 'pdf' ? $this->generatePDF($object) : $this->generateImage($object);
 
         }
 
@@ -122,4 +122,4 @@ class ConvertsBase64ToFile
         ]);
     }
 
-}
+}

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

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Models\Order;
-use App\Models\PackingList;
-use Carbon\Carbon;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-
-class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'ORDER NUMBER',
-            'Marking',
-            'Warehouse',
-            'Cbm',
-            'Description',
-            'quantity',
-            'Received Date',
-            'Remarks'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
-    }
-
-    /**
-     * @param $packingList
-     * @return array
-     */
-    public function map($packingList): array
-    {
-        $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');
-
-        return [
-            $packingList->owner->reference,
-            $marking,
-            $warehouse->reference,
-            $cbm,
-            $packingList->packages->implode('description', ', '),
-            $packingList->packages->sum('quantity'),
-            $arrival_date,
-            ''
-        ];
-    }
-}

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

@@ -1,91 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Models\Container;
-use App\Models\Package;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Carbon\Carbon;
-
-class ExportsCompanyModuleSummary implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-
-    use Exportable;
-
-    protected $companyModuleId, $containerIds;
-
-    public function headings(): array
-    {
-        return [
-            'Date',
-            'Full Marking',
-            'Container',
-            'Description',
-            'Ctns',
-            'L (cm)',
-            'H (cm)',
-            'W (cm)',
-            'CBM'
-        ];
-    }
-    
-    public function setParameters($companyModuleId, $containerIds)
-    {
-        $this->companyModuleId = $companyModuleId;
-        $this->containerIds = $containerIds;
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function collection()
-    {
-        $packagesArray = collect();
-        $containers = Container::whereIn('reference', explode(',', $this->containerIds))->get();
-        foreach ($containers as $container){
-            $company_module_id = $this->companyModuleId;
-            $packingLists = $container->packingLists()->get()->filter(function ($packingList) use ($company_module_id) {
-                return $packingList->owner->company_module_id == $company_module_id;
-            });
-            foreach ($packingLists as $packingList){
-                if($packingList->packingLists->first()){
-                    $packingList = $packingList->packingLists->first();
-                }
-                $packages = $packingList->packages;
-                foreach ($packages as $package){
-                    $packagesArray->push($package);
-                }
-            }
-        }
-
-        return $packagesArray;
-    }
-
-    /**
-     * @param Package $package
-     *
-     * @return array
-     */
-    public function map($package): array
-    {
-        $connection = $package->packingList->owner->companyModule->inviters()->withPivot('invitee_reference')->first();
-        $marking = $connection ? $connection->pivot->invitee_reference:'';
-
-        return [
-            Carbon::parse($package->created_at)->format('d-m-Y'),
-            $marking,
-            $package->packingList->containers()->first()->reference,
-            $package->description,
-            $package->quantity,
-            $package->length,
-            $package->height,
-            $package->width,
-            ((($package->length / 100) * ($package->height / 100) * ($package->width / 100)) *  $package->quantity)
-        ];
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,97 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Company;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-
-class ExportsNullDebtors implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-
-    use Exportable;
-
-
-    public function headings(): array
-    {
-        return [
-            'Code',
-            'DebtorControlAcc',
-            'ControlAccount',
-            'CompanyName',
-            'Desc2',
-            'DebtorType',
-            'DisplayTerm',
-            'CurrencyCode',
-            'RegisterNo',
-            'Address1',
-            'Address2',
-            'Address3',
-            'PostCode',
-            'DeliverAddr1',
-            'DeliverAddr2',
-            'DeliverAddr3',
-            'DeliverPostCode',
-            'EmailAddress',
-            'Attention',
-            'Phone1',
-            'Phone2',
-            'Fax1'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        return Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->whereHas('parcels')->where('status', ApprovalStatus::APPROVED);
-    }
-
-    /**
-     * @param Company $company
-     *
-     * @return array
-     */
-    public function map($company): array
-    {
-        $marking = $company->companyModules()->where('type', BusinessType::IMPORTER)->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-
-        return [
-            '<<New>>',
-            '300-0000',
-            '300-0000',
-            $company->name.' (Shipping)',
-            $marking,
-            '',
-            'PIA',
-            'MYR',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',//EmailAddress
-            '',
-            '',
-            '',
-            ''
-        ];
-    }
-}

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

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

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

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

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

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\Modules\Exports\Sheets\ContainersSheet;
-use App\Classes\Modules\Exports\Sheets\PackingListsSheet;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\WithMultipleSheets;;
-
-class ExportsParcel implements WithMultipleSheets
-{
-    use Exportable;
-
-
-    /**
-     * @return array
-     */
-    public function sheets(): array
-    {
-        $sheets = [];
-
-        $sheets[] = new ContainersSheet();
-        $sheets[] = new PackingListsSheet();
-
-        return $sheets;
-    }
-
-}

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

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\Order;
-use App\Models\PackingList;
-use Carbon\Carbon;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-
-class ExportsParcelPostcodes implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'Order Number',
-            'Postcode'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        return PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereRaw('LENGTH(reference) > 8')->where('reference', 'not like', "%YW%")->where('owner_type', Order::class)->whereDate('created_at', '>=', Carbon::parse('20-09-2022'))->whereDoesntHave('containers');
-    }
-
-    /**
-     * @param $packingList
-     * @return array
-     */
-    public function map($packingList): array
-    {
-
-        $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-        return [
-            $packingList->reference,
-            $address->postcode
-        ];
-    }
-}

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

@@ -1,143 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Transaction;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-    use Exportable;
-
-    private $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    public function headings(): array
-    {
-        return [
-            'DocNo',
-            'DocDate',
-            'DebtorCode',
-            'ShipInfo',
-            'AccNo',
-            'DetailDescription',
-            'FurtherDescription',
-            'ProjNo',
-            'DeptNo',
-            'Qty',
-            'UnitPrice'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        $start_date = $this->request->input('startDate', null);
-        if ($start_date) {
-            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
-        }
-
-        $end_date = $this->request->input('endDate', null);
-        if ($end_date) {
-            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
-        }
-
-        $query = Transaction::query();
-
-        // paidInvoiceSection
-        $approvalStatus = ApprovalStatus::COMPLETED;
-
-        if ($this->request->route('section') == 'pendingPaymentSection') {
-            // pendingPaymentSection
-            $approvalStatus = ApprovalStatus::APPROVED;
-        }
-
-        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
-
-        if($start_date && $end_date) {
-            $query->whereBetween('updated_at', [
-                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
-                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
-            ]);
-        }
-        elseif($start_date && !$end_date) {
-            $query->whereHas('transactions', function($transaction) use ($start_date) {
-                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
-            });
-
-        }
-        elseif(!$start_date && $end_date) {
-            $query->whereHas('transactions', function($transaction) use ($end_date) {
-                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($end_date)->format('Y-m-d 0:00:00'));
-            });
-        }
-
-        return $query;
-    }
-
-    public function map($transaction): array
-    {
-        $container = $transaction->owner->containers()->first();
-        $order = $transaction->owner->owner;
-        $company = $order->companyModule->company;
-        $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
-
-        $furtherDescription = '';
-
-        foreach ($transaction->transactionDetails as $item){
-
-            if($item->reference === 'SHIPPING_FEE')
-                $furtherDescription .= str_replace('X1 Freight Service Charge<br>', '', $item->name)."\n";
-            elseif($item->reference === 'OVER_WEIGHT_CHARGES')
-                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
-            elseif($item->reference === 'MIN_CBM_CHARGES')
-                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
-            else
-                $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
-        }
-
-        return [
-            '<<New>>',
-            $transaction->created_at->format('m/d/Y H:m'),
-            $company->debtor,
-            $order->reference,
-            '500-0000',
-            'X1 Freight Service Charge',
-            $furtherDescription,
-            $container->reference,
-            'CIEF',
-            $shippingTransactionDetails->quantity,
-            $shippingTransactionDetails->price
-        ];
-        return [
-            '<<New>>',
-            $transaction->updated_at->format('m/d/Y H:m'),
-            $company->debtor,
-            $container->reference,
-            '500-0000',
-            'X1 Freight Service Charge',
-            'FurtherDescription',
-            $container->reference,
-            'M3',
-            'CIEF',
-            $shippingTransactionDetails->quantity,
-            $shippingTransactionDetails->price,
-        ];
-    }
-}

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

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

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

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\Order;
-use App\Models\State;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Carbon\Carbon;
-
-class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'Customer Marking',
-            'Order Number'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        $johor_state_id = State::where('name', 'johor')->first()->id;
-
-        return Order::whereHas('addresses', function($address) use ($johor_state_id){
-            $address->where('status', ApprovalStatus::APPROVED)->where('state_id', $johor_state_id);
-        })->whereHas('packingLists', function($packingLists) {
-            $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports');
-        });
-    }
-
-    /**
-     * @param Order $order
-     *
-     * @return array
-     */
-    public function map($order): array
-    {
-        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-
-        return [
-            $marking,
-            $order->reference,
-        ];
-    }
-}

app/Classes/Modules/Exports/Sheets/ContainersSheet.php

@@ -1,105 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Omair Saleh
- * Date: 20/9/2022
- * Time: 12:20 AM
- */
-
-namespace App\Classes\Modules\Exports\Sheets;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Container;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\WithTitle;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-
-
-class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery, WithTitle
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'Container No.',
-            'Loaded Date',
-            'ETD',
-            'ETA',
-            'Delay',
-            'Unstuffing date',
-            'Status',
-            'CTN',
-            'CBM'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        return Container::query();
-    }
-
-    /**
-     * @param $container
-     * @return array
-     */
-    public function map($container): array
-    {
-
-        $transport = $container->transports()->first();
-        $currentSchedule = $transport ? $transport->schedules()->where('status', '!=', ApprovalStatus::EXPIRED)->first() : null;
-        $scheduleHistory = $transport ? $transport->schedules()->where('status', ApprovalStatus::EXPIRED)->get() : null;
-
-        $status = 'Loaded';
-
-        if($currentSchedule) {
-            if(Carbon::parse($currentSchedule->etd) >= Carbon::today()){
-                $status = 'Shipping';
-            }
-
-            if(Carbon::parse($currentSchedule->eta) >= Carbon::today()){
-                $status = 'Arrived?';
-            }
-
-            if($transport->drop_date){
-                $status = 'Pending deliveries';
-                if(!$container->packinglists()->whereDoesntHave('transports')->get()){
-                    $status = 'Complete';
-                }
-            }
-
-
-        }
-
-        return [
-            $container->reference,
-            $container->loading_date,
-            $currentSchedule ? $currentSchedule->etd : null,
-            $currentSchedule ? $currentSchedule->eta : null,
-            $scheduleHistory ? count($scheduleHistory) : 0,
-            $transport ? $transport->drop_date : null,
-            $status,
-            $container->packages()->sum('quantity'),
-            $container->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
-
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    public function title(): string
-    {
-        return 'Containers';
-    }
-}

app/Classes/Modules/Exports/Sheets/PackingListsSheet.php

@@ -1,131 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Omair Saleh
- * Date: 20/9/2022
- * Time: 12:20 AM
- */
-
-namespace App\Classes\Modules\Exports\Sheets;
-
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Support\Facades\DB;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\WithTitle;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-
-
-
-class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection, WithTitle
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'Arrival Date',
-            'Marking',
-            'Order No.',
-            'Reference',
-            'Quantity',
-            'CBM',
-            'Overweight',
-            'Total CBM',
-            'Container No.',
-            'Delivery Date',
-            'Warehouse',
-            'Warehouse District',
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function collection()
-    {
-        $packingLists = PackingList::where('status', '=', 2)->whereIn('type', [PackingListType::WAREHOUSE_RECEIVE_LIST, PackingListType::SHIPPING_PACKING_LIST])->get();
-
-        return $packingLists->filter(function ($packingList) {
-
-            if($packingList->type === PackingListType::SHIPPING_PACKING_LIST){
-                $warehouseArrival = PackingList::where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->where('reference', $packingList->reference)->get();
-                return $warehouseArrival ? false : true;
-            }
-
-            return true;
-        });
-    }
-
-    /**
-     * @param $packingList
-     * @return array
-     */
-    public function map($packingList): array
-    {
-
-        $warehouseArrivalList = $packingList;
-        $shippingList = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->where('reference', $packingList->reference)->first();
-
-        if($packingList->type === PackingListType::SHIPPING_PACKING_LIST) {
-            $warehouseArrivalList = null;
-            $shippingList = $packingList;
-
-        }
-
-        $arrivalTransport = null;
-
-        if($warehouseArrivalList){
-            $arrivalTransport = $warehouseArrivalList->transports()->first();
-        }
-
-        $order = null;
-        if($packingList->owner instanceof Order){
-            $order = $packingList->owner;
-        }
-
-        $cbm = $packingList->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        });
-
-        $overWeight = $packingList->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        });
-
-        $container = $shippingList ? $shippingList->container : null;
-
-        $delivery = $shippingList ? $shippingList->transport : null;
-
-        return [
-            $arrivalTransport ? $arrivalTransport->drop_date : null,
-            $order ? $order->reference : 'Unclaimed',
-            $order ? $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'Unclaimed',
-            $packingList->reference,
-            $packingList->packages()->sum('quantity'),
-            $cbm,
-            $overWeight ? $overWeight : 0,
-            $cbm + $overWeight,
-            $container ? $container->reference : null,
-            $delivery ? $delivery->drop_date : null,
-            strlen($packingList->reference) > 8 ? 'YD' : 'VT',
-            $order ? $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->name : null,
-        ];
-
-    }
-
-    /**
-     * @return string
-     */
-    public function title(): string
-    {
-        return 'Packing Lists';
-    }
-}

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

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Imports\Services;
-
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Models\Company;
-
-use Maatwebsite\Excel\Concerns\ToModel;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithBatchInserts;
-use Maatwebsite\Excel\Concerns\WithValidation;
-
-class ImportsDebtor implements ToModel, WithHeadingRow, WithBatchInserts, WithValidation
-{
-  public function __construct() {
-
-  }
-
-  public function model($row = [])
-  {
-      try {
-          preg_match_all('/([0-9]{3,4}[a-zA-Z]{3,4})/', $row['desc2'], $matches);
-
-          foreach ($matches[0] as $match){
-              $reference = $match;
-              $debtor =  $row['code'];
-              $company = Company::whereNull('debtor')->whereHas('companyModules', function($query) use ($reference) {
-                  $query->whereHas('connections', function($query) use ($reference) {
-                      $query->where('invitee_reference', $reference);
-                  });
-              })->first();
-
-              if ($company) {
-                  $company->debtor = $debtor;
-                  $company->update();
-              }
-
-          }
-
-      } catch (\Exception $exception){
-          dd($exception);
-      }
-  }
-
-  public function batchSize(): int
-  {
-    return 100;
-  }
-
-  public function rules(): array
-  {
-      return [
-
-      ];
-  }
-}

app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Notifications\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Notifications\Services\ListsNotification;
-use App\Http\Resources\NotificationResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListNotificationsLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieve Notifications',
-            'message' => 'You have successfully retrieved a list of Notifications'
-        ];
-    }
-
-    /** @var ListsNotification */
-    private $listsNotification;
-
-    /**
-     * ListNotificationsLogic constructor.
-     * @param ListsNotification $listsNotification
-     */
-    public function __construct(
-        ListsNotification $listsNotification
-    )
-    {
-        $this->listsNotification = $listsNotification;
-    }
-
-
-    /**
-     * @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
-    {
-
-        $filters = [
-            // 'target_id'=>auth()->user()->id,
-            // 'per_page'=>$request->route('per_page')
-        ];
-
-        $notifications = $this->listsNotification->execute($filters);
-
-        return $this->collectionResponse(NotificationResource::collection($notifications));
-
-    }
-
-}

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
@@ -40,8 +39,6 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
-    /** @var NewLeadTaskToPerfexCRMProcessor */
-    private $newLeadTaskToPerfexCRMProcessor;
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -49,31 +46,27 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
-     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
-        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
     }
 
 
     public function logic(Request $request) : JsonResponse {
 
-
+        
         $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
+        
         $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);
-
+        
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
-            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
-        }
+        $originWarehouse = $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? $this->fetchesCompanyModule->execute(['reference' => in_array($company->id, [2376]) ? WarehouseReferences::VT_GUANG_ZHOU : WarehouseReferences::YD_GUANG_ZHOU]) : $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_YIWU]);
 
         if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
             throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');
@@ -81,10 +74,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));
     }
 }