fix migration for local

This reverts commit a49920973e.

.env.example

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

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

@@ -80,12 +80,13 @@ class CallbackBillplzProcessor
             if ($group) {
                 foreach ($group->groupTransactions as $groupTransaction) {
                     $invoice = $groupTransaction->transaction;
+                    if($invoice->status !== ApprovalStatus::COMPLETED){
+                        $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
 
-                    $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
-
-                    if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
-                        $pL = $invoice->owner;
-                        $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                        if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                            $pL = $invoice->owner;
+                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                        }
                     }
                 }
 
@@ -111,7 +112,9 @@ class CallbackBillplzProcessor
 
             foreach ($group->groupTransactions as $groupTransaction) {
                 $invoice = $groupTransaction->transaction;
-                $totalAmountToBePaid += $invoice->amount;
+                if($invoice->status !== ApprovalStatus::COMPLETED){
+                    $totalAmountToBePaid += $invoice->amount;
+                }
             }
 
             if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){

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

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

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

@@ -41,6 +41,9 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DeptNo',
             'Qty',
             'UnitPrice',
+            'TaxType',
+            'TaxableAmt',
+            'TaxRate',
 //            'marking',
 //            'contact person',
 //            'contact number',
@@ -130,6 +133,37 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                 $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
         }
 
+        $transactionDetails = $transaction->transactionDetails;
+
+        $firstItem = true;
+        $rows = [];
+        foreach ($transactionDetails as $detail) {
+            // Prepare each row based on the transaction detail
+            $rows[] = [
+                $firstItem ? '<<New>>' : '',
+                $transaction->created_at->format('m/d/Y H:m'),
+                $company->debtor,
+                $order->reference,
+                $order->reference,
+                '500-0000',
+                str_replace('<br>', ' ', $detail->name),
+                '',
+                $container->reference,
+                'CIEF',
+                $detail->quantity,
+                $detail->price,
+                floatval($detail->tax_percentage) > 0 ? 'SV-6' : '',
+                floatval($detail->tax_percentage) > 0 ? $detail->amount : '0',
+                $detail->tax_percentage,
+            ];
+
+            if($firstItem) {
+                $firstItem = false;
+            }
+        }
+
+        return $rows;
+
         return [
             '<<New>>',
             $transaction->created_at->format('m/d/Y H:m'),

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

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

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

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

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

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

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

@@ -15,6 +15,7 @@ use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Models\Document;
+use Carbon\Carbon;
 
 class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
@@ -51,11 +52,18 @@ class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         foreach ($orders as $order){
             $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
             foreach ($invoices as $invoice){
-    
+
                 $invoice->documents()->delete();
-    
-                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
-    
+
+                $view = 'pages.pdfs.shipping_invoice';
+                $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+                $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
+                if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
+                    $view = 'pages.pdfs.shipping_invoice_sst';
+                }
+
+                $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice]);
+
                 $document_object = new DocumentObject(
                     DocumentType::SHIPPING_INVOICE,
                     [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
@@ -63,11 +71,11 @@ class RegenerateShippingInvoiceTransactionLogic extends AbstractControllerLogic
                     ApprovalStatus::COMPLETED,
                     'shipping_invoice'
                 );
-    
+
                 $document =$this->createsDocument->execute($invoice, $document_object);
-    
+
                 $this->createsFiles->execute($document, $document_object);
-    
+
                 // dump($document);
             }
         }

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

@@ -16,6 +16,7 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Models\Document;
+use Carbon\Carbon;
 
 class RegenerateSingleShippingInvoiceTransactionLogic extends AbstractControllerLogic
 {
@@ -54,7 +55,14 @@ class RegenerateSingleShippingInvoiceTransactionLogic extends AbstractController
 
         $invoice->documents()->delete();
 
-        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+        $view = 'pages.pdfs.shipping_invoice';
+        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+        $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
+        if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
+            $view = 'pages.pdfs.shipping_invoice_sst';
+        }
+
+        $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice]);
 
         $document_object = new DocumentObject(
             DocumentType::SHIPPING_INVOICE,

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

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

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

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

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

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

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

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

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

@@ -23,6 +23,7 @@ use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TaxPercentage;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
 use App\Http\Resources\TransactionWithStorageResource;
 use App\Models\Order;
@@ -195,14 +196,26 @@ class CheckStorageInvoiceTransactionProcessor
             $cbm =  $cbm + $quantity;
         }
 
+        $total_tax = 0;
+        $taxPercentage = TaxPercentage::DEFAULT;
         $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
+        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+        $shippingInvoiceTransactionCreatedDate = Carbon::now();
+
         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);
+
+            if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare)) {
+                $taxPercentage = TaxPercentage::SIX_PERCENT;
+                $total_tax = $price_cbm * $taxPercentage / 100;
+                $price_cbm = $price_cbm + $total_tax;
+            }
+
+            $storageInvoice = $this->createStorageInvoiceTransaction($destinationWarehousePackage, $billNumber, $company_module_id, $price_cbm, $total_tax);
             $storageInvoiceId = $storageInvoice->id;
-            $this->createStorageInvoiceTransactionDetails($storageInvoice, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
+            $this->createStorageInvoiceTransactionDetails($storageInvoice, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded, $taxPercentage);
         }
         else if($storageInvoice){
             //Additional handling for giving selected storage invoice a waiver
@@ -221,6 +234,12 @@ class CheckStorageInvoiceTransactionProcessor
                 $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
             }
 
+            if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare)) {
+                $taxPercentage = TaxPercentage::SIX_PERCENT;
+                $total_tax = $price_cbm * $taxPercentage / 100;
+                $price_cbm = $price_cbm + $total_tax;
+            }
+
             $amount = $storageInvoice->amount;
             $epsilon = 0.0001; // Tolerance for the comparison
             Log::channel('storage_invoices')->info('Update $transaction->id: '.$transaction->id);
@@ -246,9 +265,10 @@ class CheckStorageInvoiceTransactionProcessor
 
             if($proceedToUpdate || ($pricePerCBM == 0 && $amount != 0)){
                 Log::channel('storage_invoices')->info('proceedToUpdate');
-                $storageInvoice = $this->updateStorageInvoiceTransaction($storageInvoice, $price_cbm);
+
+                $storageInvoice = $this->updateStorageInvoiceTransaction($storageInvoice, $price_cbm, $total_tax);
                 $invoiceTransactionDetails = $storageInvoice->transactionDetails()->first();
-                $this->updateStorageInvoiceTransactionDetails($invoiceTransactionDetails, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
+                $this->updateStorageInvoiceTransactionDetails($invoiceTransactionDetails, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded, $taxPercentage);
             }
 
             $storageInvoiceId = $storageInvoice->id;
@@ -328,7 +348,7 @@ class CheckStorageInvoiceTransactionProcessor
 
     private function updatePaymentTransactionViaGroupPayment($storageInvoice){
         Log::channel('storage_invoices')->info('updatePaymentTransactionViaGroupPayment');
-        $groups = $storageInvoice->groups()->get();
+        $groups = $storageInvoice->groups()->whereNotIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::SUSPENDED])->get();
         foreach ($groups as $grp){
             $groupReference = $grp->reference;
             $walletTransaction = $this->fetchesTransaction->execute(['payment_reference' => $groupReference]);
@@ -356,7 +376,7 @@ class CheckStorageInvoiceTransactionProcessor
         }
     }
 
-    private function updateStorageInvoiceTransaction(Transaction $transaction, float $totalAmount){
+    private function updateStorageInvoiceTransaction(Transaction $transaction, float $totalAmount, float $totalTax){
 
         $object = new TransactionObject(
             $transaction->bill_no,
@@ -370,7 +390,7 @@ class CheckStorageInvoiceTransactionProcessor
             1,
             1,
             0,
-            0,
+            $totalTax,
             0,
             null,
             ApprovalStatus::APPROVED
@@ -382,18 +402,19 @@ class CheckStorageInvoiceTransactionProcessor
         return $invoice_transaction;
     }
 
-    private function updateStorageInvoiceTransactionDetails($invoice_transaction_details, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays){
+    private function updateStorageInvoiceTransactionDetails($invoice_transaction_details, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays, $taxPercentage){
         $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
+            $pricePerCBM * $numberOfDays,
+            $taxPercentage
         );
 
         $this->updatesTransactionDetail->execute($invoice_transaction_details, $object_detail);
     }
 
-    private function createStorageInvoiceTransaction(PackingList $packing_list, string $billNumber, int $companyModuleId, float $totalAmount){
+    private function createStorageInvoiceTransaction(PackingList $packing_list, string $billNumber, int $companyModuleId, float $totalAmount, float $totalTax){
 
         $object = new TransactionObject(
             $billNumber,
@@ -407,7 +428,7 @@ class CheckStorageInvoiceTransactionProcessor
             1,
             1,
             0,
-            0,
+            $totalTax,
             0,
             null,
             ApprovalStatus::APPROVED
@@ -419,12 +440,13 @@ class CheckStorageInvoiceTransactionProcessor
         return $invoice_transaction;
     }
 
-    private function createStorageInvoiceTransactionDetails($invoice_transaction, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays){
+    private function createStorageInvoiceTransactionDetails($invoice_transaction, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays, $taxPercentage){
         $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
+            $pricePerCBM * $numberOfDays,
+            $taxPercentage
         );
 
         $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);

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

@@ -22,14 +22,17 @@ use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TaxPercentage;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
 
 use App\Models\CompanyModule;
 use App\Models\Document;
 use App\Models\PackingList;
 use App\Models\Transaction;
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateInvoiceTransactionProcessor
@@ -171,6 +174,16 @@ class CreateInvoiceTransactionProcessor
 
         $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
 
+        $total_tax = 0;
+        $taxPercentage = TaxPercentage::DEFAULT;
+        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+        $shippingInvoiceTransactionCreatedDate = Carbon::now();
+        if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare)) {
+            $taxPercentage = TaxPercentage::SIX_PERCENT;
+            $total_tax = $total_cbm * $taxPercentage / 100;
+            $total_cbm = $total_cbm + $total_tax;
+        }
+
         $object = new TransactionObject(
             $billNumber,
             TransactionType::SHIPPING_INVOICE,
@@ -183,7 +196,7 @@ class CreateInvoiceTransactionProcessor
             1,
             1,
             0,
-            0,
+            $total_tax,
             0,
             null,
             ApprovalStatus::PENDING_SUBMISSION
@@ -196,7 +209,8 @@ class CreateInvoiceTransactionProcessor
             'SHIPPING_FEE',
             TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
             $cbm,
-            $price_cbm
+            $price_cbm,
+            $taxPercentage
         );
 
         $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
@@ -206,7 +220,8 @@ class CreateInvoiceTransactionProcessor
                 'OVER_WEIGHT_CHARGES',
                 TransactionDetailType::OVER_WEIGHT_CHARGES,
                 $over_weight_cbm,
-                $price_cbm
+                $price_cbm,
+                $taxPercentage
             );
 
             $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
@@ -217,7 +232,8 @@ class CreateInvoiceTransactionProcessor
                 'MIN_CBM_CHARGES',
                 TransactionDetailType::MIN_CBM_CHARGES,
                 $minimum_charge,
-                $price_cbm
+                $price_cbm,
+                $taxPercentage
             );
 
             $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php

@@ -15,6 +15,7 @@ use App\Classes\Modules\Transactions\Services\CreatesTransactionableTransaction;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
 use App\Models\CompanyModule;
 
 class CreditWalletProcessor
@@ -36,6 +37,9 @@ class CreditWalletProcessor
 
     /** @var UpdatesWallet */
     private $updatesWallet;
+    
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
 
     /**
      * CreateWalletLogic constructor.
@@ -45,6 +49,7 @@ class CreditWalletProcessor
      * @param CreatesTransaction $createsTransaction
      * @param CreatesTransactionableTransaction $createsTransactionableTransaction
      * @param UpdatesWallet $updatesWallet
+     * @param UpdatesWalletBalance $updatesWalletBalance
      */
     public function __construct(
         GeneratesWalletCode $generatesWalletCode,
@@ -52,7 +57,8 @@ class CreditWalletProcessor
         GeneratesTransactionBillNumber $generatesTransactionBillNumber,
         CreatesTransaction $createsTransaction,
         CreatesTransactionableTransaction $createsTransactionableTransaction,
-        UpdatesWallet $updatesWallet
+        UpdatesWallet $updatesWallet,
+        UpdatesWalletBalance $updatesWalletBalance
     )
     {
         $this->generatesWalletCode = $generatesWalletCode;
@@ -61,6 +67,7 @@ class CreditWalletProcessor
         $this->createsTransaction = $createsTransaction;
         $this->createsTransactionableTransaction = $createsTransactionableTransaction;
         $this->updatesWallet = $updatesWallet;
+        $this->updatesWalletBalance = $updatesWalletBalance;
     }
 
 
@@ -87,11 +94,13 @@ class CreditWalletProcessor
         $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
         $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
         
-        $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
+        $this->updatesWalletBalance->execute($wallet, $transaction->amount);
 
-        $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
+        // $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
 
-        $wallet = $this->updatesWallet->execute($wallet, $walletObject);
+        // $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
+
+        // $wallet = $this->updatesWallet->execute($wallet, $walletObject);
 
         return $wallet;
     }

app/Classes/ValueObjects/Constants/TaxPercentage.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class TaxPercentage {
+
+    public const DEFAULT = 0;
+
+    public const NO_TAX = 0;
+
+    public const SIX_PERCENT = 6;
+}

app/Classes/ValueObjects/Constants/TransactionDetailType.php

@@ -13,4 +13,6 @@ final class TransactionDetailType {
     public const CUSTOM_CHARGES = 'Custom charges';
 
     public const STORAGE_FEE = 'Malaysia Warehouse Storage Fee';
+
+    public const PAY_ON_BEHALF = 'Pay on behalf';
 }

app/Console/Commands/FixInvoice.php

@@ -58,13 +58,20 @@ class FixInvoice extends Command
         foreach ($orders as $order){
             $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
             foreach ($invoices as $invoice){
-    
+
                 dump($invoice->id);
-                
+
                 $invoice->documents()->delete();
-    
-                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
-    
+
+                $view = 'pages.pdfs.shipping_invoice';
+                $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+                $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
+                if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
+                    $view = 'pages.pdfs.shipping_invoice_sst';
+                }
+
+                $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice]);
+
                 $document_object = new DocumentObject(
                     DocumentType::SHIPPING_INVOICE,
                     [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
@@ -72,10 +79,10 @@ class FixInvoice extends Command
                     ApprovalStatus::COMPLETED,
                     'shipping_invoice'
                 );
-    
+
                 /** @var Document $document */
                 $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
-    
+
                 (App()->make(CreatesFiles::class))->execute($document, $document_object);
             }
         }

app/Console/Commands/SendPermitsReminderEmails.php

@@ -7,6 +7,7 @@ use App\Models\PermitsReminder;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
 
 class SendPermitsReminderEmails extends Command
 {
@@ -41,23 +42,23 @@ class SendPermitsReminderEmails extends Command
      */
     public function handle()
     {
-        $now = now();
-        $startRange = $now->subDays(3)->startOfDay();
-        $endRange = $now->copy()->addDays(6)->endOfDay();
+        $currentDateTime = now();
+        $startRange = $currentDateTime->subDays(3)->startOfDay();
+        $endRange = $currentDateTime->copy()->addDays(6)->endOfDay();
 
         $reminders = PermitsReminder::whereDate('reminder_date', '>=', $startRange)
             ->whereDate('reminder_date', '<=', $endRange)
+            ->orWhere('reminder_date', '<', now())
             ->pluck('model');
 
-        $this->info($this->getTimeStamp() . json_encode($reminders));
+        if ($reminders->isEmpty()) {
+            $this->info('No reminders expiring within the specified range.');
+            return;
+        }
 
-        $users = User::whereIn(
-            'email',
-            [
-                'edmond.wuiming2021@gmail.com',
-                'anithagurl96@gmail.com'
-            ]
-        )->get();
+        $this->info($this->getTimeStamp() . 'Reminders: ' . $reminders->toJson());
+
+        $users = User::whereIn('email', $this->getEmailList())->get();
 
         foreach ($users as $user) {
             $this->info($this->getTimeStamp() . 'Reminder email sent to ' . $user->email);
@@ -71,4 +72,12 @@ class SendPermitsReminderEmails extends Command
     {
         return '[' . Carbon::now()->format('Y-m-d H:i:s') . '] - ';
     }
+
+    protected function getEmailList(): array
+    {
+        return [
+            'edmond.wuiming2021@gmail.com',
+            'anithagurl96@gmail.com'
+        ];
+    }
 }

app/Http/Controllers/PermitsReminder/ListPermitsReminderController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\PermitsReminder;
 
 use App\Models\PermitsReminder;
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -15,14 +16,25 @@ class ListPermitsReminderController
     public function list(Request $request): JsonResponse
     {
         $perPage = 10; // Number of items per page
-        $page = request('page', 1); // Get the current page from the request
+        $page = $request->query('page', 1); // Get the current page from the request
 
         // Paginate the PermitsReminder model
-        $query = PermitsReminder::orderBy('id', 'desc');
-        $paginator = $query->paginate($perPage, ['*'], 'page', $page);
+        $paginator = PermitsReminder::orderBy('reminder_date')->paginate($perPage, ['*'], 'page', $page);
 
-        // Convert paginated data to an array
+        // Get current date and time
+        $currentDateTime = now();
+
+        // Define date range
+        $startRange = $currentDateTime->subDays(3)->startOfDay();
+        $endRange = $currentDateTime->copy()->addDays(6)->endOfDay();
+
+        // Process paginated items
         $data = $paginator->items();
+        foreach ($data as &$item) {
+            // Check if the reminder_date is within the date range or after the current date
+            $reminderDate = Carbon::parse($item->reminder_date);
+            $item->show_remind = $reminderDate->between($startRange, $endRange) || $reminderDate->isBefore($currentDateTime);
+        }
 
         // Create pagination links
         $links = [
@@ -32,6 +44,7 @@ class ListPermitsReminderController
             "next" => $paginator->nextPageUrl(),
         ];
 
+        // Prepare response
         $response = [
             "title" => "List Permits Reminder",
             "message" => "You have successfully retrieved a list of Permits Reminder",

app/Http/Controllers/Transactions/DeletePaidGroupController.php

@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\DeletePaidGroupLogic;
+
+class DeletePaidGroupController
+{
+    /**
+     * @param Request $request
+     * @param DeleteGroupTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeletePaidGroupLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Resources/ContainerResource.php

@@ -23,17 +23,25 @@ class ContainerResource extends JsonResource
             'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type],
             'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
-            'loading_date' => $this->loading_date ? $this->loading_date->format('d-m-Y') : $this->loading_date,
+            'loading_date' => optional($this->loading_date)->format('d-m-Y'),
             'transport' => new TransportResource($this->transports()->first()),
             'packages_count' => $this->packages()->where('packages.type', '!=', 2)->sum('quantity'),
             'total_cbm' => $this->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
             'remarks' => RemarkResource::collection($this->remarks),
             'status' => $this->status,
-            'packing_lists' =>  $this->whenLoaded('packingLists', PackingListResource::collection($this->whenLoaded('packingLists', function(){
-                return $this->packingLists()->get()->sortBy(function ($packingList) {
-                    return $packingList->owner->company_module_id;
-                });
-            })))
+            'packing_lists' => $this->shouldIncludePackingListData($request) ? $this->getSortedPackingLists() : null,
         ];
     }
+
+    protected function shouldIncludePackingListData($request)
+    {
+        return (isset($request->all()['with_packing_list_data']) && ($request->all()['with_packing_list_data'] == false)) ? false : true;
+    }
+
+    protected function getSortedPackingLists()
+    {
+        return $this->whenLoaded('packingLists', PackingListResource::collection(
+            $this->packingLists()->get()->sortBy(fn ($packingList) => $packingList->owner->company_module_id)
+        ));
+    }
 }

app/Http/Resources/GroupForOrderV2Resource.php

@@ -26,7 +26,7 @@ class GroupForOrderV2Resource extends JsonResource
             'original_currency' => new CurrencyResource($this->original_currency),
             'issuer_name' => $this->issuerCompany->name,
             'issuer_id' => $this->issuerCompany->id,
-            'amount' => (float) $this->amount,
+            'amount' => (float) $this->amount, //cief todo: 58
             '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'),
@@ -40,8 +40,10 @@ class GroupForOrderV2Resource extends JsonResource
             'payment_transaction' => $payment_transaction ? [
                 'id' => $payment_transaction->id,
                 'status' => $payment_transaction->status,
-                'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status]
-            ] : []
+                'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status],
+                'bill_no' => $payment_transaction->bill_no,
+                'updated_at' => Carbon::parse($payment_transaction->updated_at)->format('d-m-Y h:i:s A'),
+            ] : null
         ];
     }
 }

app/Http/Resources/TransactionResource.php

@@ -52,7 +52,7 @@ class TransactionResource extends JsonResource
             'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
-            'amount' => (double) $this->amount,
+            'amount' => (double) $this->amount, //cief todo: 58
             'payment_method' => (int) $this->payment_method,
             'payment_reference' => $this->payment_reference,
             'outstanding' => (double) $this->amount - ($this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount')),
@@ -78,7 +78,7 @@ class TransactionResource extends JsonResource
                     ->get()
             ),
             'remarks' => RemarkResource::collection($this->remarks),
-            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
         ];

app/Http/Resources/TransactionWithStorageResource.php

@@ -59,7 +59,7 @@ class TransactionWithStorageResource extends JsonResource
         if ($ts) {
             $paymentTransaction = Transaction::where('payment_reference',  $ts->reference)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION])->first();
             if($paymentTransaction){
-                $groupTotalAmount = (double) $this->amount;
+                $groupTotalAmount = (double) $this->amount; //cief todo: 58
 
                 foreach ($group_payment_history as $key => $value) {
                     if ($value->id === $ts->id && $value->reference === $ts->reference) {
@@ -88,10 +88,10 @@ class TransactionWithStorageResource extends JsonResource
             'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
-            'amount' => (double) $this->amount,
+            'amount' => (double) $this->amount, //cief todo: 58
             'payment_method' => (int) $this->payment_method,
             'payment_reference' => $this->payment_reference,
-            'outstanding' => (double) $this->amount - ($this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount')),
+            'outstanding' => (double) $this->amount - ($this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount')), //cief todo: 58
             'floating' => $group_payment_attempts ? $groupTotalAmount : (double) $this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION])->sum('amount'),
             'service_charge' => (double) $this->service_charge,
             'tax' => (double) $this->tax,
@@ -121,7 +121,7 @@ class TransactionWithStorageResource extends JsonResource
             'remarks' => RemarkResource::collection($this->remarks),
             'storages' => $this->storages ? $this->storages : null, //from middleware
             'is_waived' => (int) $this->is_waived,
-            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
         ];

config/logging.php

@@ -113,6 +113,12 @@ return [
             'level' => 'info',
         ],
 
+        'deletePaidGroupOrder' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/deletePaidGroupOrder.log'),
+            'level' => 'info',
+        ],
+
         'vue_polling' => [
             'driver' => 'single',
             'path' => storage_path('logs/laravel_vue_plling.log'),

config/qr.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    // please update resources/assets/vue/app.js if value is changed
+    
+    // 'qr_code_img_url' => 'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=', // not working 
+    'qr_code_img_url' => 'https://qrcode.tec-it.com/API/QRCode?data=',
+];

database/migrations/2021_10_16_223036_create_transaction_logs_table.php

@@ -0,0 +1,65 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+class CreateTransactionLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('transaction_logs', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('transaction_id');
+            $table->morphs('owner');
+            $table->string('type')->default(TransactionType::PAYMENT);
+            $table->foreignId('issuer')->unsigned();
+            $table->foreignId('receiver')->unsigned();
+            $table->foreignId('recipient_bank_account_id')->unsigned();
+            $table->string('payment_method')->nullable();
+            $table->string('payment_reference')->nullable();
+            $table->string('bill_no')->unique();
+            $table->decimal('amount', 25, 5)->default(0.00);
+            $table->decimal('original_amount', 25, 5)->default(0.00);
+            $table->foreignId('currency_id')->unsigned();
+            $table->foreignId('original_currency_id')->unsigned();
+            $table->decimal('currency_rate', 14, 5)->default(0.00);
+            $table->decimal('tax', 14, 5)->default(0.00);
+            $table->decimal('service_charge', 14, 5)->default(0.00);
+            $table->timestamp('expires_on')->nullable();
+            $table->integer('status')->default(ApprovalStatus::PENDING_SUBMISSION);
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('transaction_id')->references('id')->on('transactions');
+            $table->foreign('currency_id')->references('id')->on('currencies');
+            $table->foreign('issuer')->references('id')->on('company_modules');
+            $table->foreign('receiver')->references('id')->on('company_modules');
+            $table->foreign('original_currency_id')->references('id')->on('currencies');
+
+        });
+
+        //In-case the model name lengthy
+        Schema::table('transaction_logs', function (Blueprint $table) {
+            $table->string('owner_type', 250)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('transaction_logs');
+    }
+}

database/migrations/2024_04_06_004026_add_columns_to_transaction_details_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColumnsToTransactionDetailsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('transaction_details', function (Blueprint $table) {
+            $table->decimal('tax_amount', 14, 5)->after('amount')->default(0.00);
+            $table->decimal('tax_percentage', 6, 2)->after('tax_amount')->default(0.00);
+            $table->decimal('discount', 14, 5)->after('tax_percentage')->default(0.00);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('transaction_details', function (Blueprint $table) {
+            $table->dropColumn('tax_amount');
+            $table->dropColumn('tax_percentage');
+            $table->dropColumn('discount');
+        });
+    }
+}

resources/assets/vue/app.js

@@ -24,6 +24,9 @@ import closable from './general/directives/closable';
 
 import Avatar from 'vue-avatar';
 
+// define global variable
+Vue.prototype.$qr_code_img_url = 'https://qrcode.tec-it.com/API/QRCode?data=';
+
 /** Application Injections */
 Vue.use(vuelidate);
 Vue.use(VueTheMask);

resources/assets/vue/components/containers/forms/ContainerCommentFormComponent.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-t-5">
+    <div class="row m-t-5" @keyup.enter="submitForm">
         <div class="col">
             <validation-wrapper-component :validator="$v.parameters.content">
                 <input type="text" class="form-control fs-12" placeholder="Write your comments..." v-model.trim="parameters.content">
@@ -42,7 +42,7 @@
             submitForm() {
                 this.submit(this.data ? this.route('api.remark.update', this.data.id) : this.route('api.packing_list.container.remark.create', this.id), this.data ? 'put' : 'post', this.section, true, true);
                 this.$emit('submit')
-            }
+            },
         },
         mixins: [modalFormHandler]
     }

resources/assets/vue/components/containers/sections/ContainerProfileV2SectionComponent.vue

@@ -0,0 +1,229 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row" v-if="container">
+                <div class="col">
+                    <div class="row align-items-center m-t-10">
+                        <div class="col bg-master-lightest rounded padding-20 m-l-10 m-r-10">
+                            <div class="row d-flex justify-content-between align-items-center">
+                                <div class="col b-r">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="m-b-0 large-text normal m-b-10">Container Number</p>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="m-t-0 m-b-0 fs-20 bold">{{ container.container_reference }}</p>
+                                            <p class="m-t-0 m-b-0 small-text">{{ container.container_number }}</p>
+                                            <p class="m-t-0 m-b-0 small-text">seal number</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="fs-10 bold m-b-0">ETD</p>
+                                            <p class="small-text m-t-0">{{ container.transport.current_schedule.etd }} <a class="b-rad-none all-caps requestModal" data-type="rescheduleDate"><i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i></a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="fs-10 bold m-b-0">ETA</p>
+                                            <p class="small-text m-t-0">{{ container.transport.current_schedule.eta }} <a class="b-rad-none all-caps requestModal" data-type="rescheduleDate"><i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i></a>
+                                            </p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="fs-10 bold m-b-0">Location</p>
+                                            <p class="small-text m-t-0">-tbc-</p>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="fs-10 bold m-b-0">Destination</p>
+                                            <p class="small-text m-t-0">-tbc-</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="fs-10 bold m-b-0">Container Type</p>
+                                            <p class="small-text m-t-0">{{ container.container_specification.name }}</p>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <p class="fs-10 bold m-b-0">Owner</p>
+                                            <p class="small-text m-t-0">-tbc-</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-t-10 m-b-50">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row h-100">
+                                        <div class="col">
+                                            <h5 class="m-b-5 large-text bold l-20">Tracking:</h5>
+                                            <div class="row padding-10">
+                                                <div class="col rounded bg-master-lighter padding-15">
+                                                    <li class="m-t-10">
+                                                        <a class="btn btn-sm btn-primary b-rad-none all-caps requestModal"
+                                                            data-type="containerDepature">Container Departure</a>
+                                                    </li>
+                                                    <li class="m-t-10">
+                                                        <a class="btn btn-sm btn-primary b-rad-none all-caps requestModal"
+                                                            data-type="containerArrival">Arrival Date</a>
+                                                    </li>
+                                                    <li class="m-t-10">
+                                                        <a class="btn btn-sm btn-primary b-rad-none all-caps requestModal"
+                                                            data-type="containerUnpacking">Date of Unpacking</a>
+                                                    </li>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in"
+                        type="rescheduleDate">
+                        <reschedule-date-form-component :section="section"
+                            :data="container"></reschedule-date-form-component>
+                    </modal-component>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in"
+                        type="containerDepature">
+                        <container-depature-form-component :section="section"
+                            :data="container"></container-depature-form-component>
+                    </modal-component>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in"
+                        type="containerArrival">
+                        <container-arrival-form-component :section="section"
+                            :data="container"></container-arrival-form-component>
+                    </modal-component>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in"
+                        type="containerUnpacking">
+                        <container-unpacking-form-container :section="section"
+                            :data="container"></container-unpacking-form-container>
+                    </modal-component>
+
+                    <div class="row m-t-10">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col-auto padding-5 m-l-15 m-r-15 pointer" :class="[{ 'text-primary': tabShowing === 'Comments' }, { 'b-b': tabShowing === 'Comments' }]" @click="tabShowing = 'Comments'">
+                                    <h5 class="large-text bold l-20" :class="[{ 'text-primary': tabShowing === 'Comments' }]"> Comments</h5>
+                                </div>
+                                <!-- <div class="col-auto padding-5 m-l-15 m-r-15 pointer" :class="[{ 'text-primary': tabShowing === 'Timeline' }, { 'b-b': tabShowing === 'Timeline' }]" @click="tabShowing = 'Timeline'">
+                                    <h5 class="large-text bold l-20" :class="[{ 'text-primary': tabShowing === 'Timeline' }]"> Activity Timeline</h5>
+                                </div> -->
+                            </div>
+                            <div class="row p-l-10 p-r-10">
+                                <div class="col rounded padding-15">
+                                    <div class="row" v-if="tabShowing === 'Comments'">
+                                        <div class="col">
+                                            <div class="row" v-for="remarks in container.remarks">
+                                                <div class="col">
+                                                    <container-comment-component :section="section" :data="remarks"></container-comment-component>
+                                                </div>
+                                            </div>
+                                            <container-comment-form-component :section="section" :id="container.id"></container-comment-form-component>
+                                        </div>
+                                    </div>
+                                    <div class="row" v-if="tabShowing === 'Timeline'">
+                                        <div class="col">
+                                            <div class="row align-items-center justify-content-center p-t-50 p-b-50">
+                                                <div class="col-10">
+                                                    <div class="row align-items-center justify-content-center  hint-text">
+                                                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                    </div>
+                                                    <div class="row text-center">
+                                                        <div class="col">
+                                                            <div class="row m-t-20">
+                                                                <div class="col">
+                                                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row m-t-5 align-items-center justify-content-center hide">
+                                                                <div class="col">
+                                                                    <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props: {
+        id: {
+            type: Number,
+            required: true,
+        }
+    },
+    data() {
+        return {
+            section: 'containerPofileSection',
+            isLoading: true,
+            container: null,
+            expanded: false,
+            CBMcapacity: 30,
+            // tabShowing: 'Timeline',
+            tabShowing: 'Comments',
+            selectAllPackingList: false,
+            selectedPackageList: [],
+            deleteCommentId: '',
+        }
+    },
+    computed: {
+        pendingQueue() {
+            return this.$store.getters.isInCompleteQueue(this.section);
+        },
+        loadedCBM() {
+            return (Math.ceil((this.container.packing_lists.reduce((total, obj) => total + obj.packages.reduce((total, obj) => obj.cbm + total, 0), 0)) * 1000) / 1000).toFixed(3)
+        },
+    },
+    watch: {
+        pendingQueue(inComplete) {
+            if (inComplete) {
+                this.fetchCompany();
+            }
+        }
+    },
+    created() {
+        this.$store.dispatch('updateListQueue', { 'name': this.section });
+    },
+    methods: {
+        fetchCompany() {
+            this.isLoading = true;
+            this.submit(route('api.packing_list.container.show', this.id) + '?with_packing_list_data=0', 'get', this.section, false, false)
+        },
+        successHandler(response) {
+            this.$store.dispatch('completeList', { 'name': this.section, 'data': [] });
+            this.isLoading = false;
+            this.container = response.payload.data;
+        },
+    }
+}
+</script>

resources/assets/vue/components/orders/elements/OrderComponent.vue

@@ -5,9 +5,10 @@
                 <div class="col-6 no-padding">
                     <div class="row">
                         <div class="col">
-                            <a :href="route('order.qr.download', item.id)" target="_blank">
+                            <a :href="route('order.qr.download', item.id)" target="_blank" class="d-flex justify-content-center allign-items-center">
                                 <div class="peelable-corner overflow-hidden relative">
-                                    <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+item.id+'}'" class="w-100">
+                                    <!-- <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+item.id+'}'" class="w-100"> -->
+                                    <img :src="this.$qr_code_img_url + item.id + '}'" class="w-100" style="max-width: 150px; max-height: 150px;">
                                 </div>
                             </a>
                         </div>

resources/assets/vue/components/orders/elements/PackageComponent.vue

@@ -47,7 +47,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row b-b b-grey p-b-20 align-items-center">
+                            <div class="row b-b b-grey p-b-20 align-items-center parentContainer">
                                 <div class="col">
                                     <div class="row m-b-5">
                                         <div class="col-auto">
@@ -58,9 +58,48 @@
                                             <small class="fs-10 all-caps muted">Status</small>
                                             <p class="no-margin bold">{{item.container ? item.container.transport.schedule_complete && status === 'Shipping' ? 'Custom Clearance' : status : status}}</p>
                                         </div>
-                                        <div class="col-auto" v-if="$store.getters.isAdmin">
-                                            <small class="fs-10 all-caps muted">Container</small>
-                                            <p class="no-margin bold">{{item.container ? item.container.container_reference : '-'}}</p>
+                                        <div class="col" v-if="$store.getters.isAdmin">
+                                            <div class="row h-100 justify-content-center align-items-center">
+                                                <div class="col">
+                                                    <small class="fs-10 all-caps muted">Container</small>
+                                                    <p class="no-margin bold">{{ item.container ? item.container.container_reference : '-' }}</p>
+                                                </div>
+                                                <div class="col-auto" v-if="$store.getters.isAdmin && item.container">
+                                                    <i class="fa fa-comment fs-15 pointer requestModal" data-type="commentsModal"></i>
+                                                    <modal-component type="commentsModal" styleType="fill-in">
+                                                        <div class="row">
+                                                            <div class="col bg-white b-rad-lg p-t-10 p-t-10 p-l-40 p-r-40">
+                                                                <h4 class="m-b-20">Remarks</h4>
+                                                                <div class="row" v-if="item.container.remarks.length">
+                                                                    <div class="col">
+                                                                        <div class="row" v-for="remarks in item.container.remarks">
+                                                                            <div class="col">
+                                                                                <container-comment-component :section="section" :data="remarks"></container-comment-component>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-else>
+                                                                    <div class="col-10">
+                                                                        <div class="row align-items-center justify-content-center  hint-text">
+                                                                            <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                                                        </div>
+                                                                        <div class="row text-center">
+                                                                            <div class="col">
+                                                                                <div class="row m-t-20">
+                                                                                    <div class="col">
+                                                                                        <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </modal-component>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="row">

resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue

@@ -12,7 +12,8 @@
                                         <div class="col-10">
                                             <a :href="route('order.qr.download', order.id)" target="_blank">
                                                 <div class="peelable-corner overflow-hidden relative">
-                                                    <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100">
+                                                    <!-- <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100"> -->
+                                                    <img :src="this.$qr_code_img_url + order.id + '}'" class="w-100">
                                                 </div>
                                             </a>
                                         </div>

resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue

@@ -12,7 +12,8 @@
                                         <div class="col-10">
                                             <a :href="route('order.qr.download', order.id)" target="_blank">
                                                 <div class="peelable-corner overflow-hidden relative">
-                                                    <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100">
+                                                    <!-- <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100"> -->
+                                                    <img :src="this.$qr_code_img_url + order.id + '}'" class="w-100">
                                                 </div>
                                             </a>
                                         </div>

resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue

@@ -1,322 +0,0 @@
-<template>
-    <div class="row m-b-15 m-l-5 m-r-10 parentContainer">
-        <div class="col bg-white rounded">
-            <div class="row">
-                <div class="col padding-20">
-                    <div class="row align-items-center">
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Marking</p>
-                            <div class="no-margin">
-                                <div v-if="item.order">
-                                    <a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>/<a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a>
-                                    <p>{{item.loading_days_ago}}</p>
-                                </div>
-                                <div v-else class="text-danger">Unclaimed Packing List</div>
-                            </div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Container</p>
-                            <div v-if="item.packages[0].container"> {{item.packages[0].container.container_reference}}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
-                            <div v-if="!item.shipping_transaction">n/a</div>
-                            <div v-if="item.shipping_transaction"> {{ item.shipping_transaction.updated_at }}</div>
-                        </div>
-                        <div class="col">
-                            <div v-if="item.order">
-                                <p class="no-margin fs-10 all-caps">Address</p>
-                                <div>{{ item.order.address.post_code_area}}</div>
-                                <div>{{ item.order.address.district.name +' '+item.order.address.postcode+' '+item.order.address.state.name  }}</div>
-                            </div>
-                            <div v-else class="text-danger">Unclaimed</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Status</p>
-                            <div class="all-caps">{{ invoice_status }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Amount</p>
-                            <div v-if="!item.shipping_transaction">n/a</div>
-                            <div v-if="item.shipping_transaction">MYR  {{ item.shipping_transaction.amount.toFixed(2) }}</div>
-                        </div>
-                        <div class="col-auto p-l-0 p-r-0" v-if="['Pending Payment', 'Paid Invoice', 'Suspended Invoice'].includes(invoice_status)">
-                            <div v-if="item.shipping_transaction">
-                                <div v-if="item.shipping_transaction.documents.length">
-                                    <div v-for="file in item.shipping_transaction.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>
-                        <div class="col-auto">
-                            <div class="row text-center parentContainer m-b-10" v-if="['Pending Invoice'].includes(invoice_status) && !item.receive_packing_list" >
-                                <div class="col">
-                                    <div class="requestModal pointer btn btn-primary btn-xs" data-type="addWarehouseTransport">
-                                        Add Warehouse Transport
-                                    </div>
-                                    <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="addWarehouseTransport">
-                                        <create-warehouse-transport-form-component :packinglistId="item.id" :section="section"></create-warehouse-transport-form-component>
-                                    </modal-component>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col">
-                                    <div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval', 'Pending Payment'].includes(invoice_status)">
-                                        <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
-                                    </div>
-                                    <div v-if="!item.shipping_transaction">
-                                        <div v-if="item.order">
-                                            <div v-if="!item.order.company_module.billingAddress">
-                                                <div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
-                                                <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="billingAddressComponent">
-                                                    <address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
-                                                </modal-component>
-                                            </div>
-                                            <div class="row" v-if="item.order.company_module.billingAddress">
-                                                <div class="col">
-                                                    <div class="col-auto requestModal pointer" data-type="editBillingAddress">
-                                                        <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
-                                                    </div>
-                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
-                                                        <div class="row">
-                                                            <div class="col bg-white">
-                                                                <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
-                                                            </div>
-                                                        </div>
-                                                    </modal-component>
-                                                </div>
-                                            </div>
-                                            <div v-if="!item.order.address.post_code_area">
-                                                <div class="btn btn-xs btn-primary pointer m-t-10 requestModal btn-block" data-type="defineLocation">Define Location</div>
-                                                <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="defineLocation">
-                                                    <declare-postcode-area-form-component :data="item.order.address" :section="section"></declare-postcode-area-form-component>
-                                                </modal-component>
-                                            </div>
-                                            <div v-if="item.order.company_module.billingAddress && item.order.address.post_code_area" class="btn btn-outline-primary btn-lg pointer" @click="generateInvoice()">Generate Invoice</div>
-                                        </div>
-                                        <div v-else>
-                                            <div class="btn btn-outline-primary btn-lg pointer invisible">Generate Invoice</div>
-                                        </div>
-                                    </div>
-                                    <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="confirmInvoice">
-                                        <i class="fa fa-check fs-12"></i>
-                                    </div>
-                                    <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="deleteInoive">
-                                        <i class="fa fa-close fs-12"></i>
-                                    </div>
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="confirmInvoice">
-                                        <approve-shipping-invoice-form-component :section="section" :data="data"></approve-shipping-invoice-form-component>
-                                    </modal-component>
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInoive">
-                                        <delete-shipping-invoice-form-component :section="section" :data="data"></delete-shipping-invoice-form-component>
-                                    </modal-component>
-                                </div>
-                            </div>
-                        </div>
-                    </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.shipping_transaction && ['Pending Approval', 'Suspended Invoice'].includes(invoice_status)">
-                <div class="col p-b-10">
-                    <div class="row">
-                        <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
-                            <div class="row align-items-center">
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Container Reference</p>
-                                    <div v-if="item.packages.length">{{ item.packages[0].container ? item.packages[0].container.container_reference : 'n/a' }}</div>
-                                    <div v-else>n/a</div>
-                                </div>
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Due Date</p>
-                                    <div v-if="item.packages.length">
-                                        <div v-if="item.packages[0].container">
-                                            <div v-if="item.packages[0].container.transport">{{ item.packages[0].container.transport.drop_date == null ? item.packages[0].container.transport.current_schedule.etd : item.packages[0].container.transport.drop_date }}</div>
-                                            <div v-else>n/a</div>
-                                        </div>
-                                        <div v-else>n/a</div>
-                                    </div>
-                                    <div v-else>n/a</div>
-                                </div>
-                                <!-- <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Paid Date</p>
-                                    <div>n/a</div>
-                                </div> -->
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Total CBM</p>
-                                    <div>{{ (parseFloat(cbm) + parseFloat(overweight)).toFixed(3) }}</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <h5 class="text-underline text-center">Invoice Details</h5>
-                    <invoice-items-form-component :data="item.shipping_transaction" :section="section"></invoice-items-form-component>
-
-                    <div class="row">
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Subtotal</p>
-                            <div>{{ item.shipping_transaction.amount -  item.shipping_transaction.service_charge - item.shipping_transaction.tax }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Service Charges</p>
-                            <div>{{ item.shipping_transaction.service_charge }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Tax</p>
-                            <div>{{ item.shipping_transaction.tax }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Total</p>
-                            <div>{{ item.shipping_transaction.amount }}</div>
-                        </div>
-                    </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.shipping_transaction && invoice_status == 'Pending Payment'">
-                <div class="col-12 col-md-7 padding-20">
-                    <div class="row bg-master-lightest h-100">
-                        <div class="col">
-                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_attempts.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 Attempt</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <shipping-transaction-component v-for="item in item.shipping_transaction.payment_attempts" v-bind:key="item.id" :data="item" ></shipping-transaction-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_history.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 History</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <payment-history-component v-for="item in item.shipping_transaction.payment_history" v-bind:key="item.id" :data="item" ></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((item.shipping_transaction.amount + 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 hide">
-                                        <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((item.shipping_transaction.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
-                                            <div class="font-heading fs-12">Paid Total</div>
-                                        </div>
-                                    </div>
-                                    <div class="row align-items-end m-b-10 hide">
-                                        <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((item.shipping_transaction.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
-                                            <div class="font-heading fs-12">Floating Amount</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((item.shipping_transaction.outstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
-                                        </div>
-                                    </div>
-                                    <div class="row m-t-20" v-if="item.shipping_transaction.outstanding > 0">
-                                        <div class="col">
-                                            <div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
-                                <payment-form-component :data="item.shipping_transaction" :section="section"></payment-form-component>
-                            </modal-component>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    export default {
-        props: {
-            invoice_status: {
-                type: String,
-                required: true
-            },
-            section:{
-                type: String,
-                required: true
-            }
-        },
-        data(){
-            return {
-                parameters: {
-                    packing_list_id: null,
-                    transaction_details: [],
-                },
-                expanded: false,
-            }
-        },
-        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)
-            }
-        },
-        created(){
-            this.parameters.packing_list_id = this.data.id;
-        },
-        methods: {
-            generateInvoice() {
-                this.submit(this.route('api.transaction.invoice.create'), 'post', this.section, true, true);
-            },
-            successHandler(response){
-                this.item = response.payload.data;
-                this.updateList();
-            }
-        },
-        mixins: [componentHandler]
-    }
-</script>

resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingWithSearchComponent.vue

@@ -38,6 +38,7 @@
                 <template slot="list" slot-scope="{data}">
                     <single-parent-admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></single-parent-admin-payments-billing-component>
                     <!-- <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component> -->
+                    <!-- AdminPaymentsBillingComponent.vue deleted to avoid confusion -->
                 </template>
             </list-component>
         </div>

resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingWithStorageComponent.vue

@@ -277,11 +277,11 @@
                                             <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="row m-t-20" v-if="totalOutstanding - totalFloating > 0.009 && !groupPaymentPending">
                                         <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)" :showManualPayment="false"></group-payment-form-component>
+                                                <group-payment-form-component :section="section" :selectedIds="selectedIds" :sumAmount="totalOutstanding.toFixed(2)" :showManualPayment="true"></group-payment-form-component>
                                             </modal-component>
                                         </div>
                                     </div>
@@ -345,6 +345,20 @@
                 });
                 return ids;
             },
+            groupPaymentPending(){
+                if (Array.isArray(this.items)) {
+                    for (let i = 0; i < this.items.length; i++) {
+                        for (let j = 0; j < this.items[i].groups_payment_history.length; j++) {
+                            const item = this.items[i].groups_payment_history[j];
+                            // console.log('item', JSON.stringify(item));
+                            if (item.payment_transaction && item.payment_transaction.status === 1) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return false;
+            }
         },
         methods: {
             getLatestComment(item) {
@@ -356,6 +370,7 @@
             },
             groupTransactionsExist(items, groups) {
                 return groups.some(group =>
+                    group.payment_transaction &&
                     group.transactions_ids.length === items.length &&
                     group.transactions_ids.every(transaction =>
                         items.some(item => item.id === transaction.transaction_id)

resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue

@@ -25,12 +25,12 @@
                                 <i class="fa fa-repeat fs-20 text-white"></i>
                             </div>
                         </div>
-                        <div class="col-auto requestModal" v-if="item.status != 2 && item.status != 6" data-type="deleteGroupTransaction">
+                        <div class="col-auto requestModal" v-if="item.status != 2 && item.status != 6" data-type="deleteGroupTransactionInProgress">
                             <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">
+                        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteGroupTransactionInProgress">
                             <general-confirmation-form-component
                                 contentText="Are you sure you want to delete this Group Payment?"
                                 modalType="delete"
@@ -75,6 +75,23 @@
                                 <i class="fa fa-repeat fs-20 text-white"></i>
                             </div>
                         </div>
+                        <!-- <div class="col-auto requestModal" v-if="item.status == 2 && $store.getters.isSuperAdmin && false" data-type="deletePaidGroupTransaction">
+                            <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="deletePaidGroupTransaction">
+                            <general-confirmation-form-component
+                                contentText="Are you sure you want to delete this Paid Group Payment?"
+                                modalType="delete"
+                                buttonText="Delete"
+                                class="text-center"
+                                :apiRoute="route('api.transaction.group.paidGroup.delete', item.id)"
+                                apiMethod="delete"
+                                :section="section"
+                            >
+                            </general-confirmation-form-component>
+                        </modal-component>
                         <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>

resources/assets/vue/components/paymentsBilling/elements/PaymentExpiredComponent.vue

@@ -18,12 +18,18 @@
                                         {{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="col-auto p-l-0"  v-if="item.bill_no">
                                     <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 class="col-auto p-l-0" v-else-if="item.payment_transaction && $store.getters.isAdmin">
+                                    <div class="font-heading fs-8 muted all-caps">Bill Number</div>
+                                    <div class="font-heading fs-10 bold">
+                                        {{ item.payment_transaction.bill_no }}
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

resources/assets/vue/components/paymentsBilling/elements/PaymentHistoryComponent.vue

@@ -80,7 +80,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
+                                    <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
                                 </div>
                             </div>
                             <div class="row">

resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue

@@ -19,16 +19,16 @@
                                         {{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="col-auto p-l-0" v-if="$store.getters.isAdmin">
                                     <div class="font-heading fs-8 muted all-caps">Bill Number</div>
                                     <div class="font-heading fs-10 bold">
-                                        {{ item.bill_no }}
+                                        {{ item.payment_transaction.bill_no }}
                                     </div>
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <div class="font-heading fs-8 all-caps" :class="[{'text-danger': item.payment_transaction.status === 4}, {'text-primary': item.payment_transaction.status !== 4}]">{{ item.payment_transaction.status === 2 ? 'Received' : item.payment_transaction.status === 4 ? 'Rejected' : 'Submitted'}} On: {{item.updated_at}}</div>
+                                    <div class="font-heading fs-8 all-caps" :class="[{'text-danger': item.payment_transaction.status === 4}, {'text-primary': item.payment_transaction.status !== 4}]">{{ item.payment_transaction.status === 2 ? 'Received' : item.payment_transaction.status === 4 ? 'Rejected' : 'Submitted'}} On: {{item.payment_transaction.updated_at}}</div>
                                 </div>
                             </div>
                         </div>
@@ -81,12 +81,12 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
+                                    <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <div class="font-heading all-caps fs-10 bold">Bank In Amount: <span class="text-success">{{(Math.round((parseFloat(amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span></div>
+                                    <div class="font-heading all-caps fs-10 bold">Bank In Amount: <span class="text-success">{{(Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span></div>
                                 </div>
                             </div>
                         </div>

resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue

@@ -115,7 +115,7 @@
                                                                 </div>
                                                                 <div class="row">
                                                                     <div class="col">
-                                                                        <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
+                                                                        <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
                                                                     </div>
                                                                 </div>
                                                                 <div class="row">

resources/assets/vue/components/paymentsBilling/forms/InvoiceItemFormComponent.vue

@@ -37,7 +37,11 @@
             <div class="row" v-if="isEdit">
                 <div class="col padding-25 bg-master-lightest">
                     <div class="row">
-                        <div class="col">
+                        <div class="col" v-if="name">
+                            <p class="m-b-0 small muted">Name</p>
+                            <p class="m-b-0 bold">{{product.name}}</p>
+                        </div>
+                        <div class="col" v-else>
                             <validation-wrapper-component :validator="$v.product.name">
                                 <label>Name</label>
                                 <input class="form-control" v-model="product.name">
@@ -93,6 +97,10 @@
                 // required: true
                 default: 0
             },
+            name:{
+                type: String,
+                default: ""
+            },
         },
         data(){
             return {
@@ -102,6 +110,7 @@
                     quantity: 0,
                     price: 0,
                     amount: 0,
+                    reference: 'CUSTOM_CHARGES',
                 },
                 products: []
             }
@@ -113,6 +122,12 @@
                 price: { required },
             }
         },
+        mounted() {
+            if(this.name){
+                this.product.name = this.name;
+                this.product.reference = 'PAY_ON_BEHALF';
+            }
+        },
         created() {
             if (this.data) {
                 this.product = this.data;
@@ -136,7 +151,7 @@
                     this.$emit('add', {
                         name: this.product.name,
                         quantity: this.product.quantity,
-                        reference: 'CUSTOM_CHARGES',
+                        reference: this.product.reference,
                         price: parseFloat((this.product.price).toString().replace(',', '')),
                         amount: this.productTotal
                     });

resources/assets/vue/components/paymentsBilling/forms/InvoiceItemsFormComponent.vue

@@ -15,13 +15,14 @@
 
                     <div class="row" v-if="addCharges">
                         <div class="col">
-                            <invoice-item-form-component currency="MYR" :editable="!submitted" :section="section" @change="addCharges = !addCharges" @add="addProduct($event)" v-on:remove="removeProduct(index)"></invoice-item-form-component>
+                            <invoice-item-form-component currency="MYR" :editable="!submitted" :section="section" :name="addChargesName" @change="addCharges = !addCharges" @add="addProduct($event)" v-on:remove="removeProduct(index)"></invoice-item-form-component>
                         </div>
                     </div>
 
                     <div class="row d-flex justify-content-center allign-items-between align-items-center m-b-15">
                         <div class="col-auto">
-                            <div class="btn btn-outline-primary btn-md" @click="addCharges = !addCharges">{{ addCharges? 'Cancel' : 'Add Charges' }}</div>
+                            <div class="btn btn-outline-primary btn-md" @click="addCharges = !addCharges; addChargesName = 'Pay On Behalf'">{{ addCharges? 'Cancel' : 'Add \'Pay On Behalf \' Charges' }}</div>
+                            <div class="btn btn-outline-primary btn-md" @click="addCharges = !addCharges; addChargesName = ''">{{ addCharges? 'Cancel' : 'Add Charges' }}</div>
                             <div class="btn btn-outline-primary btn-md" @click="submitForm()">Save Change</div>
                         </div>
                     </div>
@@ -44,6 +45,7 @@
                 parameters: {
                     transaction_details: []
                 },
+                addChargesName: ''
             }
         },
         methods: {

resources/assets/vue/components/paymentsBilling/forms/PaymentFormComponent.vue

@@ -76,7 +76,7 @@
                                                             </div>
                                                             <div class="row">
                                                                 <div class="col">
-                                                                    <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
+                                                                    <div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
                                                                 </div>
                                                             </div>
                                                             <div class="row">

resources/assets/vue/components/settings/elements/PermitsReminderItemComponent.vue

@@ -29,7 +29,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">{{ data.model }}</div>
+                            <div class="font-heading all-caps" :class="[{ 'text-danger': data.show_remind }]">{{ data.model }}</div>
                         </div>
                     </div>
                 </div>
@@ -41,7 +41,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">{{ data.expiry_date }}</div>
+                            <div class="font-heading all-caps" :class="[{ 'text-danger': data.show_remind }]">{{ data.expiry_date }}</div>
                         </div>
                     </div>
                 </div>
@@ -53,7 +53,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">{{ data.reminder_date }}</div>
+                            <div class="font-heading all-caps" :class="[{ 'text-danger': data.show_remind }]">{{ data.reminder_date }}</div>
                         </div>
                     </div>
                 </div>
@@ -65,7 +65,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="font-heading all-caps">{{ data.created_at }}</div>
+                            <div class="font-heading all-caps" :class="[{ 'text-danger': data.show_remind }]">{{ data.created_at }}</div>
                         </div>
                     </div>
                 </div>

resources/views/pages/pdfs/shipping_invoice_sst.blade.php

@@ -0,0 +1,21 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+    <br>
+    <htmlpageheader name="page-header">
+        <br><br>
+        <div class="separator"><strong><i>{{ $invoice_transaction->bill_no }}</i></strong></div>
+    </htmlpageheader>
+    @include('pages.pdfs.shipping_invoice_sst_inner', ['invoice_transaction' => $invoice_transaction])
+
+    <pagebreak />
+    @include('pages.pdfs.packing_list_measurement', ['invoice_transaction' => $invoice_transaction])
+
+    <htmlpagefooter name="page-footer">
+        <table width="100%">
+            <tr>
+                <td style="text-align: right; ">SST This is generated by computer. No signature required.</td>
+                <td style="text-align: right; ">Page {PAGENO} of {nbpg}</td>
+            </tr>
+        </table>
+    </htmlpagefooter>
+@endsection

resources/views/pages/pdfs/shipping_invoice_sst_inner.blade.php

@@ -0,0 +1,143 @@
+<style>
+    body {
+        font-size: 14px;
+    }
+</style>
+<table>
+    <tr>
+        <td class="header-logo">
+            <img src="{{ asset('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
+        </td>
+        <td class="header-cief-address">
+            <span class="company-name">
+                <strong>
+                    CIEF WORLDWIDE SDN BHD
+                </strong>
+            </span>
+            <span class="company-reg">(1134596-M)</span><br>
+            No. 72-3, Jalan Jalil 1,<br>
+            The Earth Bukit Jalil,<br>
+            57000 Kuala Lumpur<br>
+            Tel: 03-8082 1252<br>
+            SST No: W10-2403-32000643
+        </td>
+        <td class="header-details">
+            <div class="title" style="font-size: 20px; text-transform: uppercase;">
+                <strong>
+                    Invoice
+                </strong>
+            </div>
+
+            <div class="number">Invoice No: {{ $invoice_transaction->bill_no }}</div>
+
+            @php
+                $companyModule = $invoice_transaction->owner->owner->companyModule;
+            @endphp
+
+            <div class="date">Date: {{ $invoice_transaction->created_at }}</div>
+            <div class="ref">Order No: {{ $invoice_transaction->owner->owner->reference }}</div>
+            <div class="ref">Container Ref: {{ $invoice_transaction->owner->containers()->first()->reference }}</div>
+            {{--<div class="d-none">{{ $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference }}</div>--}}
+            <div>&nbsp;</div>
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="3" class="bill-to">
+            <span class="sub-title">
+                Bill To
+            </span>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="3" class="address">
+            <div class="label">
+                {{ $companyModule->name }}
+            </div>
+            <div class="address">
+                @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
+                    $contact = $companyModule->contacts()->first();
+                @endphp
+                Phone: {{ $contact ? $contact->phone : '' }}
+            </div>
+        </td>
+    </tr>
+</table>
+
+<br>
+<br>
+<table class="line-table" style="overflow: wrap" autosize="1">
+    <thead>
+    <tr>
+        <th width="5%">No</th>
+        <th class="description">Description</th>
+        <th width="10%">Qty</th>
+        <th width="10%">Unit Price <br>(RM)</th>
+        <th width="10%">Tax (%)</th>
+        <th width="20%">Tax Amount <br>(RM)</th>
+        <th width="15%">Sub Total<br>(RM)</th>
+    </tr>
+    </thead>
+    <tbody>
+    @foreach ($invoice_transaction->transactionDetails as $key => $transaction_detail)
+        <tr>
+            <td width="5%" class="center top">{{ $key + 1 }}</td>
+            <td class="description">{!! $transaction_detail->name  !!}</td>
+            <td width="10%" class="center top" style="text-align: center">{{ round($transaction_detail->quantity, 3) }}</td>
+            <td width="10%" class="center top" style="text-align: center">
+                {{ round($transaction_detail->price, 2) }}
+            </td>
+            <td width="10%" class="center top" style="text-align: center">
+                {{ round($transaction_detail->tax_percentage, 2) }}
+            </td>
+            <td width="20%" class="center top" style="text-align: center">
+                {{ number_format(round($transaction_detail->tax_amount, 2), 2) }}
+            </td>
+            <td width="15%" class="right top">
+                {{ number_format(round($transaction_detail->amount, 2), 2) }}
+            </td>
+        </tr>
+    @endforeach
+    </tbody>
+    <tfoot>
+    <tr class="subtotal">
+        <td colspan="5"></td>
+        <td class="right middle">Subtotal</td>
+        <td class="right middle">
+            {{ number_format(round($invoice_transaction->amount - $invoice_transaction->tax, 2), 2) }}
+        </td>
+    </tr>
+    <tr class="billingcharges">
+        <td colspan="5"></td>
+        <td class="right">Service Charges</td>
+        <td class="right">
+            {{ number_format(round($invoice_transaction->service_charge, 2), 2) }}
+        </td>
+    </tr>
+    <tr class="billingcharges">
+        <td colspan="5"></td>
+        <td class="right">Total SST (6%) RM</td>
+        <td class="right">{{ number_format($invoice_transaction->tax, 2) }}</td>
+    </tr>
+    <tr>
+        <td colspan="5"></td>
+        <td class="right middle">Total Amount RM</td>
+        <td class="total right middle">
+            {{ number_format(round($invoice_transaction->amount, 2), 2) }}
+        </td>
+    </tr>
+    </tfoot>
+</table>

resources/views/pages/pdfs/shipping_invoices_sst_combined.blade.php

@@ -0,0 +1,163 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+    @php
+        $grandTotal = 0;
+        $grandTotalTax = 0;
+        $grandSubTotal = 0;
+    @endphp
+
+    <table>
+        <tr>
+            <td class="header-logo">
+                <img src="{{ asset('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
+            </td>
+            <td class="header-cief-address">
+                <span class="company-name">
+                    <strong>
+                        CIEF WORLDWIDE SDN BHD
+                    </strong>
+                </span>
+                <span class="company-reg">(1134596-M)</span><br>
+                No. 72-3, Jalan Jalil 1,<br>
+                The Earth Bukit Jalil,<br>
+                57000 Kuala Lumpur<br>
+                Tel: 03-8082 1252<br>
+                SST No: W10-2403-32000643
+            </td>
+            <td class="header-details">
+                <div class="title" style="font-size: 20px; text-transform: uppercase;">
+                    <strong>
+                        Summary
+                    </strong>
+                </div>
+
+                @php
+                    $companyModule = $invoice_transactions[0]->owner->owner->companyModule;
+                @endphp
+
+                {{-- <div class="date">Date: {{ $invoice_transactions[0]->created_at }}</div> --}}
+                <div class="date">Date: {{ \Carbon\Carbon::now() }}</div>
+                <div>&nbsp;</div>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3" class="bill-to">
+                <span class="sub-title">
+                    Bill To
+                </span>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3" class="address">
+                <div class="label">
+                    {{ $companyModule->name }}
+                </div>
+                <div class="address">
+                    @php
+                        $addresses = $companyModule->addresses()->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
+                    @endphp
+                    {{ $addresses->street_one }}
+                    {{ $addresses->street_two }} ,
+                    {{ $addresses->district()->first()->name }},
+                    {{ $addresses->postcode }}
+                    {{ $addresses->state()->first()->name }},
+                    {{ $addresses->country()->first()->name }}
+                </div>
+                <div>
+                    @php
+                        $contact = $companyModule->contacts()->first();
+                    @endphp
+                    Phone: {{ $contact ? $contact->phone : '' }}
+                </div>
+            </td>
+        </tr>
+    </table>
+
+    <br>
+    <br>
+    <table class="line-table" style="overflow: wrap" autosize="1">
+        <thead>
+        <tr>
+            <th width="5%">No</th>
+            <th class="description">Invoice No</th>
+            <th class="description">Description</th>
+            <th width="10%">Qty</th>
+            <th width="10%">Unit Price <br>(RM)</th>
+            <th width="10%">Tax (%)</th>
+            <th width="20%">Tax Amount <br>(RM)</th>
+            <th width="15%">Sub Total<br>(RM)</th>
+        </tr>
+        </thead>
+        <tbody>
+        @foreach ($invoice_transactions as $key => $invoice_transaction)
+            @foreach ($invoice_transaction->transactionDetails as $transaction_detail)
+                <tr>
+                    <td width="5%" class="center top">{{ $key + 1 }}</td>
+                    <td width="15%" class="center top">{{ $invoice_transaction->bill_no }}</td>
+                    <td class="description">{!! $transaction_detail->name  !!}</td>
+                    <td width="10%" class="center top" style="text-align: center">{{ round($transaction_detail->quantity, 3) }}</td>
+                    <td width="10%" class="center top" style="text-align: center">
+                        {{ round($transaction_detail->price, 2) }}
+                    </td>
+                    <td width="10%" class="center top" style="text-align: center">
+                        {{ round($transaction_detail->tax_percentage, 2) }}
+                    </td>
+                    <td width="20%" class="center top" style="text-align: center">
+                        {{ number_format(round($transaction_detail->tax_amount, 2), 2) }}
+                    </td>
+                    <td width="15%" class="right top">
+                        {{ round($transaction_detail->amount, 2) }}
+                    </td>
+                </tr>
+            @endforeach
+            @php
+                $grandSubTotal = $grandSubTotal + round($invoice_transaction->amount - $invoice_transaction->tax, 2);
+                $grandTotalTax = $grandTotalTax + round($invoice_transaction->tax, 2);
+                $grandTotal = $grandTotal + round($invoice_transaction->amount, 2);
+            @endphp
+        @endforeach
+        </tbody>
+        <tfoot>
+        <tr class="subtotal">
+            <td colspan="6"></td>
+            <td class="right middle">Total Taxable Amount</td>
+            <td class="right middle">
+                {{ round($grandSubTotal, 2) }}
+            </td>
+        </tr>
+        <tr class="billingcharges">
+            <td colspan="6"></td>
+            <td class="right middle">Total SST (6%) RM</td>
+            <td class="right middle">
+                {{ round($grandTotalTax, 2) }}
+            </td>
+        </tr>
+        <tr>
+            <td colspan="6"></td>
+            <td class="right middle">Total Amount RM</td>
+            <td class="total right middle">
+                {{ round($grandTotal, 2) }}
+
+            </td>
+        </tr>
+        </tfoot>
+    </table>
+
+    @foreach ($invoice_transactions as $transaction)
+        <pagebreak />
+        @include('pages.pdfs.shipping_invoice_sst_inner', ['invoice_transaction' => $transaction])
+        <pagebreak />
+        @include('pages.pdfs.packing_list_measurement', ['invoice_transaction' => $transaction])
+    @endforeach
+
+
+    <htmlpagefooter name="page-footer">
+        <table width="100%">
+            <tr>
+                <td style="text-align: right; ">This is generated by computer. No signature required.</td>
+                <td style="text-align: right; ">Page {PAGENO} of {nbpg}</td>
+            </tr>
+        </table>
+    </htmlpagefooter>
+@endsection

resources/views/pages/templates/warehouseFlow.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <container-profile-section-component :id="{{$id}}"></container-profile-section-component>
+    <!-- <container-profile-section-component :id="{{$id}}"></container-profile-section-component> -->
+    <container-profile-v2-section-component :id="{{$id}}"></container-profile-v2-section-component>
 @endsection

resources/views/pdfs/qr.blade.php

@@ -16,7 +16,7 @@
                         <tbody>
                         <tr align="center">
                             <td>
-                                <img src="{{ url('https://chart.googleapis.com/chart?chs=250x250&cht=qr&chl={"id":'.$order->id.'}') }}" style="width: 230px; height: 230px;" />
+                                <img src="{{ url(config('qr.qr_code_img_url') . '{id:'.$order->id.'}') }}" style="width: 230px; height: 230px;" />
                             </td>
                         </tr>
                         <tr align="center">

routes/transaction.php

@@ -47,6 +47,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         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::delete('/{id}/delete-paid', 'DeletePaidGroupController@delete')->name('paidGroup.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');

routes/web.php

@@ -802,7 +802,14 @@ Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
 
             $invoice->documents()->delete();
 
-            $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+            $view = 'pages.pdfs.shipping_invoice';
+            $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+            $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
+            if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
+                $view = 'pages.pdfs.shipping_invoice_sst';
+            }
+
+            $transaction_invoice_pdf = LaravelMpdf::loadView($view, ['invoice_transaction' => $invoice]);
 
             $document_object = new DocumentObject(
                 DocumentType::SHIPPING_INVOICE,
@@ -828,8 +835,16 @@ Route::get('/invoices/combine/{ids}', function($ids){
     $ids = json_decode($ids);
 
     $transactions = Transaction::whereIn('id', $ids)->get();
+    $invoice = $transactions[0]; //NOTE: invoices that need to be combined need to be seperated before and after SST implementation
 
-    $pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoices_combined', ['invoice_transactions' => $transactions]);
+    $view = 'pages.pdfs.shipping_invoices_combined';
+    $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+    $shippingInvoiceTransactionCreatedDate = Carbon::parse($invoice->created_at);
+    if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare) && $invoice->tax > 0) {
+        $view = 'pages.pdfs.shipping_invoices_sst_combined';
+    }
+
+    $pdf = LaravelMpdf::loadView($view, ['invoice_transactions' => $transactions]);
     return $pdf->download('combined_invoice_.pdf');
 })->name('invoice.combined_summary');
 
@@ -1253,3 +1268,46 @@ Route::get('fix-payment-status-updated-but-failed-update-invoice', function (Upd
 Route::get('/payment-and-billing-2', function () {
     return view('pages.paymentAndBilling2');
 })->name('admin.payment-and-billing-2');
+
+Route::get('/show-all-extra-payments', function () {
+    ini_set('memory_limit', '-1');
+
+    $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)
+        ->where('status', ApprovalStatus::COMPLETED)
+        ->whereHas('transactions', function ($query) {
+            $query->where('type', TransactionType::PAYMENT)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+        })
+        ->get();
+
+    echo '<table>
+          <tr>
+            <th>Transaction Type</th>
+            <th>Total</th>
+            <th>Paid</th>
+            <th>Customer</th>
+            <th>Order</th>
+          </tr>';
+    foreach ($invoices as $invoice) {
+        $paidAmount = $invoice->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+        $packingList = $invoice->owner;
+        $order = $packingList->owner;
+
+        $companyModule= $order->companyModule;
+        $marking = $companyModule->getMarking();
+
+        if (($paidAmount <= $invoice->amount) || ($paidAmount - $invoice->amount < 0.01)) {
+            continue;
+        }
+
+        echo '<tr>';
+        echo '<td>' . $invoice->type . '</td>';
+        echo '<td>' . $invoice->amount . '</td>';
+        echo '<td>' . $paidAmount . '</td>';
+        echo '<td><a href="'.route('customer.profile', $marking).'" target="_blank">'.$marking.'</a></td>';
+        echo '<td><a target="_blank" href="' . route('order.show', $order->reference) . '">' . $order->reference . ' - ' . $order->created_at . '</a><br></td>';
+        echo '</tr>';
+    }
+    echo '</table>';
+});