@feedmepos/mf-order-setting 0.0.72-test.1 → 0.0.73-dev

package/src/views/order-settings/dine-in/DineInSetting.vue

@@ -106,6 +106,22 @@
         label-placement="right"
         @update:model-value="updateOverridePax"
       ></FmSwitch>
+
+      <FmSwitch
+        :model-value="orderSetting?.dineInSettings?.autoCloseBill ?? false"
+        :label="t('order.autoCloseBill')"
+        :sublabel="t('order.autoCloseBillSublabel')"
+        label-placement="right"
+        @update:model-value="updateAutoCloseBill"
+      ></FmSwitch>
+
+      <FmSwitch
+        :model-value="orderSetting?.dineInSettings?.printReceiptAfterClose ?? false"
+        :label="t('order.printReceiptAfterClose')"
+        :sublabel="t('order.printReceiptAfterCloseSublabel')"
+        label-placement="right"
+        @update:model-value="updatePrintReceiptAfterClose"
+      ></FmSwitch>
     </div>
     <div class="p-[1.5rem] flex flex-col gap-2 m-5 w-2/3">
       <PaymentType
@@ -153,6 +169,8 @@ import { useSnackbarFunctions } from '@/components/snackbar'
 
 const { t } = useI18n()
 
+type OrderDineInSettings = NonNullable<OrderSettingsDto['dineInSettings']>
+
 const { currentRestaurant } = useCoreStore()
 const restaurantStore = useRestaurantStore()
 const dineInSetting = ref<FdoRestaurantDineIn>(initDineInSetting())
@@ -208,27 +226,42 @@ function updateLastOrderMinutesBeforeClose(minutes: number) {
   }
 }
 
-function updatePrintChecklist(v: boolean) {
-  if (orderSetting.value) {
-    if (!orderSetting.value.dineInSettings) {
-      orderSetting.value.dineInSettings = {
-        overridePax: true,
-      };
-    }
-    orderSetting.value.dineInSettings.printChecklist = v
+function defaultOrderDineInSettings(
+  overrides: Partial<OrderDineInSettings> = {}
+): OrderDineInSettings {
+  return {
+    overridePax: true,
+    tableCartSyncMode: 'poll',
+    ...overrides
   }
 }
 
-function updateOverridePax(v: boolean) {
-  if (orderSetting.value) {
-    if (!orderSetting.value.dineInSettings) {
-      orderSetting.value.dineInSettings = {
-        overridePax: v,
-      };
-    } else {
-      orderSetting.value.dineInSettings.overridePax = v
-    }
+function ensureOrderDineInSettings(): OrderDineInSettings | undefined {
+  if (!orderSetting.value) return undefined
+  if (!orderSetting.value.dineInSettings) {
+    orderSetting.value.dineInSettings = defaultOrderDineInSettings()
   }
+  return orderSetting.value.dineInSettings
+}
+
+function updatePrintChecklist(v: boolean) {
+  const dineInSettings = ensureOrderDineInSettings()
+  if (dineInSettings) dineInSettings.printChecklist = v
+}
+
+function updateOverridePax(v: boolean) {
+  const dineInSettings = ensureOrderDineInSettings()
+  if (dineInSettings) dineInSettings.overridePax = v
+}
+
+function updateAutoCloseBill(v: boolean) {
+  const dineInSettings = ensureOrderDineInSettings()
+  if (dineInSettings) dineInSettings.autoCloseBill = v
+}
+
+function updatePrintReceiptAfterClose(v: boolean) {
+  const dineInSettings = ensureOrderDineInSettings()
+  if (dineInSettings) dineInSettings.printReceiptAfterClose = v
 }
 
 // Threshold mirrors backend `posSupportsDineInRemarkMerge` — must be kept
@@ -259,12 +292,10 @@ const dineInRemarkMergeActionOptions = computed(() => [
 ])
 
 function ensureRemarkSettings() {
-  if (!orderSetting.value) return
-  if (!orderSetting.value.dineInSettings) {
-    orderSetting.value.dineInSettings = { overridePax: true }
-  }
-  if (!orderSetting.value.dineInSettings.remark) {
-    orderSetting.value.dineInSettings.remark = {
+  const dineInSettings = ensureOrderDineInSettings()
+  if (!dineInSettings) return
+  if (!dineInSettings.remark) {
+    dineInSettings.remark = {
       enabled: false,
       mergeAction: 'override'
     }

package/src/views/order-settings/dine-in/PaymentType.vue

@@ -5,8 +5,7 @@ import OfflinePaymentTypeDialog from './OfflinePaymentTypeDialog.vue'
 import { useCoreStore, useI18n } from '@feedmepos/mf-common'
 
 const { t } = useI18n()
-const { currentRestaurant, namespace } = useCoreStore()
-const isDev = computed(() => namespace.value === 'dev')
+const { currentRestaurant } = useCoreStore()
 
 const props = defineProps({
   paymentTypes: {
@@ -85,7 +84,7 @@ const checkboxChildren = computed(() => {
           }
         : undefined
     },
-    ...(isDev.value ? [{
+    {
       label: t('order.credit'),
       value: 'credit',
       disable: !props.allowCredit,
@@ -95,7 +94,7 @@ const checkboxChildren = computed(() => {
             class: 'text-negative t-system'
           }
         : undefined
-    }] : [])
+    }
   ]
   return options
 })
@@ -104,7 +103,7 @@ const initializeCheckboxes = () => {
   const initialValues: string[] = []
   if (allowOfflinePayment.value) initialValues.push('offline')
   if (allowEPayment.value) initialValues.push('e-payment')
-  if (isDev.value && allowCreditPayment.value) initialValues.push('credit')
+  if (allowCreditPayment.value) initialValues.push('credit')
   nestedVal.value = initialValues
 
   let availableOptionsCount = 0
@@ -256,14 +255,12 @@ onMounted(() => {
       <slot name="e-payment-content"></slot>
     </div>
 
-    <template v-if="isDev">
-      <FmCheckbox v-if="allowCredit || showDisabledOptions" v-model="nestedVal" :label="checkboxChildren[2].label" :value="checkboxChildren[2].value"
-        @update:model-value="handleChildUpdate" :disabled="checkboxChildren[2].disable" />
+    <FmCheckbox v-if="allowCredit || showDisabledOptions" v-model="nestedVal" :label="checkboxChildren[2].label" :value="checkboxChildren[2].value"
+      @update:model-value="handleChildUpdate" :disabled="checkboxChildren[2].disable" />
 
-      <div class="text-fm-color-secondary-salmon fm-typo-en-body-sm-600 ml-7" v-if="checkboxChildren[2].suffix">
-          {{ checkboxChildren?.[2]?.suffix?.text }}
-      </div>
-    </template>
+    <div class="text-fm-color-secondary-salmon fm-typo-en-body-sm-600 ml-7" v-if="checkboxChildren[2].suffix">
+        {{ checkboxChildren?.[2]?.suffix?.text }}
+    </div>
 
    </div>
 </template>

package/src/views/order-settings/general/GeneralSetting.vue

@@ -28,12 +28,21 @@
       <div class="mr-9 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-2 gap-5">
         <div class="min-w-0">
           <div class="bg-gray-50 p-3 rounded-lg border">
-            <FmSwitch
-              :model-value="!!orderSetting?.sequenceSettings?.autoReset?.resetTime"
-              :label="t('order.autoResetOrderNumber')"
-              @update:model-value="toggleResetTime"
-              label-placement="right"
-            ></FmSwitch>
+            <div class="flex items-center gap-2">
+              <FmSwitch
+                :model-value="!!orderSetting?.sequenceSettings?.autoReset?.resetTime"
+                :label="t('order.autoResetOrderNumber')"
+                @update:model-value="toggleResetTime"
+                label-placement="right"
+              ></FmSwitch>
+              <FmTooltip :content="t('order.autoResetOrderNumberTooltip')" :zIndex="1000">
+                <FmIcon
+                  name="info"
+                  size="sm"
+                  class="cursor-help text-fm-color-neutral-gray-400"
+                />
+              </FmTooltip>
+            </div>
             <FmTimePicker
               v-if="!!orderSetting?.sequenceSettings?.autoReset?.resetTime"
               :model-value="orderSetting?.sequenceSettings?.autoReset?.resetTime"

package/src/views/order-settings/pickup/PickUpSettingDialog.vue

@@ -1,7 +1,12 @@
 <template>
   <FmSideSheet :header="t('order.updatePickupSetting')" dismiss-away class="w-full fm-typo-en-title-md-600" :maxWidth="600"
     :model-value="props.showPickupDialog" @update:model-value="togglePickupDialog">
-    <PickUpSettingDialogContent @update-pickup="updatePickupSetting" :pickup="pickupSetting" />
+    <PickUpSettingDialogContent
+      @update-pickup="updatePickupSetting"
+      @update-order-settings="updateOrderPickupSettings"
+      :pickup="pickupSetting"
+      :order-pickup-settings="orderPickupSettings"
+    />
     <template #side-sheet-footer>
       <div class="flex gap-8 items-center justify-start">
         <FmButton variant="primary" :label="t('order.apply')" size="lg" @click="onSave" />
@@ -21,6 +26,8 @@ import { useRestaurantStore } from '@/stores/restaurant'
 import { useSnackbarFunctions } from '@/components/snackbar'
 import { F_ORDER_PAYMENT_TYPE, FdoRestaurantPickup } from '@feedmepos/core/entity'
 import { useI18n } from '@feedmepos/mf-common'
+import { OrderSettingApi } from '@/api/order-setting'
+import type { OrderPickupSettingsDto, OrderSettingsDto } from '@entity'
 
 const { t } = useI18n()
 
@@ -30,6 +37,10 @@ const restaurantStore = useRestaurantStore()
 const { showSuccess, showError } = useSnackbarFunctions()
 
 const pickupSetting = ref<FdoRestaurantPickup>(initDefaultPickupSetting())
+// `orderSetting.pickupSettings` (bill auto-close / receipt-print) is a separate doc
+// from the restaurant-level pickup setting; loaded/saved alongside it here.
+const orderSetting = ref<OrderSettingsDto | undefined>(undefined)
+const orderPickupSettings = ref<OrderPickupSettingsDto>({})
 const props = defineProps({
   showPickupDialog: {
     type: Boolean,
@@ -58,12 +69,16 @@ function updatePickupSetting(value: FdoRestaurantPickup) {
   pickupSetting.value = value
 }
 
+function updateOrderPickupSettings(value: OrderPickupSettingsDto) {
+  orderPickupSettings.value = value
+}
+
 async function onSave() {
   const pickupTime = pickupSetting.value.pickupTime
   if (pickupTime) {
     const { min, max } = pickupTime.day
     if (max <= min || max - min > MAX_PREORDER_DAYS) {
-      showError(t('order.preOrderMax7DaysError'))
+      showError(t('order.preOrderMaxDaysError', { days: MAX_PREORDER_DAYS }))
       return
     }
   }
@@ -73,6 +88,12 @@ async function onSave() {
     if (currentRestaurant.value) {
       currentRestaurant.value.pickup = pickupSetting.value
     }
+    if (orderSetting.value) {
+      orderSetting.value = await OrderSettingApi.updateOrderSetting({
+        ...orderSetting.value,
+        pickupSettings: orderPickupSettings.value
+      })
+    }
     showSuccess('Pickup setting updated. ')
   })
   await emits('close-side-sheet', true)
@@ -81,10 +102,17 @@ async function onSave() {
 
 watch(
   () => props.showPickupDialog,
-  () => {
+  async (show) => {
     if (currentRestaurant.value) {
       pickupSetting.value = currentRestaurant.value.pickup ?? initDefaultPickupSetting()
     }
+    if (show && currentRestaurant.value) {
+      await startAsyncCallWithErr(async () => {
+        const setting = await OrderSettingApi.getOrderSetting()
+        orderSetting.value = setting
+        orderPickupSettings.value = setting.pickupSettings ?? {}
+      })
+    }
   }
 )
 </script>

package/src/views/order-settings/pickup/PickUpSettingDialogContent.vue

@@ -8,6 +8,24 @@
     label-placement="right"
     @update:model-value="updateIgnoreStock"
   />
+  <FmSwitch
+    class="mt-5"
+    :model-value="orderPickupSettings.autoCloseBill ?? false"
+    value="autoCloseBill"
+    :label="t('order.autoCloseBill')"
+    :sublabel="t('order.autoCloseBillSublabel')"
+    label-placement="right"
+    @update:model-value="updateAutoCloseBill"
+  />
+  <FmSwitch
+    class="mt-5"
+    :model-value="orderPickupSettings.printReceiptAfterClose ?? false"
+    value="printReceiptAfterClose"
+    :label="t('order.printReceiptAfterClose')"
+    :sublabel="t('order.printReceiptAfterCloseSublabel')"
+    label-placement="right"
+    @update:model-value="updatePrintReceiptAfterClose"
+  />
   <FmCard variant="outlined" class="p-5 mt-10">
     <Preorder :model-value="pickupData" @update:model-value="updatePickupSetting" />
   </FmCard>
@@ -60,6 +78,7 @@ import {
   FdoPickupPoint,
   FdoRestaurantPickup
 } from '@feedmepos/core/entity'
+import type { OrderPickupSettingsDto } from '@entity'
 
 import { computed, ref, watch, type PropType } from 'vue'
 import PickUpPointDialog from './PickUpPointDialog.vue'
@@ -82,14 +101,29 @@ const restaurantStore = useRestaurantStore()
 
 const emits = defineEmits<{
   (event: 'update-pickup', v: FdoRestaurantPickup): void
+  (event: 'update-order-settings', v: OrderPickupSettingsDto): void
 }>()
 
 const props = defineProps({
   pickup: {
     type: Object as PropType<FdoRestaurantPickup>,
     required: true
+  },
+  // Bill auto-close / receipt-print preferences live on `orderSetting.pickupSettings`,
+  // a separate doc from the restaurant-level pickup setting above.
+  orderPickupSettings: {
+    type: Object as PropType<OrderPickupSettingsDto>,
+    default: () => ({})
   }
 })
+
+function updateAutoCloseBill(autoCloseBill: boolean) {
+  emits('update-order-settings', { ...props.orderPickupSettings, autoCloseBill })
+}
+
+function updatePrintReceiptAfterClose(printReceiptAfterClose: boolean) {
+  emits('update-order-settings', { ...props.orderPickupSettings, printReceiptAfterClose })
+}
 const pickupSetting = ref<FdoRestaurantPickup>(defaultPickupSetting())
 const pickupData = computed<PreorderData | null>(() => {
   if (!pickupSetting.value.pickupTime) {

package/src/views/order-settings/pickup/Preorder.vue

@@ -1,5 +1,14 @@
 <script lang="ts">
-export const MAX_PREORDER_DAYS = 7
+export const MAX_PREORDER_DAYS = 30
+
+export interface PreorderData {
+  day: {
+    min: number
+    max: number
+  }
+}
+
+export type InputModel = string | number | boolean | null
 </script>
 
 <script setup lang="ts">
@@ -9,13 +18,6 @@ import { useI18n } from '@feedmepos/mf-common'
 
 const { t } = useI18n()
 
-interface PreorderData {
-  day: {
-    min: number
-    max: number
-  }
-}
-
 enum PICKUP_TYPE {
   asap = 'asap',
   preorder = 'preorder'
@@ -72,8 +74,6 @@ function updatePickupTime(v: { min?: number; max?: number }) {
   emits('update:model-value', res)
 }
 
-type InputModel = string | number | boolean | null
-
 function getValue<T>(value: InputModel, type: 'string' | 'number'): T {
   let result = value
   switch (type) {
@@ -100,7 +100,8 @@ function updateEndTime(v: InputModel) {
 
 const validationError = computed<string | null>(() => {
   if (max.value < min.value) return t('order.preOrderInvalidRange')
-  if (max.value - min.value + 1 > MAX_PREORDER_DAYS) return t('order.preOrderMax7DaysError')
+  if (max.value - min.value + 1 > MAX_PREORDER_DAYS)
+    return t('order.preOrderMaxDaysError', { days: MAX_PREORDER_DAYS })
   return null
 })
 </script>
@@ -126,6 +127,6 @@ const validationError = computed<string | null>(() => {
     {{ validationError }}
   </div>
   <div v-if="pickupType === 'preorder'" class="text-fm-color-overlay-background fm-typo-en-body-sm-400 mt-3">
-    {{ t('order.preOrderHint', {today: preorderHint.today, start: preorderHint.start, end:preorderHint.end}) }}
+    {{ t('order.preOrderHint', {today: preorderHint.today, start: preorderHint.start, end:preorderHint.end, maxDays: MAX_PREORDER_DAYS}) }}
   </div>
 </template>

package/src/views/order-settings/queue/QueueSetting.vue

@@ -25,6 +25,7 @@ const orderSettingDefault = ref<FdoOrderSettings | undefined>(undefined)
 const queueSettings = ref<FdoOrderQueueSettings>({ ...defaultQueueSetting })
 const restaurantSetting = ref<RestaurantSettingDoc | undefined>(undefined)
 const presetRemarks = ref<string[]>([])
+const allowOverrideQueueCode = ref<boolean>(false)
 
 const Dialog = useDialog()
 
@@ -77,6 +78,7 @@ async function init() {
       )
       const queueQrSetting = restaurantSetting.value?.queueQrSetting
       presetRemarks.value = queueQrSetting?.presetRemarks ?? []
+      allowOverrideQueueCode.value = queueQrSetting?.allowOverrideQueueCode ?? false
     })
   }
 }
@@ -151,7 +153,10 @@ async function savePresetRemarks(remarks: string[]) {
       const result = await restaurantApi.updateQueueSetting(currentRestaurant.value._id, {
         printerIds: queueQrSetting?.printerIds ?? [],
         promptConfirmationDialog: queueQrSetting?.promptConfirmationDialog,
-        presetRemarks: remarks
+        presetRemarks: remarks,
+        // Preserve the override-code toggle — the backend replaces the whole
+        // queueQrSetting object, so omitting this would wipe it.
+        allowOverrideQueueCode: allowOverrideQueueCode.value
       })
 
       restaurantSetting.value = result
@@ -160,6 +165,23 @@ async function savePresetRemarks(remarks: string[]) {
     }
   })
 }
+
+async function saveAllowOverrideQueueCode(value: boolean) {
+  allowOverrideQueueCode.value = value
+  await startAsyncCallWithErr(async () => {
+    if (currentRestaurant.value && restaurantSetting.value) {
+      const queueQrSetting = restaurantSetting.value.queueQrSetting
+      const result = await restaurantApi.updateQueueSetting(currentRestaurant.value._id, {
+        printerIds: queueQrSetting?.printerIds ?? [],
+        promptConfirmationDialog: queueQrSetting?.promptConfirmationDialog,
+        presetRemarks: queueQrSetting?.presetRemarks ?? presetRemarks.value,
+        allowOverrideQueueCode: value
+      })
+      restaurantSetting.value = result
+    }
+  })
+  showSuccess(t('order.settingUpdated'))
+}
 </script>
 
 <template>
@@ -200,6 +222,13 @@ async function savePresetRemarks(remarks: string[]) {
           label-placement="right"
         />
 
+        <FmSwitch
+          :model-value="allowOverrideQueueCode"
+          @update:model-value="(v: boolean) => saveAllowOverrideQueueCode(v)"
+          :label="t('order.allowOverrideQueueCode')"
+          label-placement="right"
+        />
+
         <FmSwitch
           :model-value="queueSettings.disableSMS ?? false"
           @update:model-value="(v: boolean) => updateQueueSetting('disableSMS', v)"

package/src/views/order-settings/servicecharge/RateInput.vue

@@ -1,12 +1,10 @@
 <template>
   <FmTextField
-    :model-value="rate"
-    :label="t('order.rate')" 
-    append-icon="percent"
-    :rules="[
-      (val) => (val >= 0 && val <= 100) || 'Invalid rate (0% - 100%)',
-    ]"
     type="number"
+    append-icon="percent"
+    :model-value="rate"
+    :label="props.label ?? t('order.rate')"
+    :rules="[(val) => (val >= 0 && val <= 100) || 'Invalid rate (0% - 100%)']"
     @update:model-value="handleInputChange"
   />
 </template>
@@ -23,6 +21,10 @@ const props = defineProps({
   modelValue: {
     type: Object as PropType<AdjustmentAmount>,
     required: true
+  },
+  label: {
+    type: String,
+    required: false
   }
 })
 
@@ -35,7 +37,7 @@ const rate = computed(() => {
 })
 
 function handleInputChange(value: string) {
-  const numberValue = parseFloat(value);
+  const numberValue = parseFloat(value)
   emits('update:model-value', percentToAdjustment(numberValue))
 }
 </script>

package/vite.config.ts

@@ -1,12 +1,11 @@
 import { fileURLToPath, URL } from 'node:url'
 import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import { fmmfVitePresent } from "@feedmepos/mf-common/vite-preset";
-
+import { fmmfVitePresent } from '@feedmepos/mf-common/vite-preset'
 
 // https://vitejs.dev/config/
 export default defineConfig((env) => {
-  process.env = { ...process.env, ...loadEnv(env.mode, process.cwd(), "") }
+  process.env = { ...process.env, ...loadEnv(env.mode, process.cwd(), '') }
   const config = {
     plugins: [vue()],
     resolve: {
@@ -19,8 +18,7 @@ export default defineConfig((env) => {
       }
     },
     define: {
-      devInfo: JSON.stringify({
-      }),
+      devInfo: JSON.stringify({}),
       appApi: JSON.stringify({
         googleMap: process.env.VITE_GOOGLE_MAP_API_KEY,
         firebase: {
@@ -31,7 +29,7 @@ export default defineConfig((env) => {
           storageBucket: process.env.FIREBASE_STORAGE_BUCKET,
           messagingSenderId: process.env.FIREBASE_MESSAGING_SENDER_ID,
           appId: process.env.FIREBASE_APP_ID,
-          measurementId: process.env.FIREBASE_MEASUREMENT_ID,
+          measurementId: process.env.FIREBASE_MEASUREMENT_ID
         },
         assetBucketUrl: process.env.ASSET_STORAGE_BUCKET,
         feedMeClientId: process.env.FEEDME_CLIENT_ID,
@@ -41,20 +39,22 @@ export default defineConfig((env) => {
           serverUrl: process.env.GTM_SERVER_URL,
           env: process.env.GTM_ENV,
           serverMeasurementId: process.env.GTM_SERVER_MEASUREMENT_ID,
-          debug: process.env.GTM_DEBUG === 'true',
+          debug: process.env.GTM_DEBUG === 'true'
         },
-        r2: process.env.R2_ENDPOINT ? {
-          endPoint: process.env.R2_ENDPOINT,
-          bucketName: process.env.R2_BUCKET_NAME,
-          accessKeyId: process.env.R2_ACCESS_KEY || '',
-          secretAccessKey: process.env.R2_ACCESS_SECRET || '',
-        } : null,
+        r2: process.env.R2_ENDPOINT
+          ? {
+              endPoint: process.env.R2_ENDPOINT,
+              bucketName: process.env.R2_BUCKET_NAME,
+              accessKeyId: process.env.R2_ACCESS_KEY || '',
+              secretAccessKey: process.env.R2_ACCESS_SECRET || ''
+            }
+          : null
       }),
       appEndpoint: JSON.stringify({
-        customerV3App: process.env.CUSTOMER_V3_APP_URL,
+        customerV3App: process.env.CUSTOMER_V3_APP_URL
       }),
-      'process.env': JSON.stringify(process.env),
-    },
+      'process.env': JSON.stringify(process.env)
+    }
   }
 
   // return config