Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development

Debugging
2026-08-19 12:34:18 +00:00 · 2024-09-13 01:02:52 +08:00 · 2024-09-13 01:02:40 +08:00 · 2024-09-13 00:49:29 +08:00 · 2024-09-13 00:49:20 +08:00 · 2024-09-13 00:36:48 +08:00
393 changed files with 1261 additions and 15056 deletions
@@ -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=
@@ -67,9 +67,5 @@ WEPOST_CLIENT_ID=1234
 WEPOST_CLIENT_SECRET=cief-secret-temp
 WEPOST_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"
@@ -7,12 +7,12 @@ APP_URL=http://localhost
 LOG_CHANNEL=stack
 LOG_LEVEL=debug

-# DB_CONNECTION=mysql
-# DB_HOST=127.0.0.1
-# DB_PORT=3306
-# DB_DATABASE=shpping_portal
-# DB_USERNAME=root
-# DB_PASSWORD=P@ssw0rd
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=shpping_portal
+DB_USERNAME=root
+DB_PASSWORD=P@ssw0rd

 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -27,7 +27,3 @@ package-lock.json
 public/*
 /public/*
 storage/framework/laravel-excel/*
-.vapor/
-.env.production
-.env.staging
-.env.development
@@ -56,10 +56,7 @@ composer_php:
    - cp .env.example .env
    - php artisan key:generate
  rules:
-    - when: never
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'

 #build the UI
 #node installation
@@ -68,9 +65,7 @@ npm:
  script:
    - npm install # Install npm dependencies
  rules:
-    - when: never
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH =~ /.*/'
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'

 #building assets
 building_assets:
@@ -81,9 +76,7 @@ building_assets:
    - npm install # Install npm dependencies
    - gulp build # Build assets
  rules:
-    - when: never
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH =~ /.*/'
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'

 #mysql
 database:
@@ -100,9 +93,7 @@ database:
    - php artisan migrate:fresh
    - php artisan db:seed
  rules:
-    - when: never
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH =~ /.*/'
+    - if: '$CI_COMMIT_BRANCH =~ /.*/'

 #mysql
 #unit_test:
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Site Under Maintenance</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            background-color: #f4f4f4;
-            text-align: center;
-            padding: 50px;
-        }
-        .content {
-            background: white;
-            padding: 20px;
-            border-radius: 10px;
-            display: inline-block;
-            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-        }
-    </style>
-</head>
-<body>
-    <div class="content">
-        <h1>We'll be back soon!</h1>
-        <p>Sorry for the inconvenience but we're performing some maintenance at the moment. We'll be back online shortly!</p>
-        <p>&mdash; CIEF IZYIM</p>
-    </div>
-</body>
-</html>
@@ -1,131 +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 = '.'
-        DB_CONNECTION = 'mysql'
-        DB_DATABASE = 'portal_development'
-        APP_ENV = 'testing'
-    }
-    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'
-                withCredentials([
-                    usernamePassword(
-                        credentialsId: 'shipping-portal-dev-db-credential',
-                        usernameVariable: 'DB_USERNAME',
-                        passwordVariable: 'DB_PASSWORD'
-                    ),
-                    string(credentialsId: 'shipping-portal-dev-db-host', variable: 'DB_HOST')
-                ]) {
-                    // sh 'vendor/bin/phpunit --filter ListOrderTrackingLogicTest'
-                }
-                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
-}
@@ -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;
-    }
-
-}
@@ -16,7 +16,6 @@ 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
@@ -72,7 +71,7 @@ abstract class AbstractControllerLogic

            } else {
                if ($exception instanceof JobResourceNotFoundException) {
-                    LogHelper::channel('vue_polling')->info(sprintf(
+                    Log::channel('vue_polling')->info(sprintf(
                        "Uncaught exception '%s' with message '%s' in %s:%d",
                        get_class($exception),
                        $exception->getMessage(),
@@ -17,4 +17,4 @@ class HasInvoiceStatusIn implements Filter
            $query->where('type', 1)->whereIn('status', $value);
        });
    }
-}
+}
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class OrderTrackingId implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('order_tracking_id', $value);
-    }
-
-}
@@ -23,7 +23,6 @@ class PackingListLimitOneByTypeOrderedByInvoiceDate implements Filter
            $join->on('transactions.owner_id', '=', 'packing_lists.id');
            $join->where('transactions.owner_type', '=', PackingList::class);
            $join->where('transactions.status', '=', ApprovalStatus::APPROVED);
-            $join->whereNull('transactions.deleted_at');
            $join->whereRaw('(transactions.type <> 16 OR transactions.id = (
                SELECT id FROM transactions WHERE owner_id = packing_lists.id AND type = 16 LIMIT 1
            ))');
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class TrackingNo implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('tracking_no', $value)
-        ->where(function ($query) {
-            $query->whereNotNull('tracking_english')
-                  ->orWhereNotNull('remark_english');
-        });
-    }
-}
@@ -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;
    }

-}
+}
@@ -49,12 +49,4 @@ class Helper
    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() : [];
-    }
 }
@@ -1,66 +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';
-        if($envVar)
-        {
-            Log::info("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';
-        if($envVar)
-        {
-            Log::info("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';
-        if($envVar)
-        {
-            Log::info("Error: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        }
-
-        if ($envVar && !$isLocal) {
-            Log::channel($this->channelName . '_vapor')->error($message);
-        } else {
-            Log::channel($this->channelName)->error($message);
-        }
-    }
-}
@@ -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 [];
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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);
-    }
-}
@@ -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);
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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);
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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  . '.');
-    }
-}
@@ -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  . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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  . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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  . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -1,61 +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\Documents\Services\ApprovesDocument;
-use App\Classes\Modules\Documents\Services\RejectsDocument;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Group;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-
-class FixPaymentApprovalTimedOutErrorV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function handle()
-    {
-        Log::info(Carbon::now() . ': Start job - Fix payment approval timed out error (status 504: Endpoint request timed out).');
-        $start   = new Carbon();
-
-        $status= 'approve';
-        $transactionId = 23160;
-
-        $transaction =  (App()->make(FetchesTransaction::class))->execute(['id' => $transactionId]);
-        $document  = $transaction->documents()
-        ->where('status', ApprovalStatus::PENDING_VERIFICATION)
-        ->first();
-
-        Log::info("FixApprovedPaymentFailedGroupV2CommandJob document: ".json_encode($document));
-
-        if($status === 'approve') {
-            // (App()->make(ApprovesDocument::class))->execute($document);
-            $document->status = ApprovalStatus::APPROVED;
-            // $document->approver = Auth()->user()->id;
-            $document->approval_date = Carbon::now();
-            $document->save();
-        }
-        else {
-            (App()->make(RejectsDocument::class))->execute($document);
-        }
-
-        (App()->make(UpdatesTransactionStatus::class))->execute($transaction, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
-
-        if ($status === 'approve') {
-            (App()->make(CallbackBillplzProcessor::class))->execute($transaction, ApprovalStatus::APPROVED);
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        Log::info(Carbon::now() . ': End job - Fix payment approval timed out error (status 504: Endpoint request timed out). ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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\Billplzs\Processors\CallbackBillplzProcessor;
-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 cron ended.');
-        $start   = new Carbon();
-
-        //Transaction fix with this one time fix command: 15205, 16803, 17310, 22008, 6770
-        //This transaction, 16803 has approve payment but not its owner, shipping invoice
-        $transactions = Transaction::whereIn('id', [22008, 6770])->get();
-        Log::info(Carbon::now() . ' : One time fix failled callback from billplz started.');
-
-        foreach ($transactions as $transaction){
-            if($transaction){
-
-                Log::info(Carbon::now() . ' : '.$transaction->id);
-                $status = ApprovalStatus::APPROVED;
-                (App()->make(CallbackBillplzProcessor::class))->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 cron ended. ElapsedTime: ' . $elapsedTime  . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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'
-        ];
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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);
-    }
-}
@@ -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);
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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 . '.');
-    }
-}
@@ -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);
-    }
-}
@@ -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);
-    }
-}
@@ -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);
-    }
-}
@@ -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);
-    }
-}
@@ -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);
-    }
-}
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchByTrakingNoYdPortalV2Processor;
-use App\Models\PackingList;
-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 FetchTrakingInfoYDByPackingListV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $packingList;
-
-    public function __construct(PackingList $packingList)
-    {
-        $this->packingList = $packingList;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchTrakingInfoYDByPackingListV2CommandJob');
-        $processor = app(FetchByTrakingNoYdPortalV2Processor::class);
-        $processor->execute($this->packingList);
-    }
-}
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-use App\Classes\Modules\PackingLists\Processors\V2\FetchByTrakingNoYdPortalV2Processor;
-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 FetchTrakingInfoYDByTrackingNoV2CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $trackingNo;
-
-    public function __construct(string $trackingNo)
-    {
-        $this->trackingNo = $trackingNo;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchTrakingInfoYDByTrackingNoV2CommandJob');
-        $processor = app(FetchByTrakingNoYdPortalV2Processor::class);
-        $processor->processTrackingNo($this->trackingNo);
-    }
-}
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-
-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\Artisan;
-
-class ProcessYDByTrakingNoDataV2Job implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $trackingNo;
-
-    public function __construct($trackingNo)
-    {
-        $this->trackingNo = $trackingNo;
-    }
-
-    public function handle()
-    {
-         Artisan::call('process-yd-by-traking-no-data-command', [
-            'trackingNo' => $this->trackingNo
-        ]);
-    }
-}
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V2\YD;
-
-
-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\Artisan;
-
-class ProcessYDPortalDataV2Job implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $start;
-    protected $end;
-
-    public function __construct($start, $end)
-    {
-        $this->start = $start;
-        $this->end = $end;
-    }
-
-    public function handle()
-    {
-        Artisan::call('process-yd-portal-data-command', [
-            'start_date' => $this->start,
-            'end_date' => $this->end
-        ]);
-    }
-}
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V3\YD;
-
-
-use App\Classes\Modules\PackingLists\Processors\V3\FetchContainersUpdatesYdPortalV3Processor;
-use App\Models\Container;
-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 FetchContainersUpdatesYdPortalV3CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $container;
-
-    public function __construct(Container $container)
-    {
-        $this->container = $container;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchContainersUpdatesYdPortalV3CommandJob');
-        $processor = app(FetchContainersUpdatesYdPortalV3Processor::class);
-        $processor->execute($this->container);
-    }
-}
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs\Commands\V3\YD;
-
-
-use App\Classes\Modules\PackingLists\Processors\V3\FetchContainersYdPortalV3Processor;
-use App\Models\PackingList;
-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 FetchContainersYdPortalV3CommandJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    protected $packingList;
-
-    public function __construct(PackingList $packingList)
-    {
-        $this->packingList = $packingList;
-    }
-
-    public function handle()
-    {
-        Log::info('Processing FetchContainersYdPortalV3CommandJob');
-        $processor = app(FetchContainersYdPortalV3Processor::class);
-        $processor->execute($this->packingList);
-    }
-}
@@ -3,7 +3,7 @@
 namespace App\Classes\Jobs;

 use App\Classes\Modules\PackingLists\Processors\ListPackingListsJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -17,29 +17,29 @@ class ListPackingListsJob implements ShouldQueue

    public $timeout = 900;

-    /** @var JobSubmissionObject */
-    private $jobSubmissionObject;
+    /** @var ListGenericJobObject */
+    private $listGenericJobObject;

    /**
     * ListPackingListsJob constructor.
-     * @param JobSubmissionObject $JobSubmissionObject
+     * @param ListGenericJobObject $listGenericJobObject
     */
-    public function __construct(JobSubmissionObject $jobSubmissionObject)
+    public function __construct(ListGenericJobObject $listGenericJobObject)
    {
-        $this->jobSubmissionObject = $jobSubmissionObject;
+        $this->listGenericJobObject = $listGenericJobObject;
    }

    public function handle()
    {
        $rawPayload = $this->job->payload();
        if(isset($rawPayload['data']['commandName'])){
-            $this->jobSubmissionObject->setJobCommandName($rawPayload['data']['commandName']);
+            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
        }

        if(isset($rawPayload['data']['command'])){
-            $this->jobSubmissionObject->setJobCommand($rawPayload['data']['command']);
+            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
        }

-        $result = (App()->make(ListPackingListsJobProcessor::class))->execute($this->jobSubmissionObject);
+        $result = (App()->make(ListPackingListsJobProcessor::class))->execute($this->listGenericJobObject);
    }
 }
@@ -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);
-    }
-}
@@ -22,7 +22,6 @@ use Illuminate\Support\Facades\Log;
 use Carbon\Carbon;

 use App\Classes\General\Helper;
-use App\Classes\General\LogHelper;

 class UpdatePerfexCRMInvoice implements ShouldQueue
 {
@@ -50,7 +49,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::channel('perfex_crm')->info('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());
@@ -58,7 +57,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');
+                Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
            }
        }
        else{
@@ -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;
        }
@@ -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));
-    }
-}
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Accounts\ControllersLogic;

 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\General\LogHelper;
+
 use App\Classes\General\Services\GeneratesInitials;
 use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
 use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
@@ -190,7 +190,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
                'portal'   => 'izyim'
            ];
            $response = Http::post($url, $payload);
-            LogHelper::channel('wac_webhook')->info('Register Account: ' . json_encode($response));
+            Log::channel('wac_webhook')->info('Register Account: ' . json_encode($response));
        }

 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
@@ -202,7 +202,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
            // register account on exchange portal if this registration not coming from exchange
            $exchangeCompanyId = $this->registerOnExchangeProcessor->execute($request, $companyModule->id);
        }
-
+        
        if ($exchangeCompanyId) {
            // create exchange company connection
            $this->connectCompanyModuleToExchangeCompany->execute($companyModule, $exchangeCompanyId);
@@ -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()]);
        }
    }

-}
+}
@@ -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);

@@ -22,7 +22,6 @@ use App\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use App\Transformers\AddressTransformer;
-use Carbon\Carbon;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -112,23 +111,15 @@ class CreateAddressLogic extends AbstractControllerLogic
            ->parseIncludes('remark')
            ->respond(200, [], JSON_PRETTY_PRINT);*/

-        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'),
+            'property_type'         => $request->input('property_type'),
+            'tools_required_unload' => $request->input('tools_required_unload'),
+            'pickup_time_from'      => $request->input('pickup_time_from'),
+            'pickup_time_to'        => $request->input('pickup_time_to'),
        ];

-        $address->addressExtraFields()->delete();
        $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
-        $remark = $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
+        $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);

        return $this->resourceResponse(new AddressResource($address));

@@ -131,7 +131,6 @@ class UpdateAddressLogic extends AbstractControllerLogic
        $address->addressExtraFields()->delete();
        $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
        $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
-        $remark = $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);

        return $this->resourceResponse(new AddressResource($address));

@@ -88,14 +88,14 @@ class CallbackBillplzDataPatchProcessor
                    $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($invoice->status !== ApprovalStatus::COMPLETED){
+                        // $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);

-                        if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                        // if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
                            $pL = $invoice->owner;
                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice, true);
-                        }
-                    }
+                        //}
+                    //}
                }

                $group->status = $status;
@@ -130,8 +130,8 @@ class CallbackBillplzDataPatchProcessor

            }
            else{
-                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid);
-                Log::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;
            }
        }
@@ -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;
@@ -122,8 +121,8 @@ class CallbackBillplzProcessor

            }
            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;
            }
        }
@@ -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();
@@ -8,13 +8,14 @@ use App\Classes\Modules\Documents\Standards\Rules\CanApproveDocument;
 use App\Classes\Modules\Orders\Services\UpdatesOrdersStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\DocumentResource;
+
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\ApproveIdentificationDocumentOnExchangeProcessor;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
+
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
-use App\Classes\Modules\Documents\Services\PendingVerificationDocument;
 use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
-use App\Classes\Modules\Notifications\Processors\CreateNotificationProcessor;
+Use App\Classes\Modules\Notifications\Processors\CreateNotificationProcessor;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Document;
 use App\Models\ExchangeCompanyConnection;
@@ -28,11 +29,10 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
    /**
     * @return array
     */
-    protected function notification(): array
-    {
+    protected function notification():array {
        return [
-            'title' => 'Update Document Status',
-            'message' => 'You have successfully updated the Document Status'
+            'title' => 'Approve Document',
+            'message' => 'You have successfully approved the Document'
        ];
    }

@@ -45,9 +45,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
    /** @var RejectsDocument */
    private $rejectsDocument;

-    /** @var PendingVerificationDocument */
-    private $pendingVerificationDocument;
-
    /** @var FetchesDocument */
    private $fetchesDocument;

@@ -69,13 +66,12 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
     * @param ApprovesDocument $approvesDocument
     * @param RejectsDocument $rejectsDocument
     * @param FetchesDocument $fetchesDocument
-     * @param PendingVerificationDocument $pendingVerificationDocument
     * @param UpdatesCompanyStatus $updatesCompanyStatus
     * @param UpdatesOrdersStatus $updatesOrdersStatus
     * @param CreateNotificationProcessor $createNotificationProcessor
     * @param ApproveIdentificationDocumentOnExchangeProcessor $approveIdentificationDocumentOnExchangeProcessor
     */
-    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus, CreateNotificationProcessor $createNotificationProcessor, ApproveIdentificationDocumentOnExchangeProcessor $approveIdentificationDocumentOnExchangeProcessor, PendingVerificationDocument $pendingVerificationDocument)
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus, CreateNotificationProcessor $createNotificationProcessor, ApproveIdentificationDocumentOnExchangeProcessor $approveIdentificationDocumentOnExchangeProcessor)
    {
        $this->canApproveDocument = $canApproveDocument;
        $this->approvesDocument = $approvesDocument;
@@ -84,7 +80,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
        $this->updatesCompanyStatus = $updatesCompanyStatus;
        $this->updatesOrdersStatus = $updatesOrdersStatus;
        $this->createNotificationProcessor = $createNotificationProcessor;
-        $this->pendingVerificationDocument = $pendingVerificationDocument;
        $this->approveIdentificationDocumentOnExchangeProcessor = $approveIdentificationDocumentOnExchangeProcessor;
    }

@@ -95,7 +90,7 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
     * @throws \App\Classes\Exceptions\MalformedRequestException
     * @throws \App\Classes\Exceptions\RequestValidationException
     */
-    public function logic(Request $request): JsonResponse
+    public function logic(Request $request) : JsonResponse
    {
        $documentId = $request->route('document_id');

@@ -108,37 +103,36 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
        $status = $request->route('status');

        /** @var Document $document */
-        $document = $this->fetchesDocument->execute(['id' => $request->route('document_id')]);
+        $document = $this->fetchesDocument->execute(['id' => $documentId]);
+
        $this->canApproveDocument->passes();

-        if ($status === 'approve') {
-            $document = $this->approvesDocument->execute($document);
-            $this->updatesCompanyStatus->execute($document->owner, ApprovalStatus::APPROVED);
-            $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
-        } elseif ($status === 'reject') {
-            $document = $this->rejectsDocument->execute($document);
-            $this->updatesCompanyStatus->execute($document->owner, ApprovalStatus::REJECTED);
-        } elseif ($status === 'pending') {
-            $document = $this->pendingVerificationDocument->execute($document);
-            $this->updatesCompanyStatus->execute($document->owner, ApprovalStatus::PENDING_VERIFICATION);
+        $document = $status === 'approve' ? $this->approvesDocument->execute($document) : $this->rejectsDocument->execute($document);
+
+        $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+
+//        $object = new NotificationObject(
+//            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ),
+//            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ),
+//            $document->owner,
+//            $document->owner->companyModules()->first()->employees()->first(),
+//            $document,
+//        );
+//
+//        $this->createNotificationProcessor->execute($object);
+
+        if($status === 'approve'){
+            $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
        }

-        // $object = new NotificationObject(
-        //     'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ),
-        //     ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ),
-        //     $document->owner,
-        //     $document->owner->companyModules()->first()->employees()->first(),
-        //     $document,
-        // );
-
-        // $this->createNotificationProcessor->execute($object);
-
-        // if this request is not calling from exchange portal, then approve the document on exchange portal for this user
-        $companyModule = $document->owner->companyModules()->first();
-        if (!$request->route('exchange_company_id') && $companyModule->exchangeCompanyConnection()->first()) {
+         // if this request is not calling from exchange portal, then approve the document on exchange portal for this user
+         $companyModule = $document->owner->companyModules()->first();
+         if (!$request->route('exchange_company_id') && $companyModule->exchangeCompanyConnection()->first()) {
            $this->approveIdentificationDocumentOnExchangeProcessor->execute($request, $companyModule->id, $status);
        }

        return $this->resourceResponse(new DocumentResource($document));
+
    }
+
 }
@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Contacts\Services\CreatesContact;
-use App\Http\Resources\ContactResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Http\Resources\CompanyResource;
-
-class CreateCompanyContactNumberLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Company Contact Number',
-            'message' => 'You have successfully created the Company Contact Number'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var CreatesContact */
-    private $createsContact;
-
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /**
-     * UpdateCompanyControllersLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param CreatesContact $createsContact
-     * @param CreateContactProcessor $createContactProcessor
-     */
-    public function __construct(FetchesCompany $fetchesCompany, CreatesContact $createsContact, CreateContactProcessor $createContactProcessor)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->createsContact = $createsContact;
-        $this->createContactProcessor = $createContactProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $company = $this->fetchesCompany->execute(['id' => $request->input('companyId')]);
-
-        $contact = new ContactObject(
-            $company->reference,
-            $request->input('contactNumber'),
-            $company->email,
-            $company->wechat_id
-        );
-
-        $this->createContactProcessor->execute($contact, $company);
-
-        return $this->resourceResponse(new CompanyResource($company));
-
-    }
-
-}
@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Services\FetchesContact;
-use App\Classes\Modules\Contacts\Services\UpdatesContact;
-use App\Http\Resources\ContactResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCompanyContactNumberLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Company Contact Number',
-            'message' => 'You have successfully updated the Company Contact Number'
-        ];
-    }
-
-    /** @var FetchesContact */
-    private $fetchesContact;
-
-    /** @var UpdatesContact */
-    private $updatesContact;
-
-    /**
-     * UpdateCompanyControllersLogic constructor.
-     * @param FetchesContact $fetchesContact
-     * @param UpdatesContact $updatesContact
-     */
-    public function __construct(FetchesContact $fetchesContact, UpdatesContact $updatesContact)
-    {
-        $this->fetchesContact = $fetchesContact;
-        $this->updatesContact = $updatesContact;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesContact->execute(['id' => $request->input('id')]);
-
-        $contact = new ContactObject(
-            $query->reference,
-            $request->input('contactNumber'),
-            $query->email,
-            $query->wechat_id
-        );
-
-        $this->updatesContact->execute($query, $contact);
-
-        return $this->resourceResponse(new ContactResource($query));
-
-    }
-
-}
@@ -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) ]);
    }
-}
+}
@@ -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;
+
    }

    /**
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Documents\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Document;
-use Carbon\Carbon;
-
-class PendingVerificationDocument extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Document $model
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Document $model)
-    {
-        $model->status = ApprovalStatus::PENDING_VERIFICATION;
-        $model->approver = Auth()->user()->id;
-        $model->approval_date = Carbon::now();
-
-        return $this->handler($model);
-    }
-}
@@ -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;
    }

 }
@@ -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;
-    }
-
-}
@@ -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;
    }

 }
@@ -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;
-        }
-    }
-
-}
@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use App\Classes\General\Eloquent\ApplyFiltersToQuery;
-use App\Models\Company;
-
-class ExportsAllCustomersInfoForLarkSystem implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
-{
-    use Exportable;
-    public function __construct() {}
-
-    public function headings(): array
-    {
-        return [
-            'Marking',
-            'Name',
-            'Phone Number',
-            'Email',
-            'Registration Date',
-            'Last Order Date',
-            'Custom Segments',
-        ];
-    }
-
-    public function query()
-    {
-        return (new ApplyFiltersToQuery())->execute(Company::query(), [
-            'has_business_module_type' => 1,
-        ]);
-    }
-
-    public function map($company): array
-    {
-        $company_module = $company->companyModules()->first();
-        $marking = $company_module->getMarking();
-        $employees = $company_module->employees()->first();
-
-        $data = [
-            $marking,
-            $company->name,
-            $company->contacts()->first()->phone ?? '',
-            $employees?->email ?? '',
-            $company->created_at,
-            $company->updated_at,
-            $company_module->connections()->first()->segments()->pluck('name')->implode(', ')
-        ];
-
-        return $data;
-    }
-}
@@ -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) {
@@ -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 : ''
        ];
    }
-}
+}
@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Exports\Services;

 use App\Classes\Modules\Exports\Sheets\ContainersSheet;
 use App\Classes\Modules\Exports\Sheets\PackingListsSheet;
-use Carbon\Carbon;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;;

@@ -12,14 +11,6 @@ class ExportsParcel implements WithMultipleSheets
 {
    use Exportable;

-    protected $startDate;
-    protected $endDate;
-
-    public function __construct($startDate = null, $endDate = null) {
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
-    }
-

    /**
     * @return array
@@ -28,10 +19,10 @@ class ExportsParcel implements WithMultipleSheets
    {
        $sheets = [];

-        $sheets[] = new ContainersSheet($this->startDate, $this->endDate);
-        $sheets[] = new PackingListsSheet($this->startDate, $this->endDate);
+        $sheets[] = new ContainersSheet();
+        $sheets[] = new PackingListsSheet();

        return $sheets;
    }

-}
+}
@@ -143,10 +143,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
            // Prepare each row based on the transaction detail
            $rows[] = [
                $firstItem ? '<<New>>' : '',
-                // $transaction->created_at->format('m/d/Y H:m'),
-                $transaction->created_at->format('m/d/Y'),
-                // $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
-                $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y'),
+                $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,
@@ -171,8 +169,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading

        return [
            '<<New>>',
-            // $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
-            $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y'),
+            $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
            $company->debtor,
            $order->reference,
            $order->reference,
@@ -191,8 +188,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
        ];
        return [
            '<<New>>',
-            // $transaction->updated_at->format('m/d/Y H:m'),
-            $transaction->updated_at->format('m/d/Y'),
+            $transaction->updated_at->format('m/d/Y H:m'),
            $company->debtor,
            $container->reference,
            '500-0000',
@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use App\Classes\General\Eloquent\ApplyFiltersToQuery;
-use App\Models\Company;
-use Illuminate\Support\Facades\Log;
-
-class ExportsSegmentCustomers implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
-{
-    use Exportable;
-
-    private $filters;
-    protected $customerMarking;
-    protected $segment;
-
-    public function __construct() {}
-
-    public function setParameters($customerMarking, $segment)
-    {
-        $this->customerMarking = $customerMarking;
-        $this->segment = $segment;
-
-        $this->filters = [
-            "company_segments_in" => [$this->segment],
-        ];
-
-        if ($this->customerMarking != 0) {
-            $this->filters['marking_in'] = [$this->customerMarking];
-        }
-    }
-
-
-    public function headings(): array
-    {
-        return [
-            'Company Name',
-            'Company Marking',
-            'Is Credit Term Customers',
-            'Auto Release',
-            'Latest Order Creation Date',
-        ];
-    }
-
-    public function query()
-    {
-        return (new ApplyFiltersToQuery())->execute(Company::query(), $this->filters);
-    }
-
-
-    public function map($list): array
-    {
-        $companyModule = $list->companyModules()->first();
-        $marking = $companyModule->getMarking();
-
-        $isCreditTermCustomer = false;
-        $segments = $companyModule->connections()->first()->segments()->pluck('name')->toArray();
-
-        $isCreditTermCustomer = in_array('Credit Term Customer', $segments);
-        $autoRelease = in_array('Auto Release', $segments);
-
-        $lastestOrder = $companyModule->orders()->orderBy('id', 'desc')->first();
-
-        return [
-            $list->name,
-            $marking,
-            $isCreditTermCustomer ? 'TRUE' : 'FALSE',
-            $autoRelease ? 'TRUE' : 'FALSE',
-            $lastestOrder ? $lastestOrder->created_at : '',
-        ];
-    }
-}
@@ -23,16 +23,9 @@ use Maatwebsite\Excel\Concerns\ShouldAutoSize;

 class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery, WithTitle
 {
+
    use Exportable;

-    protected $startDate;
-    protected $endDate;
-
-    public function __construct($startDate = null, $endDate = null) {
-        $this->startDate = $startDate ? Carbon::parse($startDate)->startOfDay() : Carbon::now()->subMonths(3);
-        $this->endDate = $endDate ? Carbon::parse($endDate)->endOfDay() : Carbon::now();
-    }
-
    public function headings(): array
    {
        return [
@@ -53,8 +46,7 @@ class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, Shou
     */
    public function query()
    {
-        return Container::query()
-        ->whereBetween('created_at', [$this->startDate, $this->endDate]); //Limit, 'expensive' query
+        return Container::query();
    }

    /**
@@ -110,4 +102,4 @@ class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, Shou
    {
        return 'Containers';
    }
-}
+}
@@ -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;
@@ -30,14 +29,6 @@ class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, Sh

    use Exportable;

-    protected $startDate;
-    protected $endDate;
-
-    public function __construct($startDate = null, $endDate = null) {
-        $this->startDate = $startDate ? Carbon::parse($startDate)->startOfDay() : Carbon::now()->subMonths(3);
-        $this->endDate = $endDate ? Carbon::parse($endDate)->endOfDay() : Carbon::now();
-    }
-
    public function headings(): array
    {
        return [
@@ -61,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', [$this->startDate, $this->endDate]) //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) {

@@ -140,4 +128,4 @@ class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, Sh
    {
        return 'Packing Lists';
    }
-}
+}
@@ -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]);
-    }
-
-}
@@ -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;
-    }
-
-}
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Jobs\DataTransferObjects;

 use App\Classes\General\Interfaces\DataTransferObject;

-class JobSubmissionObject implements DataTransferObject
+class ListGenericJobObject implements DataTransferObject
 {
    /** @var string */
    private $name;
@@ -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;
-    }
-
-}
@@ -6,7 +6,7 @@ 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\ListGenericJobObject;
 use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;

 class UpdateJobResultProcessor
@@ -30,14 +30,14 @@ class UpdateJobResultProcessor
    }

    /**
-     * @param JobSubmissionObject $jobSubmissionObject
+     * @param ListGenericJobObject $listGenericJobObject
     * @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()]);
+    public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
+        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
        $resultCurrentJson = json_encode($resultCurrent);
        $resultSignatureCurrent = md5($resultCurrentJson);

@@ -45,10 +45,10 @@ class UpdateJobResultProcessor
            $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());
+                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
            //}
        } catch (JobResourceNotFoundException $exception){
-            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobSubmissionObject->getJobCommandName(), $jobSubmissionObject->getJobCommand());
+            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
        }
    }

@@ -4,22 +4,22 @@ namespace App\Classes\Modules\Jobs\Services;

 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\JobResult;
-use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
+use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;

 class CreatesJobResult extends AbstractUpdateRecord
 {
    /**
-     * @param JobSubmissionObject $jobSubmissionObject
+     * @param ListGenericJobObject $listGenericJobObject
     * @return \Illuminate\Database\Eloquent\Model
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
-    public function execute(JobSubmissionObject $jobSubmissionObject)
+    public function execute(ListGenericJobObject $listGenericJobObject)
    {
        $model = new JobResult();
-        $model->job_id = $jobSubmissionObject->getJobId();
-        $model->request_signature = $jobSubmissionObject->getRequestSignature();
-        $model->result_signature = $jobSubmissionObject->getResultSignature();
-        $model->url = $jobSubmissionObject->getName();
+        $model->job_id = $listGenericJobObject->getJobId();
+        $model->request_signature = $listGenericJobObject->getRequestSignature();
+        $model->result_signature = $listGenericJobObject->getResultSignature();
+        $model->url = $listGenericJobObject->getName();

        return $this->handler($model);
    }
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\OpenAI\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Exceptions\ConnectionErrorException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesChatGPTResponse
-{
-    /**
-     * @param string $userPrompt
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $userPrompt) {
-        try {
-            $data = [
-                'model' => 'gpt-4-turbo', //gpt-4-turbo, gpt-4o-mini
-                'messages' => [
-                    [
-                        'role' => 'user',
-                        'content' => $userPrompt
-                    ]
-                ]
-            ];
-
-            $response = Http::withHeaders([
-                'Authorization' => 'Bearer ' . config('openai.api_key')
-            ])->post(config('openai.base_url') . '/v1/chat/completions', $data);
-
-            if ($response->successful()) {
-                $data = $response->json();
-                return $data;
-            } else {
-                Log::info('CreatesChatGPTResponse: ' . $response);
-                return null;
-            }
-        }
-        catch (\Illuminate\Http\Client\ConnectionException $exception) {
-            $error = 'Failed to connect to ChatGPT API';
-            throw new ConnectionErrorException($error, $exception->getMessage(), $userPrompt, $exception->getTraceAsString());
-        }
-        catch (\Exception $exception) {
-            throw new MalformedRequestException('Unable to get correct response from ChatGPT API: ' . $exception->getMessage());
-        }
-    }
-}
@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Services\ChecksIfOrderNumberExists;
-use App\Classes\Modules\Orders\Services\RestoresOrder;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Http\Resources\OrderResource;
-use App\Models\Order;
-use App\Models\SupplierTaxRebate;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class CreateSupplierTaxRebateLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Create Supplier Tax Refund',
-            'message' => 'You have successfully created a Supplier Tax Refund'
-        ];
-    }
-
-    /** @var RestoresOrder */
-    private $restoresOrder;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var ChecksIfOrderNumberExists */
-    private $checkIfOrderNumberExists;
-
-    /**
-     * CancelOrderLogic constructor.
-     * @param RestoresOrder $restoresOrder
-     * @param FetchesOrder $fetchesOrder
-     */
-    public function __construct(RestoresOrder $restoresOrder, FetchesOrder $fetchesOrder, ChecksIfOrderNumberExists $checkIfOrderNumberExists)
-    {
-        $this->restoresOrder = $restoresOrder;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->checkIfOrderNumberExists = $checkIfOrderNumberExists;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        /** @var Order $order */
-        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
-
-        $taxRebate = SupplierTaxRebate::create([
-            'order_id' => $order->id,
-            'supplier_name' => $request->input('supplier_name'),
-            'supplier_contact_number' => $request->input('supplier_contact_number'),
-            'reference_number' => $this->generateUniqueReferenceNumber(),
-        ]);
-
-        return $this->resourceResponse(new OrderResource($order));
-    }
-
-    public function generateUniqueReferenceNumber(?string $prefix = '', ?int $length = 9): string
-    {
-        // regenerate new reference number until a new unique reference is found
-        do {
-            $reference = $prefix . rand((int)('1' . str_repeat('0', $length - 2) . '1'), (int) str_repeat('9', $length));
-        } while (
-            SupplierTaxRebate::where('reference_number', $reference)->exists() || $this->checkIfOrderNumberExists->execute($reference)
-        );
-
-        return $reference;
-    }
-}
@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Models\SupplierTaxRebate;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteSupplierTaxRebateLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Delete Supplier Tax Refund',
-            'message' => 'You have successfully deleted a Supplier Tax Refund'
-        ];
-    }
-
-    /**
-     * DeleteSupplierTaxRebateLogic constructor.
-     */
-    public function __construct() {}
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        SupplierTaxRebate::find($request->route('id'))->delete();
-
-        return $this->response([]);
-    }
-}
@@ -1,81 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Orders\Standards\Rules\CanFetchOrder;
-use App\Http\Resources\OrderPackagesBaseResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-/**
- * @deprecated This class is deprecated and should not be used.
- * Use `FetchOrderPackagesV2Logic` instead or write a new one based on FetchOrderPackagesV2Logic
- */
-class FetchOrderPackagesLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Order Packages',
-            'message' => 'You have successfully retrieved an order packages'
-        ];
-    }
-
-    /** @var CanFetchOrder */
-    private $canFetchOrder;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /**
-     * FetchOrderPackagesLogic constructor.
-     * @param CanFetchOrder $canFetchOrder
-     * @param FetchesOrder $fetchesOrder
-     */
-    public function __construct(CanFetchOrder $canFetchOrder, FetchesOrder $fetchesOrder)
-    {
-        $this->canFetchOrder = $canFetchOrder;
-        $this->fetchesOrder = $fetchesOrder;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $this->canFetchOrder->passes();
-
-        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
-
-        $filters = json_decode($request->input('filters'), true);
-        if(isset($filters['include_packages_origin_warehouse'])){
-             $query->include_packages_origin_warehouse = $filters['include_packages_origin_warehouse'];
-        }
-        if(isset($filters['include_packages_in_transit'])){
-            $query->include_packages_in_transit = $filters['include_packages_in_transit'];
-        }
-        if(isset($filters['include_packages_destination_warehouse'])){
-            $query->include_packages_destination_warehouse = $filters['include_packages_destination_warehouse'];
-        }
-        if(isset($filters['include_packages_delivery'])){
-            $query->include_packages_delivery = $filters['include_packages_delivery'];
-        }
-        if(isset($filters['include_packages_received'])){
-            $query->include_packages_received = $filters['include_packages_received'];
-       }
-
-        return $this->resourceResponse(new OrderPackagesBaseResource($query));
-
-    }
-
-}
@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Orders\Standards\Rules\CanFetchOrder;
-use App\Http\Resources\OrderPackagesReceivedResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchOrderPackagesV2Logic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Order Packages',
-            'message' => 'You have successfully retrieved an order packages'
-        ];
-    }
-
-    /** @var CanFetchOrder */
-    private $canFetchOrder;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /**
-     * FetchOrderPackagesV2Logic constructor.
-     * @param CanFetchOrder $canFetchOrder
-     * @param FetchesOrder $fetchesOrder
-     */
-    public function __construct(CanFetchOrder $canFetchOrder, FetchesOrder $fetchesOrder)
-    {
-        $this->canFetchOrder = $canFetchOrder;
-        $this->fetchesOrder = $fetchesOrder;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $this->canFetchOrder->passes();
-
-        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
-
-        //Can refer FetchOrderPackagesLogic for different type of OrderPackages Resources
-        return $this->resourceResponse(new OrderPackagesReceivedResource($query));
-    }
-
-}
@@ -1,84 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Services\ListsOrderTracking;
-use App\Http\Resources\OrderTrackingResource;
-use App\Models\Order;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Contracts\Encryption\DecryptException;
-use App\Classes\Modules\Orders\Standards\Rules\CanListTrackings;
-
-class ListOrderTrackingLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Order Tracking',
-            'message' => 'You have successfully retrieved order tracking info'
-        ];
-    }
-
-    /** @var ListsOrderTracking */
-    private $listsOrderTracking;
-
-    /** @var CanListTrackings */
-    private $canListTrackings;
-
-    /**
-     * ListOrderTrackingLogic constructor.
-     * @param CanListTrackings $canListTrackings
-     * @param ListsOrderTracking $listsOrderTracking
-     */
-    public function __construct(CanListTrackings $canListTrackings, ListsOrderTracking $listsOrderTracking)
-    {
-        $this->canListTrackings = $canListTrackings;
-        $this->listsOrderTracking = $listsOrderTracking;
-    }
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = null;
-        $filters = json_decode($request->input('filters'), true);
-        $trackingNo = $filters['tracking_no'];
-
-        try {
-            $trackingNo = Crypt::decryptString($trackingNo);
-            $trackingNo = str_replace('_01', '', $trackingNo);
-        } catch (DecryptException $e) {
-            Log::info('Decryption failed, string might already be decrypted or invalid.');
-            $this->canListTrackings->passes();
-            // if(!in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN])){
-            //     abort(404);
-            // }
-        }
-
-        if (preg_match('/^\d{9}$/', $trackingNo)) {
-            $order = Order::where('reference', $trackingNo)->first();
-            if($order){
-                $packingList = $order->packingLists()->first();
-                $trackingNo = $packingList->reference;
-                Artisan::call('process-yd-by-traking-no-data-command', [
-                    'trackingNo' => $trackingNo
-                ]);
-                $query = $this->listsOrderTracking->execute(array_merge($this->listsOrderTracking->deserializeFilters($request->input('filters')), ['tracking_no' => $trackingNo]));
-            }
-        }
-        else{
-            Artisan::call('process-yd-by-traking-no-data-command', [
-                'trackingNo' => $trackingNo
-            ]);
-            $query = $this->listsOrderTracking->execute(array_merge($this->listsOrderTracking->deserializeFilters($request->input('filters')), ['tracking_no' => $trackingNo]));
-        }
-
-        return $this->collectionResponse(OrderTrackingResource::collection($query));
-    }
-}
@@ -7,12 +7,10 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Orders\Services\ListsOrders;
 use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
 use App\Classes\ValueObjects\Constants\OrderType;
-use App\Http\Resources\OrderBaseResource;
 use App\Http\Resources\OrderV2Resource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;

 class ListOrdersV2Logic extends AbstractControllerLogic
 {
@@ -49,23 +47,8 @@ class ListOrdersV2Logic extends AbstractControllerLogic

        $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]));

-        $filters = json_decode($request->input('filters'), true);
+        return $this->collectionResponse(OrderV2Resource::collection($query));

-        //cief todo: to be reviewed
-        foreach ($query->items() as $item) {
-            if(isset($filters['include_invoices'])){
-                $item['include_invoices'] = $filters['include_invoices'];
-
-            }
-
-            if(isset($filters['include_parcels'])){
-                $item['include_parcels'] = $filters['include_parcels'];
-
-            }
-        }
-
-        return $this->collectionResponse(OrderBaseResource::collection($query));
-        //return $this->collectionResponse(OrderV2Resource::collection($query));
    }


--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dillon Ngo	e25377d62d	Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development	2024-09-13 01:02:52 +08:00
Dillon Ngo	c9570db825	Debugging	2024-09-13 01:02:40 +08:00
Dillon Ngo	807af317a1	Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development	2024-09-13 00:49:29 +08:00
Dillon Ngo	5c60de2851	Debugging	2024-09-13 00:49:20 +08:00
Dillon Ngo	0c0dd30a1d	Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development	2024-09-13 00:36:48 +08:00
Dillon Ngo	4ed79659df	Debugging	2024-09-13 00:36:38 +08:00
Dillon Ngo	0d5d5afbb0	Debugging	2024-09-13 00:35:53 +08:00
Dillon Ngo	ee1bab12bf	Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development	2024-09-13 00:31:22 +08:00
Dillon Ngo	b077730214	Debugging	2024-09-13 00:31:02 +08:00