From 1336b3f3aebcf992fa64a1f5dbced4f240e01d64 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 22 Jul 2026 21:46:38 +0800 Subject: [PATCH 1/4] 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 --- .../settings/forms/EditWarehouseChargesFormComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue index 7db8e26b..7bb2c295 100644 --- a/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue @@ -9,7 +9,7 @@
- +
From f834bfd63adc0d710f220b90b5b2503ae2791236 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 23 Jul 2026 13:06:12 +0800 Subject: [PATCH 2/4] 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); From 390510e8aa32eaea089cbd31fa73feaaa6dd407b Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 24 Jul 2026 15:41:27 +0800 Subject: [PATCH 3/4] 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index 015c018f..cac7fc7b 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -136,6 +136,7 @@ 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 = 0; if (is_object($selected_warehouse_rate)) { $warehouse_rate = $selected_warehouse_rate->amount; } elseif (is_array($selected_warehouse_rate)) { From 6cc8283594aa19d6c73d1259bb89223f7b82aead Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 6 Aug 2026 12:01:43 +0800 Subject: [PATCH 4/4] Sin Yee requested for additional info to be included in arrived-parcel.xlsx --- .../Exports/Services/ExportsArrivedParcel.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index df33a355..40af0f57 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -2,6 +2,7 @@ namespace App\Classes\Modules\Exports\Services; +use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Models\Order; use App\Models\PackingList; use Carbon\Carbon; @@ -38,7 +39,10 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, 'Received Date', 'Recorded On', 'Days to Record', - 'Remarks' + 'Remarks', + 'Delivery Address', + 'Post Code', + 'State', ]; } @@ -79,6 +83,8 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $recorded_on = $packingList->created_at->format('d-m-Y'); $days_to_record = Carbon::parse($arrival_date)->diffInDays(Carbon::parse($recorded_on)); + $address = $order->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first(); + return [ $packingList->owner->reference, $marking, @@ -89,7 +95,10 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $arrival_date, $recorded_on, $days_to_record, - '' + '', + $address->street_one . ' ' . ($address->street_two ? $address->street_two : '') . ', ' . $address->district->name, + $address->postcode, + $address->state->name, ]; } }