added isLoading to false and section for delete- packinglist-form-component, changed unclaimedpackinglist1 to section

Inserted logs for monitoring warehouse storage charges

See merge request CIEFWorldwideSdnBhd/shipping-portal!223

.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/General/Abstracts/AbstractControllerLogic.php

@@ -65,7 +65,7 @@ abstract class AbstractControllerLogic
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
             if ($exception instanceof JobResourceNotFoundException) {
-                Log::error(sprintf(
+                Log::channel('vue_polling')->info(sprintf(
                     "Uncaught exception '%s' with message '%s' in %s:%d",
                     get_class($exception),
                     $exception->getMessage(),

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

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

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

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

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

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

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

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

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/Companies/ControllersLogic/AssignCompanyConnectionToConnectionSegmentLogic.php

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

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

@@ -6,6 +6,12 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleIsCreditTerm;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompanyModule;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionIsWaived;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -30,16 +36,37 @@ class UpdateCompanyCreditTermStatusLogic extends AbstractControllerLogic
     /** @var UpdatesCompanyModuleIsCreditTerm */
     private $updatesCompanyModuleIsCreditTerm;
 
+    /** @var CanUpdateCompanyModule */
+    private $canUpdateCompanyModule;
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /** @var UpdatesTransactionIsWaived */
+    private $updatesTransactionIsWaived;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
 
     /**
      * UpdateCompanyCreditTermStatusLogic constructor.
      * @param FetchesCompany $fetchesCompany
      * @param UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm
+     * @param CanUpdateCompanyModule $canUpdateCompanyModule
+     * @param UpdatesTransactionIsWaived $updatesTransactionIsWaived
+     * @param ListsTransactions $listsTransactions
+     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm)
+    public function __construct(FetchesCompany $fetchesCompany, UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm, CanUpdateCompanyModule $canUpdateCompanyModule, UpdatesTransactionIsWaived $updatesTransactionIsWaived, ListsTransactions $listsTransactions, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->updatesCompanyModuleIsCreditTerm = $updatesCompanyModuleIsCreditTerm;
+        $this->canUpdateCompanyModule = $canUpdateCompanyModule;
+        $this->listsTransactions = $listsTransactions;
+        $this->updatesTransactionIsWaived = $updatesTransactionIsWaived;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
     /**
@@ -51,10 +78,11 @@ class UpdateCompanyCreditTermStatusLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
+        $this->canUpdateCompanyModule->passes();
 
         $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $isCreditTerm = $company->companyModules()->first()->connections()->first()->is_credit_term;
+        $companyModule = $company->companyModules()->first();
+        $isCreditTerm = $companyModule->connections()->first()->is_credit_term;
 
         if ($isCreditTerm == 1) {
             $isCreditTerm = 0;
@@ -62,6 +90,28 @@ class UpdateCompanyCreditTermStatusLogic extends AbstractControllerLogic
             $isCreditTerm = 1;
         }
 
+        if($isCreditTerm === 1){
+            //{"per_page":10,"order_by":{"column":"id","DESC":true},"status_in":[2],"receiver":190,"type_in":[1],"does_not_have_payment_status_in":[0,1],"does_not_have_groups":1,"check_for_storage_invoice":1}
+
+            $filters = [
+                'status_in' => [2],
+                'receiver' =>  $companyModule->id,
+                'type_in' => [TransactionType::STORAGE_INVOICE]
+            ];
+
+            $transactions = $this->listsTransactions->execute($filters);
+            foreach($transactions as $transaction){
+                $this->updatesTransactionIsWaived->execute($transaction);
+                $packingList = $transaction->owner()->first();
+                if($packingList){
+                    $order = $packingList->owner()->first();
+                    if($order instanceof Order){
+                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                    }
+                }
+            }
+        }
+
         $this->updatesCompanyModuleIsCreditTerm->execute($company->companyModules()->first()->connections()->first(), $isCreditTerm);
         Log::info(Auth::user()->email." updated credit term status for customer with id: " .$request->route('id'). " to status " . $isCreditTerm);
 

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

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

app/Classes/Modules/Exports/Services/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/PackingLists/ControllersLogic/Containers/RescheduleContainerLogic.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/ListTransactionsLogic.php

@@ -43,17 +43,18 @@ class ListTransactionsLogic extends AbstractControllerLogic
         $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
 
         if($request->input('storages')){
-            foreach ($query->items() as &$item) {
+            foreach ($query->items() as $item) {
                 $transactionId = $item['id'];
                 $filteredStorages = array_filter($request->input('storages'), function ($storage) use ($transactionId) {
                     return isset($storage['parentInvoiceId']) &&  $storage['parentInvoiceId'] == $transactionId;
                 });
                 $item['storages'] = $filteredStorages;
             }
-            return $this->collectionResponse(TransactionWithStorageResource::collection($query));
-        }
-        else{
-            return $this->collectionResponse(TransactionResource::collection($query));
+            //return $this->collectionResponse(TransactionWithStorageResource::collection($query));
         }
+        // else{
+        //     return $this->collectionResponse(TransactionResource::collection($query));
+        //
+        return $this->collectionResponse(TransactionWithStorageResource::collection($query));
     }
 }

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;
@@ -99,33 +100,38 @@ class CheckStorageInvoiceTransactionProcessor
         return $this->executeOrder($order);
     }
 
-    public function executeOrder(Order $order, bool $isBackDoorCheck = false){
+    public function executeOrder(Order $order){
         $results = [];
         $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
         $is_credit_term = $order->companyModule->inviters()->withPivot('is_credit_term')->first()->pivot->is_credit_term;
-        if(!$is_credit_term){
-            Log::channel('storage_invoices')->info('orderId: '.$order->id.', orderReference: '.$order->reference.', marking: '.$marking.', is_credit_term: '.$is_credit_term);
-            $packingLists = $order->destinationWarehousePackages;
+        Log::channel('storage_invoices')->info('orderId: '.$order->id.', orderReference: '.$order->reference.', marking: '.$marking.', is_credit_term: '.$is_credit_term);
+        $packingLists = $order->destinationWarehousePackages;
 
-            foreach ($packingLists as $packingList){
-                $arrivalDateAtChinaWarehouse = $this->getArrivalDateAtChinaWarehoue($packingList);
-                Log::channel('storage_invoices')->info('arrivalDateAtChinaWarehouse: '.json_encode($arrivalDateAtChinaWarehouse));
-                Log::channel('storage_invoices')->info('destinationWarehousePackage: '.json_encode($packingList));
-                $eta = $this->getEtaFromPackingList($packingList);
-                if($arrivalDateAtChinaWarehouse && $eta){
-                    $transactions = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
-                    // $transactions = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->where('transactions.status', ApprovalStatus::APPROVED)->get();
+        foreach ($packingLists as $packingList){
+            $arrivalDateAtChinaWarehouse = $this->getArrivalDateAtChinaWarehoue($packingList);
+            Log::channel('storage_invoices')->info('arrivalDateAtChinaWarehouse: '.json_encode($arrivalDateAtChinaWarehouse));
+            Log::channel('storage_invoices')->info('destinationWarehousePackage: '.json_encode($packingList));
+            $eta = $this->getEtaFromPackingList($packingList);
+            if($arrivalDateAtChinaWarehouse && $eta){
+                $transactions = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+                // $transactions = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->where('transactions.status', ApprovalStatus::APPROVED)->get();
 
-                    /** @var Transaction $invoice_transaction */
-                    foreach ($transactions as $invoice_transaction){
-                        $result =  $this->processSingleTransactionOfTypeShippingInvoice($invoice_transaction, $packingList, $order->company_module_id, $eta, $isBackDoorCheck);
-                        if($result){
-                            $results[] = $result;
-                        }
+                /** @var Transaction $invoice_transaction */
+                foreach ($transactions as $invoice_transaction){
+                    $result = null;
+                    if(!$is_credit_term){
+                        $result =  $this->processSingleTransactionOfTypeShippingInvoice($invoice_transaction, $packingList, $order->company_module_id, $eta);
+                    }
+                    else{
+                        $result =  $this->isPaidOrWaivedStorageInvoiceExist($invoice_transaction, $packingList, $eta);
+                    }
+                    if($result){
+                        $results[] = $result;
                     }
                 }
             }
         }
+
         return $results;
     }
 
@@ -158,6 +164,7 @@ class CheckStorageInvoiceTransactionProcessor
                     if ($transport) {
                         $schedule = $transport->schedules->last();
                         if ($schedule) {
+                            Log::channel('storage_invoices')->info('schedule: '.json_encode($schedule));
                             return $schedule->eta;
                         }
                     }
@@ -167,15 +174,18 @@ class CheckStorageInvoiceTransactionProcessor
         return null;
     }
 
-    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta, $isBackDoorCheck){
+    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta){
         $pricePerCBM = 3;
         $resultNumberOfDaysFree = 10;
         $dt1 = $eta->copy()->addDay()->startOfDay();
-        $resultStartDate =  $dt1->format('Y-m-d');
-        $currentDatetime = Carbon::now();
-        $dt2 = $currentDatetime->copy()->addDay()->startOfDay();
-        $resultCurrentDate = $dt2->format('Y-m-d H:i:s');
+        $dt2 = Carbon::now()->copy()->addDay()->startOfDay();
         $interval = Carbon::parse($dt2)->diff($dt1);
+        Log::channel('storage_invoices')->info('eta: '.json_encode($eta));
+        Log::channel('storage_invoices')->info('dt1: '.json_encode($dt1));
+        Log::channel('storage_invoices')->info('dt2: '.json_encode($dt2));
+        Log::channel('storage_invoices')->info('interval: '.json_encode($interval));
+        Log::channel('storage_invoices')->info('Carbon now: '.json_encode(Carbon::now()));
+
 
         $resultNumberOfDaysExceeded = $interval->days - $resultNumberOfDaysFree;
         $storageInvoice = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->first();
@@ -190,14 +200,25 @@ class CheckStorageInvoiceTransactionProcessor
             $cbm =  $cbm + $quantity;
         }
 
+        $total_tax = 0;
+        $taxPercentage = TaxPercentage::DEFAULT;
         $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
-        Log::channel('storage_invoices')->info('storageInvoice: '.json_encode($storageInvoice).', $transaction->status: '.$transaction->status);
+        $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
+
+        Log::channel('storage_invoices')->info('dateToCompare: '.json_encode($dateToCompare));
         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 (Carbon::now()->isAfter($dateToCompare)) {
+                $taxPercentage = TaxPercentage::SIX_PERCENT;
+                $total_tax = $price_cbm * $taxPercentage / 100;
+                $price_cbm = $price_cbm + $total_tax;
+            }
+
+            $storageInvoice = $this->createStorageInvoiceTransaction($destinationWarehousePackage, $billNumber, $company_module_id, $price_cbm, $total_tax);
             $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
@@ -210,12 +231,18 @@ class CheckStorageInvoiceTransactionProcessor
             $paymentStorageTransaction = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::APPROVED)->first();
             if($paymentStorageTransaction){
                 $dateStorageInvoicePaid = $paymentStorageTransaction->created_at->copy()->addDay()->startOfDay();
-                Log::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$resultCurrentDate);
+                Log::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$dt2->format('Y-m-d H:i:s'));
                 $intervalRecalculate = Carbon::parse($dateStorageInvoicePaid)->diff($dt1);
                 $resultNumberOfDaysExceeded = $intervalRecalculate->days - $resultNumberOfDaysFree;
                 $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
             }
 
+            if (Carbon::now()->isAfter($dateToCompare)) {
+                $taxPercentage = TaxPercentage::SIX_PERCENT;
+                $total_tax = $price_cbm * $taxPercentage / 100;
+                $price_cbm = $price_cbm + $total_tax;
+            }
+
             $amount = $storageInvoice->amount;
             $epsilon = 0.0001; // Tolerance for the comparison
             Log::channel('storage_invoices')->info('Update $transaction->id: '.$transaction->id);
@@ -227,23 +254,24 @@ class CheckStorageInvoiceTransactionProcessor
 
             if(abs($price_cbm - $amount) > $epsilon && $storageInvoice->status !== ApprovalStatus::COMPLETED){
                 $paymentTransactions = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::PENDING_SUBMISSION)->get();
-                if(!$isBackDoorCheck){
-                    if(count($paymentTransactions) > 0){
-                        $this->updatePaymentTransactionViaNonGroupPayment($paymentTransactions);
-                    }
-                    else{
-                        $this->updatePaymentTransactionViaGroupPayment($storageInvoice);
-                    }
+                // if(!$isBackDoorCheck){
+                if(count($paymentTransactions) > 0){
+                    $this->updatePaymentTransactionViaNonGroupPayment($paymentTransactions);
                 }
+                else{
+                    $this->updatePaymentTransactionViaGroupPayment($storageInvoice);
+                }
+                //}
 
                 $proceedToUpdate = true;
             }
 
             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;
@@ -255,8 +283,8 @@ class CheckStorageInvoiceTransactionProcessor
                 'storageInvoiceId' => $storageInvoiceId,
                 'numberOfDaysExceeded' => $resultNumberOfDaysExceeded,
                 'numberOfDaysFree' => $resultNumberOfDaysFree,
-                'startDate' => $resultStartDate,
-                'currentDate' => $resultCurrentDate,
+                'startDate' => $dt1->format('Y-m-d'),
+                'currentDate' => $dt2->format('Y-m-d H:i:s'),
                 'cbm' => $cbm,
                 'pricePerCBM' => $pricePerCBM,
                 'storageInvoice' => new TransactionWithStorageResource($storageInvoice)
@@ -266,9 +294,64 @@ class CheckStorageInvoiceTransactionProcessor
 
     }
 
+    private function isPaidOrWaivedStorageInvoiceExist($transaction, $packingList, $eta){
+        $pricePerCBM = 3;
+        $resultNumberOfDaysFree = 10;
+        $dt1 = $eta->copy()->addDay()->startOfDay();
+        $resultStartDate =  $dt1->format('Y-m-d');
+        $currentDatetime = Carbon::now();
+        $dt2 = $currentDatetime->copy()->addDay()->startOfDay();
+        $resultCurrentDate = $dt2->format('Y-m-d H:i:s');
+        $interval = Carbon::parse($dt2)->diff($dt1);
+        $resultNumberOfDaysExceeded = $interval->days - $resultNumberOfDaysFree;
+        $paidStorageInvoice = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->whereIn('transactions.status', [ApprovalStatus::COMPLETED])->first();
+        if($paidStorageInvoice){
+            $storageInvoice = $paidStorageInvoice;
+        }
+        else{
+            $waivedStorageInvoice = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->where('transactions.is_waived', 1)->whereIn('transactions.status', [ApprovalStatus::APPROVED])->first();
+            $storageInvoice = $waivedStorageInvoice;
+        }
+
+        if($storageInvoice){
+            $storageInvoiceId = $storageInvoice->id;
+
+            if(isset($storageInvoice->is_waived) && $storageInvoice->is_waived){
+                $pricePerCBM = 0;
+            }
+
+            $transactionDetailsItems = $transaction->transactionDetails()->get();
+            $cbm = 0.00;
+            foreach ($transactionDetailsItems as $tdItem){
+                $quantity = $tdItem->quantity;
+                if($tdItem->price < 0.00){
+                    $quantity = $quantity * -1;
+                }
+                $cbm =  $cbm + $quantity;
+            }
+
+            if($storageInvoiceId !== 0){
+                $result = [
+                    'parentInvoiceId' => $transaction->id,
+                    'storageInvoiceId' => $storageInvoiceId,
+                    'numberOfDaysExceeded' => $resultNumberOfDaysExceeded,
+                    'numberOfDaysFree' => $resultNumberOfDaysFree,
+                    'startDate' => $resultStartDate,
+                    'currentDate' => $resultCurrentDate,
+                    'cbm' => $cbm,
+                    'pricePerCBM' => $pricePerCBM,
+                    'storageInvoice' => new TransactionWithStorageResource($storageInvoice)
+                ];
+                return $result;
+            }
+        }
+
+        return [];
+    }
+
     private function updatePaymentTransactionViaGroupPayment($storageInvoice){
         Log::channel('storage_invoices')->info('updatePaymentTransactionViaGroupPayment');
-        $groups = $storageInvoice->groups()->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]);
@@ -296,7 +379,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,
@@ -310,7 +393,7 @@ class CheckStorageInvoiceTransactionProcessor
             1,
             1,
             0,
-            0,
+            $totalTax,
             0,
             null,
             ApprovalStatus::APPROVED
@@ -322,18 +405,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,
@@ -347,7 +431,7 @@ class CheckStorageInvoiceTransactionProcessor
             1,
             1,
             0,
-            0,
+            $totalTax,
             0,
             null,
             ApprovalStatus::APPROVED
@@ -359,12 +443,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/Transactions/Standards/Validators/WaiveTransactionValidation.php

@@ -5,6 +5,8 @@ namespace App\Classes\Modules\Transactions\Standards\Validators;
 
 use App\Classes\General\Abstracts\AbstractValidation;
 use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 
 class WaiveTransactionValidation extends AbstractValidation
 {
@@ -28,8 +30,8 @@ class WaiveTransactionValidation extends AbstractValidation
     protected function rules(): array {
         return [
             'id' => 'required',
-            'type' => ['required', 'numeric', 'in:16'], //Only storage invoice (type 16) can be waived
-            'status' => ['required', 'numeric', 'in:2'], //Approve storage invoice only, paid invoice stricly forbidden
+            'type' => ['required', 'numeric', 'in:'.TransactionType::STORAGE_INVOICE], //Only storage invoice (type 16) can be waived
+            'status' => ['required', 'numeric', 'in:'.ApprovalStatus::APPROVED], //Approve storage invoice only, paid invoice stricly forbidden
             // 'billNo' => 'required',
         ];
     }

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/Notifications/InvoiceIssuedEmail.php

@@ -8,6 +8,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\PackingList;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
 class InvoiceIssuedEmail extends AbstractEmail
@@ -35,10 +36,14 @@ class InvoiceIssuedEmail extends AbstractEmail
         $invoice = $this->packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::APPROVED)->first();
         $invoiceDocument = $invoice->documents()->first()->files;
 
+        // $fileContent = Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file);
+        $filePath = storage_path('app/documents/' . $invoiceDocument->first()->file->file_info->original->file);
+
+        Log::info('InvoiceIssuedEmail sent - Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference);
 
         return (new MailMessage)
             ->subject('Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
+            ->attach($filePath, [
                 'as' => 'name.pdf',
                 'mime' => 'application/pdf',
             ])->view('emails.shipment.invoice', ['user' => $this->user, 'packingList' => $this->packingList]);

app/Classes/Notifications/ShipmentDepartureEmail.php

@@ -9,6 +9,7 @@ use App\Models\PackingList;
 use App\Models\PasswordReset;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
 class ShipmentDepartureEmail extends AbstractEmail
@@ -40,10 +41,14 @@ class ShipmentDepartureEmail extends AbstractEmail
 
         $invoiceDocument = $invoice->documents()->first()->files;
 
+        // $fileContent = Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file);
+        $filePath= storage_path('app/documents/' . $invoiceDocument->first()->file->file_info->original->file);
+
+        Log::info('ShipmentDepartureEmail sent - Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference);
 
         return (new MailMessage)
             ->subject('Your packages are on the way to malaysia - Invoice pending payment for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
+            ->attach($filePath, [
                 'as' => 'name.pdf',
                 'mime' => 'application/pdf',
             ])->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.ETD', ['user' => $this->user, 'packingList' => $this->packingList]);

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/OneTimeTransactionFixBillplzFailedCallback.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class OneTimeTransactionFixBillplzFailedCallback extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'one-time-transaction-fix-billplz-failed-callback';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is a one time fix billplz failed callback for transaction with id 15205';
+
+    protected $output = null;
+
+    protected $outputArray = [];
+
+     /** @var CallbackBillplzProcessor */
+     private $callbackBillplzProcessor;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(CallbackBillplzProcessor $callbackBillplzProcessor)
+    {
+        parent::__construct();
+        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->outputArray = [];
+        $start   = new Carbon();
+
+        //This transaction, 15205 has approve payment but not its owner, shipping invoice
+        $transaction = Transaction::whereIn('id', [15205])->first();
+        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 15205 cron started.');
+
+        if($transaction && $transaction->id == 15205){
+
+            $status = ApprovalStatus::APPROVED;
+            $this->callbackBillplzProcessor->execute($transaction, $status);
+        }
+
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 15205 cron ended. ElapsedTime: ' . $elapsedTime);
+    }
+}

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/Kernel.php

@@ -73,5 +73,6 @@ class Kernel extends HttpKernel
         'storage.invoice.check.byorder' => \App\Http\Middleware\CheckForStorageInvoiceByOrderId::class,
         'storage.invoice.check.bytransactions' => \App\Http\Middleware\CheckForStorageInvoiceByTransactions::class,
         'storage.invoice.check.bygroup' => \App\Http\Middleware\CheckForStorageInvoiceByGroup::class,
+        'storage.invoice.check.bypackinglists' => \App\Http\Middleware\CheckForStorageInvoiceByPackingLists::class,
     ];
 }

app/Http/Middleware/CheckForStorageInvoiceByOrderId.php

@@ -29,7 +29,12 @@ class CheckForStorageInvoiceByOrderId
     public function handle(Request $request, Closure $next)
     {
         $orderId = $request->route('id');
-        $storages = $this->storageInvoiceTransactionProcessor->execute($orderId);
+        $storages = [];
+        try{
+            $storages = $this->storageInvoiceTransactionProcessor->execute($orderId);
+        } catch (\Exception $exception) {
+            $storages = [];
+        }
         $request->merge(['storages' => $storages]);
         return $next($request);
     }

app/Http/Middleware/CheckForStorageInvoiceByPackingLists.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\CompanyConnection;
+use App\Models\Order;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class CheckForStorageInvoiceByPackingLists
+{
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+    /** @var ListsPackingLists */
+    private $listsPackingLists;
+
+
+    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor, ListsPackingLists $listsPackingLists)
+    {
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+        $this->listsPackingLists = $listsPackingLists;
+    }
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $results = [];
+        $packinglists = null;
+
+        $filters = json_decode($request->input('filters'), true);
+        // $filters['type_in'] = [TransactionType::SHIPPING_INVOICE];
+        // if(json_encode($filters['order_by']) == '{"column":"id","DESC":true}'){
+        //     $filters['order_by_id_desc'] = true;
+        // }
+
+        if(isset($filters['check_for_storage_invoice'])){
+            unset($filters['order_by']);
+            $packinglists = $this->listsPackingLists->execute($filters);
+            foreach($packinglists as $packingList){
+                if($packingList){
+                    $order = $packingList->owner()->first();
+                    if($order instanceof Order){
+                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                        if($storages){
+                            $results = array_merge($results, $storages);
+                        }
+                    }
+                }
+            }
+        }
+
+        $request->merge(['storages' => $results]);
+
+        return $next($request);
+    }
+}

app/Http/Resources/CompanyResource.php

@@ -40,7 +40,8 @@ class CompanyResource extends JsonResource
             'last_order' => $companyModule->type === 7 ? new DeliveryOrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()) : new OrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()),
             'order_count' => $companyModule->orders()->count(),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first()),
-            'created_at' => $this->created_at->format('d-m-Y')
+            'created_at' => $this->created_at->format('d-m-Y'),
+            'whatsapp' => new ContactResource($this->contacts()->where('reference', 'LIKE', '%Whatsapp%')->orderBy('created_at', 'DESC')->first())
 
         ];
 

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

@@ -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/ListPackingListJobWithStorageResource.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Order;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ListPackingListJobWithStorageResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $exceptionUsers = in_array($this->userInfo ? $this->userInfo->type : Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
+        $shippingTransaction = $this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first();
+        $transactions = $this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
+        $storages = [];
+
+        if($this->storages){
+            $transactionId = $shippingTransaction->id;
+            $filteredStorages = array_filter($this->storages, function ($storage) use ($transactionId) {
+                return isset($storage['parentInvoiceId']) &&  $storage['parentInvoiceId'] == $transactionId;
+            });
+            $storages = $filteredStorages;
+        }
+
+        return [
+            'id' => $this->id,
+            'claimant_id' => $this->claimant_id,
+            'reference' => $this->reference,
+            'status' => $this->status,
+            'transport' => new TransportResource($this->transports()->first()),
+            'type' => $this->type,
+            // 'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $this->userInfo)),
+            // 'packages' => PackageResource::collection($packages),
+            // $this->mergeWhen($this->owner instanceof Order, [
+            //     'order' => New OrderResource($this->owner)
+            // ]),
+            'container' => new ContainerResource($this->containers->first()),
+            'packages' => PackageWithoutOrderResource::collection($packages),
+            $this->mergeWhen($this->owner instanceof Order, [ 'order' => New OrderResource($this->owner) ]),
+            'shipping_transaction' => count($storages) == 0 ? new TransactionWithStorageResource($shippingTransaction): null,
+            'storages' => $storages,
+            'invoices' =>  TransactionWithStorageResource::collection($transactions),
+            'suspended_invoice' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
+            // 'suspended_invoices' => TransactionResource::collection($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->get()),
+        ];
+    }
+}

app/Http/Resources/MappableTransactionWithDetailsResource.php

@@ -32,9 +32,11 @@ class MappableTransactionWithDetailsResource extends JsonResource
 
         if ($this->type === TransactionType::PAYMENT) {
             $order = $this->owner->owner->owner;
-            $data['order_reference'] = $order->reference;
-            $data['debtor_code'] = $order->companyModule->company->debtor;
-            $data['created_at'] = $this->owner->created_at; // invoice date
+            if ($order) {
+                $data['order_reference'] = $order->reference;
+                $data['debtor_code'] = $order->companyModule->company->debtor;
+                $data['created_at'] = $this->owner->created_at; // invoice date
+            }
         } elseif (in_array($this->type, [TransactionType::GROUP_PAYMENT, TransactionType::TOP_UP])) {
             $connection = $this->owner->owner->inviters()->withPivot('invitee_reference')->first();
             $data['marking'] = $connection ? $connection->pivot->invitee_reference : '';
@@ -48,17 +50,20 @@ class MappableTransactionWithDetailsResource extends JsonResource
             if ($payments->count()) {
                 $data['payment_transactions'] = $payments->map(function ($payment) {
                     $order = $payment->owner->owner->owner;
-                    return [
-                        'id' => $payment->id,
-                        'updated_at' => $payment->updated_at,
-                        'debtor_code' => $order->companyModule->company->debtor,
-                        'order_reference' => $order->reference,
-                        'bill_no' => null,
-                        'type' => $payment->type,
-                        'marking' => null,
-                        'amount' => $payment->amount,
-                        'created_at' => $this->created_at
-                    ];
+
+                    if ($order) {
+                        return [
+                            'id' => $payment->id,
+                            'updated_at' => $payment->updated_at,
+                            'debtor_code' => $order->companyModule->company->debtor,
+                            'order_reference' => $order->reference,
+                            'bill_no' => null,
+                            'type' => $payment->type,
+                            'marking' => null,
+                            'amount' => $payment->amount,
+                            'created_at' => $this->created_at
+                        ];
+                    }
                 })->toArray();
             } else {
                 $data['status'] = 'error';

app/Http/Resources/PackingListWithStorageResource.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Log;
+
+class PackingListWithStorageResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
+        $shippingTransaction = $this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first();
+        $transactions = $this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
+        $storages = [];
+
+        if($this->storages){
+            $transactionId = $shippingTransaction->id;
+            $filteredStorages = array_filter($this->storages, function ($storage) use ($transactionId) {
+                return isset($storage['parentInvoiceId']) &&  $storage['parentInvoiceId'] == $transactionId;
+            });
+            $storages = $filteredStorages;
+        }
+
+        return [
+            'id' => $this->id,
+            'claimant_id' => $this->claimant_id,
+            'reference' => $this->reference,
+            'status' => $this->status,
+            'transport' => new TransportResource($this->transports()->first()),
+            'type' => $this->type,
+            'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListResource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first())),
+            'packages' => PackageResource::collection($packages),
+            $this->mergeWhen($this->owner instanceof Order, [
+                'order' => New OrderResource($this->owner)
+            ]),
+            'shipping_transaction' => count($storages) == 0 ? new TransactionWithStorageResource($shippingTransaction): null,
+            'storages' => $storages,
+            'invoices' =>  TransactionWithStorageResource::collection($transactions),
+            'suspended_invoice' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
+        ];
+    }
+}

app/Http/Resources/SegmentResource.php

@@ -18,7 +18,7 @@ class SegmentResource extends JsonResource
         $constant = $this->constants->where('reference', SegmentConstants::CUSTOM_PRICE)->first();
         return [
             'id' => $this->id,
-            'name' => $this->name,
+            'name' => ucwords(str_replace('_', ' ', $this->name)),
             'price' => $constant ? $constant->value[0] : 0
         ];
     }

app/Http/Resources/TransactionResource.php

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

@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
+use App\Models\PackingList;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use Carbon\Carbon;
@@ -54,6 +55,10 @@ class TransactionWithStorageResource extends JsonResource
 
         }
 
+        $packingListReference = null;
+        if ($this->owner instanceof PackingList) {
+            $packingListReference = $this->owner->reference;
+        }
 
         $ts = $this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION])->last();
         if ($ts) {
@@ -119,9 +124,10 @@ class TransactionWithStorageResource extends JsonResource
                     ->get()
             ),
             'remarks' => RemarkResource::collection($this->remarks),
+            'packing_list_reference' => $packingListReference,
             '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')
         ];

app/Models/CompanyConnection.php

@@ -69,4 +69,12 @@ class CompanyConnection extends AbstractModel
         return $this->belongsToMany(Segment::class, (new ConnectionSegment())->getTable(), 'company_connection_id', 'segment_id');
     }
 
+    /**
+     * @return belongsToMany
+     */
+    public function connectionSegments(): HasMany
+    {
+        return $this->hasMany(ConnectionSegment::class, 'company_connection_id');
+    }
+
 }

config/logging.php

@@ -112,6 +112,24 @@ return [
             'path' => storage_path('logs/paymentUnknownOrderLog.log'),
             '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'),
+            'level' => 'info',
+        ],
+
+        'perfex_crm' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel_perfex_crm.log'),
+            'level' => 'info',
+        ],
     ],
 
 ];

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/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/companies/elements/CompanyComponent.vue

@@ -10,6 +10,10 @@
             <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
             <div class="font-heading all-caps fs-11">CIEF/{{this.item.company_module.marking}}</div>
         </div>
+        <div class="col-auto" v-if="this.item.whatsapp">
+            <div class="font-heading all-caps fs-11">Whatsapp:</div>
+            <div class="font-heading all-caps fs-11">{{ this.item.whatsapp.reference.replace('Whatsapp:', '') }}: {{ this.item.whatsapp.phone }}</div>
+        </div>
         <div class="col-auto text-center">
             <div class="font-heading all-caps fs-11">Orders</div>
             <div class="font-heading all-caps fs-11">{{this.item.order_count}}</div>

resources/assets/vue/components/companies/elements/FulfilmentInterestedFormComponent.vue

@@ -0,0 +1,115 @@
+<template>
+    <div class="row bg-white padding-25">
+        <div class="col" v-if="step === 1">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <h3>Please provide your Whatsapp phone number:</h3>
+
+                        </div>
+                    </div>
+                    <div class="row m-t-20 m-b-15">
+                        <div class="col-12">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Name</label>
+                                <input class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 p-t-15">
+                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                <label>Phone</label>
+                                <input class="form-control" v-model="parameters.phone">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row p-t-15">
+                        <div class="col p-r-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border bg-master-lighter" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border text-white bg-primary pointer" @click="nextStep">Confirm</div>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+        <div class="col" v-if="step === 2">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <h3>欲知更多详情，请浏览 <a href="https://bit.ly/4a5v34p" target="_blank" class="text-underline">https://bit.ly/4a5v34p</a> 或联系 Whatsapp: <a href="https://wa.me/601136814520" target="_blank" class="text-underline text-success">+6011-36814520</a></h3>
+                        </div>
+                    </div>
+                    <div class="row p-t-15">
+                        <div class="col p-r-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border bg-master-lighter" @click="previousStep">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border text-white bg-primary pointer" @click="activateService">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required } from 'vuelidate/lib/validators';
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            company:{
+                type: Object,
+                required: true
+            },
+            segmentId:{
+                type: Number,
+                required: false
+            }
+        },
+        data() {
+            return {
+                step: 1,
+                parameters: {
+                    name: '',
+                    phone: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: { required },
+                phone: { required },
+            }
+        },
+        methods: {
+            previousStep() {
+                this.step = 1;
+            },
+            nextStep() {
+                if (this.parameters.name && this.parameters.phone) {
+                    this.step = 2;
+                } else {
+                    this.parameters = {};
+                    this.submit(this.route('api.company.connection.assign', this.company.id, this.company.company_module.connections[0].id), 'post', 'activateService', true, false);
+                }
+            },
+            activateService(){
+                this.parameters.segment_id = this.segmentId
+       
+                this.submit(this.route('api.company.connection.assign', this.company.id, this.company.company_module.connections[0].id), 'post', 'activateService', true, false);
+            },
+            successHandler(){
+                location.reload();
+            }
+        },
+        mixins: [componentHandler, modalFormHandler]
+
+    }
+</script>

resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue

@@ -0,0 +1,119 @@
+<template>
+    <div class="row m-t-15 m-b-15 align-items-end parentContainer" v-if="company">
+        <div class="col">
+            <!-- 1688 consent -->
+            <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!company.segments.some(item => item.id === 10 || item.id === 11 || item.id === 12)">
+                <div class="col bg-white padding-15">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row ">
+                                <div class="col">
+                                    <h5 class="m-t-0 text-justify">重磅消息! CIEF 正式开通 <span class="bold">3PL fulfillment 服务</span>!! 你从中国进来的货物, 我们可以直接帮你仓储, 分拣打包, 直接送货到您的顾客手上, 只需系统对接你的 Lazada , Shopee , Tiktok 网店, 就能实现全自动化! 一个月只需 <span class="bold">RMX88</span>! </h5>
+                                    <h5 class="m-t-0 text-justify">Exciting news! CIEF has officially launched its <span class="bold">3PL fulfillment service</span>! We can assist with warehousing, sorting, packaging, and direct delivery of your goods from China to your customers. Simply integrate your Lazada, Shopee, or TikTok online stores with our system for full automation! Only <span class="bold">RMX88</span> per month!</h5>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-12 text-center">
+                                    <div class="btn btn-md block btn m-b-5 no-border text-white pointer bg-success requestModal" data-type="fulfilment-interested-now">Interested now (感兴趣)</div>
+                                </div>
+                                <div class="col-12 text-center">
+                                    <div class="btn btn-md block btn m-b-5 pointer requestModal" data-type="fulfilment-interested-later">Interested later (感兴趣，但现在不需要)</div>
+                                </div>
+                                <div class="col-12 text-center">
+                                    <div class="btn btn-md block btn m-b-5 no-border text-white pointer bg-danger requestModal" data-type="not-interested-confirm">Not interested (不感兴趣)</div>
+                                </div>
+                              
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" type="fulfilment-interested-now" styleType="fill-in" size="large">
+                <fulfilment-interested-form-component
+                    section="activateService"
+                    :company="company"
+                    :segmentId="10"
+                >
+                </fulfilment-interested-form-component>
+            </modal-component>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" type="fulfilment-interested-later" styleType="fill-in" size="large">
+                <fulfilment-interested-form-component
+                    section="activateService"
+                    :company="company"
+                    :segmentId="11"
+                >
+                </fulfilment-interested-form-component>
+            </modal-component>
+            <modal-component small type="not-interested-confirm">
+                <div class="row">
+                    <div class="col text-center">
+                        <div class="row">
+                            <div class="col text-center">
+                                <div class="row m-b-20">
+                                    <div class="col">
+                                        <h5 class="all-caps">Are you Sure?</h5>
+                                        <div class="fs-11">Are you sure you are not interested in this service?</div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col p-r-5">
+                                        <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">No, take me back</div>
+                                    </div>
+                                    <div class="col p-l-5">
+                                        <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="activateService(12)">Yes, I’m sure</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </modal-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                section: 'newServiceList',
+                parameters: {
+                    segment_id: ''
+                },
+                expanded: false,
+                failed: false,
+                part: 0,
+                isFetchCompany: false,
+                company: null
+            }
+        },
+        created(){
+            this.fetchCompany();
+        },
+        methods: {
+            fetchCompany(){
+                this.parameters = null;
+                this.isFetchCompany = true;
+                this.submit(route('api.company.show', this.$store.getters.getCompanyId), 'get', this.section, false, false)
+            },
+            activateService(segmentId){
+                this.parameters = {
+                    segment_id: segmentId
+                };
+                this.part = 1;
+                this.submit(this.route('api.company.connection.assign', this.company.id, this.company.company_module.connections[0].id), 'post', 'activateService', true, false);
+            },
+            successHandler(response){
+                if (this.isFetchCompany) {
+                    this.company = response.payload.data;
+                    this.isFetchCompany = false;
+                }
+                if(this.part == 1 || this.part == 4){
+                    location.reload();
+                }
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>

resources/assets/vue/components/companies/forms/UpdateCreditTermStatusFormComponent.vue

@@ -8,7 +8,7 @@
                         <div class="col">
                             <h5 class="all-caps">Update Credit Term Customer</h5>
                             <div class="fs-11">Are you sure you want to update the credit term status for this company to <b>{{ data.is_credit_term === 1 ? 'NO' : 'YES' }}</b>?</div>
-
+                            <p class="fs-11 text-danger" v-if="data.is_credit_term === 0">All existing invoices for storage that have not yet been paid will be waived</p>
                         </div>
                     </div>
                     <div class="row">

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/general/elements/ListPollingComponent.vue

@@ -74,9 +74,6 @@
         data(){
             return {
                 filters: this.options,
-                pollingInterval: null,
-                isPolling: false,
-                isFetchingResult: false,
                 isLoading: false,
             }
         },
@@ -87,13 +84,26 @@
         computed: {
             pendingList () {
                 return this.$store.getters.isInCompleteQueue(this.section);
-            }
+            },
+            getJob() {
+                return this.$store.getters.getJob(this.section);
+            },
+            getJobAttemptCount() {
+                return this.$store.getters.getJobAttemptCount(this.section);
+            },
         },
         watch: {
             pendingList(inComplete){
                 if(inComplete){
                     this.fetchList();
                 }
+            },
+            getJobAttemptCount(newValue, oldValue) {
+                // console.log('Old value:',  JSON.stringify(oldValue));
+                // console.log('New value:',  JSON.stringify(newValue));
+                if(this.getJob){
+                    this.fetchJobResult(this.getJob.isLastAttempt);
+                }
             }
         },
         methods: {
@@ -101,7 +111,7 @@
                 let listDecorators = this.$store.getters.getListDetails(this.section);
                 let url = this.endpoint + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters);
                 this.isLoading = true;
-                this.submitJob(url);
+                this.$store.dispatch('submitJobRequest', {'url': url, 'name': this.section});
             },
             successHandler(response){
                 let result = JSON.parse(response.payload.data.result);
@@ -118,83 +128,21 @@
                     to: result.meta.to,
                     total: result.meta.total
                 };
-
-                this.stopPolling();
                 this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
+                this.$store.dispatch('stopPollingJobResultByJobId', {'jobId': this.getJob.jobId});
                 this.$refs.pagination.makePagination(result.meta, result.links);
                 this.isLoading = false;
             },
             errorHandler(error){
-                this.isFetchingResult = false;
-                this.isPolling = false;
+                // console.log("Error: " + JSON.stringify(error));
+                this.$store.dispatch('updatePollingJobResultByJobId', {'jobId': this.getJob.jobId, 'isPolling': false, 'isFetchingResult': false });
             },
-            startPolling(jobId, maxAttempts = 8) {
-                let attempts = 0;
-                let interval = 10000; // Initial interval
-
-                const resetPollingInterval = (customInterval) => {
-                    this.pollingInterval = setInterval(pollJobResult, customInterval);
-                };
-
-                const pollJobResult = () => {
-                    if (this.isPolling || this.isFetchingResult) {
-                        return;
-                    }
-                    this.isPolling = true;
-
-                    attempts++;
-                    if(attempts === 1){
-                        this.stopPolling();
-                        resetPollingInterval(5000);
-                    }
-
-                    if (attempts > maxAttempts) {
-                        this.stopPolling();
-                        this.isLoading = false;
-                        console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
-                        return;
-                    }
-
-                    if(attempts === maxAttempts){
-                        this.fetchJobResult(jobId, true);
-                    }
-                    else{
-                        this.fetchJobResult(jobId);
-                    }
-                };
-
-                // pollJobResult();  // Initial call
-                this.pollingInterval = setInterval(pollJobResult, interval);
-            },
-            stopPolling() {
-                clearInterval(this.pollingInterval);
-                this.pollingInterval = null;
-                this.isPolling = false;
-                this.isFetchingResult = false;
-            },
-            submitJob(url){
+            fetchJobResult(isLastAttempt = false) {
+                this.$store.dispatch('updatePollingJobResultByJobId', {'jobId': this.getJob.jobId, 'isFetchingResult': true });
                 try {
-                    this.$store.dispatch('crudRequestV2', {endpoint: url, method: 'get'}).then(response => {
-                        let success = response.ok;
-                        response.json().then(response => {
-                            if(!success){return;}
-                            let jobId = response.payload.data.job_id;
-                            if(jobId){
-                                this.startPolling(jobId);
-                            }
-                        });
-                    })
-                } catch (error) {
-                    console.error('Error submitJob', error);
-                }
-            },
-            fetchJobResult(jobId, isLastAttempt = false) {
-                // console.log('fetchJobResult: ', jobId);
-                this.isFetchingResult = true;
-                try {
-                    let anotherEndpoint = route('api.job.fetch', jobId);
+                    let anotherEndpoint = route('api.job.fetch', this.getJob.jobId);
                     if(isLastAttempt){
-                        anotherEndpoint = route('api.job.fetch.last.attempt', jobId, isLastAttempt);
+                        anotherEndpoint = route('api.job.fetch.last.attempt', this.getJob.jobId, isLastAttempt);
                     }
                     this.poll(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
                 } catch (error) {

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/elements/UnclaimedPackinglistComponent.vue

@@ -17,7 +17,7 @@
                                 <div class="col-auto hide" v-if="$store.getters.isSuperAdmin">
                                     <button type="button" class="btn b-rad-none btn-danger fs-11 requestModal" data-type="deletePackingList"><i class="fa fa-times text-white fs-12"></i></button>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deletePackingList">
-                                        <delete-packinglist-form-component :data="data"></delete-packinglist-form-component>
+                                        <delete-packinglist-form-component :data="data" section="section"></delete-packinglist-form-component>
                                     </modal-component>
                                     <button type="button" class="btn b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
                                 </div>
@@ -51,7 +51,7 @@
                                                                 <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
                                                             </div>
                                                             <div class="col p-l-5">
-                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', 'unclaimedPackingListSection', true, true)">Confirm</div>
+                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', section, true, true)">Confirm</div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -78,6 +78,11 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
-        mixins: [componentHandler]
+        mixins: [componentHandler],
+        data() {
+            return {
+                isLoading: false
+            }
+        }
     }
 </script>

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>
@@ -79,7 +80,7 @@
                                             <h6 class="no-margin">
                                                 <div class="row">
                                                     <div class="col-12 col-sm-auto pr-sm-0"><b>Delivery Address:</b>&nbsp;</div>
-                                                    <div class="col-12 col-sm-auto pl-sm-0">{{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i></div>
+                                                    <div class="col-12 col-sm-auto pl-sm-0">{{order.address.reference}} <i class="fa fa-info-circle m-l-10"  v-tooltip:right="order.address.street_one + ' ' + (order.address.street_two ? order.address.street_two : '') + ', ' + (order.address.district ? order.address.district.name : '') + ', ' + order.address.post_code + ' ' + (order.address.state ? order.address.state.name : '') + ', ' + (order.address.country ? order.address.country.name : '')"></i></div>
                                                 </div>
                                             </h6>
                                         </div>
@@ -149,7 +150,7 @@
                             </div>
                             <div class="row bg-master-lightest p-t-15" v-for="invoice in order.invoices" v-if="invoice.type === 1">
                                 <div class="col" v-if="getMergedInvoices(invoice).length > 1">
-                                    <customer-payments-billing-variant-2-component :data="getMergedInvoices(invoice)" :storage="getStorageInfo(invoice)" invoice_status="Pending Payment" :section="section"></customer-payments-billing-variant-2-component>
+                                    <customer-payments-billing-with-storage-component :data="getMergedInvoices(invoice)" :storage="getStorageInfo(invoice)" invoice_status="Pending Payment" :section="section"></customer-payments-billing-with-storage-component>
                                 </div>
                                 <div class="col" v-else>
                                     <customer-payments-billing-component :data="invoice" invoice_status="Pending Payment" :section="section"></customer-payments-billing-component>
@@ -215,6 +216,11 @@
                 this.isLoading = false;
                 this.order = response.payload.data;
             },
+            errorHandler(error, status){
+                if(status == 404){
+                    window.location.href = this.route('error.404');
+                }
+            },
             getStorageInfo(invoice) {
                 const storageObject = this.findStorageInfoObject(invoice.id);
                 return storageObject;

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

@@ -34,17 +34,13 @@
                     </div>
                 </div>
             </div>
-            <!-- CIEF TODO: For easy revert to old code -->
             <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
                 <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
+                    <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>
-            <!-- <list-polling-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list.job')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-polling-component> -->
         </div>
     </div>
 </template>

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

@@ -34,15 +34,10 @@
                     </div>
                 </div>
             </div>
-            <!-- CIEF TODO: For easy revert to old code -->
-            <!-- <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-component> -->
             <list-polling-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list.job')" :options="options">
                 <template slot="list" slot-scope="{data}">
-                    <single-admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></single-admin-payments-billing-component>
+                    <!-- <single-admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></single-admin-payments-billing-component> -->
+                    <single-parent-admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></single-parent-admin-payments-billing-component>
                 </template>
             </list-polling-component>
         </div>