code update

.env.example

@@ -59,7 +59,3 @@ YD_API_CODE=''
 PERFEXCRM_BASE_URL=""
 PERFEXCRM_API_KEY=""
 PERFEXCRM_IS_ENABLED="false"
-
-
-STORAGE_FEE_LAUNCH_DATE="2023-12-11 00:00:00"
-SST_START_DATE="2024-04-01 00:00:00"

app/Classes/Exceptions/JobResourceNotFoundException.php

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

app/Classes/General/Abstracts/AbstractControllerLogic.php

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

app/Classes/General/Eloquent/AbstractFetchRecord.php

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

app/Classes/General/Eloquent/AbstractGetRecord.php

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

app/Classes/General/Eloquent/AbstractListRecord.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/Classes/General/Helper.php

@@ -2,7 +2,6 @@
 
 namespace App\Classes\General;
 
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 
@@ -41,12 +40,4 @@ class Helper
             }
         }
     }
-
-    /**
-     * @param ResourceCollection $collection
-     * @return array
-     */
-    static function collectionResponse(ResourceCollection $collection){
-        return json_decode($collection->response()->getContent(), true);
-    }
 }

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

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

app/Classes/Jobs/ListPackingListsJob.php

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

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

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

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

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

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

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

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

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

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

@@ -36,7 +36,7 @@ class CallbackBillplzProcessor
     private $releaseGoodsToCustomerProcessor;
 
     /**
-     * CallbackBillplzProcessor constructor.
+     * CreateUserProcessor constructor.
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
@@ -80,13 +80,12 @@ class CallbackBillplzProcessor
             if ($group) {
                 foreach ($group->groupTransactions as $groupTransaction) {
                     $invoice = $groupTransaction->transaction;
-                    if($invoice->status !== ApprovalStatus::COMPLETED){
-                        $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
 
-                        if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
-                            $pL = $invoice->owner;
-                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
-                        }
+                    $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                    if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                        $pL = $invoice->owner;
+                        $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
                     }
                 }
 
@@ -112,9 +111,7 @@ class CallbackBillplzProcessor
 
             foreach ($group->groupTransactions as $groupTransaction) {
                 $invoice = $groupTransaction->transaction;
-                if($invoice->status !== ApprovalStatus::COMPLETED){
-                    $totalAmountToBePaid += $invoice->amount;
-                }
+                $totalAmountToBePaid += $invoice->amount;
             }
 
             if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,108 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Group;
-use App\Models\Transaction;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class ExportsGroupTransactions implements
-    FromQuery,
-    WithHeadings,
-    WithHeadingRow,
-    WithMapping,
-    ShouldAutoSize
-{
-    use Exportable;
-
-    private $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    public function headings(): array
-    {
-        return [
-            'DocNo',
-            'DocDate',
-            'PaymentDate',
-            'DebtorCode',
-            'Ref',
-            'ShipInfo',
-            'AccNo',
-            'DetailDescription',
-            'FurtherDescription',
-            'ProjNo',
-            'DeptNo',
-            'Qty',
-            'UnitPrice',
-            'TaxType',
-            'TaxableAmt',
-            'TaxRate'
-        ];
-    }
-
-    public function query()
-    {
-        $start_date = $this->parseDate($this->request->input('startDate'));
-        $end_date = $this->parseDate($this->request->input('endDate'));
-
-        return Group::when($start_date && $end_date, function ($query) use ($start_date, $end_date) {
-            $query->whereBetween('created_at', [
-                $start_date->startOfDay(),
-                $end_date->endOfDay()
-            ]);
-        })
-            ->when($start_date && !$end_date, function ($query) use ($start_date) {
-                $query->where('created_at', '>=', $start_date->startOfDay());
-            })
-            ->when(!$start_date && $end_date, function ($query) use ($end_date) {
-                $query->where('created_at', '<=', $end_date->endOfDay());
-            });
-    }
-
-    private function parseDate($date)
-    {
-        return $date ? Carbon::parse($date)->startOfDay() : null;
-    }
-
-    public function map($transaction): array
-    {
-        $company = $transaction->receiverCompany;
-        return [
-            '<<New>>',                                     //'DocNo',
-            '',                                            //'DocDate',
-            $transaction->created_at->format('m/d/Y H:m'), //'PaymentDate',
-            $company->debtor,                              //'DebtorCode',
-            $company->referece,                            //'Ref',
-            $company->referece,                            //'ShipInfo',
-            '500-0000',                                    //'AccNo',
-            'X1 Freight Service Charge',                   //'DetailDescription',
-            'FurtherDescription',                          //'FurtherDescription',
-            'M3',                                          //'ProjNo',
-            'CIEF',                                        //'DeptNo',
-            '',                                            //'Qty',
-            '',                                            //'UnitPrice',
-            '',                                            //'TaxType',
-            floatval($transaction->tax) > 0 ? number_format($transaction->tax, 2) : '0.00', //'TaxableAmt',
-            '',                                            //'TaxRate'
-        ];
-    }
-
-    private function getTaxType($tax_percentage)
-    {
-        return floatval($tax_percentage) > 0 ? 'SV-6' : '';
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/Classes/Modules/PackingLists/ControllersLogic/Containers/RescheduleContainerLogic.php

@@ -56,21 +56,27 @@ class RescheduleContainerLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-        $transport = $container->transports()->first();
+        try {
+            $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
+            $transport = $container->transports()->first();
 
-        $old_schedule = $transport->schedules()->delete();
+            $old_sechedule = $transport->schedules()->first();
 
-        // $this->updatesScheduleStatus->execute($old_schedule, ApprovalStatus::REJECTED);
+            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
 
-        $scheduleObject = new ScheduleObject(
-            Carbon::parse($request->input('etd')),
-            Carbon::parse($request->input('eta')),
-            ApprovalStatus::APPROVED
-        );
-        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+            $scheduleObject = new ScheduleObject(
+                Carbon::parse($request->input('etd')), 
+                Carbon::parse($request->input('eta')), 
+                ApprovalStatus::APPROVED
+             );
+            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+
+            return $this->resourceResponse(new ContainerResource($container));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
-        return $this->resourceResponse(new ContainerResource($container));
     }
 
 }

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

@@ -1,78 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Jobs\ListPackingListsJob;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-
-class ListPackingListsJobLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Job Retrieving PackingLists',
-            'message' => 'You have successfully submit a job to retrieve a list of PackingLists'
-        ];
-    }
-
-    /** @var CreatesJobResult */
-    private $createsJobResult;
-
-    /**
-     * ListPackingListsJobLogic 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());
-
-
-        $listGenericJobObject = new ListGenericJobObject(
-            $request->fullUrl(),
-            $request->all(),
-            $requestSignature,
-            null,
-            $jobId,
-            $userInfo
-        );
-
-        ListPackingListsJob::dispatch($listGenericJobObject)->onQueue('high_priority');
-
-        $result = [];
-        $result['job_id'] = $jobId;
-
-
-        $this->createsJobResult->execute($listGenericJobObject);
-
-        return $this->response(['data' => $result]);
-    }
-
-}

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

@@ -6,8 +6,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
+use App\Http\Resources\PackingListNullOrderResource;
 use App\Http\Resources\PackingListResource;
-use App\Http\Resources\PackingListWithStorageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -54,14 +54,7 @@ class ListPackingListsLogic extends AbstractControllerLogic
 
         $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
 
-        if($request->input('storages')){
-            foreach ($query->items() as $item) {
-                $item['storages'] = $request->input('storages');
-            }
-            return $this->collectionResponse(PackingListWithStorageResource::collection($query));
-        }
-        else{
-            return $this->collectionResponse(PackingListResource::collection($query));
-        }
+        return $this->collectionResponse(PackingListResource::collection($query));
     }
+
 }

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

@@ -76,7 +76,6 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
                 try {
                     $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
 
-                    Log::info('Delivery tracking sTrackingNo: '. $packingList->reference);
                     $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$packingList->reference.'&sOrgId=sti', ['timeout' => 3]);
                     $deliveryTracking = json_decode($request->getBody()->getContents());
                     foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
@@ -120,7 +119,7 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
             }
 
         }
-        Log::info('FetchDeliveryUpdatesFromYdPortalProcessor ends');
+
     }
 }
 

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

@@ -138,13 +138,7 @@ class FetchPackingListsFromYdPortalProcessor
 
                     $receiveDate = Carbon::parse(substr(preg_replace("/[^0-9]/", "", $row->expressno), 0, 8));
 
-                    $customerno = $row->customerno;
-                    // Check if $customerno contains '正确唛头YD' and extract the part after it
-                    if (strpos($customerno, '正确唛头YD') !== false) {
-                        $customerno = explode('正确唛头YD', $customerno)[1];
-                    }
-                    
-                    $customerno = preg_split('/[-()\/]/', $customerno);
+                    $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
 
                     $orderNumber = $customerno[array_key_last($customerno)];
                     $allow_contract = true;

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

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
-use App\Classes\General\Helper;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Http\Middleware\CheckForStorageInvoiceByPackingLists;
-use App\Http\Resources\ListPackingListJobResource;
-use App\Http\Resources\ListPackingListDetailsJobResource;
-use App\Http\Resources\ListPackingListJobWithStorageResource;
-use Illuminate\Support\Facades\Log;
-
-class ListPackingListsJobProcessor
-{
-
-    /** @var ListsPackingLists */
-    private $listsPackingLists;
-
-    /** @var UpdateJobResultProcessor */
-    private $updateJobResultProcessor;
-
-    /** @var CheckForStorageInvoiceByPackingLists */
-    private $checkForStorageInvoiceByPackingLists;
-
-    /**
-     * ListPackingListsJobProcessor constructor.
-     * @param ListsPackingLists $listsPackingLists
-     * @param UpdateJobResultProcessor $updateJobResultProcessor
-     */
-    public function __construct(ListsPackingLists $listsPackingLists, UpdateJobResultProcessor $updateJobResultProcessor, CheckForStorageInvoiceByPackingLists $checkForStorageInvoiceByPackingLists)
-    {
-        $this->listsPackingLists = $listsPackingLists;
-        $this->updateJobResultProcessor = $updateJobResultProcessor;
-        $this->checkForStorageInvoiceByPackingLists = $checkForStorageInvoiceByPackingLists;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject) {
-        // $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]);
-        $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
-        // $query = $this->listsPackingLists->execute(array_merge($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]));
-
-        $filtersArray = json_decode($listGenericJobObject->getPayload()['filters'], true);
-
-        $storages = [];
-        if(isset($filtersArray['check_for_storage_invoice']))
-        {
-            $myRequest = new \Illuminate\Http\Request();
-            $myRequest->setMethod('POST');
-            $myRequest->request->add($listGenericJobObject->getPayload());
-            $next = function ($request) {
-                return $request;
-            };
-
-            $response = $this->checkForStorageInvoiceByPackingLists->handle($myRequest, $next);
-            $storages = $response->input('storages');
-        }
-
-        foreach ($query->items() as &$item) {
-            $item['userInfo'] = $listGenericJobObject->getUserInfo();
-            $item['storages'] = $storages;
-        }
-
-        if(isset($filtersArray['does_not_have_transaction_type'])){ //For Payment and Billing page > Pending Invoice tab
-            $resultCurrent = Helper::collectionResponse(ListPackingListDetailsJobResource::collection($query));
-            $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-        }
-        else{
-            if($storages){ //For Payment and Billing page > Pending Payment tab, Paid Invoice tab
-                $resultCurrent = Helper::collectionResponse(ListPackingListJobWithStorageResource::collection($query));
-                $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-            }
-            else{
-                $resultCurrent = Helper::collectionResponse(ListPackingListJobResource::collection($query));
-                $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-            }
-        }
-    }
-}

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

@@ -61,7 +61,7 @@ class FetchPerfexCRMInvoiceProcessor
                 $invoiceId = $result->payload['id'];
             } else {
                 $log['message'] = 'FetchPerfexCRMInvoiceProcessor failed for transaction > bill_no: '.$number;
-                Log::channel('perfex_crm')->info($log);
+                Helper::debugLogger($log);
             }
         }
         else{

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

@@ -25,7 +25,7 @@ class ConvertsPerfexCRMLeadToCustomer
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('ConvertsPerfexCRMLeadToCustomer: '.$response);
+                Log::error('ConvertsPerfexCRMLeadToCustomer: '.$response);
                 return null;
             }
         }

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

@@ -28,7 +28,7 @@ class CreatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMCustomer: '.$response);
+                Log::error('CreatesPerfexCRMCustomer: '.$response);
                 return null;
             }
         }

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

@@ -35,7 +35,7 @@ class CreatesPerfexCRMCustomerContact
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMCustomerContact: '.$response);
+                Log::error('CreatesPerfexCRMCustomerContact: '.$response);
                 return null;
             }
         }

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

@@ -34,7 +34,7 @@ class CreatesPerfexCRMCustomerProject
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMCustomerProject: '.$response);
+                Log::error('CreatesPerfexCRMCustomerProject: '.$response);
                 return null;
             }
         }

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

@@ -54,7 +54,7 @@ class CreatesPerfexCRMInvoice
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMInvoice: '.$response);
+                Log::error('CreatesPerfexCRMInvoice: '.$response);
                 return null;
             }
         }

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

@@ -34,7 +34,7 @@ class CreatesPerfexCRMInvoicePayment
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMInvoicePayment: '.$response);
+                Log::error('CreatesPerfexCRMInvoicePayment: '.$response);
                 return null;
             }
         }

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

@@ -41,7 +41,7 @@ class CreatesPerfexCRMLead
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMLead: '.$response);
+                Log::error('CreatesPerfexCRMLead: '.$response);
                 return null;
             }
         }

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

@@ -37,7 +37,7 @@ class CreatesPerfexCRMMilestone
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMMilestone: '.$response);
+                Log::error('CreatesPerfexCRMMilestone: '.$response);
                 return null;
             }
         }

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

@@ -34,7 +34,7 @@ class CreatesPerfexCRMSupportTicket
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info($response);
+                Log::error($response);
                 return null;
             }
         }

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

@@ -58,7 +58,7 @@ class CreatesPerfexCRMTask
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMTask: '.$response);
+                Log::error('CreatesPerfexCRMTask: '.$response);
                 return null;
             }
         }

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

@@ -25,7 +25,7 @@ class FetchesPerfexCRMCustomer
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMCustomer: '.$response);
+                Log::error('FetchesPerfexCRMCustomer: '.$response);
                 return null;
             }
         }

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

@@ -27,7 +27,7 @@ class FetchesPerfexCRMInvoice
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMInvoice: '.$response);
+                Log::error('FetchesPerfexCRMInvoice: '.$response);
                 return null;
             }
         }

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

@@ -25,7 +25,7 @@ class FetchesPerfexCRMLead
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMLead: '.$response);
+                Log::error('FetchesPerfexCRMLead: '.$response);
                 return null;
             }
         }

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

@@ -31,7 +31,7 @@ class FetchesPerfexCRMMilestone
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMMilestone: '.$response);
+                Log::error('FetchesPerfexCRMMilestone: '.$response);
                 return null;
             }
         }

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

@@ -31,7 +31,7 @@ class FetchesPerfexCRMProject
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMProject: '.$response);
+                Log::error('FetchesPerfexCRMProject: '.$response);
                 return null;
             }
         }

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

@@ -45,7 +45,7 @@ class FetchesPerfexCRMTask
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info($response);
+                Helper::debugLogger($response);
                 return null;
             }
         }

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

@@ -39,7 +39,7 @@ class UpdatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                // Log::channel('perfex_crm')->info($response);
+                // Helper::debugLogger($response);
                 return null;
             }
         }

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

@@ -61,7 +61,7 @@ class UpdatesPerfexCRMInvoice
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMInvoice: '.$response);
+                Log::error('UpdatesPerfexCRMInvoice: '.$response);
                 return null;
             }
         }

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

@@ -42,7 +42,7 @@ class UpdatesPerfexCRMLead
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMLead: '.$response);
+                Log::error('UpdatesPerfexCRMLead: '.$response);
                 return null;
             }
         }

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

@@ -34,7 +34,7 @@ class UpdatesPerfexCRMProject
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMProject: '.$response);
+                Log::error('UpdatesPerfexCRMProject: '.$response);
                 return null;
             }
         }

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

@@ -39,7 +39,7 @@ class UpdatesPerfexCRMTask
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMTask: '.$response);
+                Log::error('UpdatesPerfexCRMTask: '.$response);
                 return null;
             }
         }

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

@@ -82,35 +82,16 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
     public function logic(Request $request) : JsonResponse
     {
+        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
+
         $invoice_ids    = json_decode($request->route('transaction_ids'));
+        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
 
         // todo-new: check why is this not working
         // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
         $invoices       = Transaction::whereIn('id', $invoice_ids)->get();
-        $isInvoicesApprove = $this->checkIfInvoicesAreApprove($invoices);
-        if(!$isInvoicesApprove){
-            $response =  ['message' => 'One of the transactions might be suspended; please check if there are any disputes in progress.'];
-            return $this->response(['data' => $response]);
-        }
-        else{
-            $paymentMethodStr = $request->input('payment_method');
-            $paymentMethod     = PaymentMethodType::PAYMENT_METHODS[$paymentMethodStr];
-            $amount = $request->input('amount');
-            $bankCode = $request->input('bank_code');
-            $result = $this->processInvoices($invoices, $paymentMethodStr, $amount, $bankCode);
 
-            if ($paymentMethod === PaymentMethodType::PAYMENT_GATEWAY) {
-                return $this->resourceResponse(new WalletTransactionResource($result));
-            }
-        }
-        return $this->response([]);
-    }
-
-    private function processInvoices($invoices, $reqPaymentMethod, $reqAmount, $reqBankCode){
-        $result = [];
-        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$reqPaymentMethod];
-        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
-        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
         foreach ($invoices as $invoice) {
             $order = null;
             if ($invoice->owner instanceof Transaction) {
@@ -137,7 +118,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
             $wallet = Wallet::where('owner_id', $companyModuleId)->first();
 
             // todo-new: verify currently checking wallet amount based on 'amount' value passed by frontend
-            if((float) number_format(($wallet->amount - $reqAmount),2) < 0){
+            if((float) number_format(($wallet->amount - $request->input('amount')),2) < 0){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 
@@ -173,7 +154,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
         foreach ($invoices as $invoice) {
             if ($payment_method == PaymentMethodType::WALLET) {
-                $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $reqBankCode, false);
+                $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'), false);
 
                 if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
                     $pL = $invoice->owner;
@@ -200,12 +181,11 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
         if (in_array($payment_method, [PaymentMethodType::PAYMENT_GATEWAY, PaymentMethodType::CASH])) {
             // create only one billplz payment for wallet top up
-            $amount = floatval(str_replace(',', '', $reqAmount));
+            $amount = floatval(str_replace(',', '', $request->input('amount')));
             $companyModuleId = $invoice->receiver;
             $companyModule = $this->fetchesCompanyModule->execute(['id' => $companyModuleId]);
 
-            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $reqBankCode, $payment_method, $billNumber, true);
-            $result = $topUpTransaction;
+            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'), $payment_method, $billNumber, true);
         }
 
         $group->issuer                  = $issuer;
@@ -221,15 +201,11 @@ class CreateGroupsLogic extends AbstractControllerLogic
         $group->status                  = $groupPyamentStatus;
         $group->save();
 
-        return $result;
-    }
+        if ($payment_method === PaymentMethodType::PAYMENT_GATEWAY) {
+            return $this->resourceResponse(new WalletTransactionResource($topUpTransaction));
 
-    private function checkIfInvoicesAreApprove($invoices){
-        foreach ($invoices as $invoice) {
-            if($invoice->status !== ApprovalStatus::APPROVED && $invoice->status !== ApprovalStatus::COMPLETED){
-                return false;
-            }
+        } else {
+            return $this->response([]);
         }
-        return true;
     }
 }

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

@@ -52,18 +52,28 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
 
         $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);
 
-        if($invoice_transaction->status === ApprovalStatus::APPROVED){
-            $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'), false);
+        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'), false);
 
-            if($payment_transaction && $payment_transaction->status === ApprovalStatus::APPROVED){
-                $pL = $invoice_transaction->owner;
-                $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice_transaction);
-            }
-            return $this->resourceResponse(new TransactionResource($payment_transaction));
+        if($payment_transaction && $payment_transaction->status == ApprovalStatus::APPROVED){
+            $pL = $invoice_transaction->owner;
+            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice_transaction);
         }
 
-        $response =  ['message' => 'A transaction might be suspended; please check if there is any dispute in progress.'];
-        return $this->response(['data' => $response]);
+        //cief todo: at exchange there is a transition step - starts
+        // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
+        //     $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+        // }
+
+        // if(config('perfexcrm.is_enabled') == 'true'){
+        //     $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
+        // }
+
+        //To use
+        //ApprovalStatus::PENDING_VERIFICATION;
+        //use this to trigger  $this->transactionToPerfexCRMV2Processor->execute > defineTasks > defineTasks_handlePendingVerificationStatus > definePaymentTasks
+        //cief todo: at exchange there is a transition step - ends
+
+        return $this->resourceResponse(new TransactionResource($payment_transaction));
     }
 
 

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

@@ -48,8 +48,6 @@ class DeleteGroupLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        ini_set('memory_limit', '-1'); 
-
         $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
 
         foreach ($group->groupTransactions as $groupTransaction) {

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

@@ -1,90 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\General\Eloquent\Filters\PaymentMethod;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Transactions\Services\FetchesGroup;
-use App\Classes\Modules\Transactions\Services\DeletesTransaction;
-use App\Classes\Modules\Transactions\Services\DeletesGroup;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class DeletePaidGroupLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Delete Paid Group Transaction',
-            'message' => 'You have successfully deleted this Group Transaction'
-        ];
-    }
-
-    /** @var FetchesGroup */
-    private $fetchesGroup;
-
-    /** @var DeletesGroup */
-    private $deletesGroup;
-
-    /**
-     * DeleteGroupLogic constructor.
-     * @param updatesTransactionStatus $updatesTransactionStatus
-     * @param FetchesGroup $fetchesGroup
-     * @param DeletesTransaction $deletesTransaction
-     */
-    public function __construct(FetchesGroup $fetchesGroup, DeletesGroup $deletesGroup)
-    {
-        $this->fetchesGroup = $fetchesGroup;
-        $this->deletesGroup = $deletesGroup;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
-
-        foreach ($group->groupTransactions as $groupTransaction) {
-            $invoice = $groupTransaction->transaction;
-            $paymentTransaction = $invoice->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first();
-
-            if ($paymentTransaction->payment_method == PaymentMethodType::WALLET) {
-                // Store the transaction ID before deleting
-                $transactionId = Transaction::where('bill_no', $paymentTransaction->payment_reference)->first()->id;
-
-                // Delete the transaction
-                Transaction::where('id', $transactionId)->first()->delete();
-
-                // Now you have the transaction ID available in $transactionId
-                Log::channel('deletePaidGroupOrder')->info("Deleted payment reference transaction ID: " . $transactionId);
-            } else {
-                Log::channel('deletePaidGroupOrder')->info("no transaction found. Invoice Id ->" . $invoice->id);
-            }
-
-            // Store the transaction ID before deleting
-            $transactionId = $paymentTransaction->id;
-
-            // Delete the payment transaction
-            $paymentTransaction->delete();
-            Log::channel('deletePaidGroupOrder')->info("Deleted payment transaction ID: " . $transactionId);
-        }
-
-        Log::channel('deletePaidGroupOrder')->info("Deleted Group -> " . $group->id);
-        $this->deletesGroup->execute($group);
-
-        return $this->response([]);
-    }
-}

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

@@ -6,13 +6,9 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Transactions\Services\FetchesGroup;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Transaction;
-use App\Models\Wallet;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 
 class DeletePaymentTransactionLogic extends AbstractControllerLogic
 {
@@ -27,9 +23,6 @@ class DeletePaymentTransactionLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var FetchesGroup */
-    private $fetchesGroup;
-
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
@@ -41,13 +34,11 @@ class DeletePaymentTransactionLogic extends AbstractControllerLogic
      * SuspendTransactionLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param FetchesGroup $fetchesGroup
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesGroup $fetchesGroup)
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->fetchesGroup = $fetchesGroup;
     }
 
 
@@ -55,23 +46,11 @@ class DeletePaymentTransactionLogic extends AbstractControllerLogic
     {
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
 
-        if($transaction->owner instanceof Wallet){
-            try{
-                $group = $this->fetchesGroup->execute(['reference' => $transaction->payment_reference]);
-                $group->status = ApprovalStatus::SUSPENDED;
-                $group->save();
-            }
-            catch(\Exception $excaption){
-                Log::info('No group associated with transaction with payment_reference - '.$transaction->payment_reference);
-            }
-        }
-
         $transaction->delete();
 
         $invoice = $transaction->owner;
-        if ($invoice instanceof Transaction) {
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::APPROVED);
-        }
+
+        $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::APPROVED);
 
         return $this->response([]);
     }

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

@@ -30,7 +30,7 @@ class DeleteTransactionLogic extends AbstractControllerLogic
 
 
     /**
-     * DeleteTransactionLogic constructor.
+     * SuspendTransactionLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      */

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

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\TransactionWithStorageResource;
 use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -43,18 +42,15 @@ class ListTransactionsLogic extends AbstractControllerLogic
         $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
 
         if($request->input('storages')){
-            foreach ($query->items() as $item) {
+            foreach ($query->items() as &$item) {
                 $transactionId = $item['id'];
                 $filteredStorages = array_filter($request->input('storages'), function ($storage) use ($transactionId) {
                     return isset($storage['parentInvoiceId']) &&  $storage['parentInvoiceId'] == $transactionId;
                 });
                 $item['storages'] = $filteredStorages;
             }
-            //return $this->collectionResponse(TransactionWithStorageResource::collection($query));
         }
-        // else{
-        //     return $this->collectionResponse(TransactionResource::collection($query));
-        //
-        return $this->collectionResponse(TransactionWithStorageResource::collection($query));
+
+        return $this->collectionResponse(TransactionResource::collection($query));
     }
 }

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

@@ -15,7 +15,6 @@ use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Models\Document;
-use Carbon\Carbon;
 
 class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
@@ -52,18 +51,11 @@ class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         foreach ($orders as $order){
             $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
             foreach ($invoices as $invoice){
-
+    
                 $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]);
-
+    
+                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+    
                 $document_object = new DocumentObject(
                     DocumentType::SHIPPING_INVOICE,
                     [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
@@ -71,11 +63,11 @@ class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
                     ApprovalStatus::COMPLETED,
                     'shipping_invoice'
                 );
-
+    
                 $document =$this->createsDocument->execute($invoice, $document_object);
-
+    
                 $this->createsFiles->execute($document, $document_object);
-
+    
                 // dump($document);
             }
         }

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

@@ -16,7 +16,6 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Models\Document;
-use Carbon\Carbon;
 
 class RegenerateSingleShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
@@ -55,14 +54,7 @@ class RegenerateSingleShippingInvoiceTransactionLogic extends AbstractController
 
         $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]);
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
 
         $document_object = new DocumentObject(
             DocumentType::SHIPPING_INVOICE,

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

@@ -1,67 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionFixProcessor;
-use App\Classes\Modules\Transactions\Standards\Rules\CanRegenerateStorageInvoice;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class RegenerateSingleStorageInvoiceTransactionLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Regenerate Storage Invoice',
-            'message' => 'You have successfully regenerated storage invoice'
-        ];
-    }
-
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var CreateStorageInvoiceDocTransactionFixProcessor */
-    private $createStorageInvoiceDocTransactionProcessor;
-
-    /** @var CanRegenerateStorageInvoice */
-    private $canRegenerateStorageInvoice;
-
-    /**
-     * @param CreatesDocument $createsDocument
-     */
-    public function __construct(FetchesTransaction $fetchesTransaction, CreateStorageInvoiceDocTransactionFixProcessor $createStorageInvoiceDocTransactionProcessor, CanRegenerateStorageInvoice $canRegenerateStorageInvoice)
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->createStorageInvoiceDocTransactionProcessor = $createStorageInvoiceDocTransactionProcessor;
-        $this->canRegenerateStorageInvoice = $canRegenerateStorageInvoice;
-    }
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $this->canRegenerateStorageInvoice->passes();
-
-        $invoice = $this->fetchesTransaction->execute(['id' => $request->route('invoice_id')]);
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-        $invoices = $order->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->get();
-        foreach ($invoices as $invoice){
-            $invoice->documents()->delete();
-        }
-
-        $this->createStorageInvoiceDocTransactionProcessor->execute($packingList, true);
-        Log::info(Auth::user()->email." regenerate storage invoice for transaction with id ".$request->route('invoice_id'));
-
-        return $this->response([]);
-    }
-
-}

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

@@ -25,8 +25,6 @@ use App\Classes\Modules\Transactions\Services\DeletesTransactionDetails;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\ValueObjects\Constants\TaxPercentage;
-use Carbon\Carbon;
 
 class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
@@ -62,9 +60,9 @@ class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 
     /** @var DeletesTransactionDetails */
     private $deletesTransactionDetails;
-
+    
     public function __construct(
-        FetchesPackingList $fetchesPackingList,
+        FetchesPackingList $fetchesPackingList,  
         FetchesTransaction $fetchesTransaction,
         UpdatesTransaction $updatesTransaction,
         FetchesTransactionDetail $fetchesTransactionDetail,
@@ -107,25 +105,11 @@ class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
             $transaction_detail = (object) $transaction_detail;
 
             if(!in_array($transaction_detail->reference, ['SHIPPING_FEE', 'OVER_WEIGHT_CHARGES', 'MIN_CBM_CHARGES'])){
-                $reference = 'CUSTOM_CHARGES';
-                $taxPercentage = TaxPercentage::DEFAULT;
-
-                $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-                $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice_transaction->created_at);
-                if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare)) {
-                    $taxPercentage = TaxPercentage::SIX_PERCENT;
-                }
-
-                if($transaction_detail->reference === "PAY_ON_BEHALF"){
-                    $reference = "PAY_ON_BEHALF";
-                    $taxPercentage = TaxPercentage::NO_TAX;
-                }
                 $object_detail = new TransactionDetailObject(
-                    $reference,
+                    'CUSTOM_CHARGES',
                     isset($transaction_detail->name) ? $transaction_detail->name : TransactionDetailType::CUSTOM_CHARGES,
                     $transaction_detail->quantity,
-                    $transaction_detail->price,
-                    $taxPercentage
+                    $transaction_detail->price
                 );
 
                 if(isset($transaction_detail->id)){
@@ -137,20 +121,20 @@ class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         }
 
         $object = new TransactionObject(
-            $invoice_transaction->bill_no,
-            TransactionType::SHIPPING_INVOICE,
-            1,
+            $invoice_transaction->bill_no, 
+            TransactionType::SHIPPING_INVOICE, 
+            1, 
             $invoice_transaction->issuer,
-            1,
+            1, 
             PaymentMethodType::CASH,
             $invoice_transaction->transactionDetails()->sum('amount'),
             $invoice_transaction->transactionDetails()->sum('amount'),
             1,
-            1,
+            1, 
+            0, 
+            0, 
             0,
-            $invoice_transaction->transactionDetails()->sum('tax_amount'),
-            0,
-            null,
+            null, 
             ApprovalStatus::PENDING_VERIFICATION
         );
 

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

@@ -1,65 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionIsWaived;
-use App\Classes\Modules\Transactions\Standards\Rules\CanWaiveTransaction;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class WaiveTransactionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Waive Transaction',
-            'message' => 'You have successfully waived the transaction'
-        ];
-    }
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransactionIsWaived */
-    private $updatesTransactionIsWaived;
-
-    /** @var CanWaiveTransaction */
-    private $canWaiveTransaction;
-
-
-    /**
-     * WaiveTransactionLogic constructor.
-     * @param FetchesTransaction $fetchesTransaction
-     * @param UpdatesTransactionIsWaived $updatesTransactionIsWaived
-     * @param CanWaiveTransaction $canWaiveTransaction
-     */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionIsWaived $updatesTransactionIsWaived, CanWaiveTransaction $canWaiveTransaction)
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->updatesTransactionIsWaived = $updatesTransactionIsWaived;
-        $this->canWaiveTransaction = $canWaiveTransaction;
-    }
-
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
-
-        $object = new WaiveTransactionObject($transaction->id, $transaction->bill_no, $transaction->type, $transaction->status);
-        $this->canWaiveTransaction->passes($object);
-
-        $this->updatesTransactionIsWaived->execute($transaction);
-        Log::info(Auth::user()->email." waive storage invoice charges with bill_no: ".$transaction->bill_no);
-
-        return $this->response([]);
-    }
-}

app/Classes/Modules/Transactions/DataTransferObjects/TransactionDetailObject.php

@@ -18,25 +18,19 @@ class TransactionDetailObject implements DataTransferObject
     /** @var float|null */
     private $price;
 
-    /** @var float|null */
-    private $taxPercentage;
-
-
     /**
      * TransactionDetailObject constructor.
      * @param string $reference
      * @param string $name
      * @param float $quantity
      * @param float $price
-     * @param float $taxPercentage
      */
-    public function __construct(?string $reference, ?string $name , ?float $quantity, ?float $price, ?float $taxPercentage)
+    public function __construct(?string $reference, ?string $name , ?float $quantity, ?float $price)
     {
         $this->reference = $reference;
         $this->name = $name;
         $this->quantity = $quantity;
         $this->price = $price;
-        $this->taxPercentage = $taxPercentage;
     }
 
     /**
@@ -71,28 +65,9 @@ class TransactionDetailObject implements DataTransferObject
         return $this->price;
     }
 
-    /**
-     * @return float
-     */
     public function getAmount(): float
     {
-        return ($this->getQuantity() * $this->getPrice()) + $this->getTaxAmount();
-    }
-
-    /**
-     * @return float
-     */
-    public function getTaxPercentage(): ?float
-    {
-        return $this->taxPercentage;
-    }
-
-    /**
-     * @return float
-     */
-    public function getTaxAmount(): float
-    {
-        return ($this->getQuantity() * $this->getPrice()) * $this->getTaxPercentage() / 100;
+        return $this->getQuantity() * $this->getPrice();
     }
 
 }

app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php

@@ -80,21 +80,21 @@ class TransactionObject implements DataTransferObject
      * @param array|null $details
      */
     public function __construct(
-        string $billNo,
-        string $transactionType,
-        int $issuer,
-        int $receiver,
-        int $recipientBankAccountId,
-        int $paymentMethod,
-        float $amount,
-        float $originalAmount,
+        string $billNo, 
+        string $transactionType, 
+        int $issuer, 
+        int $receiver, 
+        int $recipientBankAccountId, 
+        int $paymentMethod, 
+        float $amount, 
+        float $originalAmount, 
         int $currencyId,
-        int $originalCurrencyId,
+        int $originalCurrencyId, 
         float $currencyRate,
-        float $tax,
-        float $serviceCharge,
-        ?Carbon $expiresOn,
-        ?int $status = ApprovalStatus::PENDING_SUBMISSION,
+        float $tax, 
+        float $serviceCharge, 
+        ?Carbon $expiresOn, 
+        ?int $status = ApprovalStatus::PENDING_SUBMISSION, 
         ?array $details = [],
         ?string $paymentReference = null
     )
@@ -241,10 +241,10 @@ class TransactionObject implements DataTransferObject
     /**
      * @return array
      */
-    public function getDetails(): array //cief todo: not in used as of 20240407
+    public function getDetails(): array
     {
         return array_map(function($product){
-            return new TransactionDetailObject($product['stockCode'] ?? '', $product['description'] ?? '', $product['quantity'] ?? '', floatval(str_replace(',', '', $product['unit_price'])), 0.0 );
+            return new TransactionDetailObject($product['stockCode'] ?? '', $product['description'] ?? '', $product['quantity'] ?? '', floatval(str_replace(',', '', $product['unit_price'])));
         }, $this->details);
     }
 
@@ -255,4 +255,4 @@ class TransactionObject implements DataTransferObject
     {
         return $this->paymentReference;
     }
-}
+}

app/Classes/Modules/Transactions/DataTransferObjects/WaiveTransactionObject.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class WaiveTransactionObject implements DataTransferObject
-{
-
-    /** @var int */
-    private $id;
-
-    /** @var string */
-    private $billNo;
-
-    /** @var int */
-    private $type;
-
-    /** @var int */
-    private $status;
-
-    public function __construct(int $id, string $billNo, int $type, int $status)
-    {
-        $this->id = $id;
-        $this->billNo = $billNo;
-        $this->type = $type;
-        $this->status = $status;
-    }
-
-    /**
-     * @return int
-     */
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillNo(): string
-    {
-        return $this->billNo;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-}

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

@@ -19,7 +19,6 @@ use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\Jobs\CreatePerfexCRMInvoice;
 use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
 use App\Models\Order;
-use Carbon\Carbon;
 
 class ApproveShippingInvoiceTransactionProcessor
 {
@@ -60,16 +59,9 @@ class ApproveShippingInvoiceTransactionProcessor
         /** @var Transaction $invoice_transaction */
         $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
 
-        $view = 'pages.pdfs.shipping_invoice';
-        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-        $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice_transaction->created_at);
-        if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice_transaction->tax > 0) {
-            $view = 'pages.pdfs.shipping_invoice_sst';
-        }
-
         $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
 
-        $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice_transaction]);
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
 
         $document_object = new DocumentObject(
             DocumentType::SHIPPING_INVOICE,

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

@@ -23,9 +23,8 @@ use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TaxPercentage;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
-use App\Http\Resources\TransactionWithStorageResource;
+use App\Http\Resources\TransactionResource;
 use App\Models\Order;
 use App\Models\PackingList;
 use App\Models\Transaction;
@@ -100,38 +99,33 @@ class CheckStorageInvoiceTransactionProcessor
         return $this->executeOrder($order);
     }
 
-    public function executeOrder(Order $order){
+    public function executeOrder(Order $order, bool $isBackDoorCheck = false){
         $results = [];
         $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
         $is_credit_term = $order->companyModule->inviters()->withPivot('is_credit_term')->first()->pivot->is_credit_term;
-        Log::channel('storage_invoices')->info('orderId: '.$order->id.', orderReference: '.$order->reference.', marking: '.$marking.', is_credit_term: '.$is_credit_term);
-        $packingLists = $order->destinationWarehousePackages;
+        if(!$is_credit_term){
+            Log::channel('storage_invoices')->info('orderId: '.$order->id.', orderReference: '.$order->reference.', marking: '.$marking.', is_credit_term: '.$is_credit_term);
+            $packingLists = $order->destinationWarehousePackages;
 
-        foreach ($packingLists as $packingList){
-            $arrivalDateAtChinaWarehouse = $this->getArrivalDateAtChinaWarehoue($packingList);
-            Log::channel('storage_invoices')->info('arrivalDateAtChinaWarehouse: '.json_encode($arrivalDateAtChinaWarehouse));
-            Log::channel('storage_invoices')->info('destinationWarehousePackage: '.json_encode($packingList));
-            $eta = $this->getEtaFromPackingList($packingList);
-            if($arrivalDateAtChinaWarehouse && $eta){
-                $transactions = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
-                // $transactions = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->where('transactions.status', ApprovalStatus::APPROVED)->get();
+            foreach ($packingLists as $packingList){
+                $arrivalDateAtChinaWarehouse = $this->getArrivalDateAtChinaWarehoue($packingList);
+                Log::channel('storage_invoices')->info('arrivalDateAtChinaWarehouse: '.json_encode($arrivalDateAtChinaWarehouse));
+                Log::channel('storage_invoices')->info('destinationWarehousePackage: '.json_encode($packingList));
+                $eta = $this->getEtaFromPackingList($packingList);
+                if($arrivalDateAtChinaWarehouse && $eta){
+                    $transactions = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+                    // $transactions = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->where('transactions.status', ApprovalStatus::APPROVED)->get();
 
-                /** @var Transaction $invoice_transaction */
-                foreach ($transactions as $invoice_transaction){
-                    $result = null;
-                    if(!$is_credit_term){
-                        $result =  $this->processSingleTransactionOfTypeShippingInvoice($invoice_transaction, $packingList, $order->company_module_id, $eta);
-                    }
-                    else{
-                        $result =  $this->isPaidOrWaivedStorageInvoiceExist($invoice_transaction, $packingList, $eta);
-                    }
-                    if($result){
-                        $results[] = $result;
+                    /** @var Transaction $invoice_transaction */
+                    foreach ($transactions as $invoice_transaction){
+                        $result =  $this->processSingleTransactionOfTypeShippingInvoice($invoice_transaction, $packingList, $order->company_module_id, $eta, $isBackDoorCheck);
+                        if($result){
+                            $results[] = $result;
+                        }
                     }
                 }
             }
         }
-
         return $results;
     }
 
@@ -164,7 +158,6 @@ class CheckStorageInvoiceTransactionProcessor
                     if ($transport) {
                         $schedule = $transport->schedules->last();
                         if ($schedule) {
-                            Log::channel('storage_invoices')->info('schedule: '.json_encode($schedule));
                             return $schedule->eta;
                         }
                     }
@@ -174,18 +167,15 @@ class CheckStorageInvoiceTransactionProcessor
         return null;
     }
 
-    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta){
+    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta, $isBackDoorCheck){
         $pricePerCBM = 3;
         $resultNumberOfDaysFree = 10;
         $dt1 = $eta->copy()->addDay()->startOfDay();
-        $dt2 = Carbon::now()->copy()->addDay()->startOfDay();
+        $resultStartDate =  $dt1->format('Y-m-d');
+        $currentDatetime = Carbon::now();
+        $dt2 = $currentDatetime->copy()->addDay()->startOfDay();
+        $resultCurrentDate = $dt2->format('Y-m-d H:i:s');
         $interval = Carbon::parse($dt2)->diff($dt1);
-        Log::channel('storage_invoices')->info('eta: '.json_encode($eta));
-        Log::channel('storage_invoices')->info('dt1: '.json_encode($dt1));
-        Log::channel('storage_invoices')->info('dt2: '.json_encode($dt2));
-        Log::channel('storage_invoices')->info('interval: '.json_encode($interval));
-        Log::channel('storage_invoices')->info('Carbon now: '.json_encode(Carbon::now()));
-
 
         $resultNumberOfDaysExceeded = $interval->days - $resultNumberOfDaysFree;
         $storageInvoice = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->first();
@@ -200,78 +190,48 @@ class CheckStorageInvoiceTransactionProcessor
             $cbm =  $cbm + $quantity;
         }
 
-        $total_tax = 0;
-        $taxPercentage = TaxPercentage::DEFAULT;
         $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
-        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-
-        Log::channel('storage_invoices')->info('dateToCompare: '.json_encode($dateToCompare));
+        Log::channel('storage_invoices')->info('storageInvoice: '.json_encode($storageInvoice).', $transaction->status: '.$transaction->status);
         if(!$storageInvoice && $resultNumberOfDaysExceeded  > 0 && $transaction->status != ApprovalStatus::COMPLETED){
             Log::channel('storage_invoices')->info('Created $transaction->id: '.$transaction->id);
             $billNumber = $this->generatesTransactionBillNumber->execute('STOR-');
-
-            if (Carbon::now()->isAfter($dateToCompare)) {
-                $taxPercentage = TaxPercentage::SIX_PERCENT;
-                $total_tax = $price_cbm * $taxPercentage / 100;
-                $price_cbm = $price_cbm + $total_tax;
-            }
-
-            $storageInvoice = $this->createStorageInvoiceTransaction($destinationWarehousePackage, $billNumber, $company_module_id, $price_cbm, $total_tax);
+            $storageInvoice = $this->createStorageInvoiceTransaction($destinationWarehousePackage, $billNumber, $company_module_id, $price_cbm);
             $storageInvoiceId = $storageInvoice->id;
-            $this->createStorageInvoiceTransactionDetails($storageInvoice, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded, $taxPercentage);
+            $this->createStorageInvoiceTransactionDetails($storageInvoice, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
         }
         else if($storageInvoice){
-            //Additional handling for giving selected storage invoice a waiver
-            if(isset($storageInvoice->is_waived) && $storageInvoice->is_waived){
-                $pricePerCBM = 0;
-                $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
-            }
 
             //Additional handling for calculation of numberOfDaysExceeded in the event of the storage already paid
             $paymentStorageTransaction = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::APPROVED)->first();
             if($paymentStorageTransaction){
                 $dateStorageInvoicePaid = $paymentStorageTransaction->created_at->copy()->addDay()->startOfDay();
-                Log::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$dt2->format('Y-m-d H:i:s'));
+                Log::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$resultCurrentDate);
                 $intervalRecalculate = Carbon::parse($dateStorageInvoicePaid)->diff($dt1);
                 $resultNumberOfDaysExceeded = $intervalRecalculate->days - $resultNumberOfDaysFree;
                 $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
             }
 
-            if (Carbon::now()->isAfter($dateToCompare)) {
-                $taxPercentage = TaxPercentage::SIX_PERCENT;
-                $total_tax = $price_cbm * $taxPercentage / 100;
-                $price_cbm = $price_cbm + $total_tax;
-            }
-
             $amount = $storageInvoice->amount;
             $epsilon = 0.0001; // Tolerance for the comparison
             Log::channel('storage_invoices')->info('Update $transaction->id: '.$transaction->id);
             Log::channel('storage_invoices')->info('$storageInvoice->status: '.$storageInvoice->status);
             Log::channel('storage_invoices')->info('price_cbm: '.$price_cbm."-".gettype($price_cbm));
-            Log::channel('storage_invoices')->info('amount: '.$amount);
-
-            $proceedToUpdate = false;
 
             if(abs($price_cbm - $amount) > $epsilon && $storageInvoice->status !== ApprovalStatus::COMPLETED){
                 $paymentTransactions = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::PENDING_SUBMISSION)->get();
-                // if(!$isBackDoorCheck){
-                if(count($paymentTransactions) > 0){
-                    $this->updatePaymentTransactionViaNonGroupPayment($paymentTransactions);
+
+                if(!$isBackDoorCheck){
+                    if(count($paymentTransactions) > 0){
+                        $this->updatePaymentTransactionViaNonGroupPayment($paymentTransactions);
+                    }
+                    else{
+                        $this->updatePaymentTransactionViaGroupPayment($storageInvoice);
+                    }
                 }
-                else{
-                    $this->updatePaymentTransactionViaGroupPayment($storageInvoice);
-                }
-                //}
 
-                $proceedToUpdate = true;
-            }
-
-            if($proceedToUpdate || ($pricePerCBM == 0 && $amount != 0)){
-                Log::channel('storage_invoices')->info('proceedToUpdate');
-
-                $storageInvoice = $this->updateStorageInvoiceTransaction($storageInvoice, $price_cbm, $total_tax);
+                $storageInvoice = $this->updateStorageInvoiceTransaction($storageInvoice, $price_cbm);
                 $invoiceTransactionDetails = $storageInvoice->transactionDetails()->first();
-                $this->updateStorageInvoiceTransactionDetails($invoiceTransactionDetails, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded, $taxPercentage);
+                $this->updateStorageInvoiceTransactionDetails($invoiceTransactionDetails, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
             }
 
             $storageInvoiceId = $storageInvoice->id;
@@ -283,75 +243,20 @@ class CheckStorageInvoiceTransactionProcessor
                 'storageInvoiceId' => $storageInvoiceId,
                 'numberOfDaysExceeded' => $resultNumberOfDaysExceeded,
                 'numberOfDaysFree' => $resultNumberOfDaysFree,
-                'startDate' => $dt1->format('Y-m-d'),
-                'currentDate' => $dt2->format('Y-m-d H:i:s'),
+                'startDate' => $resultStartDate,
+                'currentDate' => $resultCurrentDate,
                 'cbm' => $cbm,
                 'pricePerCBM' => $pricePerCBM,
-                'storageInvoice' => new TransactionWithStorageResource($storageInvoice)
+                'storageInvoice' => new TransactionResource($storageInvoice)
             ];
             return $result;
         }
 
     }
 
-    private function isPaidOrWaivedStorageInvoiceExist($transaction, $packingList, $eta){
-        $pricePerCBM = 3;
-        $resultNumberOfDaysFree = 10;
-        $dt1 = $eta->copy()->addDay()->startOfDay();
-        $resultStartDate =  $dt1->format('Y-m-d');
-        $currentDatetime = Carbon::now();
-        $dt2 = $currentDatetime->copy()->addDay()->startOfDay();
-        $resultCurrentDate = $dt2->format('Y-m-d H:i:s');
-        $interval = Carbon::parse($dt2)->diff($dt1);
-        $resultNumberOfDaysExceeded = $interval->days - $resultNumberOfDaysFree;
-        $paidStorageInvoice = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->whereIn('transactions.status', [ApprovalStatus::COMPLETED])->first();
-        if($paidStorageInvoice){
-            $storageInvoice = $paidStorageInvoice;
-        }
-        else{
-            $waivedStorageInvoice = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->where('transactions.is_waived', 1)->whereIn('transactions.status', [ApprovalStatus::APPROVED])->first();
-            $storageInvoice = $waivedStorageInvoice;
-        }
-
-        if($storageInvoice){
-            $storageInvoiceId = $storageInvoice->id;
-
-            if(isset($storageInvoice->is_waived) && $storageInvoice->is_waived){
-                $pricePerCBM = 0;
-            }
-
-            $transactionDetailsItems = $transaction->transactionDetails()->get();
-            $cbm = 0.00;
-            foreach ($transactionDetailsItems as $tdItem){
-                $quantity = $tdItem->quantity;
-                if($tdItem->price < 0.00){
-                    $quantity = $quantity * -1;
-                }
-                $cbm =  $cbm + $quantity;
-            }
-
-            if($storageInvoiceId !== 0){
-                $result = [
-                    'parentInvoiceId' => $transaction->id,
-                    'storageInvoiceId' => $storageInvoiceId,
-                    'numberOfDaysExceeded' => $resultNumberOfDaysExceeded,
-                    'numberOfDaysFree' => $resultNumberOfDaysFree,
-                    'startDate' => $resultStartDate,
-                    'currentDate' => $resultCurrentDate,
-                    'cbm' => $cbm,
-                    'pricePerCBM' => $pricePerCBM,
-                    'storageInvoice' => new TransactionWithStorageResource($storageInvoice)
-                ];
-                return $result;
-            }
-        }
-
-        return [];
-    }
-
     private function updatePaymentTransactionViaGroupPayment($storageInvoice){
         Log::channel('storage_invoices')->info('updatePaymentTransactionViaGroupPayment');
-        $groups = $storageInvoice->groups()->whereNotIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::SUSPENDED])->get();
+        $groups = $storageInvoice->groups()->get();
         foreach ($groups as $grp){
             $groupReference = $grp->reference;
             $walletTransaction = $this->fetchesTransaction->execute(['payment_reference' => $groupReference]);
@@ -379,7 +284,7 @@ class CheckStorageInvoiceTransactionProcessor
         }
     }
 
-    private function updateStorageInvoiceTransaction(Transaction $transaction, float $totalAmount, float $totalTax){
+    private function updateStorageInvoiceTransaction(Transaction $transaction, float $totalAmount){
 
         $object = new TransactionObject(
             $transaction->bill_no,
@@ -393,7 +298,7 @@ class CheckStorageInvoiceTransactionProcessor
             1,
             1,
             0,
-            $totalTax,
+            0,
             0,
             null,
             ApprovalStatus::APPROVED
@@ -405,19 +310,18 @@ class CheckStorageInvoiceTransactionProcessor
         return $invoice_transaction;
     }
 
-    private function updateStorageInvoiceTransactionDetails($invoice_transaction_details, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays, $taxPercentage){
+    private function updateStorageInvoiceTransactionDetails($invoice_transaction_details, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays){
         $object_detail = new TransactionDetailObject(
             'STORAGE_FEE',
             TransactionDetailType::STORAGE_FEE.' for '.$numberOfDays. ' days * RM'.$pricePerCBM.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
             $cbm,
-            $pricePerCBM * $numberOfDays,
-            $taxPercentage
+            $pricePerCBM * $numberOfDays
         );
 
         $this->updatesTransactionDetail->execute($invoice_transaction_details, $object_detail);
     }
 
-    private function createStorageInvoiceTransaction(PackingList $packing_list, string $billNumber, int $companyModuleId, float $totalAmount, float $totalTax){
+    private function createStorageInvoiceTransaction(PackingList $packing_list, string $billNumber, int $companyModuleId, float $totalAmount){
 
         $object = new TransactionObject(
             $billNumber,
@@ -431,7 +335,7 @@ class CheckStorageInvoiceTransactionProcessor
             1,
             1,
             0,
-            $totalTax,
+            0,
             0,
             null,
             ApprovalStatus::APPROVED
@@ -443,13 +347,12 @@ class CheckStorageInvoiceTransactionProcessor
         return $invoice_transaction;
     }
 
-    private function createStorageInvoiceTransactionDetails($invoice_transaction, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays, $taxPercentage){
+    private function createStorageInvoiceTransactionDetails($invoice_transaction, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays){
         $object_detail = new TransactionDetailObject(
             'STORAGE_FEE',
             TransactionDetailType::STORAGE_FEE.' for '.$numberOfDays. ' days * RM'.$pricePerCBM.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
             $cbm,
-            $pricePerCBM * $numberOfDays,
-            $taxPercentage
+            $pricePerCBM * $numberOfDays
         );
 
         $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);

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

@@ -22,19 +22,15 @@ use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TaxPercentage;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
 
 use App\Models\CompanyModule;
 use App\Models\Document;
 use App\Models\PackingList;
 use App\Models\Transaction;
-use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use Illuminate\Support\Facades\Http;
 
 class CreateInvoiceTransactionProcessor
 {
@@ -75,18 +71,6 @@ class CreateInvoiceTransactionProcessor
      */
     public function execute(PackingList $packingList)
     {
-        $ori_packing_list = $packingList;
-        // call wac webhook
-        $hasInvoiceCreated = Transaction::withTrashed()
-            ->where('type', TransactionType::SHIPPING_INVOICE)
-            ->where('owner_type', PackingList::class)
-            ->where('owner_id', $ori_packing_list->id)
-            ->exists();
-        
-        if ($hasInvoiceCreated) {
-            Log::channel('wac_webhook')->info('Regenerating Invoice for PackingList: ' . $ori_packing_list->id . '. No call wac api.');
-        }
-        
         $packing_list = PackingList::where('reference', $packingList->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
 
         $billable_packing_list = $packing_list->packingLists()->first();
@@ -187,16 +171,6 @@ class CreateInvoiceTransactionProcessor
 
         $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
 
-        $total_tax = 0;
-        $taxPercentage = TaxPercentage::DEFAULT;
-        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-        $shippingInvoiceTransactionCreatedDate = Carbon::now();
-        if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare)) {
-            $taxPercentage = TaxPercentage::SIX_PERCENT;
-            $total_tax = $total_cbm * $taxPercentage / 100;
-            $total_cbm = $total_cbm + $total_tax;
-        }
-
         $object = new TransactionObject(
             $billNumber,
             TransactionType::SHIPPING_INVOICE,
@@ -209,7 +183,7 @@ class CreateInvoiceTransactionProcessor
             1,
             1,
             0,
-            $total_tax,
+            0,
             0,
             null,
             ApprovalStatus::PENDING_SUBMISSION
@@ -222,8 +196,7 @@ class CreateInvoiceTransactionProcessor
             'SHIPPING_FEE',
             TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
             $cbm,
-            $price_cbm,
-            $taxPercentage
+            $price_cbm
         );
 
         $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
@@ -233,8 +206,7 @@ class CreateInvoiceTransactionProcessor
                 'OVER_WEIGHT_CHARGES',
                 TransactionDetailType::OVER_WEIGHT_CHARGES,
                 $over_weight_cbm,
-                $price_cbm,
-                $taxPercentage
+                $price_cbm
             );
 
             $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
@@ -245,38 +217,11 @@ class CreateInvoiceTransactionProcessor
                 'MIN_CBM_CHARGES',
                 TransactionDetailType::MIN_CBM_CHARGES,
                 $minimum_charge,
-                $price_cbm,
-                $taxPercentage
+                $price_cbm
             );
 
             $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
         }
-        
-        if (app()->environment('production') && !$hasInvoiceCreated) {
-            $order = $ori_packing_list->owner;
-            $companyModule = $order->companyModule;
-            $company = $companyModule->company;
-            $companyContact = $company->contacts()->first();
-            $employee = $companyModule->employees()->first();
-
-            $invoiceCount = Transaction::where('type', TransactionType::SHIPPING_INVOICE)
-                ->where('receiver', $companyModule->id)
-                ->where('status', ApprovalStatus::APPROVED)
-                ->count();
-
-            $payload = [
-                'name' => $employee->name,
-                'email' => $employee->email,
-                'phone' => $companyContact->phone,
-                'order_reference' => $order->reference,
-                'portal' => 'izyim',
-                'invoice_count' => $invoiceCount,
-            ];
-
-            Log::channel('wac_webhook')->info('Attempt to send wac_webhook - Invoice Created: ' . json_encode($payload));
-            $response = Http::post(config('wagWebhookUrl.invoice_created_url'), $payload);
-            Log::channel('wac_webhook')->info('Invoice Created: ' . json_encode($response));
-        }
 
         return;
     }

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

@@ -1,188 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\Processors;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\Services\CreatesPaymentTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Models\Transaction;
-use App\Models\Wallet;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Illuminate\Support\Facades\Log;
-
-//DATE: 20240616
-//THIS IS A ONE TIME FIX PROCESSOR MEANT TO FIX A GROUP PAYMENT THAT GOT STUCK: https://izyim.cief-malaysia.com/customer/943GCC/payment-and-billing
-//TRNASACTION WITH ID: 16803
-//GROUP WITH ID: 609
-
-class CreatePaymentTransactionOneTimeFixProcessor
-{
-
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesPaymentTransaction */
-    private $createsPaymentTransaction;
-
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
-
-    /** @var CreatesTransactionableTransaction */
-    private $createsTransactionableTransaction;
-
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
-
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus ;
-
-    /**
-     * @param FetchesTransaction $fetchesTransaction,
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-     * @param CreatesPaymentTransaction $createsPaymentTransaction
-     * @param CreatesTransactionDetail $createsTransactionDetail
-     * @param CreatesBillplzBill $createsBillplzBil
-     * @param CreatesTransactionableTransaction $createsTransactionableTransaction
-     * @param UpdatesWalletBalance $updatesWalletBalance
-     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
-     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     */
-    public function __construct(
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-        CreatesPaymentTransaction $createsPaymentTransaction,
-        CreatesBillplzBill $createsBillplzBill,
-        CreatesTransactionableTransaction $createsTransactionableTransaction,
-        UpdatesWalletBalance $updatesWalletBalance,
-        UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor,
-        UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
-        UpdatesTransactionStatus $updatesTransactionStatus
-    )
-    {
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsPaymentTransaction = $createsPaymentTransaction;
-        $this->createsBillplzBill = $createsBillplzBill;
-        $this->createsTransactionableTransaction = $createsTransactionableTransaction;
-        $this->updatesWalletBalance = $updatesWalletBalance;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-    }
-
-    /**
-     * @throws MalformedRequestException
-     */
-    public function execute(Transaction $invoice, $payment_method, $bank_code, $date, $run = true)
-    {
-        $amount             = $invoice->amount;
-        Log::info($invoice->owner);
-        $company_module     = $invoice->owner->owner->companyModule()->first();
-        $approvalStatus     = ApprovalStatus::PENDING_SUBMISSION;
-        $billNumber         = $this->generatesTransactionBillNumber->execute('PYMT-');
-        $payment_reference  = null;
-
-        if ($payment_method == PaymentMethodType::PAYMENT_GATEWAY) {
-
-            // create billplz transaction
-            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
-            $billPlzBill = $this->createsBillplzBill->execute(
-                $company_module->name,
-                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
-                'This payment is for the invoice number . ' . $billNumber,
-                $amount,
-                $billNumber,
-                $bank_code,
-                true
-            );
-
-            $payment_reference = $billPlzBill->id;
-        }
-        else if ($payment_method === PaymentMethodType::WALLET) {
-            /** @var Wallet $wallet */
-            $wallet = $company_module->wallets()->first();
-
-
-            // if((float) number_format(($wallet->amount - $amount),2) < 0){
-            //     throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
-            // }
-
-            $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-
-            $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
-            $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
-            $transaction->created_at = $date;
-            $transaction->updated_at = $date;
-            $transaction->save();
-
-            $payment_reference = $walletPaymentBillNumber;
-
-            $this->updatesWalletBalance->execute($wallet, ($amount * -1));
-
-            if($run)
-            {
-                $packingList = $invoice->owner;
-                $order = $packingList->owner;
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-
-                if(app()->environment('production')){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
-            }
-
-            // later use this variabke to create a approved payment transaction
-            $approvalStatus = ApprovalStatus::APPROVED;
-
-            // update invoice to completed
-            if($run){
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-            }
-        }
-        else {
-            $payment_method = PaymentMethodType::CASH;
-        }
-
-        $object = new TransactionObject(
-            $billNumber,
-            TransactionType::PAYMENT,
-            $company_module->id,
-            1,
-            1,
-            $payment_method,
-            $amount,
-            $amount,
-            1,
-            1,
-            0,
-            0,
-            0,
-            null,
-            $approvalStatus,
-            null,
-            $payment_reference
-        );
-
-        $payment_transaction = $this->createsPaymentTransaction->execute($invoice, $object);
-
-        return $payment_transaction;
-    }
-}

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

@@ -21,7 +21,6 @@ use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
 
 class CreatePaymentTransactionProcessor
 {
@@ -50,9 +49,6 @@ class CreatePaymentTransactionProcessor
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus ;
 
-    /** @var CreditWalletProcessor */
-    private $creditWalletProcessor ;
-
     /**
      * @param FetchesTransaction $fetchesTransaction,
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber,
@@ -64,7 +60,6 @@ class CreatePaymentTransactionProcessor
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreditWalletProcessor $creditWalletProcessor
      */
     public function __construct(
         GeneratesTransactionBillNumber $generatesTransactionBillNumber,
@@ -74,7 +69,6 @@ class CreatePaymentTransactionProcessor
         UpdatesWalletBalance $updatesWalletBalance,
         UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor,
         UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
-        CreditWalletProcessor $creditWalletProcessor,
         UpdatesTransactionStatus $updatesTransactionStatus
     )
     {
@@ -85,7 +79,6 @@ class CreatePaymentTransactionProcessor
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->creditWalletProcessor = $creditWalletProcessor;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
     }
 
@@ -121,7 +114,7 @@ class CreatePaymentTransactionProcessor
             /** @var Wallet $wallet */
             $wallet = $company_module->wallets()->first();
 
-            if((float) number_format(($wallet->amount - $amount),2) < -0.01){
+            if((float) number_format(($wallet->amount - $amount),2) < 0){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 
@@ -181,11 +174,6 @@ class CreatePaymentTransactionProcessor
 
         $payment_transaction = $this->createsPaymentTransaction->execute($invoice, $object);
 
-        // cief coins
-        if ($approvalStatus == ApprovalStatus::APPROVED) {
-            $wallet = $this->creditWalletProcessor->execute($company_module, transactionType::CIEF_COINS_CREDIT, $amount, 'Cief Coins Credit', 3); // TODO-cief-coins: pls confirm the reference
-        }
-
         return $payment_transaction;
     }
 }

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

@@ -9,7 +9,6 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TaxPercentage;
 use App\Models\Order;
 
 class CreateShippingCostTransactionProcessor
@@ -58,8 +57,7 @@ class CreateShippingCostTransactionProcessor
             TransactionType::SHIPPING_COST,
             'Shipping Cost',
             $quantity,
-            $totalShippingCost/$totalCBM,
-            TaxPercentage::SIX_PERCENT
+            $totalShippingCost/$totalCBM
         );
 
         $shippingCostTransaction = $this->createsShippingCostTransaction->execute($order, $transactionObject, $transactionDetailObject);

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

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Processors;
-
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Notifications\InvoiceIssuedEmail;
-use App\Models\Document;
-use App\Models\PackingList;
-use App\Models\Transaction;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
-
-class CreateStorageInvoiceDocTransactionFixProcessor
-{
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-
-    /**
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-
-    /**
-     * @throws MalformedRequestException
-     */
-    public function execute(PackingList $packingList)
-    {
-         /** @var Transaction $invoice_transaction */
-         $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->whereIn('status', [ApprovalStatus::COMPLETED])->first();
-
-         //  $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
-         $view = 'pages.pdfs.shipping_invoice';
-         $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-         Log::info('$dateToCompare 2: '.$dateToCompare);
-         $storageInvoiceTransactionCreatedDate = Carbon::parse($invoice_transaction->created_at);
-         Log::info('$storageInvoiceTransactionCreatedDate 2: '.$storageInvoiceTransactionCreatedDate);
-         if ($storageInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice_transaction->tax > 0) {
-            $view = 'pages.pdfs.shipping_invoice_sst';
-         }
-
-         $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice_transaction]);
-
-         $document_object = new DocumentObject(
-             DocumentType::STORAGE_INVOICE,
-             [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-             '',
-             ApprovalStatus::COMPLETED,
-             'storage_invoice'
-         );
-
-        // $invouce_transaction_document = $invoice_transaction->documents()->where('document_type', DocumentType::STORAGE_INVOICE)->first();
-        // if(!$invouce_transaction_document){
-            /** @var Document $document */
-            $document = $this->createsDocument->execute($invoice_transaction, $document_object);
-
-            $this->createsFiles->execute($document, $document_object);
-            // $user = $packingList->owner->companyModule->employees()->first();
-        //     if(app()->environment(['production'])) {
-        //         $user->notify(new InvoiceIssuedEmail($user, $packingList));
-        //     }
-        // }
-    }
-
-}

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

@@ -16,8 +16,6 @@ use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
 
 class CreateStorageInvoiceDocTransactionProcessor
 {
@@ -55,16 +53,7 @@ class CreateStorageInvoiceDocTransactionProcessor
 
         //  $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
 
-        $view = 'pages.pdfs.shipping_invoice';
-        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-        Log::info('$dateToCompare: '.$dateToCompare);
-        $storageInvoiceTransactionCreatedDate = Carbon::parse($invoice_transaction->created_at);
-        Log::info('$storageInvoiceTransactionCreatedDate: '.$storageInvoiceTransactionCreatedDate);
-        if ($storageInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice_transaction->tax > 0) {
-            $view = 'pages.pdfs.shipping_invoice_sst';
-        }
-
-         $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice_transaction]);
+         $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
 
          $document_object = new DocumentObject(
              DocumentType::STORAGE_INVOICE,

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

@@ -44,33 +44,24 @@ class ReleaseGoodsToCustomerProcessor
     /**
      * @param $packingList
      * @param $invoice
-     * @param $processCompletedInvoices
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute($packingList, $invoice = null, $processCompletedInvoices = false)
+    public function execute($packingList, $invoice = null)
     {
         $result = false;
         $totalInvoicesAmountPaid = 0.00;
         $totalInvoicesAmount = 0.00;
-        if($processCompletedInvoices){
-            //processCompletedInvoices, for manual processing of invoices, e.g. incomplete payment gateway finish with storage invoice
-            $invoiceTransactions = $packingList->transactions()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
-        }
-        else{
-            $invoiceTransactions = $packingList->transactions()->where('status', ApprovalStatus::APPROVED)->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
-        }
+        $invoiceTransactions = $packingList->transactions()->where('status', [ApprovalStatus::APPROVED])->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
 
-        //Part 1: Process each single invoice type and get the total of all invoices (STORAGE + SHIPPING)
+        //Part 1: Process each single invoice type and get the total of all invoices
         foreach($invoiceTransactions as $invoiceTransaction){
+
             $totalInvoiceAmountPaid = $invoiceTransaction->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
             if ($invoice && $invoice->type == $invoiceTransaction->type) {
                 if(($invoice->amount - $totalInvoiceAmountPaid) < 0.01){
-                    Log::channel('storage_invoices')->info('ReleaseGoodsToCustomerProcessor updatesTransactionStatus');
                     $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
-                    //cief todo: remove the following if block
-                    if($invoice->type === TransactionType::STORAGE_INVOICE){
-                        Log::channel('storage_invoices')->info('ReleaseGoodsToCustomerProcessor createStorageInvoiceDocTransactionProcessor');
+                    if($invoice->type == TransactionType::STORAGE_INVOICE){
                         $this->createStorageInvoiceDocTransactionProcessor->execute($packingList);
                     }
                 }

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

@@ -44,8 +44,6 @@ class CreatesShippingCostTransaction extends AbstractUpdateRelationshipRecord
         $model->quantity = $transactionDetailObject->getQuantity();
         $model->price = $transactionDetailObject->getPrice();
         $model->amount = $transactionDetailObject->getAmount();
-        $model->tax_amount = $transactionDetailObject->getTaxAmount();
-        $model->tax_percentage = $transactionDetailObject->getTaxPercentage();
 
         return $this->handler($transaction->transactionDetails(), $model);
 

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

@@ -5,10 +5,8 @@ namespace App\Classes\Modules\Transactions\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\PackingList;
 use App\Models\Transaction;
-use Carbon\Carbon;
 
 class CreatesTransaction extends AbstractUpdateRelationshipRecord
 {
@@ -37,4 +35,4 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
 
         return $this->handler($packing_list->transactions(), $model);
     }
-}
+}

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

@@ -23,10 +23,8 @@ class CreatesTransactionDetail extends AbstractUpdateRelationshipRecord
         $model->quantity = $object->getQuantity();
         $model->price = $object->getPrice();
         $model->amount = $object->getAmount();
-        $model->tax_amount = $object->getTaxAmount();
-        $model->tax_percentage = $object->getTaxPercentage();
 
         return $this->handler($transaction->transactionDetails(), $model);
 
     }
-}
+}

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

@@ -20,10 +20,8 @@ class UpdatesTransactionDetail extends AbstractUpdateRecord
         $transactionDetail->quantity = $object->getQuantity();
         $transactionDetail->price = $object->getPrice();
         $transactionDetail->amount = $object->getAmount();
-        $transactionDetail->tax_amount = $object->getTaxAmount();
-        $transactionDetail->tax_percentage = $object->getTaxPercentage();
 
         return $this->handler($transactionDetail);
 
     }
-}
+}

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

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\Transaction;
-
-class UpdatesTransactionIsWaived extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Transaction $model
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Transaction $model)
-    {
-        $model->is_waived = 1;
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Transactions/Standards/Rules/CanRegenerateStorageInvoice.php

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

app/Classes/Modules/Transactions/Standards/Rules/CanWaiveTransaction.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
-use App\Classes\Modules\Transactions\Standards\Validators\WaiveTransactionValidation;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-
-class CanWaiveTransaction extends AbstractRule
-{
-
-    /** @var WaiveTransactionValidation */
-    private $waiveTransactionValidation;
-
-
-    public function __construct(WaiveTransactionValidation $waiveTransactionValidation)
-    {
-        $this->waiveTransactionValidation = $waiveTransactionValidation;
-    }
-
-      /**
-     * @return bool
-     */
-    protected function authorized($object): bool
-    {
-        $user = Auth()->user();
-        if($user){
-            $roleToCheck = Auth()->user()->type;
-            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param WaiveTransactionObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->waiveTransactionValidation->validate($object);
-    }
-
-    /**
-     * @param $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Transactions/Standards/Validators/WaiveTransactionValidation.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Standards\Validators;
-
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-
-class WaiveTransactionValidation extends AbstractValidation
-{
-
-    /**
-     * @param WaiveTransactionObject $object
-     * @return array
-     */
-    protected function data($object): array {
-        return [
-            'id' => $object->getId(),
-            'billNo' => $object->getBillNo(),
-            'type' => $object->getType(),
-            'status' => $object->getStatus(),
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array {
-        return [
-            'id' => 'required',
-            'type' => ['required', 'numeric', 'in:'.TransactionType::STORAGE_INVOICE], //Only storage invoice (type 16) can be waived
-            'status' => ['required', 'numeric', 'in:'.ApprovalStatus::APPROVED], //Approve storage invoice only, paid invoice stricly forbidden
-            // 'billNo' => 'required',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array {
-        return [];
-    }
-
-}