@feedmepos/mf-order-setting 0.0.76 → 0.0.77

package/src/stores/order-setting/mapper.ts

@@ -50,13 +50,13 @@ export const defaultPickUp: KioskPickAtCounterSettingForm = {
   enablePaxDialog: false
 }
 
-export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
-  dineIn: {
-    enabled: false,
-    pickUp: defaultPickUp,
-    sequenceNumber: FdoOrderKioskDineInSequence.parse({}),
-    displayStand: defaultDisplayStand
-  },
+export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
+  dineIn: {
+    enabled: false,
+    pickUp: defaultPickUp,
+    sequenceNumber: FdoOrderKioskDineInSequence.parse({}),
+    displayStand: defaultDisplayStand
+  },
   takeaway: defaultTakeaway,
   paymentSetting: {
     paymentTypes: [],
@@ -74,14 +74,16 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
         scanPay: false
       }
     }
-  },
-  menuItem: {
-    showAllOnly: false
-  },
-  coverImageLandscape: null,
-  coverImagePortrait: null,
-  otaChannel: ''
-}
+  },
+  menuItem: {
+    showAllOnly: false
+  },
+  coverImageLandscape: null,
+  coverImagePortrait: null,
+  otaChannel: '',
+  autoCloseBill: null,
+  printReceiptAfterClose: null
+}
 
 export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
   payAtCounter: null,
@@ -94,11 +96,11 @@ const convertOrderSettingDto = (dto: OrderSettingsDto): MfOrderSetting => {
   }
 }
 
-const toKiosk = (
-  kioskOrderSettings: OrderKioskSettings | null | undefined,
-  kioskDineInSeq?: OrderKioskDineInSequenceDto
-): MfKioskOrderSetting => {
-  return {
+const toKiosk = (
+  kioskOrderSettings: OrderKioskSettings | null | undefined,
+  kioskDineInSeq?: OrderKioskDineInSequenceDto
+): MfKioskOrderSetting => {
+  return {
     dineIn: toKioskDineInSetting(
       kioskDineInSeq ?? {
         current: 0,
@@ -116,30 +118,34 @@ const toKiosk = (
           }
         : defaultSubmitOrderInstruction
     },
-    paymentSetting: {
-      paymentTypes: kioskOrderSettings?.paymentSetting?.paymentTypes ?? [],
-      offlinePaymentTypes: kioskOrderSettings?.paymentSetting?.offlinePaymentTypes ?? [],
-      ePaymentTypes:
-        kioskOrderSettings?.paymentSetting?.ePaymentTypes ??
+    paymentSetting: {
+      paymentTypes: kioskOrderSettings?.paymentSetting?.paymentTypes ?? [],
+      offlinePaymentTypes: kioskOrderSettings?.paymentSetting?.offlinePaymentTypes ?? [],
+      ePaymentTypes:
+        kioskOrderSettings?.paymentSetting?.ePaymentTypes ??
         FdoEPaymentMethod.parse({
           card: {
             terminal: false,
             nfc: false
           },
-          eWallet: {
-            qrPay: false,
-            scanPay: false
-          }
-        })
-    },
-    menuItem: {
-      showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false
-    },
-    otaChannel: kioskOrderSettings?.otaChannel ?? '',
-    coverImageLandscape: kioskOrderSettings?.coverImageLandscape ?? null,
-    coverImagePortrait: kioskOrderSettings?.coverImagePortrait ?? null
-  }
-}
+          eWallet: {
+            qrPay: false,
+            scanPay: false
+          }
+        })
+    },
+    menuItem: {
+      showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false
+    },
+    otaChannel: kioskOrderSettings?.otaChannel ?? '',
+    coverImageLandscape: kioskOrderSettings?.coverImageLandscape ?? null,
+    coverImagePortrait: kioskOrderSettings?.coverImagePortrait ?? null,
+    // Preserve "unset" as null — collapsing to a boolean here is what let an
+    // unrelated save overwrite the inherited dineInSettings value.
+    autoCloseBill: kioskOrderSettings?.autoCloseBill ?? null,
+    printReceiptAfterClose: kioskOrderSettings?.printReceiptAfterClose ?? null
+  }
+}
 
 const toKioskDineInSetting = (
   kioskDineInSeq: OrderKioskDineInSequenceDto,
@@ -222,22 +228,26 @@ const toOrderKioskSettingsDto = (
     }
   })
 
-  const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
-    canTakeaway: kioskSetting.takeaway.enabled,
-    dineIn,
-    menuItem: kioskSetting.menuItem,
-    coverImageLandscape: kioskSetting.coverImageLandscape,
-    coverImagePortrait: kioskSetting.coverImagePortrait,
-    otaChannel: kioskSetting.otaChannel || undefined,
-    paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
-    takeaway: kioskSetting.takeaway.submitOrderInstruction
-      ? {
-          submitOrderInstruction: {
-            payAtCounter: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
-              ? {
-                  en: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
-                }
-              : null,
+  const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
+    canTakeaway: kioskSetting.takeaway.enabled,
+    dineIn,
+    menuItem: kioskSetting.menuItem,
+    coverImageLandscape: kioskSetting.coverImageLandscape,
+    coverImagePortrait: kioskSetting.coverImagePortrait,
+    otaChannel: kioskSetting.otaChannel || undefined,
+    // Omit when unset so the backend's `?? config.autoCloseBill` inheritance
+    // still applies — sending `false` here would pin it off for good.
+    autoCloseBill: kioskSetting.autoCloseBill ?? undefined,
+    printReceiptAfterClose: kioskSetting.printReceiptAfterClose ?? undefined,
+    paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
+    takeaway: kioskSetting.takeaway.submitOrderInstruction
+      ? {
+          submitOrderInstruction: {
+            payAtCounter: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
+              ? {
+                  en: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
+                }
+              : null,
             paid: kioskSetting.takeaway.submitOrderInstruction.paid
               ? {
                   en: kioskSetting.takeaway.submitOrderInstruction.paid

package/src/views/kiosk/settings/KioskSettingView.vue

@@ -230,6 +230,28 @@
       />
     </div>
 
+    <!-- Order Setting Section -->
+    <div class="flex flex-col gap-2">
+      <span class="fm-typo-en-title-sm-600">{{ t('order.orderSetting') }}</span>
+      <div class="flex flex-col gap-5">
+        <FmSwitch
+          :model-value="kioskOrderSettingForm.autoCloseBill ?? false"
+          :label="t('order.autoCloseBill')"
+          :sublabel="t('order.autoCloseBillSublabel')"
+          label-placement="right"
+          @update:model-value="onAutoCloseBillChange"
+        />
+        <FmSwitch
+          v-show="kioskOrderSettingForm.autoCloseBill"
+          :model-value="kioskOrderSettingForm.printReceiptAfterClose ?? true"
+          @update:model-value="(v: boolean) => (kioskOrderSettingForm.printReceiptAfterClose = v)"
+          :label="t('order.printReceiptAfterClose')"
+          :sublabel="t('order.printReceiptAfterCloseSublabel')"
+          label-placement="right"
+        />
+      </div>
+    </div>
+
     <!-- Payment Section -->
     <div class="flex flex-col gap-2">
       <KioskPaymentTypeSection
@@ -296,6 +318,17 @@ const emits = defineEmits<Emits>()
 
 const kioskOrderSettingForm = ref<MfKioskOrderSettingForm>(props.form)
 
+// autoCloseBill / printReceiptAfterClose stay null until the merchant actually
+// picks one, so the backend keeps inheriting dineInSettings. Turning auto-close
+// on is that choice — stamp the print default then rather than shipping a form
+// that reads "off" while the saved value is still unset.
+const onAutoCloseBillChange = (value: boolean) => {
+  kioskOrderSettingForm.value.autoCloseBill = value
+  if (value && kioskOrderSettingForm.value.printReceiptAfterClose === null) {
+    kioskOrderSettingForm.value.printReceiptAfterClose = true
+  }
+}
+
 // Validation rules
 const nonNegativeRule = (val: any) => {
   if (val < 0) return t('order.nonNegativeRule')

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

@@ -596,7 +596,6 @@ const grabfood = computed<FdoGrabfoodSettings>(() => {
   return {
     ...deliveryData.initGrabfoodDelivery(),
     ...grabfoodSetting.value,
-    partnerMerchantID: grabfoodSetting?.value?._id,
     ignoreDiscount: grabfoodSetting?.value?.ignoreDiscount ?? false
   }
 })

package/src/views/order-settings/delivery/delivery.data.ts

@@ -34,6 +34,7 @@ function initFeedmeExpress(): FdoRestaurantFeedmeDelivery {
 
 export function initFoodpandaDelivery(): FdoFoodpandaSettings {
   return {
+    integrationId: '',
     enable: false,
     remoteId: '',
     catalogId: null,
@@ -48,6 +49,7 @@ export function initFoodpandaDelivery(): FdoFoodpandaSettings {
 
 function initGrabfoodDelivery(): FdoGrabfoodSettings {
   return {
+    integrationId: '',
     enable: false,
     merchantID: '',
     catalogId: null,
@@ -68,6 +70,7 @@ function initLinemanDelivery(): FdoLinemanSettings {
 
 function initShopeefoodDelivery(): FdoShopeeFoodSettings {
   return {
+    integrationId: '',
     enable: false,
     storeID: '',
     catalogId: null,