From 1c393e86e29769c5f3798a3758b090563dc1a88d Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Mon, 8 Jun 2026 19:42:42 +0800 Subject: [PATCH 1/6] Update: Vue 2 to Vue 3 with Typescript, node 14 to node 22, Jenkinsfile, Dockerfile, vapor.yml (Post PROD Deployment) --- .../orders/forms/DeliveryOrderFormComponent.vue | 9 +++------ .../elements/GroupPaymentsBillingComponents.vue | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/resources/assets/vue/components/orders/forms/DeliveryOrderFormComponent.vue b/resources/assets/vue/components/orders/forms/DeliveryOrderFormComponent.vue index 9a1302af..c33c9d35 100644 --- a/resources/assets/vue/components/orders/forms/DeliveryOrderFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/DeliveryOrderFormComponent.vue @@ -326,22 +326,19 @@ const parameters = ref({ const money = { decimal: '.', thousands: ',', - precision: 2, - masked: false + precision: 2 }; const weight = { decimal: '.', thousands: ',', - precision: 1, - masked: false + precision: 1 }; const integer = { decimal: '', thousands: '', - precision: 0, - masked: false + precision: 0 }; const rules = { diff --git a/resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue b/resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue index 4057ba05..6ae7e202 100644 --- a/resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue +++ b/resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue @@ -50,7 +50,7 @@ - +
Payment Proof
@@ -134,7 +134,7 @@ const request = useRequest(); const expanded = ref(false); const selectedValue = ref(false); const selected_id = ref(''); -const item = ref(props.data || {}); +const item = ref(props.data || {}); const isLoading = ref(false); const pendingQueue = computed(() => queueStore.isInCompleteQueue(props.section)); From e52dee287742f178296d3a88fd2bd172c1f6b46d Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 10 Jun 2026 15:30:07 +0800 Subject: [PATCH 2/6] Update: Vue 2 to Vue 3 with Typescript, node 14 to node 22, Jenkinsfile, Dockerfile, vapor.yml (Post PROD Deployment) --- .../components/general/elements/TransitionComponent.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/resources/assets/vue/components/general/elements/TransitionComponent.vue b/resources/assets/vue/components/general/elements/TransitionComponent.vue index 5af712e3..255f3998 100644 --- a/resources/assets/vue/components/general/elements/TransitionComponent.vue +++ b/resources/assets/vue/components/general/elements/TransitionComponent.vue @@ -6,7 +6,7 @@ \ No newline at end of file + From 7314c3aa0bcb6e7ce4b453e11968d6e63724e6d5 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 16 Jun 2026 15:47:17 +0800 Subject: [PATCH 3/6] Update: Vue 2 to Vue 3 with Typescript, node 14 to node 22, Jenkinsfile, Dockerfile, vapor.yml (Post PROD Deployment) --- .../forms/EditUserProfileFullnameFormComponent.vue | 7 ++----- .../settings/forms/ResetUserPasswordFormComponent.vue | 7 ++----- resources/assets/vue/composables/useModalFormHandler.ts | 2 -- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue index 58487a4e..13579edc 100644 --- a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue @@ -61,7 +61,7 @@ const parameters = reactive({ const v$ = useVuelidate(rules, { parameters }) as any; -const { submit, closeModal, error, errorHandler } = useModalFormHandler({ section: props.section }); +const { submit, closeModal, error, formHandler } = useModalFormHandler({ section: props.section }); const submitForm = async () => { await submit(route('api.account.user.update', authStore.getUserId), 'put', props.section, true, true, parameters, { @@ -71,11 +71,8 @@ const submitForm = async () => { }, successHandler: (response: any) => { closeModal(); - errorHandler(''); + formHandler(''); authStore.updateProfile(response.payload.data.name); - }, - errorHandler: (response: any) => { - errorHandler(response.message); } }); }; diff --git a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue index f32b2a3d..88608e68 100644 --- a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue @@ -53,7 +53,7 @@ const parameters = reactive({ const v$ = useVuelidate(rules, { parameters }) as any; -const { submit, closeModal, error, errorHandler } = useModalFormHandler({ section: props.section }); +const { submit, closeModal, error, formHandler } = useModalFormHandler({ section: props.section }); const submitForm = async () => { await submit(route('api.account.authentication.password.forget'), 'post', props.section, true, true, parameters, { @@ -63,10 +63,7 @@ const submitForm = async () => { }, successHandler: () => { closeModal(); - errorHandler(''); - }, - errorHandler: (response: any) => { - errorHandler(response.message); + formHandler(''); } }); }; diff --git a/resources/assets/vue/composables/useModalFormHandler.ts b/resources/assets/vue/composables/useModalFormHandler.ts index 74e2b54f..bcad747c 100644 --- a/resources/assets/vue/composables/useModalFormHandler.ts +++ b/resources/assets/vue/composables/useModalFormHandler.ts @@ -80,8 +80,6 @@ export function useModalFormHandler(props: { section: string; }) { isLoading, error, closeModal, - errorHandler, - successHandler, formHandler, submit, }; From 11b24f376c1f62f5989285c7106b39c1aa0fa42c Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 16 Jun 2026 16:02:03 +0800 Subject: [PATCH 4/6] Update: Vue 2 to Vue 3 with Typescript, node 14 to node 22, Jenkinsfile, Dockerfile, vapor.yml (Post PROD Deployment) --- .../components/settings/forms/EditBasePriceFormComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue b/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue index 77c7b538..6e9ac98d 100644 --- a/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue @@ -10,7 +10,7 @@
- +
From e5a474f21c433687f0a5c5b7df2d611087bfc67c Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 16 Jun 2026 16:51:12 +0800 Subject: [PATCH 5/6] Update: Vue 2 to Vue 3 with Typescript, node 14 to node 22, Jenkinsfile, Dockerfile, vapor.yml (Post PROD Deployment) --- .../settings/forms/EditStateChargesFormComponent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue index 9a085ed2..b3df4b2c 100644 --- a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue @@ -9,13 +9,13 @@
- +
- +
From 7a7c096aba2fb98a10a7d219f0b025121e71f437 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 21 Jun 2026 15:10:34 +0800 Subject: [PATCH 6/6] Update: Vue 2 to Vue 3 with Typescript, node 14 to node 22, Jenkinsfile, Dockerfile, vapor.yml (Post PROD Deployment) --- resources/views/partials/menu.blade.php | 324 ++++++++---------------- 1 file changed, 102 insertions(+), 222 deletions(-) diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 1f502172..82f4cbeb 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -34,19 +34,11 @@
- - - - - - - - + + +
@@ -59,19 +51,13 @@
- - - - - - - - + + + + +
@@ -83,19 +69,14 @@
- - - - - - - - + + + + + +
@@ -107,19 +88,13 @@
- - - - - - - - + + + + +
@@ -131,19 +106,13 @@
- - - - - - - - + + + + +
@@ -155,19 +124,12 @@
- - - - - - - - + + + +
@@ -178,19 +140,13 @@
- - - - - - - - + + + + +
@@ -199,19 +155,11 @@
- - - - - - - - + + +
@@ -222,19 +170,11 @@
- - - - - - - - + + +
@@ -245,19 +185,11 @@
- - - - - - - - + + +
@@ -268,19 +200,11 @@
- - - - - - - - + + +
@@ -292,19 +216,11 @@
- - - - - - - - + + +
@@ -316,19 +232,11 @@
- - - - - - - - + + +
@@ -341,19 +249,14 @@
- - - - - - - - + + + + + +
@@ -365,19 +268,11 @@
- - - - - - - - + + +
@@ -389,19 +284,13 @@
- - - - - - - - + + + + +
@@ -423,19 +312,10 @@
- - - - - - - - + +
@@ -448,7 +328,7 @@ :class="[{'d-flex': authStore.isAdmin}]" v-if="authStore.isAdmin">