From f834bfd63adc0d710f220b90b5b2503ae2791236 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Thu, 23 Jul 2026 13:06:12 +0800
Subject: [PATCH] Update: Vue 2 to Vue 3 with Typescript, node 14 to node 22,
 Jenkinsfile, Dockerfile, vapor.yml (Post PROD Deployment) - Fix an error
 reported by KS on settings > Warehouses > Extra Charges

---
 .../Processors/CreateInvoiceTransactionProcessor.php       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index 5ef25141..015c018f 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -135,7 +135,12 @@ class CreateInvoiceTransactionProcessor
 
         $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
         $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
-        $warehouse_rate = is_object($selected_warehouse_rate) ? $selected_warehouse_rate->amount : 0;
+
+        if (is_object($selected_warehouse_rate)) {
+            $warehouse_rate = $selected_warehouse_rate->amount;
+        } elseif (is_array($selected_warehouse_rate)) {
+            $warehouse_rate = $selected_warehouse_rate['amount'] ?? 0;
+        }
 
         $stateId = $address->state_id;
         $state_rate_constant = $this->getConstantByKey($state_rate_constant, $stateId);