From a21614ba32ff41e88b3cac2cc73d6bc31de9be54 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 6 Feb 2026 15:32:21 +0800 Subject: [PATCH 1/4] Emergency DB issue Restore --- vapor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vapor.yml b/vapor.yml index e6e07cc3..ab30bd17 100644 --- a/vapor.yml +++ b/vapor.yml @@ -11,7 +11,7 @@ environments: queues: - shipping-portal-default-production - shipping-portal-high_priority-production - database: cief-amazon-rds-mysql + database: cief-amazon-rds-mysql-debug storage: shipping-portal-production runtime: 'docker' timeout: 180 From 151447c573f6e5ff9d6db42d6ce5994e7c77c1d4 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 6 Feb 2026 15:53:59 +0800 Subject: [PATCH 2/4] Emergency DB issue Restore --- vapor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vapor.yml b/vapor.yml index ab30bd17..e6e07cc3 100644 --- a/vapor.yml +++ b/vapor.yml @@ -11,7 +11,7 @@ environments: queues: - shipping-portal-default-production - shipping-portal-high_priority-production - database: cief-amazon-rds-mysql-debug + database: cief-amazon-rds-mysql storage: shipping-portal-production runtime: 'docker' timeout: 180 From 7faeec6ef7eedb7639bb6e5b65efa3e830deeb5d Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 12 Feb 2026 15:44:05 +0800 Subject: [PATCH 3/4] Fix a problem reported by Joanne about group payment invoices not appearing properly --- .../ControllersLogic/ListGroupsLogic.php | 4 ++ .../GroupPendingInvoicesPNBPageResource.php | 49 +++++++++++++++++++ ...CustomerPaymentBillingSectionComponent.vue | 2 +- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 app/Http/Resources/GroupPendingInvoicesPNBPageResource.php diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php index 1f104db4..3bf03445 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php @@ -5,6 +5,7 @@ namespace App\Classes\Modules\Transactions\ControllersLogic; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Transactions\Services\ListsGroups; use App\Http\Resources\GroupPaidInvoicesPNBPageResource; +use App\Http\Resources\GroupPendingInvoicesPNBPageResource; use App\Http\Resources\GroupResource; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -45,6 +46,9 @@ class ListGroupsLogic extends AbstractControllerLogic if($section === 'customerPaidGroupInvoiceComponent'){ return $this->collectionResponse(GroupPaidInvoicesPNBPageResource::collection($query)); } + else if($section === 'customerGroupPaymentInProgressInvoiceComponent'){ + return $this->collectionResponse(GroupPendingInvoicesPNBPageResource::collection($query)); + } else{ return $this->collectionResponse(GroupResource::collection($query)); } diff --git a/app/Http/Resources/GroupPendingInvoicesPNBPageResource.php b/app/Http/Resources/GroupPendingInvoicesPNBPageResource.php new file mode 100644 index 00000000..9bfd3014 --- /dev/null +++ b/app/Http/Resources/GroupPendingInvoicesPNBPageResource.php @@ -0,0 +1,49 @@ +reference)->first(); + + return [ + 'id' => $this->id, + 'original_amount' => (float) $this->original_amount, + 'original_currency' => new CurrencyResource($this->original_currency), + 'issuer_name' => $this->issuerCompany->name, + 'issuer_id' => $this->issuerCompany->id, + 'amount' => (float) $this->amount, + 'service_charge' => (float) $this->amount, + 'currency' => new CurrencyResource($this->currency), + 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'), + 'currency_rate' => (float) $this->currency_rate, + 'status' => $this->status, + 'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$this->status], + 'payment_method' => $this->payment_method, + 'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]), + 'reference' => $this->reference, + 'payment_transaction' => $payment_transaction ? [ + 'id' => $payment_transaction->id, + 'status' => $payment_transaction->status, + 'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status], + 'documents' => $this->status === ApprovalStatus::APPROVED ? DocumentResource::collection($payment_transaction->documents->where('status', ApprovalStatus::APPROVED)) : DocumentResource::collection($payment_transaction->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)), + ] : [] + ]; + } +} diff --git a/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue index 7cb4b22e..eb477023 100644 --- a/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue @@ -105,7 +105,7 @@
- +
From efe5cceceae83e402a37448357559b30260fb43f Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 12 Feb 2026 16:05:33 +0800 Subject: [PATCH 4/4] Fix a problem reported by Joanne about group payment invoices not appearing properly --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8244c4b0..5a8fcb67 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,10 @@ "config": { "optimize-autoloader": true, "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "audit": { + "block-insecure": false + } }, "minimum-stability": "dev", "prefer-stable": true