code update

api and web response time log
api response time logging
2026-08-19 12:34:18 +00:00 · 2023-12-31 12:58:22 +08:00 · 2023-12-28 23:04:16 +08:00 · 2023-12-28 22:50:19 +08:00 · 2023-12-20 18:19:08 +00:00 · 2023-12-21 02:17:04 +08:00
55 changed files with 2073 additions and 96 deletions
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OrderByIdDesc implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->orderBy('id', 'desc');
+    }
+
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OrderByUpdatedAtDesc implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->orderBy('updated_at', 'desc');
+    }
+
+}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithTrashed implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->withTrashed();
+    }
+}
@@ -18,11 +18,13 @@ use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;

 class CallbackBillplzLogic
 {
@@ -50,6 +52,9 @@ class CallbackBillplzLogic
    /** @var CallbackBillplzProcessor */
    private $callbackBillplzProcessor;

+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
    /**
     * CallbackBillplzLogic constructor.
     * @param GetBillplzBill $getBillplzBill
@@ -59,8 +64,9 @@ class CallbackBillplzLogic
     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
     * @param CallbackBillplzProcessor $callbackBillplzProcessor
+     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
     */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
    {
        $this->getBillplzBill = $getBillplzBill;
        $this->fetchesTransaction = $fetchesTransaction;
@@ -70,6 +76,7 @@ class CallbackBillplzLogic
        $this->updatesWalletBalance = $updatesWalletBalance;
        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
    }


@@ -109,10 +116,13 @@ class CallbackBillplzLogic
            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
        }

+        Log::info('Debug billPlz status: '.$status);
+
        $token = Auth::fromUser(User::find(1));
        $request->headers->set('Authorization', 'Bearer '.$token);

-        $this->callbackBillplzProcessor->execute($transaction, $status);
+        $this->storageInvoiceBackDoorPreventionCheck($transaction, $status);
+        $result = $this->callbackBillplzProcessor->execute($transaction, $status);

        $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;

@@ -123,6 +133,22 @@ class CallbackBillplzLogic
            $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
        }

-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status, 'result' => $result]);
+    }
+
+    private function storageInvoiceBackDoorPreventionCheck($transaction, $status){
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    $pL = $invoice->owner;
+                    $order = $pL->owner;
+                    if($order){
+                        $this->storageInvoiceTransactionProcessor->executeOrder($order, false); //original was set true here so that no group is soft deleted or billplz bill got deleted
+                    }
+                }
+            }
+        }
    }
 }
@@ -6,13 +6,14 @@ use Illuminate\Http\Request;
 use App\Models\Wallet;
 use App\Models\Group;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
 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;

 class CallbackBillplzProcessor
 {
@@ -31,6 +32,9 @@ class CallbackBillplzProcessor
    /** @var CreatePaymentTransactionProcessor */
    private $createPaymentTransactionProcessor;

+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
    /**
     * CreateUserProcessor constructor.
     * @param UpdatesTransactionStatus $updatesTransactionStatus
@@ -38,14 +42,16 @@ class CallbackBillplzProcessor
     * @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)
+    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;
    }


@@ -58,6 +64,9 @@ class CallbackBillplzProcessor
        $invoice = $transaction->owner;
        $packingList = $invoice->owner;

+        $proceed = $this->checkForGroupPayment($transaction);
+        if(!$proceed) return false;
+
        $this->updatesTransactionStatus->execute($transaction, $status);

        // check if is wallet top up
@@ -66,33 +75,54 @@ class CallbackBillplzProcessor
            $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;
-                    $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+
+                    $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                    if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                        $pL = $invoice->owner;
+                        $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                    }
                }
-    
+
                $group->status = $status;
                $group->save();
            }
        }

        if (!$transaction->owner instanceof Wallet) {
-            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
+        }

-            if (($invoice->amount - $totalPaidAmount) < 0.01) {
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+        return true;
+    }

-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
+    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;

-                if (app()->environment('production')) {
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $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;
    }
 }
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class DeletesBillplzBill
+{
+
+    /**
+     * @param string $billID
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billID) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->delete(config('billplz.base_url').'/api/v3/bills/'.$billID);
+            Log::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
+
+            if($response->successful()){
+                $data = $response->json();
+
+                // $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server: ' . $exception->getMessage());
+        }
+    }
+}
@@ -74,7 +74,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
            $approvalStatus = ApprovalStatus::APPROVED;
        }

-        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('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->whereBetween('updated_at', [
@@ -102,7 +103,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
        $container = $transaction->owner->containers()->first();
        $order = $transaction->owner->owner;
        $company = $order->companyModule->company;
-        $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        if($transaction->type === TransactionType::STORAGE_INVOICE){
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'STORAGE_FEE')->first();
+        }
+        else{
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        }
        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
        $contact = $order->companyModule->company->contacts->first();
        $userName = $order->companyModule->employees()->first();
@@ -118,6 +124,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
            elseif($item->reference === 'MIN_CBM_CHARGES')
                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            elseif($item->reference === 'STORAGE_FEE')
+                $furtherDescription .= str_replace('<br>', ' | ', $item->name).' '."\n";
            else
                $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
        }
@@ -53,8 +53,12 @@ class FetchOrderV2Logic extends AbstractControllerLogic

        $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);

+        if($request->input('storages')){
+            $query->storages = $request->input('storages'); //from middleware
+        }
+
        return $this->resourceResponse(new OrderV2Resource($query));

    }

-}
+}
@@ -38,6 +38,7 @@ class UpdateDoFromYDPortalProcessor
     */
    public function execute(PackingList $packingList) {
        Log::info('Trying to Call UpdateDoFromYDPortalProcessor');
+        Log::channel('storage_invoices')->info('UpdateDoFromYDPortalProcessor: '.json_encode($packingList));

        if(!app()->environment(['production'])){
            return;
@@ -121,7 +121,7 @@ class FetchContainersFromYdPortalProcessor
                    $containerReference = explode('预计到港时间', $tracking[1])[0];
                    $loadingDate = Carbon::parse($trackingRow->trackingtime);
                    $etd = Carbon::parse($tracking[2])->subDays(5);
-                    $eta = Carbon::parse($tracking[2])->addDays(2);
+                     $eta = Carbon::parse($tracking[2]);
                }
            }

@@ -147,7 +147,6 @@ class FetchContainersUpdatesFromYdPortalProcessor

            if($delayDate){

-                $delayDate = $delayDate->addDays(2);
                $transport = $container->transports()->first();

                if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
@@ -162,7 +162,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                    $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                }

-                $eta = Carbon::parse($containerInfo[4])->addDays(2);
+                $eta = Carbon::parse($containerInfo[4]);
                $etd = Carbon::parse($eta)->subDays(7);

                $delayDate = $containerInfo[7];
@@ -183,7 +183,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                }

                if($delayDate){
-                    $delayDate = Carbon::parse($delayDate)->addDays(2);
+                    $delayDate = Carbon::parse($delayDate);
                    $transport = $container->transports()->first();

                    if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
@@ -199,7 +199,7 @@ class FetchOrderListsFromYdPortalProcessor
                                $containerReference = explode('预计到港时间', $tracking[1])[0];
                                $loadingDate = Carbon::parse($trackingRow->trackingtime);
                                $etd = Carbon::parse($tracking[2])->subDays(5);
-                                $eta = Carbon::parse($tracking[2])->addDays(2);
+                                $eta = Carbon::parse($tracking[2]);
                            }

                            $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
@@ -415,7 +415,7 @@ class FetchOrderListsFromYdPortalProcessor
                        }

                        if($delayDate){
-                            $delayDate = $delayDate->addDays(2);
+                            $delayDate = $delayDate;
                            $transport = $container->transports()->first();

                            if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
@@ -21,6 +21,8 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\GroupTransaction;
 use App\Http\Resources\WalletTransactionResource;
 use App\Models\Wallet;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+

 class CreateGroupsLogic extends AbstractControllerLogic
 {
@@ -55,13 +57,18 @@ class CreateGroupsLogic extends AbstractControllerLogic
    /** @var CreatesGroup */
    private $createsGroup;

+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+
    public function __construct(
-        FetchesTransaction $fetchesTransaction, 
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        FetchesTransaction $fetchesTransaction,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
        FetchesCompanyModule $fetchesCompanyModule,
        CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor,
        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
-        CreatesGroup $createsGroup
+        CreatesGroup $createsGroup,
+        ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
    )
    {
        $this->fetchesTransaction = $fetchesTransaction;
@@ -70,6 +77,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
        $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
        $this->createsGroup = $createsGroup;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
    }

    public function logic(Request $request) : JsonResponse
@@ -146,7 +154,12 @@ class CreateGroupsLogic extends AbstractControllerLogic

        foreach ($invoices as $invoice) {
            if ($payment_method == PaymentMethodType::WALLET) {
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'));
+                $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'), false);
+
+                if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                    $pL = $invoice->owner;
+                    $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                }
            }

            $issuer                 = $invoice->issuer;
@@ -10,6 +10,8 @@ use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;

 class CreatePaymentTransactionLogic extends AbstractControllerLogic
 {
@@ -30,13 +32,18 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
    /** @var CreatePaymentTransactionProcessor */
    private $createPaymentTransactionProcessor;

+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
    public function __construct(
        FetchesTransaction $fetchesTransaction,
-        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
+        ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
    )
    {
        $this->fetchesTransaction = $fetchesTransaction;
        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
    }

    public function logic(Request $request) : JsonResponse
@@ -45,7 +52,12 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic

        $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);

-        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'));
+        $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);
+        }

        //cief todo: at exchange there is a transition step - starts
        // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
@@ -63,4 +75,7 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic

        return $this->resourceResponse(new TransactionResource($payment_transaction));
    }
+
+
+
 }
@@ -5,10 +5,11 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;

 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\BookingResource;
 use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+

 class ListTransactionsLogic extends AbstractControllerLogic
 {
@@ -38,13 +39,18 @@ class ListTransactionsLogic extends AbstractControllerLogic

    public function logic(Request $request) : JsonResponse
    {
-
        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));

+        if($request->input('storages')){
+            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(TransactionResource::collection($query));
-
    }
-
-
-
 }
@@ -17,6 +17,8 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\Jobs\CreatePerfexCRMInvoice;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Models\Order;

 class ApproveShippingInvoiceTransactionProcessor
 {
@@ -30,17 +32,21 @@ class ApproveShippingInvoiceTransactionProcessor
    /** @var CreatesFiles */
    private $createsFiles;

+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+

    /**
     * @param UpdatesTransactionStatus $updatesTransactionStatus
     * @param CreatesDocument $createsDocument
     * @param CreatesFiles $createsFiles
     */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
    {
        $this->updatesTransactionStatus = $updatesTransactionStatus;
        $this->createsDocument = $createsDocument;
        $this->createsFiles = $createsFiles;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
    }


@@ -50,7 +56,6 @@ class ApproveShippingInvoiceTransactionProcessor
     */
    public function execute(PackingList $packingList)
    {
-
        /** @var Transaction $invoice_transaction */
        $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();

@@ -75,6 +80,11 @@ class ApproveShippingInvoiceTransactionProcessor
            $user->notify(new InvoiceIssuedEmail($user, $packingList));
        }

+        $order = $packingList->owner()->first();
+        if($order instanceof Order){
+            $this->storageInvoiceTransactionProcessor->executeOrder($order);
+        }
+
        return;
    }

@@ -0,0 +1,360 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Services\DeletesGroup;
+use App\Classes\Modules\Billplzs\Services\DeletesBillplzBill;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
+
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+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\TransactionDetailType;
+use App\Http\Resources\TransactionResource;
+use App\Models\Order;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+
+
+class CheckStorageInvoiceTransactionProcessor
+{
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
+
+    /** @var UpdatesTransaction */
+    private $updatesTransaction;
+
+    /** @var UpdatesTransactionDetail */
+    private $updatesTransactionDetail;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var DeletesGroup */
+    private $deletesGroup;
+
+    /** @var DeletesBillplzBill */
+    private $deletesBillplzBill;
+
+    /**
+     * @param FetchesOrder $fetchesOrder
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param FetchesTransaction $fetchesTransaction
+     * @param CreatesTransaction $createsTransaction
+     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param UpdatesTransaction $updatesTransaction
+     * @param UpdatesTransactionDetail $updatesTransactionDetail
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param DeletesGroup $deletesGroup
+     * @param DeletesBillplzBill $deletesBillplzBill
+     */
+    public function __construct(FetchesOrder $fetchesOrder, GeneratesTransactionBillNumber $generatesTransactionBillNumber, FetchesTransaction $fetchesTransaction, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail, UpdatesTransaction $updatesTransaction, UpdatesTransactionDetail $updatesTransactionDetail, UpdatesTransactionStatus $updatesTransactionStatus, DeletesGroup $deletesGroup, DeletesBillplzBill $deletesBillplzBill)
+    {
+        $this->fetchesOrder = $fetchesOrder;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->createsTransaction = $createsTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->updatesTransaction = $updatesTransaction;
+        $this->updatesTransactionDetail = $updatesTransactionDetail;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->deletesGroup = $deletesGroup;
+        $this->deletesBillplzBill = $deletesBillplzBill;
+    }
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function execute(int $orderReference)
+    {
+        $order = $this->fetchesOrder->execute(['reference' => $orderReference, 'with_packing_lists' => true]);
+        return $this->executeOrder($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;
+        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();
+
+                    /** @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;
+    }
+
+    private function getArrivalDateAtChinaWarehoue($packingList){
+        if($packingList->type === PackingListType::SHIPPING_PACKING_LIST){
+            $receive_packing_list = PackingList::where('reference', $packingList->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first();
+            Log::channel('storage_invoices')->info('receive_packing_list: '.json_encode($receive_packing_list->transports));
+            $transport = $receive_packing_list->transports->first();
+            if ($transport) {
+                $arrivalDateAtChinaWarehouse = Carbon::parse($transport->drop_date);
+                $dateToCompare = Carbon::parse(env('STORAGE_FEE_LAUNCH_DATE', '2023-12-11 00:00:00'));
+                // dd($dateToCompare);
+                if ($arrivalDateAtChinaWarehouse->isAfter($dateToCompare)) {
+                    Log::channel('storage_invoices')->info('transport: '.json_encode($transport));
+                    Log::channel('storage_invoices')->info('dateToCompare: '.$dateToCompare.', arrivalDateAtChinaWarehouse: '.$arrivalDateAtChinaWarehouse);
+                    return $arrivalDateAtChinaWarehouse;
+                }
+            }
+        }
+        return null;
+    }
+
+    private function getEtaFromPackingList($packingList){
+        if ($packingList) {
+            $package = $packingList->packages->first();
+            if ($package) {
+                $container = $package->container()->first();
+                if ($container) {
+                    $transport = $container->transports->first();
+                    if ($transport) {
+                        $schedule = $transport->schedules->last();
+                        if ($schedule) {
+                            return $schedule->eta;
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta, $isBackDoorCheck){
+        $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;
+        $storageInvoice = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->first();
+        $storageInvoiceId = 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;
+        }
+
+        $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
+        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-');
+            $storageInvoice = $this->createStorageInvoiceTransaction($destinationWarehousePackage, $billNumber, $company_module_id, $price_cbm);
+            $storageInvoiceId = $storageInvoice->id;
+            $this->createStorageInvoiceTransactionDetails($storageInvoice, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
+        }
+        else if($storageInvoice){
+
+            //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: '.$resultCurrentDate);
+                $intervalRecalculate = Carbon::parse($dateStorageInvoicePaid)->diff($dt1);
+                $resultNumberOfDaysExceeded = $intervalRecalculate->days - $resultNumberOfDaysFree;
+                $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
+            }
+
+            $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));
+
+            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);
+                    }
+                    else{
+                        $this->updatePaymentTransactionViaGroupPayment($storageInvoice);
+                    }
+                }
+
+                $storageInvoice = $this->updateStorageInvoiceTransaction($storageInvoice, $price_cbm);
+                $invoiceTransactionDetails = $storageInvoice->transactionDetails()->first();
+                $this->updateStorageInvoiceTransactionDetails($invoiceTransactionDetails, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
+            }
+
+            $storageInvoiceId = $storageInvoice->id;
+        }
+
+        if($storageInvoiceId !== 0){
+            $result = [
+                'parentInvoiceId' => $transaction->id,
+                'storageInvoiceId' => $storageInvoiceId,
+                'numberOfDaysExceeded' => $resultNumberOfDaysExceeded,
+                'numberOfDaysFree' => $resultNumberOfDaysFree,
+                'startDate' => $resultStartDate,
+                'currentDate' => $resultCurrentDate,
+                'cbm' => $cbm,
+                'pricePerCBM' => $pricePerCBM,
+                'storageInvoice' => new TransactionResource($storageInvoice)
+            ];
+            return $result;
+        }
+
+    }
+
+    private function updatePaymentTransactionViaGroupPayment($storageInvoice){
+        Log::channel('storage_invoices')->info('updatePaymentTransactionViaGroupPayment');
+        $groups = $storageInvoice->groups()->get();
+        foreach ($groups as $grp){
+            $groupReference = $grp->reference;
+            $walletTransaction = $this->fetchesTransaction->execute(['payment_reference' => $groupReference]);
+            if($walletTransaction->status === ApprovalStatus::PENDING_SUBMISSION || $walletTransaction->status === ApprovalStatus::PENDING_VERIFICATION){
+                $grp->status = ApprovalStatus::EXPIRED;
+                $grp->save();
+                $this->deletesGroup->execute($grp);
+                $this->updatesTransactionStatus->execute($walletTransaction, ApprovalStatus::EXPIRED);
+                if($walletTransaction->payment_reference){
+                    $deletedBillplzBill = $this->deletesBillplzBill->execute($walletTransaction->payment_reference);
+                    Log::channel('storage_invoices')->info('deletedBillplzBill TransactionType::WALLET: '.json_encode($deletedBillplzBill));
+                }
+            }
+        }
+    }
+
+    private function updatePaymentTransactionViaNonGroupPayment($paymentTransactions){
+        Log::channel('storage_invoices')->info('updatePaymentTransactionViaNonGroupPayment');
+        foreach ($paymentTransactions as $paymentTransaction){
+            $this->updatesTransactionStatus->execute($paymentTransaction, ApprovalStatus::EXPIRED);
+            if($paymentTransaction->payment_reference){
+                $deletedBillplzBill = $this->deletesBillplzBill->execute($paymentTransaction->payment_reference);
+                Log::channel('storage_invoices')->info('deletedBillplzBill TransactionType::WALLET: '.json_encode($deletedBillplzBill));
+            }
+        }
+    }
+
+    private function updateStorageInvoiceTransaction(Transaction $transaction, float $totalAmount){
+
+        $object = new TransactionObject(
+            $transaction->bill_no,
+            TransactionType::STORAGE_INVOICE,
+            1,
+            $transaction->receiver,
+            1,
+            PaymentMethodType::CASH,
+            $totalAmount,
+            $totalAmount,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::APPROVED
+        );
+
+        /** @var Transaction $invoice_transaction */
+        $invoice_transaction = $this->updatesTransaction->execute($transaction, $object);
+
+        return $invoice_transaction;
+    }
+
+    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
+        );
+
+        $this->updatesTransactionDetail->execute($invoice_transaction_details, $object_detail);
+    }
+
+    private function createStorageInvoiceTransaction(PackingList $packing_list, string $billNumber, int $companyModuleId, float $totalAmount){
+
+        $object = new TransactionObject(
+            $billNumber,
+            TransactionType::STORAGE_INVOICE,
+            1,
+            $companyModuleId,
+            1,
+            PaymentMethodType::CASH,
+            $totalAmount,
+            $totalAmount,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::APPROVED
+        );
+
+        /** @var Transaction $invoice_transaction */
+        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
+
+        return $invoice_transaction;
+    }
+
+    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
+        );
+
+        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+    }
+}
@@ -85,7 +85,7 @@ class CreatePaymentTransactionProcessor
    /**
     * @throws MalformedRequestException
     */
-    public function execute(Transaction $invoice, $payment_method, $bank_code)
+    public function execute(Transaction $invoice, $payment_method, $bank_code, $run = true)
    {
        $amount             = $invoice->amount;
        Log::info($invoice->owner);
@@ -127,22 +127,26 @@ class CreatePaymentTransactionProcessor

            $this->updatesWalletBalance->execute($wallet, ($amount * -1));

-            $packingList = $invoice->owner;
-            $order = $packingList->owner;
-            $packingList->status = ApprovalStatus::APPROVED;
-            $packingList->save();
+            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);
+                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
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
+            if($run){
+                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+            }
        }
        else {
            $payment_method = PaymentMethodType::CASH;
@@ -0,0 +1,79 @@
+<?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;
+
+class CreateStorageInvoiceDocTransactionProcessor
+{
+
+    /** @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);
+
+         $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['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));
+            }
+        }
+    }
+
+}
@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use Illuminate\Http\Request;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use Illuminate\Support\Facades\Log;
+
+class ReleaseGoodsToCustomerProcessor
+{
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor;
+
+    /** @var CreateStorageInvoiceDocTransactionProcessor */
+    private $createStorageInvoiceDocTransactionProcessor;
+
+    /**
+     * ReleaseGoodsToCustomerProcessor constructor.
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreateStorageInvoiceDocTransactionProcessor $createStorageInvoiceDocTransactionProcessor
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, CreateStorageInvoiceDocTransactionProcessor $createStorageInvoiceDocTransactionProcessor)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->createStorageInvoiceDocTransactionProcessor = $createStorageInvoiceDocTransactionProcessor;
+    }
+
+
+    /**
+     * @param $packingList
+     * @param $invoice
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute($packingList, $invoice = null)
+    {
+        $result = false;
+        $totalInvoicesAmountPaid = 0.00;
+        $totalInvoicesAmount = 0.00;
+        $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
+        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){
+                    $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+                    if($invoice->type == TransactionType::STORAGE_INVOICE){
+                        $this->createStorageInvoiceDocTransactionProcessor->execute($packingList);
+                    }
+                }
+            }
+
+            $totalInvoicesAmount = $totalInvoicesAmount + $invoiceTransaction->amount;
+            $totalInvoicesAmountPaid = $totalInvoicesAmountPaid + $totalInvoiceAmountPaid;
+        }
+
+        Log::channel('storage_invoices')->info('Total invoice amount paid 1: '.$totalInvoicesAmount); //cief todo: to be removed
+        Log::channel('storage_invoices')->info('Total invoice amount paid 2: '.$totalInvoicesAmountPaid); //cief todo: to be removed
+
+        //Part 2: Based on the collected info for all the total of all invoices
+        if (($totalInvoicesAmount - $totalInvoicesAmountPaid) < 0.01 && $totalInvoicesAmountPaid > 0.01) {
+            Log::channel('storage_invoices')->info('Total invoice amount paid 3: '.$totalInvoicesAmountPaid); //cief todo: to be removed
+
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
+
+            if (app()->environment('production')) {
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            }
+
+            $result = true;
+        }
+
+        return $result;
+    }
+}
@@ -24,5 +24,6 @@ final class DocumentType {


    public const SHIPPING_INVOICE = 'SHIPPING_INVOICE';
+    public const STORAGE_INVOICE = 'STORAGE_INVOICE';

 }
@@ -11,4 +11,6 @@ final class TransactionDetailType {
    public const MIN_CBM_CHARGES = 'Minimum Charge for 0.3 CBM Per Container';

    public const CUSTOM_CHARGES = 'Custom charges';
+
+    public const STORAGE_FEE = 'Malaysia Warehouse Storage Fee';
 }
@@ -5,9 +5,9 @@ namespace App\Classes\ValueObjects\Constants;
 final class TransactionType {

    // public const PAYMENT_ATTEMPT = 0;
-    
+
    public const SHIPPING_INVOICE = 1;
-    
+
    public const PAYMENT = 2;

    // public const BILL = 3;
@@ -35,10 +35,11 @@ final class TransactionType {
    // public const SHIPPING_COST = 14;

    public const GROUP_PAYMENT = 15;
-    
+
    public const TRANSACTION_TYPE_ID = [
        self::SHIPPING_INVOICE   => "Shipping Invoice",
        self::PAYMENT            => "Payment",
    ];

+    public const STORAGE_INVOICE = 16;
 }
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\Modules\Transactions\Services\ListsGroups;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Models\Order;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class CheckStorageInvoicesGroupTransactions extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'check-storage-invoices-group-transactions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all storage invoices due to make sure that they are up to date daily, prevent \'back door\' cases';
+
+    /** @var ListsGroups */
+    private $listsGroups;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(ListsGroups $listsGroups, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    {
+        parent::__construct();
+        $this->listsGroups = $listsGroups;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->info(Carbon::now() . ': Start Check all pending group payment with storage invoice is valid.');
+        $start   = new Carbon();
+
+
+        $newfilters['order_by_updated_at_desc'] = true;
+        $newfilters['status_in'] = [0, 1];
+        $groups = $this->listsGroups->execute($newfilters);
+
+        foreach ($groups as $group){
+            $this->info('CheckForStorageInvoiceByTransactions group: '.json_encode($group));
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $packingList = $invoice->owner()->first();
+                if($packingList){
+                    $order = $packingList->owner()->first();
+                    if($order instanceof Order){
+                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                    }
+                }
+            }
+        }
+
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ': Done Check all pending group payment with storage invoice is valid. ElapsedTime: ' . $elapsedTime . '.');
+    }
+}
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\Modules\Orders\Services\ListsOrders;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Models\Order;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class CheckStorageInvoicesOrders extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'check-storage-invoices-orders';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all storage invoices due to make sure that they are up to date daily, prevent \'back door\' cases';
+
+    /** @var ListsOrders */
+    private $listsOrders;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(ListsOrders $listsOrders, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    {
+        parent::__construct();
+        $this->listsOrders = $listsOrders;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->info(Carbon::now() . ': Start Check all orders for storage invoice.');
+        $start   = new Carbon();
+
+        $orders = $this->listsOrders->execute(['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]);
+
+        $count = 0;
+        foreach ($orders as $order){
+            try{
+                $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                $count =  $count + 1;
+                $this->info('Order '.$count);
+            }
+            catch(\Exception $ex){
+                $this->info('Exception '.$ex->getMessage());
+                break;
+            }
+        }
+
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ': Done Check all orders for storage invoice. ElapsedTime: ' . $elapsedTime . '.');
+    }
+}
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\Modules\Transactions\Services\FetchesGroup;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class FixGroupPaymentProblem extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-group-payment-problem';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is a one time data patch for a problem result from Storage Invoice Implementation';
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(FetchesGroup $fetchesGroup, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
+    {
+        parent::__construct();
+        $this->fetchesGroup = $fetchesGroup;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
+    }
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->info(Carbon::now() . ': Start data patch.');
+        $start   = new Carbon();
+
+        $group = $this->fetchesGroup->execute(['id' => 325]);
+
+        $this->info('FixGroupPaymentProblem group: '.json_encode($group));
+        if ($group) {
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $this->info('FixGroupPaymentProblem group: '.json_encode($invoice));
+                //$paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+
+                //if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                    $pL = $invoice->owner;
+                    $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                //}
+            }
+            // $group->status = $status;
+            // $group->save();
+        }
+
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ': Done data patch. ElapsedTime: ' . $elapsedTime . '.');
+    }
+}
@@ -62,6 +62,11 @@ class Kernel extends ConsoleKernel
            ->hourly()
            ->withoutOverlapping()
            ->appendOutputTo (storage_path().'/logs/fix_failed_callback_from_billplz.log');
+
+        $schedule->command('check-storage-invoices-group-transactions')
+            ->dailyAt('0:01')
+            ->withoutOverlapping()
+            ->appendOutputTo(storage_path().'/logs/check_storage_invoices.log');
    }

    /**
@@ -38,11 +38,13 @@ class Kernel extends HttpKernel
            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
            \App\Http\Middleware\VerifyCsrfToken::class,
            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\WebResponseTimeLog::class,
        ],

        'api' => [
            'throttle:300,1',
            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\ApiResponseTimeLog::class,
        ],

        'apipub' => [
@@ -70,5 +72,8 @@ class Kernel extends HttpKernel
        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
        'valid.token' => ValidateToken::class,
        'token.check' => \App\Http\Middleware\TokenCheckerMiddleware::class,
+        'storage.invoice.check.byorder' => \App\Http\Middleware\CheckForStorageInvoiceByOrderId::class,
+        'storage.invoice.check.bytransactions' => \App\Http\Middleware\CheckForStorageInvoiceByTransactions::class,
+        'storage.invoice.check.bygroup' => \App\Http\Middleware\CheckForStorageInvoiceByGroup::class,
    ];
 }
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class ApiResponseTimeLog
+{
+	public function handle(Request $request, Closure $next)
+	{
+		// Get route information
+		$route = $request->route();
+		$routeName = $route ? $route->getName() : 'undefined';
+		$uri = $request->getPathInfo();
+
+		$startTime = microtime(true); // Start time
+
+		$response = $next($request); // Handle the request
+
+		$endTime = microtime(true); // End time
+		$responseTime = $endTime - $startTime; // Calculate the response time
+
+		Log::channel('apiResponseTimeLog')->info("\nRequest to route: {$uri} \nRoute name: {$routeName} \nTime Taken: " . number_format($responseTime * 1000, 2) . "ms\n");
+
+		return $response;
+	}
+}
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\ListsGroups;
+use App\Models\Order;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class CheckForStorageInvoiceByGroup
+{
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+    /** @var ListsGroups */
+    private $listsGroups;
+
+
+    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor, ListsGroups $listsGroups)
+    {
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+        $this->listsGroups = $listsGroups;
+    }
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        // :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [0, 1], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"
+        $filters = json_decode($request->input('filters'), true);
+        if(json_encode($filters['order_by']) == '{"column":"updated_at","DESC":true}'){
+            $filters['order_by_updated_at_desc'] = true;
+        }
+        unset($filters['order_by']);
+        $groups = $this->listsGroups->execute($filters);
+
+
+        if(isset($filters['check_for_storage_invoice'])){
+            foreach ($groups as $group){
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    $packingList = $invoice->owner()->first();
+                    if($packingList){
+                        $order = $packingList->owner()->first();
+                        if($order instanceof Order){
+                            $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                        }
+                    }
+                }
+            }
+        }
+
+        return $next($request);
+    }
+}
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use Illuminate\Http\Request;
+
+class CheckForStorageInvoiceByOrderId
+{
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
+    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    {
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $orderId = $request->route('id');
+        $storages = $this->storageInvoiceTransactionProcessor->execute($orderId);
+        $request->merge(['storages' => $storages]);
+        return $next($request);
+    }
+}
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Transactions\Services\ListsGroups;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\CompanyConnection;
+use App\Models\Order;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class CheckForStorageInvoiceByTransactions
+{
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /** @var ListsGroups */
+    private $listsGroups;
+
+
+    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor, ListsTransactions $listsTransactions, ListsGroups $listsGroups)
+    {
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+        $this->listsTransactions = $listsTransactions;
+        $this->listsGroups = $listsGroups;
+    }
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $results = [];
+        $transactions = null;
+        $marking = $request->route('marking');
+        if($marking){ //for web route /customer/{marking}/payment-and-billing
+            $connection = CompanyConnection::where('invitee_reference', $marking)->first();
+            $company_module_id = $connection->invitee->id;
+            $filters = [
+                'per_page' => 999,
+                'status_in' => [2],
+                'receiver' =>  $company_module_id,
+                'type_in' => [TransactionType::SHIPPING_INVOICE]
+            ];
+            $transactions = $this->listsTransactions->execute($filters);
+        }
+        else{ //for api route /transactions/list
+            $filters = json_decode($request->input('filters'), true);
+            $filters['type_in'] = [TransactionType::SHIPPING_INVOICE];
+            if(json_encode($filters['order_by']) == '{"column":"id","DESC":true}'){
+                $filters['order_by_id_desc'] = true;
+            }
+            unset($filters['order_by']);
+            $transactions = $this->listsTransactions->execute($filters);
+        }
+
+
+        if(isset($filters['check_for_storage_invoice'])){
+            foreach($transactions as $transaction){
+                $packingList = $transaction->owner()->first();
+                if($packingList){
+                    $order = $packingList->owner()->first();
+                    if($order instanceof Order){
+                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                        if($storages){
+                            $results = array_merge($results, $storages);
+                        }
+                    }
+                }
+            }
+        }
+
+        $filteredResults = array_values(array_filter($results, function($item, $key) {
+            static $seen = array();
+            $hash = md5($item['parentInvoiceId'] . $item['storageInvoiceId']);
+            return !isset($seen[$hash]) && ($seen[$hash] = true);
+        }, ARRAY_FILTER_USE_BOTH));
+
+
+        $request->merge(['storages' => $filteredResults]);
+
+        return $next($request);
+    }
+}
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class WebResponseTimeLog
+{
+	public function handle(Request $request, Closure $next)
+	{
+		// Get route information
+		$route = $request->route();
+		$routeName = $route ? $route->getName() : 'undefined';
+		$uri = $request->getPathInfo();
+
+		$startTime = microtime(true); // Start time
+
+		$response = $next($request); // Handle the request
+
+		$endTime = microtime(true); // End time
+		$responseTime = $endTime - $startTime; // Calculate the response time
+
+		Log::channel('webResponseTimeLog')->info("\nRequest to route: {$uri} \nRoute name: {$routeName} \nTime Taken: " . number_format($responseTime * 1000, 2) . "ms\n");
+
+		return $response;
+	}
+}
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class GroupForOrderV2Resource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'original_amount' => (float) $this->original_amount,
+            'original_currency' => new CurrencyResource($this->original_currency),
+            'issuer_name' => $this->issuerCompany->name,
+            'issuer_id' => $this->issuerCompany->id,
+            'amount' => (float) $this->amount,
+            'service_charge' => (float) $this->amount,
+            'currency' => new CurrencyResource($this->currency),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
+            'currency_rate' => (float) $this->currency_rate,
+            'status' => $this->status,
+            'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$this->status],
+            'payment_method' => (int)$this->payment_method,
+            'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]),
+            'payment_reference' => $this->reference,
+            'transactions_ids' => GroupTransactionsForOrderV2Resource::collection($this->groupTransactions)
+        ];
+    }
+}
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class GroupTransactionsForOrderV2Resource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            // 'id' => $this->id,
+            'group_id' => $this->group_id,
+            'transaction_id' => $this->transaction_id,
+        ];
+    }
+}
@@ -31,8 +31,9 @@ class OrderV2Resource extends JsonResource
            'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
            'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
            'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get());
            }),
+            'storages' => $this->storages ? $this->storages : null, //from middleware
            'remarks' => RemarkResource::collection($this->remarks),
            'created_at' => $this->created_at->format('d-m-Y')
        ];
@@ -3,15 +3,14 @@
 namespace App\Http\Resources;

 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
-use App\Models\Order;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;

+
 class TransactionResource extends JsonResource
 {
    /**
@@ -24,6 +23,8 @@ class TransactionResource extends JsonResource
    {
        $order = null;
        $groupTransactions = null;
+        $group_payment_attempts = null;
+        $group_payment_expired = null;

        if ($this->owner instanceof Transaction) {
            if ($this->owner) {
@@ -35,12 +36,18 @@ class TransactionResource extends JsonResource
            if ($this->owner) {
                $order = new OrderResource($this->owner->owner);
            }
+
+            if($this->groups){
+                $group_payment_attempts = GroupForOrderV2Resource::collection($this->groups->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]));
+                $group_payment_expired = GroupForOrderV2Resource::collection($this->groupsWithTrashed->whereIn('status', [ApprovalStatus::EXPIRED]));
+            }
+
        } else {
            $group = Group::where('reference', $this->payment_reference)->first();
            if ($group) {
                $groupTransactions = GroupTransactionResource::collection($group->groupTransactions);
            }
-            
+
        }

        return [
@@ -48,7 +55,9 @@ class TransactionResource extends JsonResource
            'owner_type' => $this->owner_type,
            'order' => $order,
            'group_transactions' => $groupTransactions,
-            'group_reference' => $groupTransactions ? $group->reference : null,
+            'group_reference' => $groupTransactions ? ($group ? $group->reference : null ) : null,
+            'groups_payment_attempts' => $group_payment_attempts,
+            'groups_payment_expired' => $group_payment_expired,
            'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
            'type' => (int) $this->type,
            'bill_no' => $this->bill_no,
@@ -71,6 +80,11 @@ class TransactionResource extends JsonResource
                    ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
                    ->get()
            ),
+            'payments_expired' => TransactionResource::collection(
+                $this->transactions()
+                    ->payments()->where('status', ApprovalStatus::EXPIRED)
+                    ->get()
+            ),
            'payment_history' => TransactionResource::collection(
                $this->transactions()
                    ->payments()
@@ -78,6 +92,7 @@ class TransactionResource extends JsonResource
                    ->get()
            ),
            'remarks' => RemarkResource::collection($this->remarks),
+            'storages' => $this->storages ? $this->storages : null, //from middleware
            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
@@ -89,6 +89,14 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
        return $this->BelongsToMany(Group::class, GroupTransaction::class, 'transaction_id');
    }

+    /**
+     * @return BelongsToMany
+     */
+    public function groupsWithTrashed(): BelongsToMany
+    {
+        return $this->BelongsToMany(Group::class, GroupTransaction::class, 'transaction_id')->withTrashed();;
+    }
+
    public function convert_original_amount()
    {
        if($this->booking()->first()->fix_currency_id !== 1) {
@@ -54,6 +54,12 @@ return [
            'days' => 14,
        ],

+        'storage_invoices' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel_storage_invoices.log'),
+            'level' => 'info',
+        ],
+
        'slack' => [
            'driver' => 'slack',
            'url' => env('LOG_SLACK_WEBHOOK_URL'),
@@ -106,6 +112,18 @@ return [
            'path' => storage_path('logs/paymentUnknownOrderLog.log'),
            'level' => 'info',
        ],
+
+        'apiResponseTimeLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/apiResponseTime.log'),
+            'level' => 'info',
+        ],
+
+        'webResponseTimeLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/webResponseTimeLog.log'),
+            'level' => 'info',
+        ],
    ],

 ];
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsCreditTermToCompanyConnections extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('company_connections', function (Blueprint $table) {
+            $table->boolean('is_credit_term')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('company_connections', function (Blueprint $table) {
+            $table->dropColumn('is_credit_term');
+        });
+    }
+}
@@ -6,13 +6,14 @@
                    <div v-show="!$store.getters.isLoading(section)">
                        <list-component :section="section" :endpoint="endpoint" :options="options">
                            <template slot="list" slot-scope="{data}">
-                                <payments-billing-components v-if="endpoint == route('api.transaction.list')" :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
+                                <!-- <payments-billing-components v-if="endpoint == route('api.transaction.list') && !data.storages" :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components> -->
+                                <payments-billing-variant-2-components v-if="endpoint == route('api.transaction.list')" :section="section" :invoices="getMergedInvoices(data, data.storages)" :selectedInvoice="selectedInvoice" :isPaidInvoices="isPaidInvoices" v-on:input="updateList($event)"></payments-billing-variant-2-components>
                                <group-payments-billing-components v-else :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></group-payments-billing-components>
                            </template>
                        </list-component>
                    </div>
                </div>
-                <div class="col-12 col-sm-12 col-md-4" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
+                <div class="col-12 col-sm-12 col-md-4" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent', 'customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
                    <div class="row align-items-center">
                        <div class="col">
                            <div class="row" v-if="section === 'customerPendingPaymentInvoiceComponent'">
@@ -94,6 +95,10 @@
                type: String,
                required: true
            },
+            isPaidInvoices :{
+                type: Boolean,
+                default: false
+            }
        },
        data(){
            return {
@@ -117,7 +122,7 @@
            },
            selectedIds () {
                return this.selectedInvoice.map(s=>s.id);
-            },
+            }
        },
        methods: {
            generateSummaryInvoice(){
@@ -126,9 +131,40 @@
            makePayment(){
                this.submit(this.route('api.transaction.group.create', JSON.stringify(this.selectedId)), 'post', this.section, true, false);
            },
-            updateList(packageList){
-                this.selectedInvoice.includes(packageList) ? this.selectedInvoice.splice(this.selectedInvoice.indexOf(packageList), 1) : this.selectedInvoice.push(packageList);
+            updateList(invoices){
+                invoices.forEach(invoice => {
+                    if (this.selectedInvoice.includes(invoice)) {
+                        this.selectedInvoice.splice(this.selectedInvoice.indexOf(invoice), 1);
+                    } else {
+                        this.selectedInvoice.push(invoice);
+                    }
+                });
+
            },
+            getMergedInvoices(shippingInvoice, storages){
+                if(storages){
+                    const storageMap = {};
+                    for (const storage of storages) {
+                        storageMap[storage.parentInvoiceId] = storage.storageInvoiceId;
+                    }
+
+                    const storageInvoiceId = storageMap[shippingInvoice.id];
+                    const storage = storages.find((i) => {
+                        return i.storageInvoiceId === storageInvoiceId;
+                    });
+
+                    const mergedArray = [
+                        ...(shippingInvoice ? [shippingInvoice] : []),
+                        ...(storage && storage.storageInvoice.status !== 3 ? [storage.storageInvoice] : [])
+                    ];
+                    return mergedArray;
+                }
+
+                const mergedArray = [
+                    ...(shippingInvoice ? [shippingInvoice] : [])
+                ];
+                return mergedArray;
+            }
        }
    }
 </script>
@@ -43,6 +43,22 @@
                                                        </div>
                                                    </div>
                                                </div>
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="groupPaymentExpired">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                width="35" height="35"
+                                                                viewBox="0 0 172 172"
+                                                                style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M39.81699,21.5l-18.31699,22.89414v106.10586h129v-2.15v-103.95586l-18.31699,-22.89414zM41.88301,25.8h88.23398l13.75664,17.2h-47.12363v2.15c0,5.96338 -4.78662,10.75 -10.75,10.75c-5.96338,0 -10.75,-4.78662 -10.75,-10.75v-2.15h-47.12363zM25.8,47.3h45.58672c1.08865,7.23076 7.08802,12.9 14.61328,12.9c7.52526,0 13.52463,-5.66924 14.61328,-12.9h45.58672v98.9h-120.4zM86,68.8c-15.41089,0 -27.95,12.53911 -27.95,27.95c0,15.41089 12.53911,27.95 27.95,27.95c15.41089,0 27.95,-12.53911 27.95,-27.95c0,-15.41089 -12.53911,-27.95 -27.95,-27.95zM86,73.1c13.087,0 23.65,10.563 23.65,23.65c0,13.087 -10.563,23.65 -23.65,23.65c-13.087,0 -23.65,-10.563 -23.65,-23.65c0,-13.087 10.563,-23.65 23.65,-23.65zM85.96641,77.37061c-1.18576,0.01854 -2.13264,0.9936 -2.11641,2.17939v16.125l-7.73916,5.80332c-0.95086,0.71198 -1.1445,2.05998 -0.43252,3.01084c0.71198,0.95086 2.05998,1.1445 3.01084,0.43252l9.46084,-7.09668v-18.275c0.00796,-0.58115 -0.21968,-1.14076 -0.63105,-1.55134c-0.41137,-0.41057 -0.97142,-0.63714 -1.55255,-0.62806zM38.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM55.9,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM64.5,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM73.1,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM81.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM98.9,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM107.5,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM116.1,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM133.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15z"></path></g></g>
+                                                            </svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Group Payment Expired</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paidGroupInvoice">
                                                    <div class="row justify-content-center m-b-5">
                                                        <div class="col-auto">
@@ -75,7 +91,7 @@
                                                        </div>
                                                    </div>
                                                </div>
-                                            </div>  
+                                            </div>
                                        </div>
                                    </div>
                                </div>
@@ -84,22 +100,27 @@
                                <div class="col bg-master-lightest p-1 p-sm-4">
                                    <div class="row tabsContainer tabContent" tab-name="pendingPayment">
                                        <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type': 1, 'does_not_have_payment_status_in': [0,1] ,'does_not_have_groups': 1}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type_in': [1], 'does_not_have_payment_status_in': [0,1] ,'does_not_have_groups': 1, 'check_for_storage_invoice': 1}"></customer-payment-billing-inner-component>
                                        </div>
                                    </div>
                                    <div class="row tabsContainer tabContent hide" tab-name="groupPaymentInProgress">
                                        <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerGroupPaymentInProgressInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [0, 1], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerGroupPaymentInProgressInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [0, 1], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="groupPaymentExpired">
+                                        <div class="col">
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerGroupPaymentExpiredInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [6], 'receiver': company_module_id, 'with_trashed': true, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
                                        </div>
                                    </div>
                                    <div class="row tabsContainer tabContent hide" tab-name="paidGroupInvoice">
                                        <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerPaidGroupInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerPaidGroupInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [2], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
                                        </div>
                                    </div>
                                    <div class="row tabsContainer tabContent hide" tab-name="paidInvoice">
                                        <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPaidInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [3], 'receiver': company_module_id, 'type': 1, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPaidInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [3], 'receiver': company_module_id, 'type_in': [1,16], order_by: {column: 'updated_at', DESC: true}}" :isPaidInvoices="true"></customer-payment-billing-inner-component>
                                        </div>
                                    </div>
                                </div>
@@ -147,8 +147,11 @@
                                    <p>You can view your invoices here and make payment.</p>
                                </div>
                            </div>
-                            <div class="row bg-master-lightest p-t-15" v-for="invoice in order.invoices">
-                                <div class="col">
+                            <div class="row bg-master-lightest p-t-15" v-for="invoice in order.invoices" v-if="invoice.type === 1">
+                                <div class="col" v-if="getMergedInvoices(invoice).length > 1">
+                                    <customer-payments-billing-variant-2-component :data="getMergedInvoices(invoice)" :storage="getStorageInfo(invoice)" invoice_status="Pending Payment" :section="section"></customer-payments-billing-variant-2-component>
+                                </div>
+                                <div class="col" v-else>
                                    <customer-payments-billing-component :data="invoice" invoice_status="Pending Payment" :section="section"></customer-payments-billing-component>
                                </div>
                            </div>
@@ -180,6 +183,16 @@
        computed: {
            pendingQueue () {
                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            orderStorageMap() {
+                // Create a map to link parent invoice IDs to storageInvoiceIds
+                const storageMap = {};
+                if(this.order.storages){
+                    for (const storage of this.order.storages) {
+                        storageMap[storage.parentInvoiceId] = storage.storageInvoiceId;
+                    }
+                }
+                return storageMap;
            }
        },
        watch: {
@@ -201,7 +214,36 @@
                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
                this.isLoading = false;
                this.order = response.payload.data;
-            }
+            },
+            getStorageInfo(invoice) {
+                const storageObject = this.findStorageInfoObject(invoice.id);
+                return storageObject;
+            },
+            findStorageInfoObject(shippingInvoiceId) {
+                if(this.order.storages){
+                    return this.order.storages.find(storage => storage.parentInvoiceId === shippingInvoiceId);
+                }
+                return null;
+            },
+            getMergedInvoices(invoice){
+                const storageInvoice = this.getStorageInvoice(invoice);
+                const mergedArray = [
+                    ...(invoice ? [invoice] : []),
+                    ...(storageInvoice ? [storageInvoice] : []),
+                ];
+                return mergedArray;
+            },
+            getStorageInvoice(invoice) {
+                // Retrieve the storageInvoiceId for the current shipping invoice from storage info (order.storages)
+                const storageInvoiceId = this.orderStorageMap[invoice.id];
+
+                // Find and return the storage invoice (type 16) from order.invoices
+                const storageInvoice = this.order.invoices.find((invoice) => {
+                    return invoice.type === 16 && invoice.id === storageInvoiceId;
+                });
+
+                return storageInvoice;
+            },
        }
    }
 </script>
@@ -111,6 +111,20 @@
                                    </div>
                                </div>
                            </div>
+                            <div class="row bg-master-lightest" v-if="item.payments_expired.length">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div class="font-head fs-10 all-caps">Payment Expired</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-expired-component v-for="item in item.payments_expired" v-bind:key="item.id" :data="item" ></payment-expired-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                            <div class="row bg-master-lightest" v-if="item.payment_history.length">
                                <div class="col">
                                    <div class="row m-t-10 m-b-10">
@@ -215,12 +229,12 @@
            }
        },
        computed: {
-            cbm () {
-                return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? 0 : obj.cbm) + total, 0)) * 1000) / 1000).toFixed(3)
-            },
-            overweight(){
-                return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? obj.cbm : 0) + total, 0)) * 1000) / 1000).toFixed(3)
-            },
+            // cbm () {
+            //     return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? 0 : obj.cbm) + total, 0)) * 1000) / 1000).toFixed(3)
+            // },
+            // overweight(){
+            //     return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? obj.cbm : 0) + total, 0)) * 1000) / 1000).toFixed(3)
+            // },
            latestComment() {
                let questions = this.item.remarks;
                return questions.slice().reverse()[0];
@@ -0,0 +1,302 @@
+<template>
+    <div class="row m-b-15 m-l-5 m-r-10 parentContainer">
+        <div class="col bg-white rounded">
+            <div v-for="item in items" class="row" :class="[{'b-danger': item.status == 5 ||item.status == 6, 'b-a': item.status == 5||item.status == 6}]">
+                <div class="col padding-20">
+                    <div class="row align-items-center">
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
+                            <div> {{ item.updated_at }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Status</p>
+                            <div class="all-caps" v-if="item.status == 3">Payment Completed</div>
+                            <div class="all-caps text-danger" v-else-if="item.status == 5">Dispute in progress</div>
+                            <div class="all-caps" v-else-if="item.status == 6">Cancelled Invoice</div>
+                            <div class="all-caps" v-else>Pending Payment</div>
+                        </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">Amount</p>
+                            <div>MYR {{ item.amount.toFixed(2) }}</div>
+                        </div>
+                        <div class="col-2">
+                            <div v-if="item.remarks.length">
+                                <p class="no-margin fs-10 all-caps">Billing Question</p>
+                                <div>
+                                    {{  getLatestComment(item).content }}
+                                    <span class="btn requestModal no-border" v-if="item.remarks.length" size="large" data-type="chatmodal">
+                                        <i class="fa fa-comment-o"></i>
+                                    </span>
+                                </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="chatmodal">
+                                    <remark-component :section="section" :data="item" module_type="Transaction"></remark-component>
+                                </modal-component>
+                            </div>
+                            <div v-else>
+                                <p class="no-margin fs-10 all-caps invisible">Billing Question</p>
+                                <div>
+                                    <span class="btn requestModal no-border invisible">
+                                        <i class="fa fa-edit"></i>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-2 p-l-0 p-r-0 d-flex justify-content-center align-items-center">
+                            <div v-if="item.type === 1"  :class="[{'invisible': [5, 6, 3].includes(item.status)}]">
+                                <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="billingRemark">Billing Question?</span>
+                            </div>
+                            <div v-else class="invisible">
+                                <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="billingRemark">Billing Question?</span>
+                            </div>
+                            <modal-component v-if="item.type === 1" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingRemark">
+                                <customer-invoice-remark-form-component module_type="Transaction" :data="item" :section="section"></customer-invoice-remark-form-component>
+                            </modal-component>
+                            <div v-if="item.documents.length">
+                                <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
+                                    <document-file-viewer-component :file="file">
+                                        <template slot="button">
+                                            <div class="btn bg-grey no-border muted">
+                                                <i class="fa fa-file-pdf-o"></i>
+                                            </div>
+                                        </template>
+                                    </document-file-viewer-component>
+                                </div>
+                            </div>
+                            <div v-else>
+                                <div class="btn bg-grey no-border muted invisible">
+                                    <i class="fa fa-file-pdf-o"></i>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-1 p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
+                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
+                                <i class="fa fa-close"></i>
+                            </span>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInvoice">
+                                <delete-invoice-form-component :data="item" :section="section"></delete-invoice-form-component>
+                            </modal-component>
+                        </div>
+                        <div class="col-1 hide">
+                            <div class="btn btn-sm all-caps b-rad-none btn-block" :class="{'btn-success': !expanded, 'btn-default': expanded}" @click="expanded = !expanded">
+                                {{ expanded ? 'Cancel' : 'Make Payment' }}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col" v-if="storage" v-show="item.type === 16">
+                            <p >Warehouse Storage Fee: {{ storage.numberOfDaysExceeded }} Days x RM {{ storage.pricePerCBM}} x {{ storage.cbm.toFixed(3) }} cbm</p>
+                        </div>
+                    </div>
+                    <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="[5, 6].includes(item.status)">
+                        <div class="col padding-20">
+                            <div class="row bg-master-lightest h-100 padding-20">
+                                <div class="col">
+                                    <h6 class="all-caps m-b-5 no-margin text-underline bold">Billing question</h6>
+                                    <remark-component :section="section" :data="item" module_type="Transaction"></remark-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" >
+                <div class="col-12 col-md-7 padding-20">
+                    <div class="row bg-master-lightest">
+                        <div class="col">
+                            <div v-for="(groupPaymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="groupPaymentAttemptItem.groups_payment_attempts.length && groupPaymentAttemptItem.type == 1 && groupTransactionsExist(items, groupPaymentAttemptItem.groups_payment_attempts)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Attempt</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <shipping-transaction-component v-for="group in groupPaymentAttemptItem.groups_payment_attempts" v-bind:key="group.id" :data="group" :section="section"></shipping-transaction-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(groupPaymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="groupPaymentAttemptItem.groups_payment_expired.length && groupPaymentAttemptItem.type == 1 && groupTransactionsExist(items, groupPaymentAttemptItem.groups_payment_expired)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Expired</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-expired-component v-for="group in groupPaymentAttemptItem.groups_payment_expired" v-bind:key="group.id" :data="group" :section="section"></payment-expired-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(paymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="items.some(x => x.payment_attempts && x.payment_attempts.length > 0)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Attempt</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <shipping-transaction-component v-for="i in paymentAttemptItem.payment_attempts" v-bind:key="i.id" :data="i" :section="section"></shipping-transaction-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(paymentExpiredItem, index) in items" class="row bg-master-lightest" v-if="items.some(x => x.payments_expired && x.payments_expired.length > 0)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Expired</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-expired-component v-for="i in paymentExpiredItem.payments_expired" v-bind:key="i.id" :data="i" ></payment-expired-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(paymentHistoryItem, index) in items" class="row bg-master-lightest" v-if="items.some(x => x.payment_history && x.payment_history.length > 0)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment History</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-history-component v-for="i in paymentHistoryItem.payment_history" v-bind:key="i.id" :data="i" ></payment-history-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-md-5 padding-20 parentContainer">
+                    <div class="row bg-master-lightest h-100">
+                        <div class="col">
+                            <div class="row padding-10">
+                                <div class="col">
+                                    <div class="row align-items-end m-b-10 text-complete">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Total Amount:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((totalAmount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 text-success">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Paid Total:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                             <div class="font-heading fs-12">MYR {{(Math.round((totalAmount - totalOutstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Floating Amount:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                             <div class="font-heading fs-12">MYR {{(Math.round((totalFloating + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end bold text-danger">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">OutStanding Total:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((totalOutstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-t-20" v-if="totalOutstanding - totalFloating > 0.009">
+                                        <div class="col">
+                                            <div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
+                                                <group-payment-form-component :section="section" :selectedIds="selectedIds" :sumAmount="totalOutstanding.toFixed(2)"></group-payment-form-component>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+
+        props: {
+            data: {
+                type: Array,
+            },
+            invoice_status: {
+                type: String,
+                required: true
+            },
+            section:{
+                type: String,
+                required: true
+            },
+            storage:{
+                type: Object
+            },
+        },
+        data(){
+            return {
+                items: this.data,
+                parameters: {
+                    packing_list_id: null,
+                    transaction_details: [],
+                },
+                expanded: true,
+            }
+        },
+        watch: {
+            data: function() {
+                this.items = this.data;
+            }
+        },
+        computed: {
+            totalAmount() {
+                return this.items.reduce((sum, item) => sum + item.amount, 0);
+            },
+            totalOutstanding() {
+                return this.items.reduce((sum, item) => sum + item.outstanding, 0);
+            },
+            totalFloating() {
+                return this.items.reduce((sum, item) => sum + item.floating, 0);
+            },
+            selectedIds() {
+                const ids = [];
+                this.items.forEach(item => {
+                    ids.push(item.id);
+                });
+                return ids;
+            },
+        },
+        methods: {
+            getLatestComment(item) {
+                let questions = item.remarks;
+                return questions.slice().reverse()[0];
+            },
+            successHandler(response){
+                this.item = response.payload.data;
+            },
+            groupTransactionsExist(items, groups) {
+                return groups.some(group =>
+                    group.transactions_ids.length === items.length &&
+                    group.transactions_ids.every(transaction =>
+                        items.some(item => item.id === transaction.transaction_id)
+                    )
+                );
+            }
+        }
+    }
+</script>
@@ -20,21 +20,21 @@
                            <p class="no-margin fs-10 all-caps">Payment Date</p>
                            <div>{{ item.created_at }}</div>
                        </div>
-                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2" @click="retryPayment()">
+                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2 && item.status != 6" @click="retryPayment()">
                            <div class=" no-border h-100">
                                <i class="fa fa-repeat fs-20 text-white"></i>
                            </div>
                        </div>
-                        <div class="col-auto requestModal" v-if="item.status != 2" data-type="deleteGroupTransaction">
+                        <div class="col-auto requestModal" v-if="item.status != 2 && item.status != 6" data-type="deleteGroupTransaction">
                            <div class="btn bg-grey no-border">
                                <i class="fa fa-times"></i>
                            </div>
                        </div>
                        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteGroupTransaction">
-                            <general-confirmation-form-component 
-                                contentText="Are you sure you want to delete this Group Payment?" 
-                                modalType="delete" 
-                                buttonText="Delete" 
+                            <general-confirmation-form-component
+                                contentText="Are you sure you want to delete this Group Payment?"
+                                modalType="delete"
+                                buttonText="Delete"
                                class="text-center"
                                :apiRoute="route('api.transaction.group.delete', item.id)"
                                apiMethod="delete"
@@ -75,7 +75,7 @@
                                <i class="fa fa-repeat fs-20 text-white"></i>
                            </div>
                        </div>
-                        <div class="col-auto">
+                        <div class="col-auto" v-if="!['customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
                            <div class="btn bg-grey no-border" @click="expanded = !expanded">
                                <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                            </div>
@@ -83,7 +83,7 @@
                    </div>
                </div>
            </div>
-            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.invoices">
+            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.invoices && !['customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
                <div class="col">
                    <payments-billing-components :section="section" v-for="invoice in data.invoices" v-bind:key="invoice.id" :data="invoice" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
                </div>
@@ -98,7 +98,7 @@
            selectedInvoice: {
                type: Array,
                required: false,
-            }, 
+            },
            section:{
                type: String,
                default: null
@@ -0,0 +1,41 @@
+<template>
+    <div class="row m-l-0 m-b-10 m-r-0 parentContainer" :class="[{'b-a': item.status === 4}, {'b-danger': item.status === 4}, {'b-a': item.status === 5}, {'b-danger': item.status === 5}]" >
+        <div class="col">
+            <div class="row" v-if="!item.transaction_bill">
+                <div class="col">
+                    <div class="row bg-white parentContainer">
+                        <div class="col p-t-10 p-b-10 p-r-0" :class="[{'bg-master-lighter': item.status === 1 && item.type !== 6}, {'bg-white': item.status !== 1 && item.status !== 4}, {'bg-warning-lighter': item.type === 6}]">
+                            <div class="row m-b-5">
+                                <div class="col-auto">
+                                    <div class="font-heading fs-8 muted all-caps">Status</div>
+                                    <div class="font-heading fs-10 bold" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
+                                        {{ item.status === 1 ? 'Pending Verification' : item.status === ( 4 || 5) ? 'Rejected' : 'Expired'}}
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
+                                    <div class="font-heading fs-10 bold">
+                                        {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading fs-8 muted all-caps">Bill Number</div>
+                                    <div class="font-heading fs-10 bold">
+                                        {{ item.bill_no }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
@@ -0,0 +1,110 @@
+<template>
+    <div class="row m-b-15 m-l-5 m-r-10">
+        <div class="col bg-white rounded b-a" :class="{'b-white': !selected, 'b-primary': selected, 'bg-primary-lighter': selected}">
+            <div v-for="item in items" class="row" v-if="$store.getters.isAdmin || item.order">
+                <div class="col padding-20">
+                    <div class="row align-items-center">
+                        <div class="col-auto pointer align-items-center" style="min-width:70px;" @click="activate()" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
+                            <i v-show="((item.type === 1 && !isPaidInvoices) || isPaidInvoices)" class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Invoice No</p>
+                            <div>{{ item.bill_no }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Order</p>
+                            <div v-if="item.order"><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
+                            <div class="text-danger" v-else>Error in retrieving order</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
+                            <div>{{ item.created_at }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Amount</p>
+                            <div>MYR  {{ item.amount.toFixed(2) }}</div>
+                        </div>
+                        <div class="col" v-if="['customerPaidInvoiceComponent', 'customerPaidGroupInvoiceComponent'].includes(section)">
+                            <p class="no-margin fs-10 all-caps">Payment Date</p>
+                            <div>{{ item.payment_history[item.payment_history.length-1].created_at }}</div>
+                        </div>
+                        <div class="col" v-if="['customerPaidInvoiceComponent', 'customerPaidGroupInvoiceComponent'].includes(section)">
+                            <p class="no-margin fs-10 all-caps">Bill Number</p>
+                            <div>{{ item.payment_history[item.payment_history.length-1].payment_reference }}</div>
+                        </div>
+                        <div class="col-auto">
+                            <div v-if="item.documents.length">
+                                <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
+                                    <document-file-viewer-component :file="file">
+                                        <template slot="button">
+                                            <div class="btn no-border muted" :class="{'btn-info': section === 'customerPaidInvoiceComponent', 'btn-success': section !== 'customerPaidInvoiceComponent'}">
+                                                <i class="fa fa-file-pdf-o"></i>
+                                            </div>
+                                        </template>
+                                    </document-file-viewer-component>
+                                </div>
+                            </div>
+                            <div v-else>
+                                <div class="btn bg-grey no-border muted invisible">
+                                    <i class="fa fa-file-pdf-o"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            selectedInvoice: {
+                type: Array,
+                required: false,
+            },
+            section:{
+                type: String,
+                default: null
+            },
+            invoices: {
+                type: Array,
+            },
+            isPaidInvoices :{
+                type: Boolean,
+                default: false
+            }
+        },
+        data(){
+            return {
+                items: this.invoices,
+                expanded: false,
+                selectedValue: false,
+            }
+        },
+        methods: {
+            activate(){
+                // this.select = !this.select;
+                this.$emit('input', this.invoices);
+            }
+        },
+        watch: {
+            invoices: function() {
+                this.items = this.invoices;
+            }
+        },
+        computed: {
+            selected() {
+                var response = false;
+                this.selectedInvoice.forEach((value, index) => {
+                    this.items.forEach(item => {
+                    if (item.id === value.id) {
+                        response = true;
+                    }
+                    });
+                });
+                return response;
+            }
+        }
+    }
+</script>
@@ -94,7 +94,7 @@
                                                <div class="row m-t-10" v-if="paymentMethod.id === 'cash'">
                                                    <div class="col">
                                                        <div class="row m-b-25" >
-                                                            <div class="col">   
+                                                            <div class="col">
                                                                <div class="font-heading fs-11">You can proceed by bank in <span class="text-success bold">{{(Math.round((parseFloat(parameters.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span> to the bank account detailed below and upload your payment proof to proceed with your transfer after clicking on the proceed button below.</div>
                                                            </div>
                                                        </div>
@@ -128,7 +128,7 @@
                                                    </div>
                                                </div>
                                            </div>
-                                           
+
                                        </div>
                                    </div>
                                </div>
@@ -164,7 +164,7 @@
            },
            company_module_id: {
                type: Number,
-                required: true,
+                // required: true,
            },
            selectedIds: {
                type: Array,
@@ -211,7 +211,7 @@
            },
            successHandler(response){
                // todo-new: when using the page reload, the section reload will auto refresh with new data and refresh again
-                // however if dont use the page reload, then the section will refresh with old data 
+                // however if dont use the page reload, then the section will refresh with old data
                // if (response.payload) {
                //     if (response.payload.data.payment_method === 5) {
                //         window.location.href = this.route('billplz.bill', response.payload.data.reference) + '?auto_submit=true';
@@ -25,12 +25,21 @@
            @if($status === 2)
                <div class="row">
                    <div class="col">
+                        @if(!$result)
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <h5 class="semi-bold text-success">Your Payment is Unsuccessful</h5>
+                                    <p class="hint-text">Please contact our customer service.</p>
+                                </div>
+                            </div>
+                        @else
                        <div class="row m-b-10">
                            <div class="col">
                                <h5 class="semi-bold text-success">Your Payment is Successful</h5>
                                <p class="hint-text">Thank you for your payment. The amount paid has been successfully applied to your invoice.</p>
                            </div>
                        </div>
+                        @endif
                        <div class="row m-b-20">
                            <div class="col">
                                @if($marking)
@@ -108,4 +117,4 @@

        </div>
    </div>
-@endsection
+@endsection
@@ -52,12 +52,14 @@
                @php
                    $addresses = $companyModule->addresses()->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
                @endphp
+                @if($addresses)
                {{ $addresses->street_one }}
                {{ $addresses->street_two }} ,
                {{ $addresses->district()->first()->name }},
                {{ $addresses->postcode }}
                {{ $addresses->state()->first()->name }},
                {{ $addresses->country()->first()->name }}
+                @endif
            </div>
            <div>
            @php
@@ -126,4 +128,4 @@
            </td>
        </tr>
    </tfoot>
-</table>
+</table>
@@ -4,7 +4,8 @@ use Illuminate\Support\Facades\Route;

 Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], function () {
    Route::get('/show/{id}', 'FetchOrderController@fetch')->name('show');
-    Route::get('/v2/show/{id}', 'FetchOrderV2Controller@fetch')->name('v2.show');
+    // Route::get('/v2/show/{id}', 'FetchOrderV2Controller@fetch')->name('v2.show');
+    Route::get('/v2/show/{id}', 'FetchOrderV2Controller@fetch')->middleware('storage.invoice.check.byorder')->name('v2.show');
    Route::get('/list', 'ListOrdersController@list')->name('list');
    Route::get('/v2/list', 'ListOrdersV2Controller@list')->name('v2.list');
    Route::post('/create', 'CreateOrderController@create')->name('create');
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Route;

 Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' => 'transaction.'], function () {

-    Route::get('/list', 'ListTransactionsController@list')->name('list');
+    Route::get('/list', 'ListTransactionsController@list')->middleware('storage.invoice.check.bytransactions')->name('list');
    Route::delete('/suspend/{id}', 'SuspendTransactionController@suspend')->name('suspend');
    Route::delete('/delete/{id}', 'DeleteTransactionController@delete')->name('delete');
    Route::delete('/delete-payment/{id}', 'DeletePaymentTransactionController@delete')->name('payment.delete');
@@ -18,7 +18,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
        Route::post('/upload-verification-document/{transaction_id}', 'UploadPaymentVerificationDocumentController@upload')->name('verification.create');
        Route::put('/approve/{transaction_id}/{status}', 'ApprovePaymentTransactionController@approve')->where('status', 'approve|reject')->name('approval');
    });
-    
+
    Route::group(['prefix' => 'invoice', 'as' => 'invoice.'], function () {
        route::post('/shipping-invoice/create', 'CreateShippingInvoiceTransactionController@create')->name('create');
        route::post('/shipping-invoice/company/{company_module_id}/regenerate', 'RegenerateShippingInvoiceTransactionController@regenerate')->name('company.regenerate');
@@ -43,10 +43,11 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
    Route::group(['prefix' => 'groups', 'as' => 'group.'], function () {
        Route::post('/{transaction_ids}/create', 'CreateGroupsController@create')->name('create');
        Route::get('/list', 'ListGroupsController@list')->name('list');
+        // Route::get('/list', 'ListGroupsController@list')->middleware('storage.invoice.check.bygroup')->name('list');
        Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
        Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
        // Route::post('/{id}/approve', 'CreateBulkPurchaseOrderDocumentController@aprove')->name('approve');
        // Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
    });

-});
+});
@@ -255,6 +255,7 @@ Route::get('/customer/{marking}/payment-and-billing', function ($marking) {
    $company_module_id = $connection->invitee->id;
    return view('pages.customers.paymentsBilling', ['company_module_id' => $company_module_id]);
 })->name('customer.payment-and-billing');
+// })->middleware('storage.invoice.check.bytransactions')->name('customer.payment-and-billing');

 Route::get('/customer-invoices/{company_module_id}/payment-and-billing', function ($company_module_id) {
    // todo-new: check company_module_id
Author	SHA1	Message	Date
edmondlang	dbc57fdaac	code update	2023-12-31 12:58:22 +08:00
edmondlang	9c9cf0f96e	api and web response time log	2023-12-28 23:04:16 +08:00
edmondlang	8513309126	api response time logging	2023-12-28 22:50:19 +08:00
Dillon Ngo	e0805a9601	Merge branch 'dillon/46-warehouse-storage-charges-2-merge-conflict' into 'master' Emergency fix problem with group payment (reported by Eileen) See merge request CIEFWorldwideSdnBhd/shipping-portal!184	2023-12-20 18:19:08 +00:00
Dillon Ngo	6f36c4b7ee	Emergency fix problem with group payment (reported by Eileen)	2023-12-21 02:17:04 +08:00
Dillon Ngo	87194794f2	Merge branch 'dillon/46-warehouse-storage-charges-2-merge-conflict' into 'master' Emergency fix problem with group payment (reported by Eileen) See merge request CIEFWorldwideSdnBhd/shipping-portal!183	2023-12-20 16:06:34 +00:00
Dillon Ngo	b4eca67a2f	Emergency fix problem with group payment (reported by Eileen)	2023-12-20 23:58:56 +08:00
Dillon Ngo	1770b06498	Merge branch 'dillon/46-warehouse-storage-charges-2-merge-conflict' into 'master' Emergency fix problem with group payment (reported by Eileen) See merge request CIEFWorldwideSdnBhd/shipping-portal!182	2023-12-20 12:58:32 +00:00
Dillon Ngo	5c9fd6e2a6	Emergency fix problem with group payment (reported by Eileen)	2023-12-20 20:52:24 +08:00
Dillon Ngo	ed7a636a18	Merge branch 'dillon/46-warehouse-storage-charges-2-merge-conflict' into 'master' Fix a typo error See merge request CIEFWorldwideSdnBhd/shipping-portal!181	2023-12-11 17:08:06 +00:00
Dillon Ngo	19bd548127	Fix a typo error	2023-12-12 01:07:06 +08:00
Dillon Ngo	55ac8064b1	Merge branch 'dillon/46-warehouse-storage-charges-2-merge-conflict' into 'master' Warehouse Storage Charges - Effective From 11/12/2023 onwards See merge request CIEFWorldwideSdnBhd/shipping-portal!180	2023-12-11 13:36:41 +00:00
Dillon Ngo	e7279ec4d0	Merge branch 'master' into dillon/46-warehouse-storage-charges-2-merge-conflict	2023-12-11 21:29:06 +08:00
Dillon Ngo	a7d4299897	Fix a typo error	2023-12-10 22:59:49 +08:00
Dillon Ngo	2b507d1006	Fix a typo error	2023-12-10 22:56:05 +08:00
Dillon Ngo	138a4f1cf6	Deleted some lines of codes	2023-12-07 17:17:39 +08:00
Dillon Ngo	b54d897060	Remove <br> from payment transaction exported to excel file	2023-12-07 16:50:05 +08:00
Dillon Ngo	c12959b4a8	Deleted some lines of codes	2023-12-07 16:44:06 +08:00
Dillon Ngo	f94f380c16	Deleted some lines of codes	2023-12-07 16:42:52 +08:00
Dillon Ngo	f46ec19f01	Update effective date for warehouse storage charges + commands to check for storage invoices	2023-12-07 16:35:51 +08:00
Omair Saleh	c7a6a5b020	remove the 2 days delay for the ETA	2023-12-06 16:42:22 +08:00
Omair Saleh	8f64769214	remove the 2 days delay for the ETA	2023-12-06 16:38:57 +08:00
Dillon Ngo	cb74228a68	Fix a problem reported by Yien where storage invoice number of days kept updated even though storage invoice already paid	2023-12-05 13:19:45 +08:00
Dillon Ngo	b22cc0f7e3	Yien requested for some text description in invoice to be updated	2023-11-30 16:00:43 +08:00
Dillon Ngo	2e8ba4f630	Fix an error to export payment transaction in excel file	2023-11-30 13:56:35 +08:00
Dillon Ngo	e987838d5a	Fix 2 problem with generating storage invoice and export payment transaction in excel by date range	2023-11-30 13:36:38 +08:00
Dillon Ngo	48fa67ae8c	Fix a problem with starting date should be done on arrival date of goods to china warehouse	2023-11-27 19:29:13 +08:00
Dillon Ngo	1e9e94b581	Fix a problem with starting date should be done on arrival date of goods to china warehouse	2023-11-27 19:20:45 +08:00
Dillon Ngo	67653b60fb	Fix a problem with starting date should be done on arrival date of goods to china warehouse	2023-11-27 19:14:32 +08:00
Dillon Ngo	26fffb8af1	Fix decimal number to lengthy	2023-11-27 09:35:34 +08:00
Dillon Ngo	fb0c74d645	Handling of dispute for warehouse storage fee	2023-11-24 13:44:28 +08:00
Dillon Ngo	53293f26d6	Amendment for Yien to do testing at dev environment	2023-11-24 02:29:05 +08:00
Dillon Ngo	56fe5520ad	Amendment for Yien to do testing at dev environment	2023-11-24 00:33:07 +08:00
Dillon Ngo	61c801e216	Fix storage invoice with outdated info	2023-11-17 14:43:22 +08:00
Dillon Ngo	6f0acec390	Rename file, function + disable delete function for expired group payment	2023-11-17 14:16:02 +08:00
Dillon Ngo	76e3668563	20231109 Meeting Feedback 1 Fixes for warehouse storage charges	2023-11-16 22:40:26 +08:00
Dillon Ngo	ce94dd1393	Fix for invoice status update using common function	2023-11-09 12:08:43 +08:00
Dillon Ngo	c1ea087c58	Fix for storage invoice get to be generated even when the packingList not yet have APPROVED status	2023-11-09 08:34:03 +08:00
Dillon Ngo	8595d0987f	Typo fix	2023-11-04 17:12:42 +08:00
Dillon Ngo	48d0460eef	Debug billplz callback	2023-11-04 16:41:23 +08:00
Dillon Ngo	06751fdc78	New Warehouse Storage Fee	2023-11-04 14:58:50 +08:00
Dillon Ngo	b5bcd5c553	Quick test on dev server	2023-10-27 04:18:39 +08:00