@feedmepos/mf-order-setting 0.0.43 → 0.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",

package/src/views/order-settings/delivery/DeliverySetting.vue

@@ -142,7 +142,7 @@
         :model-value="localDoc"
         :company="selectedLocalRow.doc"
         :catalog-options="menuStore.catalogOptions"
-        @update:model-value="(v: FdoLinkedDelivery | null) => (localDocUpdate = v)"
+        @update:model-value="handleLocalDocUpdate"
       />
       <template #side-sheet-footer>
         <div class="flex gap-8 items-center justify-start">
@@ -240,14 +240,13 @@ const sideSheet = ref<boolean>(false)
 const loading = computed(() => {
   return !currentRestaurant.value || loadingDpi.value
 })
-let localDoc: FdoLinkedDelivery | null
-let localDocUpdate: FdoLinkedDelivery | null
 const selectedIntegratedRow = ref<any>(null)
 const sideSheetIntegrated = ref<boolean>(false)
 const selectedLocalRow = ref<any>(null)
 async function toggleLocalSidesheet(rowData: any) {
   selectedLocalRow.value = rowData.original ?? rowData
-  localDoc = getLinkedDeliveryDoc(linkedCompanies.value, selectedLocalRow.value.key) ?? null
+  localDoc.value = getLinkedDeliveryDoc(linkedCompanies.value, selectedLocalRow.value.key) ?? null
+  localDocUpdate.value = localDoc.value
   sideSheet.value = true
 }
 
@@ -458,6 +457,8 @@ const getClassForStatus = (enabled: StatusType): string => {
 }
 
 const model = ref()
+const localDoc = ref<FdoLinkedDelivery | null>(null)
+const localDocUpdate = ref<FdoLinkedDelivery | null>(null)
 
 const capitalizeFirstLetter = (str: string) => str.charAt(0).toUpperCase() + str.slice(1)
 
@@ -767,7 +768,7 @@ async function updateLocalDeliveryCompany() {
   await updateManualDelivery({
     doc: linkedDoc,
     company: selectedLocalRow.value.doc,
-    data: localDocUpdate
+    data: localDocUpdate.value
   })
   showSuccess(t('order.DeliverySettingUpdated'))
 }
@@ -834,6 +835,10 @@ function deleteCached(doc: LinkedDeliveryDoc) {
   linkedCompanies.value = remove(linkedCompanies.value, doc, 'key')
 }
 
+function handleLocalDocUpdate(v: FdoLinkedDelivery | null) {
+  localDocUpdate.value = v
+}
+
 function closeLocalDeliverySideSheet() {
   sideSheet.value = false
 }

package/src/views/order-settings/delivery/components/ManualIntegratedDeliverySetting.vue

@@ -33,11 +33,11 @@ const emits = defineEmits<{
 const data = ref<LocalDeliverySettingData>(
   props.modelValue
     ? {
+        ...props.modelValue,
         active: !!props.modelValue,
-        catalogId: null,
+        catalogId: props.modelValue.catalogId ?? null,
         rounding: props.modelValue.rounding ?? true,
-        requiredRemark: props.modelValue.requiredRemark ?? false,
-        ...props.modelValue
+        requiredRemark: props.modelValue.requiredRemark ?? false
       }
     : {
         ...props.company,
@@ -52,12 +52,13 @@ watch(
   () => props.modelValue,
   (newVal) => {
     if (newVal) {
+      // Create a clean copy to prevent reference sharing
       data.value = {
+        ...newVal,
         active: !!newVal,
-        catalogId: null,
+        catalogId: newVal.catalogId ?? null,
         rounding: newVal.rounding ?? true,
-        requiredRemark: newVal.requiredRemark ?? false,
-        ...newVal
+        requiredRemark: newVal.requiredRemark ?? false
       }
     } else {
       data.value = {
@@ -87,7 +88,8 @@ const paymentTypeOptions = computed(() => {
 function emitChange(fn: (oldV: LocalDeliverySettingData) => LocalDeliverySettingData) {
   const newV = fn({ ...data.value })
   data.value = newV
-  emits('update:model-value', newV.active ? newV : null)
+  // Emit a clean copy to prevent reference sharing between component instances
+  emits('update:model-value', newV.active ? { ...newV } : null)
 }
 
 function updateActive(active: boolean) {