Merge branch 'dillon/137-project-upgrade-update-1A' into vapor/test

resources/assets/vue/components/general/elements/TransitionComponent.vue

@@ -6,7 +6,7 @@
     </component>
 </template>
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, Transition, TransitionGroup } from 'vue';
 
 const props = withDefaults(defineProps<{
     speed?: string;
@@ -22,9 +22,7 @@ const props = withDefaults(defineProps<{
     tag: 'div'
 });
 
-const type = computed(() => {
-    return props.group ? "transition-group" : "transition";
-});
+const type = computed(() => (props.group ? TransitionGroup : Transition));
 
 const dynamicProps = computed(() => {
     const p: any = {
@@ -53,4 +51,4 @@ const hooks = {
     beforeLeave: setAbsolutePosition,
     afterLeave: cleanUp
 };
-</script>
+</script>

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 = {

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

@@ -50,7 +50,7 @@
                             </div>
                         </div>
                         <modal-component type="paymentProofModal">
-                            <payment-verification-form-component v-if="selected_id === item.id" :section="section" :data="{...item, id: item.payment_transaction.id}"></payment-verification-form-component>
+                            <payment-verification-form-component v-if="selected_id === String(item.id)" :section="section" :data="{...item, id: item.payment_transaction.id}"></payment-verification-form-component>
                         </modal-component>
                         <div class="col-auto" v-if="item.payment_method == 1 && [1, 2].includes(item.payment_transaction.status)">
                             <div class="fs-10  all-caps">Payment Proof</div>
@@ -134,7 +134,7 @@ const request = useRequest();
 const expanded = ref(false);
 const selectedValue = ref(false);
 const selected_id = ref('');
-const item = ref<any>(props.data || {}); 
+const item = ref<any>(props.data || {});
 const isLoading = ref(false);
 
 const pendingQueue = computed(() => queueStore.isInCompleteQueue(props.section));

resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue

@@ -10,7 +10,7 @@
             <validation-wrapper-component class="m-b-15" :validator="v$?.parameters?.rate">
                 <label class="text-primary">Base Price (MYR)</label>
                 <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate" v-money3="money">
+                    <input type="text" class="form-control fs-12" v-model.lazy="parameters.rate" v-money3="money">
                 </div>
             </validation-wrapper-component>
             <div class="row m-t-15">

resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue

@@ -9,13 +9,13 @@
             <validation-wrapper-component class="m-b-15" :validator="v$.parameters.rate.center">
                 <label class="text-primary">City Center Charges (MYR)</label>
                 <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate.center" v-money3="money">
+                    <input type="text" class="form-control fs-12" v-model.lazy="parameters.rate.center" v-money3="money">
                 </div>
             </validation-wrapper-component>
             <validation-wrapper-component class="m-b-15" :validator="v$.parameters.rate.outstation">
                 <label class="text-primary">Outskirt Charges (MYR)</label>
                 <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate.outstation" v-money3="money">
+                    <input type="text" class="form-control fs-12" v-model.lazy="parameters.rate.outstation" v-money3="money">
                 </div>
             </validation-wrapper-component>
             <div class="row m-t-15">

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);
         }
     });
 };

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('');
         }
     });
 };

resources/assets/vue/composables/useModalFormHandler.ts

@@ -80,8 +80,6 @@ export function useModalFormHandler(props: { section: string; }) {
         isLoading,
         error,
         closeModal,
-        errorHandler,
-        successHandler,
         formHandler,
         submit,
     };