code update

.env.example

@@ -39,7 +39,7 @@ MAIL_FROM_NAME="${APP_NAME}"
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=shipping-portal-localhost
+AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
 PUSHER_APP_ID=
@@ -59,10 +59,3 @@ YD_API_CODE=''
 PERFEXCRM_BASE_URL=""
 PERFEXCRM_API_KEY=""
 PERFEXCRM_IS_ENABLED="false"
-
-VAPOR_ENV=local
-LARAVEL_VAPOR_ENABLED=false
-COMMANDS_V2_ENABLED=false
-
-STORAGE_FEE_LAUNCH_DATE="2023-12-11 00:00:00"
-SST_START_DATE="2024-04-01 00:00:00"

.gitignore

@@ -25,7 +25,3 @@ package-lock.json
 public/*
 /public/*
 storage/framework/laravel-excel/*
-.vapor/
-.env.production
-.env.staging
-.env.development

Jenkinsfile

@@ -1,118 +0,0 @@
-// Webhook + Gitlab git pull + Vapor
-
-// def payload = readJSON text: "${payload}"
-// String userName = payload.user_name
-// String userEmail = payload.user_email
-// String httpUrl = payload.project.http_url
-
-
-pipeline {
-    agent {
-        docker {
-            args '--group-add 992 -v /var/run/docker.sock:/var/run/docker.sock'
-            image '303644228504.dkr.ecr.ap-southeast-1.amazonaws.com/jenkins-pipeline-agent:latest'
-            registryCredentialsId "ecr:ap-southeast-1:aws-ec2-instance-iam-role"
-            registryUrl "https://303644228504.dkr.ecr.ap-southeast-1.amazonaws.com"
-        }
-    }
-    environment {
-        HOME = '.'
-    }
-    stages {
-        stage('Download source code from Git') {
-            steps {
-                script{
-                    currentBuild.description = 'Step 1 of 6 Completed'
-                    println("GIT GIT_BRANCH: " + GIT_BRANCH)
-                    switch(GIT_BRANCH) {
-                        case "vapor/production":
-                        case "vapor/staging":
-                        case "vapor/development":
-                            git(
-                                url: 'https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git',
-                                credentialsId: 'gitlab-jenkins-localhost',
-                                branch: GIT_BRANCH
-                            )
-                        break
-                        case "origin/dillon/34-jenkins-vapor":
-                            git(
-                                url: 'https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git',
-                                credentialsId: 'gitlab-jenkins-localhost',
-                                branch: 'dillon/34-jenkins-vapor'
-                            )
-                        break
-                    }
-                    currentBuild.description = 'Step 2 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Install') {
-            steps {
-                sh 'composer update'
-                script{
-                    currentBuild.description = 'Step 3 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Tests') {
-            steps {
-                //sh 'vendor/bin/phpunit tests/Unit'
-                script{
-                    currentBuild.description = 'Step 4 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Deploy') {
-            steps {
-                script{
-                    String gitCommitMessage = getCommitMessage()
-                    println("GIT CommitMessage: " + gitCommitMessage)
-                    println("GIT GIT_BRANCH: " + GIT_BRANCH)
-                    switch(GIT_BRANCH) {
-                        case "vapor/production":
-                            sh "vendor/bin/vapor deploy production --message='${gitCommitMessage}'"
-                        break
-                        case "vapor/staging":
-                            sh "vendor/bin/vapor deploy staging --message='${gitCommitMessage}'"
-                        break
-                        case "vapor/development":
-                            sh "vendor/bin/vapor deploy development --message='${gitCommitMessage}'"
-                        break
-                        case "origin/dillon/34-jenkins-vapor":
-                            sh "vendor/bin/vapor deploy development --message='${gitCommitMessage}'"
-                        break
-                    }
-                    currentBuild.description = 'Step 5 of 6 Completed'
-                }
-            }
-        }
-
-        stage('Cleanup') {
-            steps {
-                script {
-                    try {
-                        sh 'docker image prune -a -f'
-                    } catch (Exception e) {
-                        echo "Error during cleanup: ${e.message}"
-                    }
-                    currentBuild.description = 'Step 6 of 6 Completed'
-                }
-            }
-        }
-    }
-}
-
-@NonCPS
-String getCommitMessage(){
-    commitMessage = " "
-    for ( changeLogSet in currentBuild.changeSets){
-        for (entry in changeLogSet.getItems()){
-            commitMessage = entry.msg
-        }
-    }
-    commitMessage = commitMessage.replace("'", "`")
-    return commitMessage
-}

app/Classes/Exceptions/JobResourceNotFoundException.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\Exceptions;
-
-use App\Classes\ValueObjects\Constants\HttpStatus;
-
-final class JobResourceNotFoundException extends ServiceApiException {
-    public function __construct(?string $message = null) {
-        parent::__construct($message ?? 'Unable to find the requested resource', HttpStatus::RESOURCE_NOT_FOUND);
-    }
-}

app/Classes/General/AWSS3Helper.php

@@ -1,48 +0,0 @@
-<?php
-namespace App\Classes\General;
-
-use Illuminate\Support\Facades\Storage;
-use Carbon\Carbon;
-use Maatwebsite\Excel\Concerns\Exportable;
-
-class AWSS3Helper
-{
-    /**
-     * @param string $exportFileName
-     * @param Exportable $exportableObject
-     * @return string
-     */
-    static function S3Exportable($exportFileName, $exportableObject){
-        //Step 1: Upload to S3
-        $filePathForS3 = 'temp/' . $exportFileName;
-        $exportableObject->store($filePathForS3, 's3');
-
-        //Step 2: Return temporary URL from S3
-        $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-            $filePathForS3,
-            Carbon::now()->addMinutes(10)
-        );
-
-        return $temporaryUrl;
-    }
-
-    /**
-     * @param string $exportFileName
-     * @param  string|resource  $contents
-     * @return string
-     */
-    static function S3PDF($exportFileName, $contents){
-        //Step 1: Upload to S3
-        $filePathForS3 = 'temp/' . $exportFileName;
-        Storage::disk('s3')->put($filePathForS3, $contents);
-
-        //Step 2: Return temporary URL from S3
-        $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-            $filePathForS3,
-            Carbon::now()->addMinutes(10)
-        );
-
-        return $temporaryUrl;
-    }
-
-}

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -15,9 +15,6 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\DB;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\General\LogHelper;
-use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
 {
@@ -65,19 +62,6 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
-            if ($exception instanceof JobResourceNotFoundException) {
-                LogHelper::channel('vue_polling')->info(sprintf(
-                    "Uncaught exception '%s' with message '%s' in %s:%d",
-                    get_class($exception),
-                    $exception->getMessage(),
-                    $exception->getTrace()[0]['file'],
-                    $exception->getTrace()[0]['line']
-                ));
-            }
-            else{
-                Log::error($exception);
-            }
-
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 

app/Classes/General/Eloquent/AbstractFetchRecord.php

@@ -6,8 +6,6 @@ namespace App\Classes\General\Eloquent;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-
 
 abstract class AbstractFetchRecord extends AbstractGetRecord
 {
@@ -28,18 +26,12 @@ abstract class AbstractFetchRecord extends AbstractGetRecord
      * @return Model
      * @throws ResourceNotFoundException
      */
-    public function getResults(Builder $query, array $param = []): Model {
+    public function getResults(Builder $query): Model {
         if(!$query->exists()){
-            $table = $query->getModel()->getTable();
-            if($table ==='job_results'){
-                throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-            }
-            else{
-                throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
-            }
+            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
         }
 
         return $query->first();
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractGetRecord.php

@@ -50,9 +50,9 @@ abstract class AbstractGetRecord
      * @param array $filters
      * @return mixed
      */
-    public function handler(array $filters, array $params = []){
+    public function handler(array $filters){
         $this->filters = collect($filters);
-        return $this->getResults($this->applyFiltersToQuery(), $params);
+        return $this->getResults($this->applyFiltersToQuery());
     }
 
 
@@ -65,6 +65,6 @@ abstract class AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    abstract function getResults(Builder $query, array $params = []);
+    abstract function getResults(Builder $query);
 
-}
+}

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -16,10 +16,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(array $filters = [], array $param = []){
+    public function execute(array $filters = []){
 
         try{
-            return $this->handler($filters, $param);
+
+            return $this->handler($filters);
 
         } catch (QueryException $exception){
             throw new MalformedRequestException('Unable to fetch the list of records due to unexpected error');
@@ -31,7 +32,7 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    public function getResults(Builder $query, array $param = []) {
+    public function getResults(Builder $query) {
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
@@ -43,12 +44,8 @@ abstract class AbstractListRecord extends AbstractGetRecord
         }
 
         //dd($query->toSql());
-        if(!empty($param)){
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page'), ['*'], 'page', $param['page']) : $query->get(); //page data from query parameters e.g ?page=1
-        }
-        else{
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
-        }
+        return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+
     }
 
 }

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

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class CompanySegmentsIn implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('companyModules', function ($module) use ($value) {
-            $module->whereHas('connections', function ($connection) use ($value) {
-                $connection->whereHas('connectionSegments', function ($segment) use ($value) {
-                    $segment->whereIn('segment_id', $value);
-                });
-            });
-        });
-    }
-}

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

@@ -17,4 +17,4 @@ class HasInvoiceStatusIn implements Filter
             $query->where('type', 1)->whereIn('status', $value);
         });
     }
-}
+}

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

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

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

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

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

@@ -1,32 +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 PackingListLimitOneByTypeOrderedByInvoiceDate 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);
-            $join->whereRaw('(transactions.type <> 16 OR transactions.id = (
-                SELECT id FROM transactions WHERE owner_id = packing_lists.id AND type = 16 LIMIT 1
-            ))');
-        })->orderBy('transactions.updated_at', 'DESC');
-    }
-
-}

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

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

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

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

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

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

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Log;
-
-class WithContainersPackages implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        // Log::info('WithContainersPackages: '.$value);
-        // return $builder->with(['containers', 'packages']);
-        return null;
-    }
-}

app/Classes/General/ExcelHandel.php

@@ -3,8 +3,6 @@ namespace App\Classes\General;
 
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Storage;
-use Carbon\Carbon;
 
 class ExcelHandel
 {
@@ -69,23 +67,9 @@ class ExcelHandel
 	public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
     {
         $file_info = [];
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            $filePathForS3 = 'public/excels/' . $path . '/' . $filename . '.' . $extension;
-            Storage::disk('s3')->put($filePathForS3, $exceldata);
-
-            $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-                $filePathForS3,
-                Carbon::now()->addMinutes(10)
-            );
-
-            $file_info['original']['file'] = $temporaryUrl; //REMINDER: This is a path to AWS S3 URL (HTTPS) as a public anonymous user, NOT an internal system path
-        }
-        else{
-            $file = Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
-            $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
-        }
-
+        $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;
     }
 
@@ -100,4 +84,4 @@ class ExcelHandel
         return true;
     }
 
-}
+}

app/Classes/General/Helper.php

@@ -2,7 +2,6 @@
 
 namespace App\Classes\General;
 
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 
@@ -41,20 +40,4 @@ class Helper
             }
         }
     }
-
-    /**
-     * @param ResourceCollection $collection
-     * @return array
-     */
-    static function collectionResponse(ResourceCollection $collection){
-        return json_decode($collection->response()->getContent(), true);
-    }
-
-    /**
-     * @param null|string $json
-     * @return array
-     */
-    static function deserializeFilters(?string $json): array {
-        return $json !== null ? collect(json_decode($json))->toArray() : [];
-    }
 }

app/Classes/General/LogHelper.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\General;
-
-use Illuminate\Support\Facades\Log;
-
-class LogHelper
-{
-    private String $channelName;
-
-    public static function channel($channelName): self
-    {
-        $logHelper = new self;
-        $logHelper->channelName = $channelName;
-        return $logHelper;
-    }
-
-    public function info($message)
-    {
-        $envVar = env('LARAVEL_VAPOR_ENABLED');
-        $isLocal = env('VAPOR_ENV') === 'local';
-        Log::info("LogHelper.info: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar && !$isLocal) {
-            Log::channel($this->channelName.'_vapor')->info($message);
-        }
-        else{
-            Log::channel($this->channelName)->info($message);
-        }
-    }
-
-    public function warning($message)
-    {
-        $envVar = env('LARAVEL_VAPOR_ENABLED');
-        $isLocal = env('VAPOR_ENV') === 'local';
-        Log::info("LogHelper.warning: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar && !$isLocal) {
-            Log::channel($this->channelName . '_vapor')->warning($message);
-        } else {
-            Log::channel($this->channelName)->warning($message);
-        }
-    }
-
-    public function error($message)
-    {
-        $envVar = env('LARAVEL_VAPOR_ENABLED');
-        $isLocal = env('VAPOR_ENV') === 'local';
-        Log::info("LogHelper.error: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar && !$isLocal) {
-            Log::channel($this->channelName . '_vapor')->error($message);
-        } else {
-            Log::channel($this->channelName)->error($message);
-        }
-    }
-}

app/Classes/General/UrlHelper.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\General;
-
-use Illuminate\Support\Facades\Route;
-use Illuminate\Http\Request;
-
-class UrlHelper {
-    public static function getRouteParametersFromUrl($url) {
-        $parsedUrl = parse_url($url);
-        $path = $parsedUrl['path'];
-
-        $routes = Route::getRoutes();
-
-        foreach ($routes as $route) {
-            $request = Request::create($path, 'GET');
-            $route->bind($request);
-            if ($route->matches($request)) {
-                return $route->parameters();
-            }
-        }
-
-        return [];
-    }
-}

app/Classes/Jobs/Commands/V2/ApproveInvoiceV2CommandJob.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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;
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Exception;
-
-class ApproveInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Approve Invoice Command.');
-        $start   = new Carbon();
-
-        $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::PENDING_SUBMISSION)->get();
-
-        foreach ($invoices as $invoice) {
-            $packingList = $invoice->owner;
-            $order = $packingList->owner;
-
-            try {
-                (App()->make(ApproveShippingInvoiceTransactionProcessor::class))->execute($packingList);
-                Log::info('Invoice Approved for reference ' . $order->reference . '.');
-            } catch (Exception $exception) {
-                Log::info('Failed to Approve invoice for reference ' . $order->reference . '. Exception: ' . $exception->getMessage());
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Approve Invoice Command. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/AuditBillplzInvoiceV2CommandJob.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-
-class AuditBillplzInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Audit Billplz Invoice.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $transactions = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED)->whereHas('transactions', function($query){
-            return $query->where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->where('status', ApprovalStatus::REJECTED);
-        })->get();
-
-        $totalTransactions = count($transactions);
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $payment_transaction = $transaction->transactions->sortByDesc('created_at')->first();
-
-            if ($payment_transaction->status === ApprovalStatus::REJECTED) {
-                Log::info($counter . ' of ' . $totalTransactions . '. Order Marking: '. $payment_transaction->owner->owner->owner->reference . '. Transaction Id: '. $payment_transaction->id . '. Invoice Id: '. $transaction->id . ' - Date: '.$payment_transaction->created_at->format('d-m-Y').' - Amount: '. $payment_transaction->amount);
-
-                $totalAmount += $transaction->amount;
-
-                $counter++;
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Audit Billplz Invoice. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/AuditBillplzPaymentV2CommandJob.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class AuditBillplzPaymentV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Audit Billplz Payment.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
-        $totalTransactions = count($transactions);
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-            if($response->successful()){
-                $data = $response->json();
-                if($data['paid']){
-
-                } else {
-                    $totalAmount += $transaction->amount;
-                    Log::info($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
-                }
-            }else{
-                Log::info("billplz error</br>");
-            }
-            $counter++;
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Audit Billplz Payment. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/AutoGenerateInvoiceV2CommandJob.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Order;
-use Exception;
-use Illuminate\Support\Facades\Log;
-
-class AutoGenerateInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Auto generate invoice.');
-        $start   = new Carbon();
-
-        $packingLists = (App()->make(ListsPackingLists::class))->execute(['does_not_have_transaction_type' => 1, 'type' => 2]);
-
-        if (count($packingLists)) {
-
-            foreach ($packingLists as $packingList) {
-                $order = $packingList->owner;
-                if (!($order instanceof Order)) {
-                    Log::info('Failed to generate invoice for reference' . $order->reference . '. It is not an instance of Order.');
-                    continue;
-                }
-
-                $companyModule = $order->companyModule;
-                $billingAddress = $companyModule->addresses()->where('type', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
-                $deliveryAddress = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-
-                $postCodes = \App\Models\SegmentConstant::whereIn('reference', ['CENTER_POSTCODE', 'OUTSTATION_POSTCODE'])->get()->pluck('value')->flatten();
-
-                if (!!$billingAddress && in_array($deliveryAddress->postcode, $postCodes->toArray())) {
-                    try {
-                        (App()->make(CreateInvoiceTransactionProcessor::class))->execute($packingList);
-                        Log::info('Invoice generated for reference ' . $order->reference . '.');
-                    } catch (Exception $exception) {
-                        Log::info('Failed to generate invoice for reference ' . $order->reference . '. Exception: ' . $exception->getMessage());
-                    }
-                }
-                else{
-                    Log::info('Failed to generate invoice for reference ' . $order->reference . '. Billing Address is not defined / Postcode area is not defined.');
-                }
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Auto generate invoice. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/CheckDeletedInvoiceButPaidV2CommandJob.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class CheckDeletedInvoiceButPaidV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Check all deleted invoice but has completed payment.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $totalAmount = 0;
-
-        $softDeletedTransactions = Transaction::onlyTrashed()->where('type', TransactionType::SHIPPING_INVOICE)->whereHas('transactions', function (Builder $query) {
-            $query->where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY);
-        })->get();
-
-        foreach ($softDeletedTransactions as $invoice) {
-            $invoice_payments = $invoice->transactions()->payments()->get();
-
-            foreach($invoice_payments as $invoice_payment) {
-
-                $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$invoice_payment->payment_reference);
-
-                if($response->successful()){
-                    $data = $response->json();
-
-                    $orderReference = $invoice->owner->owner->reference ?? null;
-
-                    if($data['paid']){
-                        Log::info('Invoice id: ' . $invoice->id. '. Payment id: ' . $invoice_payment->id . '. Order: ' . $orderReference);
-                    } else {
-
-                    }
-                }else{
-                    Log::info("billplz error</br>");
-                }
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Check all deleted invoice but has completed payment. ElapsedTime: ' . $elapsedTime  . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/CheckStorageInvoicesGroupTransactionsV2CommandJob.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Transactions\Services\ListsGroups;
-use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
-use App\Models\Order;
-use Illuminate\Support\Facades\Log;
-
-class CheckStorageInvoicesGroupTransactionsV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Check all pending group payment with storage invoice is valid.');
-        $start   = new Carbon();
-
-
-        $newfilters['order_by_updated_at_desc'] = true;
-        $newfilters['status_in'] = [0, 1];
-        $groups = (App()->make(ListsGroups::class))->execute($newfilters);
-
-        foreach ($groups as $group){
-            Log::info('CheckForStorageInvoiceByTransactions group: '.json_encode($group));
-            foreach ($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $packingList = $invoice->owner()->first();
-                if($packingList){
-                    $order = $packingList->owner()->first();
-                    if($order instanceof Order){
-                        $storages = (App()->make(CheckStorageInvoiceTransactionProcessor::class))->executeOrder($order);
-                    }
-                }
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Check all pending group payment with storage invoice is valid. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/CheckStorageInvoicesOrdersV2CommandJob.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Orders\Services\ListsOrders;
-use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\OrderType;
-use Illuminate\Support\Facades\Log;
-
-class CheckStorageInvoicesOrdersV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Check all orders for storage invoice.');
-        $start   = new Carbon();
-
-        $orders = (App()->make(ListsOrders::class))->execute(['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]);
-
-        $count = 0;
-        foreach ($orders as $order){
-            try{
-                $storages = (App()->make(CheckStorageInvoiceTransactionProcessor::class))->executeOrder($order);
-                $count =  $count + 1;
-                Log::info('Order '.$count);
-            }
-            catch(\Exception $ex){
-                Log::info('Exception '.$ex->getMessage());
-                break;
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Check all orders for storage invoice. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/DummyJob.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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 DummyJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Dummy.');
-        $start   = new Carbon();
-
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Dummy. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixApprovedPaymentFailedGroupV2CommandJob.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Billplzs\Processors\CallbackBillplzProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Group;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class FixApprovedPaymentFailedGroupV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix all payment is approved or completed but group failed to be updated.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        // $this->outputArray = [];
-
-        $groups = Group::whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-            ->whereHas('payment', function ($query) {
-                $query->whereIn('status', [2, 3]);
-            })->get();
-
-        foreach ($groups as $group) {
-            $transaction = $group->payment;
-
-            $response = Http::withBasicAuth(config('billplz.api_key') . ':', '')->get(config('billplz.base_url') . '/api/v3/bills/' . $transaction->payment_reference);
-
-            dump($transaction->payment_reference);
-
-            if ($response->successful()) {
-                $data = $response->json();
-                if ($data['paid']) {
-                    $status = ApprovalStatus::PENDING_VERIFICATION;
-
-                    if ($data['state'] === 'paid') {
-                        $status = ApprovalStatus::APPROVED;
-                    }
-
-                    Log::info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference);
-                    (App()->make(CallbackBillplzProcessor::class))->execute($transaction, $status);
-                }
-            } else {
-                Log::info("billplz error");
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-
-        // if ($groups) {
-        //     $this->info(Carbon::now() . ' : Done . ElapsedTime: ' . $elapsedTime);
-        // }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix all payment is approved or completed but group failed to be updated. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixBillplzFailedCallbackPaymentV2CommandJob.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Billplzs\Processors\CallbackBillplzProcessor;
-use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class FixBillplzFailedCallbackPaymentV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $transactionId;
-
-    public function __construct(int $transactionId)
-    {
-        $this->transactionId = $transactionId;
-    }
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix failled callback from billplz.');
-        $start   = new Carbon();
-
-        $transaction = Transaction::where('id', $this->transactionId)->first();
-
-        Log::info('Billplz Url: '.config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-        $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-        if($response->successful()){
-            $data = $response->json();
-            if($data['paid']) {
-                $status = ApprovalStatus::PENDING_VERIFICATION;
-
-                if($data['state'] === 'paid') {
-                    $status = ApprovalStatus::APPROVED;
-                }
-
-                Log::info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference);
-                (App()->make(CallbackBillplzProcessor::class))->execute($transaction, $status);
-            }
-        }
-        else{
-            Log::info("billplz error");
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix failled callback from billplz. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixDuplicateContainerReferenceV2CommandJob.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Container;
-use App\Models\ContainerPackingList;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-class FixDuplicateContainerReferenceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix Duplicate Container Reference.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-
-        $duplicatedContainers = Container::select('reference', DB::raw('COUNT(reference) as count'))
-            ->groupBy('reference')
-            ->having('count', '>', 1)
-            ->get();
-
-        foreach ($duplicatedContainers as $duplicatedContainer) {
-            $containers = Container::where('reference', $duplicatedContainer->reference)->get();
-
-            $containers = $containers->sortByDesc(function ($container) {
-                return $container->packingLists->count();
-            });
-
-            $firstContainer = $containers->shift();
-
-            foreach ($containers as $container) {
-                $firstContainer->packingLists()->syncWithoutDetaching($container->packingLists);
-                $container->packingLists()->detach();
-                Log::info('Deleted container ' . $container->id);
-                $container->delete();
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix Duplicate Container Reference. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixGroupPaymentProblemV2CommandJob.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionFixProcessor;
-use Illuminate\Support\Facades\Log;
-
-class FixGroupPaymentProblemV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix Group Payment Problem.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        /*
-        $group = $this->fetchesGroup->execute(['id' => 325]);
-        $this->info('FixGroupPaymentProblem group: '.json_encode($group));
-        if ($group) {
-            foreach ($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $this->info('FixGroupPaymentProblem group: '.json_encode($invoice));
-                $pL = $invoice->owner;
-                $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
-            }
-        }
-        */
-
-        $order = (App()->make(FetchesOrder::class))->execute(['reference' => '729251424']);
-        $packingLists = $order->destinationWarehousePackages;
-
-        foreach ($packingLists as $packingList){
-            (App()->make(CreateStorageInvoiceDocTransactionFixProcessor::class))->execute($packingList, true);
-            dd(json_encode($packingList));
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix Group Payment Problem. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixInvoiceV2CommandJob.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\Modules\Jobs\DataTransferObjects\FixInvoiceV2CommandObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\CompanyConnection;
-use App\Models\Order;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use Illuminate\Support\Facades\Log;
-
-class FixInvoiceV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var FixInvoiceV2CommandObject*/
-    private $fixInvoiceV2CommandObject;
-
-    /**
-     * FixInvoiceV2CommandJob constructor.
-     * @param FixInvoiceV2CommandObject $fixInvoiceV2CommandObject
-     */
-    public function __construct(FixInvoiceV2CommandObject $fixInvoiceV2CommandObject)
-    {
-        $this->fixInvoiceV2CommandObject = $fixInvoiceV2CommandObject;
-    }
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix invoice.');
-        $start   = new Carbon();
-
-        $connection = CompanyConnection::where('invitee_reference', $this->fixInvoiceV2CommandObject->getMarking())->first();
-        $company_module_id = $connection->invitee->id;
-
-        $orders = Order::where('company_module_id', $company_module_id)->get();
-
-        foreach ($orders as $order){
-            $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
-            foreach ($invoices as $invoice){
-
-                dump($invoice->id);
-
-                $invoice->documents()->delete();
-
-                $view = 'pages.pdfs.shipping_invoice';
-                $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-                $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
-                if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
-                    $view = 'pages.pdfs.shipping_invoice_sst';
-                }
-
-                $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice]);
-
-                $document_object = new DocumentObject(
-                    DocumentType::SHIPPING_INVOICE,
-                    [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-                    '',
-                    ApprovalStatus::COMPLETED,
-                    'shipping_invoice'
-                );
-
-                /** @var Document $document */
-                $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
-
-                (App()->make(CreatesFiles::class))->execute($document, $document_object);
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix invoice. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixMissingPackingListV2CommandJob.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
-use Illuminate\Support\Facades\Log;
-
-class FixMissingPackingListV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix Missing PackingList.');
-        $start   = new Carbon();
-
-        $start_date = '2024-05-05';
-        $end_date = '2024-05-05';
-
-        $start = $start_date ? Carbon::parse($start_date) : null;
-        $end = $end_date ? Carbon::parse($end_date) : null;
-
-        if (!$start || !$end) {
-            return;
-        }
-
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix Missing PackingList. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/FixPackingListV2CommandJob.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\PackingList;
-use Illuminate\Support\Facades\Log;
-
-class FixPackingListV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix PackingList.');
-        $start   = new Carbon();
-
-        $packingLists = PackingList::whereDoesntHave('packages')->get();
-
-        if ($packingLists->isNotEmpty()) {
-
-            $restoredPackagesCount = 0;
-            $restoredPackagesIds = [];
-
-            // Eager loading packages for all packing lists
-            $packingLists->load(['packages' => function ($query) {
-                $query->onlyTrashed();
-            }]);
-
-            foreach ($packingLists as $packingList) {
-                $deletedPackages = $packingList->packages->filter(function ($package) use ($restoredPackagesIds) {
-                    // Filter out packages that have already been restored
-                    return !in_array($package->id, $restoredPackagesIds);
-                });
-
-                if ($deletedPackages->isNotEmpty()) {
-                    $groupedPackages = $deletedPackages->groupBy(function ($item) {
-                        return $item->only(['type', 'description', 'width', 'height', 'length', 'weight', 'quantity']);
-                    });
-
-                    foreach ($groupedPackages as $group) {
-                        $latestPackage = $group->sortByDesc('created_at')->first();
-
-                        // Check if the package ID is already restored before attempting to restore it
-                        if (!in_array($latestPackage->id, $restoredPackagesIds)) {
-                            $latestPackage->restore();
-                            Log::info('Package ID: ' . $latestPackage->id . ' has been restored');
-                            $restoredPackagesCount++;
-                            $restoredPackagesIds[] = $latestPackage->id;
-                        }
-                    }
-                }
-            }
-
-            Log::info('Restored Packages Count: ' . $restoredPackagesCount);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix PackingList. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/HouseKeepingS3FilesV2CommandJob.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-
-use Carbon\Carbon;
-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\File;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
-
-class HouseKeepingS3FilesV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Housekeeping temporary files in S3 Bucket.');
-        $start   = new Carbon();
-
-        $s3 = Storage::disk('s3');
-        $directories = [
-            'temp',
-        ];
-        foreach ($directories as $directory) {
-            $startInner = Carbon::now();
-            Log::info(Carbon::now() . ' [HouseKeepingS3FilesV2] Start cleaning - ' . $directory);
-
-            $objects = $s3->allFiles($directory);
-
-            foreach ($objects as $object) {
-                $s3->delete($object);
-                Log::info('[HouseKeepingS3FilesV2] Deleted object: ' . $object);
-            }
-
-            Log::info('[HouseKeepingS3FilesV2] All files have been deleted.');
-
-            $endInner = Carbon::now();
-            $elapsedTime = $startInner->diff($endInner)->format('%H:%I:%S');
-            Log::info(Carbon::now() . ' [HouseKeepingS3FilesV2] Process ended. ElapsedTime: ' . $elapsedTime);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Housekeeping temporary files in S3 Bucket. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/NewUserRegistrationExpireCheckV2CommandJob.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use App\Classes\Modules\Accounts\Services\ExpiresEmailVerificationAttempt;
-use App\Models\UserEmailVerification;
-use Carbon\Carbon;
-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 NewUserRegistrationExpireCheckV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - New user email verification expiration check.');
-        $start   = new Carbon();
-
-        $attempts = UserEmailVerification::active()->twoDaysOld()->get();
-
-        Log::info('NewUser Carbon now()->subHours(48): '. Carbon::now()->subHours(48));
-        Log::info('NewUser Attempts count: '.count($attempts));
-
-        foreach ($attempts as $attempt){
-            (new ExpiresEmailVerificationAttempt())->execute($attempt);
-            Log::info('NewUser Expired: '.$attempt->id.', '.$attempt->created_at);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - New user email verification expiration check. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/OneTimeTransactionFixBillplzFailedCbV2CommandJob.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Billplzs\Processors\CallbackBillplzDataPatchProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-class OneTimeTransactionFixBillplzFailedCbV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - One time fix failled callback from billplz for transaction with id 17310 cron ended.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        //Transaction fix with this one time fix command: 15205, 16803, 17310
-        //This transaction, 16803 has approve payment but not its owner, shipping invoice
-        $transaction = Transaction::whereIn('id', [17310])->first();
-        Log::info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 17310 cron started.');
-
-        if($transaction && $transaction->id == 17310){
-
-            Log::info(Carbon::now() . ' : 17310.');
-            $status = ApprovalStatus::APPROVED;
-            // $this->callbackBillplzProcessor->execute($transaction, $status);
-            (App()->make(CallbackBillplzDataPatchProcessor::class))->execute($transaction, $status);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - One time fix failled callback from billplz for transaction with id 17310 cron ended. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/PasswordResetTokenExpirationV2CommandJob.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use App\Classes\Modules\Accounts\Services\ExpiresPasswordReset;
-use App\Models\PasswordReset;
-use Carbon\Carbon;
-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 PasswordResetTokenExpirationV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Password reset token expiration check.');
-        $start   = new Carbon();
-
-        $attempts = PasswordReset::active()->oneDayOld()->get();
-
-        Log::info('PasswordReset Carbon now()->subHours(24): '. Carbon::now()->subHours(24));
-        Log::info('PasswordReset Attempts count: '.count($attempts));
-
-        foreach ($attempts as $attempt){
-            (new ExpiresPasswordReset())->execute($attempt);
-            Log::info('PasswordReset Expired: '.$attempt->id.', '.$attempt->created_at);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Password reset token expiration check. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/SendContainerDepartureEmailV2CommandJob.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Notifications\ShipmentDepartureEmail;
-use App\Models\Order;
-use App\Models\Container;
-use Illuminate\Support\Facades\Log;
-
-class SendContainerDepartureEmailV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Send Container Departure Email.');
-        $start   = new Carbon();
-
-        $containers = Container::whereHas('transports', function ($transport){
-            return $transport->whereDate('dispatch_date', '=', Carbon::today());
-         })->get();
-
-         foreach ($containers as $container){
-             foreach ($container->packingLists as $packingList){
-                 if(!($packingList->owner instanceof Order)) continue;
-                 $user = $packingList->owner->companyModule->employees()->first();
-                 if(app()->environment(['production'])) {
-                     $user->notify(new ShipmentDepartureEmail($user, $packingList));
-                 }
-             }
-         }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Send Container Departure Email. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/SendPermitsReminderEmailsV2CommandJob.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\Notifications\PermitsReminderEmail;
-use App\Models\PermitsReminder;
-use App\Models\User;
-use Illuminate\Support\Facades\Log;
-
-class SendPermitsReminderEmailsV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Send Permits Reminders Email.');
-        $start   = new Carbon();
-
-        $currentDateTime = now();
-        $startRange = $currentDateTime->subDays(3)->startOfDay();
-        $endRange = $currentDateTime->copy()->addDays(6)->endOfDay();
-
-        $reminders = PermitsReminder::whereDate('reminder_date', '>=', $startRange)
-            ->whereDate('reminder_date', '<=', $endRange)
-            ->orWhere('reminder_date', '<', now())
-            ->pluck('model');
-
-        if ($reminders->isEmpty()) {
-            Log::info('No reminders expiring within the specified range.');
-            return;
-        }
-
-        Log::info($this->getTimeStamp() . 'Reminders: ' . $reminders->toJson());
-
-        $users = User::whereIn('email', $this->getEmailList())->get();
-
-        foreach ($users as $user) {
-            Log::info($this->getTimeStamp() . 'Reminder email sent to ' . $user->email);
-            if (app()->environment('production')) {
-                $user->notify(new PermitsReminderEmail($user, $reminders));
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Send Permits Reminders Email. ElapsedTime: ' . $elapsedTime . '.');
-    }
-
-    public function getTimeStamp()
-    {
-        return '[' . Carbon::now()->format('Y-m-d H:i:s') . '] - ';
-    }
-
-    protected function getEmailList(): array
-    {
-        return [
-            // 'edmond.wuiming2021@gmail.com',
-            'anithagurl96@gmail.com'
-        ];
-    }
-}

app/Classes/Jobs/Commands/V2/ShowBillplzPaymentStatusV2CommandJob.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use App\Classes\Modules\Jobs\DataTransferObjects\ShowBillplzPaymentStatusV2CommandObject;
-use Carbon\Carbon;
-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\Http;
-use Illuminate\Support\Facades\Log;
-
-class ShowBillplzPaymentStatusV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    /** @var ShowBillplzPaymentStatusV2CommandObject*/
-    private $showBillplzPaymentStatusV2CommandObject;
-
-    /**
-     * ShowBillplzPaymentStatusV2CommandJob constructor.
-     * @param ShowBillplzPaymentStatusV2CommandObject $showBillplzPaymentStatusV2CommandObject
-     */
-    public function __construct(ShowBillplzPaymentStatusV2CommandObject $showBillplzPaymentStatusV2CommandObject)
-    {
-        $this->showBillplzPaymentStatusV2CommandObject = $showBillplzPaymentStatusV2CommandObject;
-    }
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Show Billplz payment status.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $billplz_id = $this->showBillplzPaymentStatusV2CommandObject->getBillplzId();
-        $billplz_id = explode(",", $billplz_id);
-
-        foreach ($billplz_id as $payment) {
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$payment);
-            if($response->successful()){
-                $data = $response->json();
-                dump($data);
-            }else{
-                Log::info("billplz error</br>");
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Show Billplz payment status. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/ShowFailediBllplzCallbackV2CommandJob.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class ShowFailediBllplzCallbackV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Show all failled callback from billplz.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-
-        $transactions = Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP, TransactionType::GROUP_PAYMENT])->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
-        $totalTransactions = count($transactions);
-
-        if ($totalTransactions) {
-            Log::info(Carbon::now() . ' totalTransactions : ' . $totalTransactions);
-        }
-
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-            if($response->successful()){
-                $data = $response->json();
-                if($data['paid']){
-                    dump($transaction->payment_reference);
-                    dump($transaction->id);
-                }
-            }else{
-                Log::info("billplz error</br>");
-            }
-            $counter++;
-        }
-
-        // if ($totalTransactions) {
-        //     Log::info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-        // }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Show all failled callback from billplz. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/ShowFixBillplzFailedCallbackPaymentV2CommandJob.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class ShowFixBillplzFailedCallbackPaymentV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Show Billplz Failled Callback.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-        // $this->outputArray = [];
-
-        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
-
-        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
-        $totalTransactions = count($transactions);
-        $counter = 1;
-        $totalAmount = 0;
-        foreach ($transactions as $transaction){
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-            if($response->successful()){
-                $data = $response->json();
-                if($data['paid']){
-                    $totalAmount += $transaction->amount;
-                    $invoiceStatus = null;
-
-                    switch($transaction->owner->status) {
-                        case 3:
-                        $invoiceStatus = 'Payment Completed';
-                        break;
-                        case 5:
-                        $invoiceStatus = 'Dispute in progress';
-                        break;
-                        case 6:
-                        $invoiceStatus = 'Cancelled Invoice';
-                        break;
-                        default:
-                        $invoiceStatus = 'Pending Payment';
-                    }
-
-                    $order = $transaction->owner->owner->owner;
-
-                    if(!$order instanceof Order) {
-                        Log::info("Error transaction id:" . $transaction->id . 'Type: ' . get_class($order));
-                    } else {
-                        Log::info($counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
-                    }
-
-                } else {
-                    // $totalAmount += $transaction->amount;
-                    // $this->appendToOutput($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
-                }
-            }else{
-                Log::info("billplz error</br>");
-            }
-            $counter++;
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Show Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
-    }
-}

app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-
-use Carbon\Carbon;
-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\Billplzs\Services\GetBillplzBill;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-class SuccessUpdatePaymentStatusV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Success Updated Payment Status.');
-        $start   = new Carbon();
-
-        // ini_set('memory_limit', '-1');
-        // $this->outputArray = [];
-
-        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
-
-        $transactions = Transaction::where('type', TransactionType::PAYMENT)
-        ->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)
-        ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-        ->get();
-
-        foreach ($transactions as $payment) {
-            $invoice = $payment->owner ?? null;
-            if (!$invoice) {
-                Log::info('Payment has no owner. Payment ID: ' . $payment->id);
-                continue;
-            }
-
-            $packingList = $invoice->owner ?? null;
-            if (!$packingList) {
-                Log::info('Invoice has no owner. Invoice ID: ' . $invoice->id);
-                continue;
-            }
-
-            $order = $packingList->owner;
-            if (!$invoice) {
-                Log::info('PackingList has no owner. PackingList ID: ' . $packingList->id);
-                continue;
-            }
-
-            if ($invoice->status == ApprovalStatus::APPROVED) {
-
-                $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-                if(($invoice->amount - $totalPaidAmount) < 0.01) {
-                    (App()->make(UpdatesTransactionStatus::class))->execute($invoice, ApprovalStatus::COMPLETED);
-
-                    $packingList->status = ApprovalStatus::APPROVED;
-                    $packingList->save();
-
-                    if(app()->environment('production')){
-                        (App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList);
-                        (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList);
-                    }
-
-                    dump('Updated invoice ' . $invoice->id . '. Order: '. $order->reference);
-                } else {
-                    Log::info('Failed Update invoice ' . $invoice->id . ' because payment not enough. Invoice Amount: ' . $invoice->amount . ' . Paid Amount: ' . $totalPaidAmount . ' . Order: '. $order->reference);
-                }
-            }
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Success Updated Payment Status. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/TestAttachingS3FileAndSendEmailV2CommandJob.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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;
-use App\Models\Container;
-use App\Models\Order;
-use App\Models\User;
-use App\Classes\Notifications\ShipmentDepartureEmail;
-
-class TestAttachingS3FileAndSendEmailV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Test to attach a file from S3 bucket and trigger an email send.');
-        $start   = new Carbon();
-
-        $containers = Container::whereHas('transports', function ($transport){
-            return $transport->whereDate('dispatch_date', '<', Carbon::today())->whereDate('dispatch_date', '>', Carbon::now()->subdays(30));
-        })->get();
-
-        Log::info("[TESTING] total containers: " . count($containers));
-
-        $sent = false;
-        foreach ($containers as $container){
-        if($sent){
-            break;
-        }
-            foreach ($container->packingLists as $packingList){
-            if($sent){
-                break;
-            }
-
-                if(!($packingList->owner instanceof Order)) continue;
-                $user = $packingList->owner->companyModule->employees()->first();
-                $user = User::where('email', 'dillonngoweijoon@gmail.com')->first();
-
-                Log::info("[TESTING] user: " . json_encode($user));
-                Log::info("[TESTING] packingList: " . json_encode($packingList));
-
-                $user->notify(new ShipmentDepartureEmail($user, $packingList));
-                $sent = true;
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Test to attach a file from S3 bucket and trigger an email send. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/TestExportExcelToS3BucketV2CommandJob.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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;
-use App\Classes\Modules\Exports\Services\ExportsNullDebtors;
-use Illuminate\Support\Facades\Storage;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Models\Company;
-
-class TestExportExcelToS3BucketV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Test Export Excel File to S3 Bucket.');
-        $start   = new Carbon();
-
-        Log::info('company 0');
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->get();
-
-        Log::info('company 1: ' . json_encode($company));
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->get();
-
-        Log::info('company 2: ' . json_encode($company));
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->whereHas('parcels', function ($query) {
-            $query->where('packages.status', ApprovalStatus::APPROVED);
-
-        })
-        ->with(['companyModules', 'parcels'])
-        ->get();
-
-        Log::info('company 3: ' . json_encode($company));
-
-        $company = Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->whereHas('parcels')->where('status', ApprovalStatus::APPROVED)->get();
-
-        Log::info('company 4: ' . json_encode($company));
-
-        $export = new ExportsNullDebtors();
-        $filesystemDriver = Storage::getDefaultDriver();
-
-        if ($filesystemDriver === 's3') {
-            $filePathForS3 = 'temp/nullDebtor.xlsx'; //documents/exports
-            $excelFile = $export->store($filePathForS3, 's3');
-            $temporaryUrl = Storage::disk('s3')->temporaryUrl(
-                $filePathForS3,
-                Carbon::now()->addMinutes(10)
-            );
-            Log::info('temporaryUrl: ' . $temporaryUrl);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Test Export Excel File to S3 Bucket. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/TestReadDataFromYDAPIV2CommandJob.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2;
-
-use Carbon\Carbon;
-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;
-use App\Classes\Modules\PackingLists\Processors\TestFetchPackingListsFromYdPortalProcessor;
-
-class TestReadDataFromYDAPIV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Test to read data from YD API.');
-        $start   = new Carbon();
-
-        (App()->make(TestFetchPackingListsFromYdPortalProcessor::class))->execute();
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Test to read data from YD API. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchContainersFromYdPortalV2CommandJob.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchContainersFromYdPortalV2Processor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-use App\Models\PackingList;
-
-use Carbon\Carbon;
-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 FetchContainersFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $packingList;
-
-    public function __construct(PackingList $packingList)
-    {
-        $this->packingList = $packingList;
-    }
-
-
-    public function handle()
-    {
-        Log::info('Processing FetchContainersFromYdPortalV2CommandJob');
-        $processor = app(FetchContainersFromYdPortalV2Processor::class);
-        $processor->execute($this->packingList);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchContainersUpdatesFromYdPortalV2CommandJob.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\V2\FetchContainersUpdatesFromYdPortalV2Processor;
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-use App\Models\Container;
-
-use Carbon\Carbon;
-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 FetchContainersUpdatesFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $container;
-
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchContainersUpdatesFromYdPortalV2CommandJob');
-        $processor = app(FetchContainersUpdatesFromYdPortalV2Processor::class);
-        $processor->execute($this->container);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchDeliveryUpdatesFromYdPortalV2CommandJob.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\V2\FetchDeliveryUpdatesFromYdPortalV2Processor;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-use App\Models\PackingList;
-
-use Carbon\Carbon;
-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 FetchDeliveryUpdatesFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $packingListId;
-
-    public function __construct(int $packingListId)
-    {
-        $this->packingListId = $packingListId;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchDeliveryUpdatesFromYdPortalV2CommandJob');
-        $processor = app(FetchDeliveryUpdatesFromYdPortalV2Processor::class);
-        $processor->execute($this->packingListId);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchOrderListsFromYdPortalV2CommandJob.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchOrderListsFromYdPortalV2Processor;
-
-use Carbon\Carbon;
-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 FetchOrderListsFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $startDate;
-    protected $endDate;
-
-    public function __construct(?Carbon $startDate, ?Carbon $endDate)
-    {
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchOrderListsFromYdPortalV2CommandJob for start date: ' . $this->startDate. ', and end date: ' . $this->endDate);
-        $processor = app(FetchOrderListsFromYdPortalV2Processor::class);
-        $processor->execute($this->startDate, $this->endDate);
-    }
-}

app/Classes/Jobs/Commands/V2/YD/FetchPackingListsFromYdPortalV2CommandJob.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchPackingListsFromYdPortalV2Processor;
-
-use Carbon\Carbon;
-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 FetchPackingListsFromYdPortalV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $startDate;
-    protected $endDate;
-
-    public function __construct(?Carbon $startDate, ?Carbon $endDate)
-    {
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchPackingListsFromYdPortalV2CommandJob for start date: ' . $this->startDate. ', and end date: ' . $this->endDate);
-        $processor = app(FetchPackingListsFromYdPortalV2Processor::class);
-        $processor->execute($this->startDate, $this->endDate);
-    }
-}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -13,7 +13,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
 
 class FetchOrdersFromYDPortalJob implements ShouldQueue
 {
@@ -30,17 +29,12 @@ class FetchOrdersFromYDPortalJob implements ShouldQueue
      */
     public function handle()
     {
-        Log::info('FetchOrdersFromYDPortalJob starts');
-        Log::info('FetchPackingListsFromYdPortalProcessor starts');
         (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
-        Log::info('FetchContainersFromYdPortalProcessor starts');
         (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
-        Log::info('FetchContainersUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-        Log::info('FetchDeliveryUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-        Log::info('FetchOrdersFromYDPortalJob ends');
-        //        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+
+//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
 
 }

app/Classes/Jobs/ListPackingListsJob.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PackingLists\Processors\ListPackingListsJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-
-class ListPackingListsJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /** @var JobSubmissionObject */
-    private $jobSubmissionObject;
-
-    /**
-     * ListPackingListsJob constructor.
-     * @param JobSubmissionObject $JobSubmissionObject
-     */
-    public function __construct(JobSubmissionObject $jobSubmissionObject)
-    {
-        $this->jobSubmissionObject = $jobSubmissionObject;
-    }
-
-    public function handle()
-    {
-        $rawPayload = $this->job->payload();
-        if(isset($rawPayload['data']['commandName'])){
-            $this->jobSubmissionObject->setJobCommandName($rawPayload['data']['commandName']);
-        }
-
-        if(isset($rawPayload['data']['command'])){
-            $this->jobSubmissionObject->setJobCommand($rawPayload['data']['command']);
-        }
-
-        $result = (App()->make(ListPackingListsJobProcessor::class))->execute($this->jobSubmissionObject);
-    }
-}

app/Classes/Jobs/MonthlyReportJob.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\Reports\Processors\MonthlyReportJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-
-class MonthlyReportJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /** @var JobSubmissionObject */
-    private $jobSubmissionObject;
-
-    /**
-     * MonthlyReportJob constructor.
-     * @param JobSubmissionObject $jobSubmissionObject
-     */
-    public function __construct(JobSubmissionObject $jobSubmissionObject)
-    {
-        $this->jobSubmissionObject = $jobSubmissionObject;
-    }
-
-    public function handle()
-    {
-        $rawPayload = $this->job->payload();
-        if(isset($rawPayload['data']['commandName'])){
-            $this->jobSubmissionObject->setJobCommandName($rawPayload['data']['commandName']);
-        }
-
-        if(isset($rawPayload['data']['command'])){
-            $this->jobSubmissionObject->setJobCommand($rawPayload['data']['command']);
-        }
-
-        $result = (App()->make(MonthlyReportJobProcessor::class))->execute($this->jobSubmissionObject);
-    }
-}

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -20,7 +20,6 @@ use Illuminate\Queue\SerializesModels;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
 use App\Classes\General\Helper;
-use App\Classes\General\LogHelper;
 
 class UpdatePerfexCRMInvoice implements ShouldQueue
 {
@@ -48,7 +47,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        LogHelper::channel('perfex_crm')->info('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
+        Log::error('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
 
         if(is_null($invoice)){
             $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -56,7 +55,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                 $invoiceId = $result->payload['id'];
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                LogHelper::channel('perfex_crm')->info('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
             }
         }
         else{

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -32,12 +32,12 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
 
     /**
      * UpdatePerfexCRMPrelude constructor.
-     * @param PackingList $packingList
+     * @param $packingList
      * @param Transaction $transaction
      * @param UpdatePerfexCRMObject $updatePerfexCRMObject
      * @param bool|null $shouldCreateInvoice
      */
-    public function __construct(?PackingList $packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
     {
         $this->packingList = $packingList;
         $this->transaction = $transaction;
@@ -47,12 +47,6 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
 
     public function handle()
     {
-        Log::info('UpdatePerfexCRMPrelude packingList: ' . json_encode($this->packingList));
-
-        if(env('APP_ENV') !== 'production'){
-            return;
-        }
-
         if(is_null($this->packingList)){
             $this->packingList = $this->transaction->owner->owner;
         }

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

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Exceptions\ResourceConflictException;
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\UserResource;
-use App\Models\User;
-use Illuminate\Database\QueryException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class AdminAddNewMemberLogic extends AbstractControllerLogic
-{
-
-    public function notification(): array
-    {
-        return [
-            'title' => 'Admin Updated Email',
-            'message' => 'Successfully updated email'
-        ];
-    }
-
-    /**
-     * @var AssignEmployeeProcessor
-     */
-    private $assignEmployeeProcessor;
-
-    /**
-     * @var GenerateEmailVerificationAttemptProcessor
-     */
-    private $generateEmailVerificationAttemptProcessor;
-
-    /**
-     * AddNewMemberLogic constructor.
-     * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
-     */
-    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
-    {
-        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ResourceConflictException
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        Log::info($request->input('employeeId'));
-
-        try {
-            if (!$authUser = User::find($request->input('employeeId'))) {
-                throw new ResourceNotFoundException('User not found.');
-            }
-        
-            $user = $authUser->replicate();
-            $user->email = $request->input('email');
-            $user->status = ApprovalStatus::PENDING_VERIFICATION;
-            $user->save();
-            
-        } catch (QueryException $e) {
-            throw new ResourceConflictException('Email already exists.');
-        }
-
-        Log::info($request->input('email'));
-        
-        if ($company = $authUser->companyModule()->first()) {
-            $this->assignEmployeeProcessor->execute(new EmploymentObject($company, $user));
-        }
-        
-        $this->generateEmailVerificationAttemptProcessor->execute($user);
-        
-        return $this->resourceResponse(new UserResource($user));
-    }
-}

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

@@ -36,8 +36,6 @@ use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 
 class CreateCustomerLogic extends AbstractControllerLogic
 {
@@ -169,19 +167,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
             CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
         }
 
-        if(app()->environment(['production'])){
-            // call wac webhook
-            $url = config('wagWebhookUrl.account_registration_url');
-            $payload = [
-                'name'     => $request->input('name'),
-                'email'    => $request->input('email'),
-                'phone'    => $request->input('phone'),
-                'portal'   => 'izyim'
-            ];
-            $response = Http::post($url, $payload);
-            Log::channel('wac_webhook')->info('Register Account: ' . json_encode($response));
-        }
-
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

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

@@ -77,11 +77,11 @@ class GeneratePasswordResetLogic extends AbstractControllerLogic
 
             $attempt = $this->generatesPasswordReset->execute($user);
 
-            // $this->passwordResetTokenExpiration::dispatch($attempt)->delay(now()->addHours(24)); //converted to schedule task
+            $this->passwordResetTokenExpiration::dispatch($attempt)->delay(now()->addHours(24));
             $this->sendResetPasswordEmail::dispatch($user, $attempt);
 
             return $this->response(['email' => $object->getEmail()]);
         }
     }
 
-}
+}

app/Classes/Modules/Accounts/Processors/GenerateEmailVerificationAttemptProcessor.php

@@ -50,7 +50,7 @@ class GenerateEmailVerificationAttemptProcessor
 
         $attempt = $this->generatesEmailVerificationAttempt->execute($user);
 
-        //$this->emailVerificationAttemptExpiration::dispatch($attempt)->delay(now()->addHours(48));  //converted to schedule task
+        $this->emailVerificationAttemptExpiration::dispatch($attempt)->delay(now()->addHours(48));
 
         $this->sendUserVerificationEmail::dispatch($user, $attempt);
 

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

@@ -15,12 +15,10 @@ 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\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Carbon\Carbon;
 
 class UpdateAddressLogic extends AbstractControllerLogic
 {
@@ -104,24 +102,6 @@ class UpdateAddressLogic extends AbstractControllerLogic
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
-        if ($request->input('pickup_time_to') <= $request->input('pickup_time_from')) {
-            $pickupTimeFrom = Carbon::parse($request->input('pickup_time_from'));
-            $request->merge([
-                'pickup_time_to' => $pickupTimeFrom->addHour()->format('H:i') // Format to hh:mm
-            ]);
-        }
-
-        $addressExtraFields = [
-            'property_type'                  => $request->input('property_type'),
-            'receive_goods_working_hours'    => $request->input('receive_goods_working_hours'),
-            'receive_goods_after_hours'      => $request->input('receive_goods_after_hours'),
-            'receive_goods_on_saturday'      => $request->input('receive_goods_on_saturday'),
-        ];
-
-        $address->addressExtraFields()->delete();
-        $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
-        $remark = $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -145,7 +145,7 @@ class CallbackBillplzLogic
                     $pL = $invoice->owner;
                     $order = $pL->owner;
                     if($order){
-                        $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                        $this->storageInvoiceTransactionProcessor->executeOrder($order, false); //original was set true here so that no group is soft deleted or billplz bill got deleted
                     }
                 }
             }

app/Classes/Modules/Billplzs/Processors/CallbackBillplzDataPatchProcessor.php

@@ -1,140 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Billplzs\Processors;
-
-use Illuminate\Http\Request;
-use App\Models\Wallet;
-use App\Models\Group;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
-use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use Illuminate\Support\Facades\Log;
-
-//Date: 20240817
-//This Processor is used for one time data patching with OneTimeTransactionFixBillplzFailedCallback.php
-class CallbackBillplzDataPatchProcessor
-{
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor;
-
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
-
-    /** @var CreatePaymentTransactionProcessor */
-    private $createPaymentTransactionProcessor;
-
-    /** @var ReleaseGoodsToCustomerProcessor */
-    private $releaseGoodsToCustomerProcessor;
-
-    /**
-     * CallbackBillplzDataPatchProcessor constructor.
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
-     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
-     * @param UpdatesWalletBalance $updatesWalletBalance
-     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
-     * @param ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
-     */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
-    {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->updatesWalletBalance = $updatesWalletBalance;
-        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
-        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute($transaction, $status)
-    {
-        $invoice = $transaction->owner;
-        $packingList = $invoice->owner;
-
-        $proceed = $this->checkForGroupPayment($transaction);
-        if(!$proceed) return false;
-
-        $this->updatesTransactionStatus->execute($transaction, $status);
-
-        Log::info('CallbackBillplzDataPatchProcessor 1');
-
-        // check if is wallet top up
-        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
-
-            Log::info('CallbackBillplzDataPatchProcessor 2');
-
-            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-
-            $group = Group::where('reference', $transaction->payment_reference)->first();
-
-            // check if is group payment
-            if ($group) {
-                foreach ($group->groupTransactions as $groupTransaction) {
-                    $invoice = $groupTransaction->transaction;
-                    Log::info('CallbackBillplzDataPatchProcessor 3: '.json_encode($invoice));
-
-                    //if($invoice->status !== ApprovalStatus::COMPLETED){
-                        // $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
-
-                        // if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
-                            $pL = $invoice->owner;
-                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice, true);
-                        //}
-                    //}
-                }
-
-                $group->status = $status;
-                $group->save();
-            }
-        }
-
-        if (!$transaction->owner instanceof Wallet) {
-            Log::info('CallbackBillplzDataPatchProcessor 3');
-            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
-        }
-
-        return true;
-    }
-
-    private function checkForGroupPayment($transaction){
-        //This check is targetting group payment that expired and soft deleted
-        //command:check-storage-invoices must already run for this part of the code to work properly
-        $group = Group::withTrashed()->where('reference', $transaction->payment_reference)->first();
-        if ($group) {
-            $totalAmountToBePaid = 0;
-            $actualAmountPaid = $transaction->amount;
-
-            foreach ($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                if($invoice->status !== ApprovalStatus::COMPLETED){
-                    $totalAmountToBePaid += $invoice->amount;
-                }
-            }
-
-            if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){
-
-            }
-            else{
-                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid);
-                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount);
-                return false;
-            }
-        }
-        return true;
-    }
-}

app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php

@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\Billplzs\Processors;
 
-use App\Classes\General\LogHelper;
 use Illuminate\Http\Request;
 use App\Models\Wallet;
 use App\Models\Group;
@@ -37,7 +36,7 @@ class CallbackBillplzProcessor
     private $releaseGoodsToCustomerProcessor;
 
     /**
-     * CallbackBillplzProcessor constructor.
+     * CreateUserProcessor constructor.
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
@@ -81,13 +80,12 @@ class CallbackBillplzProcessor
             if ($group) {
                 foreach ($group->groupTransactions as $groupTransaction) {
                     $invoice = $groupTransaction->transaction;
-                    if($invoice->status !== ApprovalStatus::COMPLETED){
-                        $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
 
-                        if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
-                            $pL = $invoice->owner;
-                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
-                        }
+                    $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                    if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                        $pL = $invoice->owner;
+                        $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
                     }
                 }
 
@@ -113,17 +111,15 @@ class CallbackBillplzProcessor
 
             foreach ($group->groupTransactions as $groupTransaction) {
                 $invoice = $groupTransaction->transaction;
-                if($invoice->status !== ApprovalStatus::COMPLETED){
-                    $totalAmountToBePaid += $invoice->amount;
-                }
+                $totalAmountToBePaid += $invoice->amount;
             }
 
             if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){
 
             }
             else{
-                LogHelper::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid);
-                LogHelper::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount);
+                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid); //cief todo: to be removed
+                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount); //cief todo: to be removed
                 return false;
             }
         }

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\LogHelper;
 use Illuminate\Support\Facades\Log;
 
 class DeletesBillplzBill
@@ -17,7 +16,7 @@ class DeletesBillplzBill
     public function execute(string $billID) {
         try{
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->delete(config('billplz.base_url').'/api/v3/bills/'.$billID);
-            LogHelper::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
+            Log::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
 
             if($response->successful()){
                 $data = $response->json();

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

@@ -7,8 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\AssignConnectionSegmentProcessor;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Http\Resources\CompanyResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -35,22 +33,17 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
     /** @var AssignConnectionSegmentProcessor */
     private $assignCompanyConnectionToConnectionSegmentProcessor;
 
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
     /**
      * AssignCompanyToSegmentLogic constructor.
      * @param FetchesCompany $fetchesCompany
      * @param FetchesCompanyConnection $fetchesCompanyConnection
      * @param AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor
-     * @param CreateContactProcessor $createContactProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor, CreateContactProcessor $createContactProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesCompanyConnection = $fetchesCompanyConnection;
         $this->assignCompanyConnectionToConnectionSegmentProcessor = $assignCompanyConnectionToConnectionSegmentProcessor;
-        $this->createContactProcessor = $createContactProcessor;
     }
 
     /**
@@ -69,11 +62,6 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
 
         $this->assignCompanyConnectionToConnectionSegmentProcessor->execute($companyConnection, $request->input('segment_id'));
 
-        if ($request->input('segment_id') == 10 || $request->input('segment_id') == 11) {
-            $contactObject = new ContactObject('Whatsapp: ' . $request->input('name'), $request->input('phone'), null, null);
-            $this->createContactProcessor->execute($contactObject, $company);
-        }
-
         return $this->resourceResponse(new CompanyResource($company));
     }
 }

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

@@ -1,121 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleIsCreditTerm;
-use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompanyModule;
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionIsWaived;
-use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class UpdateCompanyCreditTermStatusLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Company Credit Term Status',
-            'message' => 'You have successfully updated Company Credit Term Status'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var UpdatesCompanyModuleIsCreditTerm */
-    private $updatesCompanyModuleIsCreditTerm;
-
-    /** @var CanUpdateCompanyModule */
-    private $canUpdateCompanyModule;
-
-    /** @var ListsTransactions */
-    private $listsTransactions;
-
-    /** @var UpdatesTransactionIsWaived */
-    private $updatesTransactionIsWaived;
-
-    /** @var CheckStorageInvoiceTransactionProcessor */
-    private $storageInvoiceTransactionProcessor;
-
-
-
-    /**
-     * UpdateCompanyCreditTermStatusLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm
-     * @param CanUpdateCompanyModule $canUpdateCompanyModule
-     * @param UpdatesTransactionIsWaived $updatesTransactionIsWaived
-     * @param ListsTransactions $listsTransactions
-     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
-     */
-    public function __construct(FetchesCompany $fetchesCompany, UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm, CanUpdateCompanyModule $canUpdateCompanyModule, UpdatesTransactionIsWaived $updatesTransactionIsWaived, ListsTransactions $listsTransactions, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->updatesCompanyModuleIsCreditTerm = $updatesCompanyModuleIsCreditTerm;
-        $this->canUpdateCompanyModule = $canUpdateCompanyModule;
-        $this->listsTransactions = $listsTransactions;
-        $this->updatesTransactionIsWaived = $updatesTransactionIsWaived;
-        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
-    }
-
-    /**
-     * @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->canUpdateCompanyModule->passes();
-
-        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-        $companyModule = $company->companyModules()->first();
-        $isCreditTerm = $companyModule->connections()->first()->is_credit_term;
-
-        if ($isCreditTerm == 1) {
-            $isCreditTerm = 0;
-        } else {
-            $isCreditTerm = 1;
-        }
-
-        if($isCreditTerm === 1){
-            //{"per_page":10,"order_by":{"column":"id","DESC":true},"status_in":[2],"receiver":190,"type_in":[1],"does_not_have_payment_status_in":[0,1],"does_not_have_groups":1,"check_for_storage_invoice":1}
-
-            $filters = [
-                'status_in' => [2],
-                'receiver' =>  $companyModule->id,
-                'type_in' => [TransactionType::STORAGE_INVOICE]
-            ];
-
-            $transactions = $this->listsTransactions->execute($filters);
-            foreach($transactions as $transaction){
-                $this->updatesTransactionIsWaived->execute($transaction);
-                $packingList = $transaction->owner()->first();
-                if($packingList){
-                    $order = $packingList->owner()->first();
-                    if($order instanceof Order){
-                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
-                    }
-                }
-            }
-        }
-
-        $this->updatesCompanyModuleIsCreditTerm->execute($company->companyModules()->first()->connections()->first(), $isCreditTerm);
-        Log::info(Auth::user()->email." updated credit term status for customer with id: " .$request->route('id'). " to status " . $isCreditTerm);
-
-        $result = ['is_credit_term' => $isCreditTerm];
-        return $this->response(['data' => $result]);
-    }
-}

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\CompanyConnection;
-
-class UpdatesCompanyModuleIsCreditTerm extends AbstractUpdateRecord
-{
-
-    /**
-     * @param CompanyConnection $model
-     * @param int $isCreditTerm
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CompanyConnection $model, int $isCreditTerm)
-    {
-        $model->is_credit_term = $isCreditTerm;
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompanyModule.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-
-class CanUpdateCompanyModule extends AbstractRule
-{
-
-    /**
-     * CanUpdateCompanyModule constructor.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized($object): bool
-    {
-        $user = Auth()->user();
-        if($user){
-            $roleToCheck = Auth()->user()->type;
-            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param CompanyObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

app/Classes/Modules/Documents/ControllersLogic/RenderDocumentLogic.php

@@ -54,20 +54,11 @@ class RenderDocumentLogic extends AbstractControllerLogic
 
         $this->canRenderDocument->passes();
 
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            if(!Storage::disk('s3')->exists($file))
-            {
-                throw new ResourceNotFoundException();
-            }
-            return $this->response(['src' => explode('.', $file)[1] == 'pdf' ? chunk_split(base64_encode(Storage::disk('s3')->get($file))) : Storage::disk('s3')->get($file) ]);
-        }
-        else{
-            if(!Storage::disk('documents')->exists($file))
-            {
-                throw new ResourceNotFoundException();
-            }
-            return $this->response(['src' => explode('.', $file)[1] == 'pdf' ? chunk_split(base64_encode(Storage::disk('documents')->get($file))) : Storage::disk('documents')->get($file) ]);
+        if(!Storage::disk('documents')->exists($file))
+        {
+            throw new ResourceNotFoundException();
         }
+
+        return $this->response(['src' => explode('.', $file)[1] == 'pdf' ? chunk_split(base64_encode(Storage::disk('documents')->get($file))) : Storage::disk('documents')->get($file) ]);
     }
-}
+}

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

@@ -98,17 +98,13 @@ class ConvertsBase64ToFile
      * @throws MalformedRequestException
      */
     private function generateFile(FileObject $file, string $suffix = '') {
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            $filePath = 'documents/'.$this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
-            Storage::put($filePath, $file->getDecodedData(), 's3');
-            return $filePath;
-        }
-        else{
-            $filePath = $this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
-            Storage::disk('documents')->put($filePath, $file->getDecodedData());
-            return $filePath;
-        }
+
+        $filePath = $this->path.'/'.$file->getFileName().$suffix.'.'.$file->getExtension();
+
+        Storage::disk('documents')->put($filePath, $file->getDecodedData());
+
+        return $filePath;
+
     }
 
     /**

app/Classes/Modules/Exports/ControllersLogic/ExportFeedbackDataLogic.php

@@ -3,17 +3,14 @@
 namespace App\Classes\Modules\Exports\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\Abstract2ControllerLogic;
 use App\Classes\Modules\Exports\Services\ExportsFeedback;
 use App\Classes\Modules\Exports\Standards\Rules\CanExportFeedback;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Maatwebsite\Excel\Excel;
-use App\Classes\General\AWSS3Helper;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Http\JsonResponse;
 
-
-class ExportFeedbackDataLogic extends AbstractControllerLogic
+class ExportFeedbackDataLogic extends Abstract2ControllerLogic
 {
     /**
      * @return array
@@ -47,17 +44,14 @@ class ExportFeedbackDataLogic extends AbstractControllerLogic
      * @param Request $request
      * @return Response
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request) : BinaryFileResponse
     {
         $this->canExportFeedback->passes();
 
-        $exportFileName = 'feedback.xls';
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            return $this->response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsFeedback) ]);
-        }
+        $response = $this->exportsFeedback->download('feedback.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
 
-        return $this->response([ 'src' => null ]);
+        return $response;
     }
 
 }

app/Classes/Modules/Exports/ControllersLogic/ExportFeedbackDataReturnsBinaryLogic.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\Abstract2ControllerLogic;
-use App\Classes\Modules\Exports\Services\ExportsFeedback;
-use App\Classes\Modules\Exports\Standards\Rules\CanExportFeedback;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Maatwebsite\Excel\Excel;
-use App\Classes\General\AWSS3Helper;
-use Illuminate\Support\Facades\Storage;
-
-
-class ExportFeedbackDataReturnsBinaryLogic extends Abstract2ControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Feedback',
-            'message' => 'You have successfully exported feedback data'
-        ];
-    }
-
-    /** @var ExportsFeedback */
-    private $exportsFeedback;
-
-    /** @var CanExportFeedback */
-    private $canExportFeedback;
-
-    /**
-     * ExportFeedbackDataLogic constructor.
-     * @param ExportsFeedback $exportsFeedback
-     * @param CanExportFeedback $canExportFeedback
-     */
-    public function __construct(ExportsFeedback $exportsFeedback, CanExportFeedback $canExportFeedback)
-    {
-        $this->exportsFeedback = $exportsFeedback;
-        $this->canExportFeedback = $canExportFeedback;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Response
-     */
-    public function logic(Request $request) : BinaryFileResponse
-    {
-        $this->canExportFeedback->passes();
-
-        $exportFileName = 'feedback.xls';
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            return response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsFeedback) ]);
-        }
-        else{
-            $response = $this->exportsFeedback->download($exportFileName, Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-            ob_end_clean();
-        }
-
-        return $response;
-    }
-
-}

app/Classes/Modules/Exports/ControllersLogic/ExportPackingListLogic.php

@@ -3,16 +3,15 @@
 namespace App\Classes\Modules\Exports\ControllersLogic;
 
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Abstracts\Abstract2ControllerLogic;
 use App\Classes\Modules\Exports\Standards\Rules\CanExportPackingList;
 use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
 use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use App\Classes\General\AWSS3Helper;
-use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Maatwebsite\Excel\Excel;
 
-class ExportPackingListLogic extends AbstractControllerLogic
+class ExportPackingListLogic extends Abstract2ControllerLogic
 {
     /**
      * @return array
@@ -51,24 +50,19 @@ class ExportPackingListLogic extends AbstractControllerLogic
      * @param Request $request
      * @return Response
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request) : BinaryFileResponse
     {
         $this->canExportPackingList->passes();
         $isSetPendingArrangement = $request->header('PendingArrangement');
-
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            if($isSetPendingArrangement){
-                $exportFileName = 'packing-list-delivery.xls';
-                return $this->response([ 'src' => AWSS3Helper::S3Exportable($exportFileName, $this->exportsPendingArrangementDeliveryList) ]);
-            }
-            else{
-                $exportFileName = 'packing-list-on-hold.xls';
-                return $this->response([ 'src' => AWSS3Helper::S3Exportable($exportFileName, $this->exportsOnHoldPackingList) ]);
-            }
+        if($isSetPendingArrangement){
+            $response = $this->exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        }
+        else {
+            $response = $this->exportsOnHoldPackingList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         }
 
-        return $this->response([ 'src' => null ]);
+        ob_end_clean();
+        return $response;
     }
 
 }

app/Classes/Modules/Exports/ControllersLogic/ExportPackingListReturnsBinaryLogic.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\Abstract2ControllerLogic;
-use App\Classes\Modules\Exports\Standards\Rules\CanExportPackingList;
-use App\Classes\Modules\Exports\Services\ExportsOnHoldPackingList;
-use App\Classes\Modules\Exports\Services\ExportsPendingArrangementDeliveryList;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Maatwebsite\Excel\Excel;
-use Illuminate\Support\Facades\Storage;
-use App\Classes\General\AWSS3Helper;
-
-class ExportPackingListReturnsBinaryLogic extends Abstract2ControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved PackingList',
-            'message' => 'You have successfully exported PackingList'
-        ];
-    }
-
-    /** @var ExportsOnHoldPackingList */
-    private $exportsOnHoldPackingList;
-
-    /** @var ExportsPendingArrangementDeliveryList */
-    private $exportsPendingArrangementDeliveryList;
-
-    /** @var CanExportPackingList */
-    private $canExportPackingList;
-
-    /**
-     * ExportPackingListLogic constructor.
-     * @param ExportsPendingArrangementDeliveryList $exportsPendingArrangementDeliveryList
-     * @param ExportsOnHoldPackingList $exportsOnHoldPackingList
-     * @param CanExportPackingList $canExportPackingList
-     */
-    public function __construct(ExportsPendingArrangementDeliveryList $exportsPendingArrangementDeliveryList, ExportsOnHoldPackingList $exportsOnHoldPackingList, CanExportPackingList $canExportPackingList)
-    {
-        $this->exportsPendingArrangementDeliveryList = $exportsPendingArrangementDeliveryList;
-        $this->exportsOnHoldPackingList = $exportsOnHoldPackingList;
-        $this->canExportPackingList = $canExportPackingList;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Response
-     */
-    public function logic(Request $request) : BinaryFileResponse
-    {
-        $this->canExportPackingList->passes();
-        $isSetPendingArrangement = $request->header('PendingArrangement');
-
-        $filesystemDriver = Storage::getDefaultDriver();
-        if($filesystemDriver === 's3'){
-            if($isSetPendingArrangement){
-                $exportFileName = 'packing-list-delivery.xls';
-                return response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsPendingArrangementDeliveryList) ]);
-            }
-            else{
-                $exportFileName = 'packing-list-on-hold.xls';
-                return response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $this->exportsOnHoldPackingList) ]);
-            }
-        }
-        else{
-            if($isSetPendingArrangement){
-                $response = $this->exportsPendingArrangementDeliveryList->download('packing-list-delivery.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-            }
-            else {
-                $response = $this->exportsOnHoldPackingList->download('packing-list-on-hold.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-            }
-
-            ob_end_clean();
-            return $response;
-        }
-    }
-
-}

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

@@ -24,8 +24,8 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
     {
         $this->filters = [
             "has_invoice_status_in"                 => [2],
-            // "packing_list_ordered_by_invoice_date"  => true,
-            // "with_aging_column"                     => true
+            "packing_list_ordered_by_invoice_date"  => true,
+            "with_aging_column"                     => true
         ];
     }
 
@@ -39,7 +39,6 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
             'Invoice Date',
             'Days',
             'Amount',
-            'Credit Term Customer',
         ];
     }
 
@@ -56,16 +55,9 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
         $invDate = 'n/a';
         $invNo   = 'n/a';
         $days    = 'n/a';
-        $isCreditTermCustomer = false;
 
         if ($list->owner instanceof Order) {
             $inviterPivotInviteeReference = $list->owner->companyModule->inviters()->withPivot('invitee_reference')->first();
-            $companyModule = $list->owner->companyModule;
-
-            $segment = $companyModule->connections()->first()->segments()->where('name', 'Credit Term Customer')->first();
-            if ($segment) {
-                $isCreditTermCustomer = true;
-            }
 
             if ($inviterPivotInviteeReference) {
                 $marking = $inviterPivotInviteeReference->pivot->invitee_reference;
@@ -95,7 +87,6 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
             $invDate,
             $days,
             $amt,
-            $isCreditTermCustomer ? 'TRUE' : 'FALSE',
         ];
     }
 

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

@@ -52,8 +52,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
         ])
             ->where('type', '=', 1)
             ->where('status', '=', 2)
-            ->where('owner_type', Order::class)
-            ->whereBetween('created_at', [Carbon::now()->subMonths(12), Carbon::now()]); //Limit, 'expensive' query
+            ->where('owner_type', Order::class);
 
         if (!is_null($this->start_date) && !is_null($this->end_date)) {
             $query->whereHas('transports', function ($q) {

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Exports\Services;
 
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\CompanyModule;
-use Carbon\Carbon;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
@@ -30,7 +29,7 @@ class ExportsCustomersOrderLatestDate implements FromQuery, WithHeadingRow, With
      */
     public function query()
     {
-        return CompanyModule::where('type', '=', 1)->whereBetween('created_at', [Carbon::now()->subMonths(12), Carbon::now()]); //Limit, 'expensive' query;
+        return CompanyModule::where('type', '=', 1);
     }
 
     /**
@@ -58,4 +57,4 @@ class ExportsCustomersOrderLatestDate implements FromQuery, WithHeadingRow, With
             $order ? $order->drop_date : ''
         ];
     }
-}
+}

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

@@ -70,31 +70,15 @@ class ExportsCustomersWalletTransactionHistory implements FromQuery, WithHeading
                 $description = 'Credit Voucher for ' . $transaction->payment_reference;
                 break;
             case TransactionType::PAYMENT:
-                $payment = Transaction::where('payment_reference', $transaction->bill_no)->first();
-                if (!$payment) {
-                    $description = 'Payment not found, please contact tech support.';
+                $booking = Transaction::where('payment_reference', $transaction->bill_no)->first()->owner;
+
+                if (!$booking) {
+                    $description = 'Payment for unknown booking, please contact tech support.';
                     break;
                 }
 
-                $invoice = $payment->owner;
-                if (!$invoice) {
-                    $description = 'Invoice not found, please contact tech support.';
-                    break;
-                }
-
-                $packingList = $invoice->owner;
-                if (!$packingList) {
-                    $description = 'Packing List not found, please contact tech support.';
-                    break;
-                }
-
-                $order = $packingList->owner;
-                if (!$order) {
-                    $description = 'Order not found, please contact tech support.';
-                    break;
-                }
-
-                $description = 'Payment For booking refs ' . $order->reference;
+                $marking = $booking->marking;
+                $description = 'Payment For booking refs' . $marking;
                 break;
             case TransactionType::DEBIT_NOTE:
                 $description = 'Debit Voucher for ' . $transaction->payment_reference;

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

@@ -1,108 +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\Group;
-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 ExportsGroupTransactions 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',
-            'PaymentDate',
-            'DebtorCode',
-            'Ref',
-            'ShipInfo',
-            'AccNo',
-            'DetailDescription',
-            'FurtherDescription',
-            'ProjNo',
-            'DeptNo',
-            'Qty',
-            'UnitPrice',
-            'TaxType',
-            'TaxableAmt',
-            'TaxRate'
-        ];
-    }
-
-    public function query()
-    {
-        $start_date = $this->parseDate($this->request->input('startDate'));
-        $end_date = $this->parseDate($this->request->input('endDate'));
-
-        return Group::when($start_date && $end_date, function ($query) use ($start_date, $end_date) {
-            $query->whereBetween('created_at', [
-                $start_date->startOfDay(),
-                $end_date->endOfDay()
-            ]);
-        })
-            ->when($start_date && !$end_date, function ($query) use ($start_date) {
-                $query->where('created_at', '>=', $start_date->startOfDay());
-            })
-            ->when(!$start_date && $end_date, function ($query) use ($end_date) {
-                $query->where('created_at', '<=', $end_date->endOfDay());
-            });
-    }
-
-    private function parseDate($date)
-    {
-        return $date ? Carbon::parse($date)->startOfDay() : null;
-    }
-
-    public function map($transaction): array
-    {
-        $company = $transaction->receiverCompany;
-        return [
-            '<<New>>',                                     //'DocNo',
-            '',                                            //'DocDate',
-            $transaction->created_at->format('m/d/Y H:m'), //'PaymentDate',
-            $company->debtor,                              //'DebtorCode',
-            $company->referece,                            //'Ref',
-            $company->referece,                            //'ShipInfo',
-            '500-0000',                                    //'AccNo',
-            'X1 Freight Service Charge',                   //'DetailDescription',
-            'FurtherDescription',                          //'FurtherDescription',
-            'M3',                                          //'ProjNo',
-            'CIEF',                                        //'DeptNo',
-            '',                                            //'Qty',
-            '',                                            //'UnitPrice',
-            '',                                            //'TaxType',
-            floatval($transaction->tax) > 0 ? number_format($transaction->tax, 2) : '0.00', //'TaxableAmt',
-            '',                                            //'TaxRate'
-        ];
-    }
-
-    private function getTaxType($tax_percentage)
-    {
-        return floatval($tax_percentage) > 0 ? 'SV-6' : '';
-    }
-}

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

@@ -31,7 +31,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         return [
             'DocNo',
             'DocDate',
-            'PaymentDate',
             'DebtorCode',
             'Ref',
             'ShipInfo',
@@ -42,9 +41,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DeptNo',
             'Qty',
             'UnitPrice',
-            'TaxType',
-            'TaxableAmt',
-            'TaxRate',
 //            'marking',
 //            'contact person',
 //            'contact number',
@@ -60,12 +56,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
     {
         $start_date = $this->request->input('startDate', null);
         if ($start_date) {
-            $start_date = Carbon::parse($start_date)->startOfDay();
+            $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($end_date)->endOfDay();
+            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
         }
 
         $query = Transaction::query();
@@ -78,31 +74,30 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $approvalStatus = ApprovalStatus::APPROVED;
         }
 
-        // Adjusted the query to include both types and status
-        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])
-            ->where('status', $approvalStatus);
+        // $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]);
 
-        if ($start_date && $end_date) {
-            $query->whereHas('transactions', function($transaction) use ($start_date, $end_date) {
-                $transaction->where('type', TransactionType::PAYMENT)
-                    ->whereBetween('updated_at', [$start_date, $end_date]);
-            });
-        } elseif ($start_date) {
+        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', '>=', $start_date);
+                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
             });
-        } elseif ($end_date) {
+
+        }
+        elseif(!$start_date && $end_date) {
             $query->whereHas('transactions', function($transaction) use ($end_date) {
-                $transaction->where('type', TransactionType::PAYMENT)
-                    ->where('updated_at', '<=', $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();
@@ -135,41 +130,9 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                 $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
         }
 
-        $transactionDetails = $transaction->transactionDetails;
-
-        $firstItem = true;
-        $rows = [];
-        foreach ($transactionDetails as $detail) {
-            // Prepare each row based on the transaction detail
-            $rows[] = [
-                $firstItem ? '<<New>>' : '',
-                $transaction->created_at->format('m/d/Y H:m'),
-                $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
-                $company->debtor,
-                $order->reference,
-                $order->reference,
-                '500-0000',
-                str_replace('<br>', ' ', $detail->name),
-                '',
-                $container->reference,
-                'CIEF',
-                $detail->quantity,
-                $detail->price,
-                floatval($detail->tax_percentage) > 0 ? 'SV-6' : '',
-                floatval($detail->tax_percentage) > 0 ? number_format($detail->amount, 2) : '0.00',
-                $detail->tax_percentage,
-            ];
-
-            if($firstItem) {
-                $firstItem = false;
-            }
-        }
-
-        return $rows;
-
         return [
             '<<New>>',
-            $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
+            $transaction->created_at->format('m/d/Y H:m'),
             $company->debtor,
             $order->reference,
             $order->reference,

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

@@ -46,8 +46,7 @@ class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, Shou
      */
     public function query()
     {
-        return Container::query()
-        ->whereBetween('created_at', [Carbon::now()->subMonths(3), Carbon::now()]); //Limit, 'expensive' query
+        return Container::query();
     }
 
     /**
@@ -103,4 +102,4 @@ class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, Shou
     {
         return 'Containers';
     }
-}
+}

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

@@ -13,7 +13,6 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\Order;
 use App\Models\PackingList;
-use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromCollection;
@@ -53,10 +52,7 @@ class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, Sh
      */
     public function collection()
     {
-        $packingLists = PackingList::where('status', '=', 2)
-        ->whereIn('type', [PackingListType::WAREHOUSE_RECEIVE_LIST, PackingListType::SHIPPING_PACKING_LIST])
-        ->whereBetween('created_at', [Carbon::now()->subMonths(3), Carbon::now()]) //Limit, 'expensive' query
-        ->get();
+        $packingLists = PackingList::where('status', '=', 2)->whereIn('type', [PackingListType::WAREHOUSE_RECEIVE_LIST, PackingListType::SHIPPING_PACKING_LIST])->get();
 
         return $packingLists->filter(function ($packingList) {
 
@@ -132,4 +128,4 @@ class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, Sh
     {
         return 'Packing Lists';
     }
-}
+}

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Imports\Services;
-
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Illuminate\Support\Collection;
-use Maatwebsite\Excel\Concerns\ToCollection;
-
-
-class GenericImport implements ToCollection, WithHeadingRow
-{
-    function headingRow(): int { return 1; }
-
-    public $rows;
-
-    /**
-     * @param Collection $collection
-     */
-    public function collection(Collection $collection)
-    {
-        $this->rows = $collection;
-    }
-}

app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Jobs\Processors\FetchesJobResultProcessor;
-use App\Http\Resources\JobResultResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchJobResultLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Data',
-            'message' => 'You have successfully retrieved data'
-        ];
-    }
-
-    /** @var FetchesJobResultProcessor */
-    private $fetchesJobResultProcessor;
-
-    /**
-     * FetchJobResultLogic constructor.
-     * @param FetchesJobResultProcessor $fetchesJobResultProcessor
-     */
-    public function __construct(FetchesJobResultProcessor $fetchesJobResultProcessor)
-    {
-        $this->fetchesJobResultProcessor = $fetchesJobResultProcessor;
-    }
-
-
-    /**
-     * @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
-    {
-        $query = $this->fetchesJobResultProcessor->execute($request);
-
-        return $this->resourceResponse(new JobResultResource($query));
-    }
-
-}

app/Classes/Modules/Jobs/ControllersLogic/SubmitJobLogic.php

@@ -1,79 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Jobs\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Jobs\MonthlyReportJob;
-use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-
-class SubmitJobLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Job Submission',
-            'message' => 'You have successfully submit a job for processing'
-        ];
-    }
-
-    /** @var CreatesJobResult */
-    private $createsJobResult;
-
-    /**
-     * SubmitJobLogic constructor.
-     * @param CreatesJobResult $createsJobResult
-     */
-    public function __construct(CreatesJobResult $createsJobResult)
-    {
-        $this->createsJobResult = $createsJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $jobId = uniqid();
-
-        $user = Auth::user();
-        $userInfo = (object) [
-            // 'email' => $user->email,
-            'type' => $user->type,
-        ];
-
-
-        $userInfoJson = json_encode($userInfo);
-        $requestSignature = md5($userInfoJson . $request->fullUrl());
-
-
-        $jobSubmissionObject = new JobSubmissionObject(
-            $request->fullUrl(),
-            $request->all(),
-            $requestSignature,
-            null,
-            $jobId,
-            $userInfo
-        );
-
-
-        MonthlyReportJob::dispatch($jobSubmissionObject)->onQueue(env('SQS_QUEUENAME_PREFIX', '').'high_priority');
-
-        $result = [];
-        $result['job_id'] = $jobId;
-
-
-        $this->createsJobResult->execute($jobSubmissionObject);
-
-        return $this->response(['data' => $result]);
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/FixInvoiceV2CommandObject.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class FixInvoiceV2CommandObject implements DataTransferObject
-{
-    /** @var string */
-    private $marking;
-
-
-    public function __construct(string $marking)
-    {
-        $this->marking = $marking;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMarking(): string
-    {
-        return $this->marking;
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/JobSubmissionObject.php

@@ -1,118 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class JobSubmissionObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var array */
-    private $payload;
-
-    /** @var string */
-    private $jobId;
-
-    /** @var string */
-    private $requestSignature;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var object */
-    private $userInfo;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $name, array $payload, string $requestSignature, ?string $resultSignature, string $jobId, object $userInfo = null)
-    {
-        $this->name = $name;
-        $this->payload = $payload;
-        $this->jobId = $jobId;
-        $this->requestSignature = $requestSignature;
-        $this->resultSignature = $resultSignature;
-        $this->userInfo = $userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPayload(): array
-    {
-        return $this->payload;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobId(): string
-    {
-        return $this->jobId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestSignature(): string
-    {
-        return $this->requestSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResultSignature(): ?string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return object
-     */
-    public function getUserInfo(): object
-    {
-        return $this->userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-
-
-    public function setJobCommandName(string $jobCommandName)
-    {
-        $this->jobCommandName = $jobCommandName;
-    }
-
-    public function setJobCommand(string $jobCommand)
-    {
-        $this->jobCommand = $jobCommand;
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/ShowBillplzPaymentStatusV2CommandObject.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class ShowBillplzPaymentStatusV2CommandObject implements DataTransferObject
-{
-    /** @var string */
-    private $billplzId;
-
-
-    public function __construct(string $billplzId)
-    {
-        $this->billplzId = $billplzId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillplzId(): string
-    {
-        return $this->billplzId;
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UpdateJobResultObject implements DataTransferObject
-{
-    /** @var string */
-    private $result;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $result, string $resultSignature, string $jobCommandName, string $jobCommand)
-    {
-        $this->result = $result;
-        $this->resultSignature = $resultSignature;
-        $this->jobCommandName = $jobCommandName;
-        $this->jobCommand = $jobCommand;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResult(): string
-    {
-        return $this->result;
-    }
-
-    /**
-     * @return array
-     */
-    public function getResultSignature(): string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-}

app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use Illuminate\Http\Request;
-
-
-class FetchesJobResultProcessor
-{
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-
-    /**
-     * FetchesJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     * @throws \App\Classes\Exceptions\ResourceNotFoundException
-     */
-    public function execute(Request $request){
-
-        $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
-        if($request->route('is_last')){
-            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            return $res2;
-        }
-
-        if(!$res1->result){
-            throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-        }
-
-        return $res1;
-    }
-}

app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-
-use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-
-class UpdateJobResultProcessor
-{
-
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-    /** @var UpdatesJobResult */
-    private $updatesJobResult;
-
-    /**
-     * UpdateJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     * @param UpdatesJobResult $updatesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult, UpdatesJobResult $updatesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-        $this->updatesJobResult = $updatesJobResult;
-    }
-
-    /**
-     * @param JobSubmissionObject $jobSubmissionObject
-     * @param array $resultCurrent
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(JobSubmissionObject $jobSubmissionObject, $resultCurrent) {
-        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $jobSubmissionObject->getJobId()]);
-        $resultCurrentJson = json_encode($resultCurrent);
-        $resultSignatureCurrent = md5($resultCurrentJson);
-
-        try{
-            $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            $resultSignatureExisting = $jobResultExisting->result_signature;
-            //if($resultSignatureExisting != $resultSignatureCurrent){
-                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobSubmissionObject->getJobCommandName(), $jobSubmissionObject->getJobCommand());
-            //}
-        } catch (JobResourceNotFoundException $exception){
-            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobSubmissionObject->getJobCommandName(), $jobSubmissionObject->getJobCommand());
-        }
-    }
-
-    private function updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobCommandName, $jobCommand){
-        $updateJobResultObject = new UpdateJobResultObject(
-            $resultCurrentJson,
-            $resultSignatureCurrent,
-            $jobCommandName,
-            $jobCommand
-        );
-        $create = $this->updatesJobResult->execute($jobResultCurrent, $updateJobResultObject);
-    }
-}

app/Classes/Modules/Jobs/Services/CreatesJobResult.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\JobResult;
-use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
-
-class CreatesJobResult extends AbstractUpdateRecord
-{
-    /**
-     * @param JobSubmissionObject $jobSubmissionObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(JobSubmissionObject $jobSubmissionObject)
-    {
-        $model = new JobResult();
-        $model->job_id = $jobSubmissionObject->getJobId();
-        $model->request_signature = $jobSubmissionObject->getRequestSignature();
-        $model->result_signature = $jobSubmissionObject->getResultSignature();
-        $model->url = $jobSubmissionObject->getName();
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Jobs/Services/FetchesJobResult.php

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

app/Classes/Modules/Jobs/Services/ListsJobResult.php

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

app/Classes/Modules/Jobs/Services/UpdatesJobResult.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-use App\Models\JobResult;
-
-class UpdatesJobResult extends AbstractUpdateRecord
-{
-
-    /**
-     * @param JobResult $model
-     * @param UpdateJobResultObject $updateJobResultObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(JobResult $model, UpdateJobResultObject $updateJobResultObject) {
-
-        $model->result = $updateJobResultObject->getResult();
-        $model->result_signature = $updateJobResultObject->getResultSignature();
-        $model->job_command_name = $updateJobResultObject->getJobCommandName();
-        $model->job_command = $updateJobResultObject->getJobCommand();
-
-        return $this->handler($model);
-
-    }
-}