@feedmepos/mf-order-setting 0.0.67-dev → 0.0.68-prod

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.67-dev",
+  "version": "0.0.68-prod",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -28,8 +28,8 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@feedmepos/core": "^2.15.17",
-    "@feedmepos/menu": "^1.9.1",
+    "@feedmepos/core": "^2.15.21",
+    "@feedmepos/menu": "^1.9.5",
     "@feedmepos/mf-common": "1.20.0-beta.2",
     "@feedmepos/ordering": "^0.0.3",
     "@feedmepos/ui-library": "1.5.2-beta.1",
@@ -44,6 +44,7 @@
     "i18next-vue": "^4.0.0",
     "moment": "^2.30.1",
     "pinia": "^2.1.7",
+    "semver": "^7.7.1",
     "vue": "^3.3.8",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.2.5",
@@ -55,6 +56,7 @@
     "@tsconfig/node18": "^18.2.2",
     "@types/google.maps": "^3.55.12",
     "@types/node": "^18.17.17",
+    "@types/semver": "^7.5.0",
     "@vitejs/plugin-vue": "^4.3.4",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",

package/src/locales/en-US.json

@@ -246,6 +246,13 @@
         "printChecklistSublabel": "Online order only",
         "overridePax": "Overwrite Bill Pax",
         "overridePaxSublabel": "Incoming order will overwrite the existing bill pax",
+        "dineInRemarkEnabled": "Customer order remark",
+        "dineInRemarkEnabledSublabel": "Allow customers to attach a remark when ordering dine-in.",
+        "dineInRemarkEnabledRequiresPosVersion": "Requires POS version {version} or above.",
+        "dineInRemarkMergeAction": "On bill merge, with existing remark",
+        "dineInRemarkMergeActionKeep": "Keep previous",
+        "dineInRemarkMergeActionOverride": "Override with new",
+        "dineInRemarkMergeActionConcat": "Append (newline)",
         "codeSettings": "Queue Code Settings",
         "addCodeSetting": "Add Queue Code Setting",
         "current": "Current",
@@ -292,6 +299,7 @@
         "staticQRcodeSublabel": "Customer can order with static QR code",
         "status": "Status",
         "subItemDisplayModeListView": "Sub Item List View",
+        "hideProductCode": "Hide Product Code",
         "submitOrderInstruction": "Submit order instruction",
         "success": "SUCCESS",
         "sunday": "Sunday",

package/src/locales/ja-JP.json

@@ -287,6 +287,7 @@
         "staticQRcodeSublabel": "お客様は静的QRコードで注文できます",
         "status": "ステータス",
         "subItemDisplayModeListView": "サブアイテムリストビュー",
+        "hideProductCode": "商品コードを非表示",
         "submitOrderInstruction": "注文送信指示",
         "success": "成功",
         "sunday": "日曜日",

package/src/locales/th-TH.json

@@ -288,6 +288,7 @@
         "staticQRcodeSublabel": "ลูกค้าสามารถสั่งซื้อโดยใช้รหัส QR แบบคงที่",
         "status": "สถานะ",
         "subItemDisplayModeListView": "โหมดรายการผลิตภัณฑ์เพิ่มเติม",
+        "hideProductCode": "ซ่อนรหัสสินค้า",
         "submitOrderInstruction": "ส่งข้อความสั่งซื้อ",
         "success": "สำเร็จ",
         "sunday": "วันอาทิตย์",

package/src/locales/zh-CN.json

@@ -294,6 +294,7 @@
         "staticQRcodeSublabel": "客户可以通过静态二维码下单",
         "status": "状态",
         "subItemDisplayModeListView": "附加产品列表模式",
+        "hideProductCode": "隐藏产品编号",
         "submitOrderInstruction": "提交订单文本",
         "success": "成功",
         "sunday": "星期日",

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

@@ -33,6 +33,26 @@
         :sublabel="t('order.customerItemRemarkSublabel')"
         label-placement="right"
       />
+      <FmSwitch
+        :model-value="dineInRemarkEnabled"
+        :disabled="!posSupportsRemarkMerge"
+        :label="t('order.dineInRemarkEnabled')"
+        :sublabel="
+          posSupportsRemarkMerge
+            ? t('order.dineInRemarkEnabledSublabel')
+            : t('order.dineInRemarkEnabledRequiresPosVersion', { version: REMARK_MERGE_MIN_POS_VERSION })
+        "
+        label-placement="right"
+        @update:model-value="updateDineInRemarkEnabled"
+      />
+      <div v-if="dineInRemarkEnabled && posSupportsRemarkMerge" class="flex flex-col gap-2 ml-5">
+        <span class="fm-typo-en-body-md-600">{{ t('order.dineInRemarkMergeAction') }}</span>
+        <FmSelect
+          :model-value="dineInRemarkMergeAction"
+          @update:model-value="updateDineInRemarkMergeAction"
+          :items="dineInRemarkMergeActionOptions"
+        />
+      </div>
       <FmSwitch
         v-model="dineInSetting.acceptQueue as boolean"
         value="acceptQueue"
@@ -125,6 +145,7 @@ import { useLoading } from '@/composables/loading'
 import { useCoreStore } from '@feedmepos/mf-common'
 import PaymentType from './PaymentType.vue'
 import { utils } from '@feedmepos/core'
+import semver from 'semver'
 import { useI18n } from '@feedmepos/mf-common'
 import { OrderSettingApi } from '@/api/order-setting'
 import { type OrderSettingsDto } from '@entity'
@@ -210,6 +231,60 @@ function updateOverridePax(v: boolean) {
   }
 }
 
+// Threshold mirrors backend `posSupportsDineInRemarkMerge` — must be kept
+// in lockstep. Restaurants on older POS see the toggle disabled with a
+// "requires version X+" hint instead of a hidden control.
+const REMARK_MERGE_GATE_VERSION = '7.12.12'
+const REMARK_MERGE_MIN_POS_VERSION = '7.12.13'
+const posSupportsRemarkMerge = computed<boolean>(() => {
+  const version = currentRestaurant.value?.posVersion
+  if (!version) return false
+  return semver.gt(version, REMARK_MERGE_GATE_VERSION)
+})
+
+const dineInRemarkEnabled = computed<boolean>(
+  () => orderSetting.value?.dineInSettings?.remark?.enabled ?? false
+)
+
+type RemarkMergeAction = 'keep' | 'override' | 'concat'
+
+const dineInRemarkMergeAction = computed<RemarkMergeAction>(
+  () => (orderSetting.value?.dineInSettings?.remark?.mergeAction as RemarkMergeAction) ?? 'override'
+)
+
+const dineInRemarkMergeActionOptions = computed(() => [
+  { label: t('order.dineInRemarkMergeActionKeep'), value: 'keep' },
+  { label: t('order.dineInRemarkMergeActionOverride'), value: 'override' },
+  { label: t('order.dineInRemarkMergeActionConcat'), value: 'concat' }
+])
+
+function ensureRemarkSettings() {
+  if (!orderSetting.value) return
+  if (!orderSetting.value.dineInSettings) {
+    orderSetting.value.dineInSettings = { overridePax: true }
+  }
+  if (!orderSetting.value.dineInSettings.remark) {
+    orderSetting.value.dineInSettings.remark = {
+      enabled: false,
+      mergeAction: 'override'
+    }
+  }
+}
+
+function updateDineInRemarkEnabled(v: boolean) {
+  ensureRemarkSettings()
+  if (orderSetting.value?.dineInSettings?.remark) {
+    orderSetting.value.dineInSettings.remark.enabled = v
+  }
+}
+
+function updateDineInRemarkMergeAction(v: RemarkMergeAction) {
+  ensureRemarkSettings()
+  if (orderSetting.value?.dineInSettings?.remark) {
+    orderSetting.value.dineInSettings.remark.mergeAction = v
+  }
+}
+
 function initDineInSetting(): FdoRestaurantDineIn {
   return {
     ignoreStock: false,

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

@@ -16,6 +16,12 @@
         @update:model-value="updateSubItemDisplayMode"
         label-placement="right"
       ></FmSwitch>
+      <FmSwitch
+        :model-value="!!orderSetting?.hideProductCode"
+        :label="t('order.hideProductCode')"
+        @update:model-value="updateHideProductCode"
+        label-placement="right"
+      ></FmSwitch>
 
       <div class="flex-grow fm-typo-en-title-sm-600 mt-8 mb-2">{{ t('order.orderNumberSettings') }}</div>
 
@@ -187,6 +193,12 @@ function updateSeq(key: SequenceKey, dtoKey: string, dto?: number) {
   }
 }
 
+function updateHideProductCode(v: boolean) {
+  if (orderSetting.value) {
+    orderSetting.value.hideProductCode = v
+  }
+}
+
 function updateSubItemDisplayMode(v: boolean) {
   if (orderSetting.value?.v3Settings) {
     if (v) {