@feedmepos/mf-order-setting 0.0.47 → 0.0.48

package/src/locales/th-TH.json

@@ -122,6 +122,11 @@
         "feedmeExpressPayoutAccIssue": "จำเป็นต้องมีบัญชีการจ่ายเงินเพื่อเปิดใช้งาน FeedMe Express",
         "feedmeExpressPosVersionIssue": "จำเป็นต้องมีเวอร์ชัน POS ขั้นต่ำ {minVersion} สำหรับ FeedMe Express",
         "feedmeExpressTitle": "อัปเดต FeedMe express",
+        "feedmeExpressDeprecationTitle": "FeedMe Express — ปิดรับสมัคร บริการสิ้นสุด 1 ก.พ. 2026",
+        "feedmeExpressDeprecationMessage": "การสมัคร FeedMe Express ปิดรับทันที บริการสำหรับร้านค้าที่มีอยู่จะสิ้นสุดในวันที่ 1 ก.พ. 2026 ติดต่อฝ่ายสนับสนุนเพื่อหาทางเลือกอื่น",
+        "feedmeExpressDeprecationThanks": "ขอบคุณสำหรับการสนับสนุนอย่างต่อเนื่อง",
+        "feedmeExpressDeprecationConfirm": "ฉันเข้าใจแล้ว",
+        "feedmeExpressAdminOnly": "การตั้งค่า FeedMe Express เป็นแบบอ่านอย่างเดียว ติดต่อผู้ดูแลระบบเพื่อทำการเปลี่ยนแปลง",
         "fieldCannotBeEmpty": "ไม่สามารถเว้นช่องได้",
         "followDineIn": "ทำตามการรับประทานอาหารที่ร้าน",
         "fixedTime": "เวลาที่กำหนด",
@@ -222,6 +227,7 @@
         "qrPay": "ชำระเงินด้วย QR",
         "terminalScanPay": "ชำระเงินด้วยการสแกนเทอร์มินัล",
         "terminalQrPay": "ชำระเงินด้วย QR เทอร์มินัล",
+        "terminalPaymentDescription": "ชำระเงินโดยใช้เครื่องเทอร์มินัลที่รวมอยู่ในระบบ",
         "rate": "อัตรา",
         "rateLimitWarning": "กรุณารอ 1 นาทีแล้วซิงค์อีกครั้ง",
         "remoteId": "รหัสประจำตัวระยะไกล",

package/src/locales/zh-CN.json

@@ -126,6 +126,11 @@
         "feedmeExpressPayoutAccIssue": "需要设置支付账户才能启用FeedMe外卖快递",
         "feedmeExpressPosVersionIssue": "需要最低{minVersion}版本的POS系统才能使用FeedMe外卖快递",
         "feedmeExpressTitle": "更新 Feedme 外卖快递",
+        "feedmeExpressDeprecationTitle": "FeedMe Express — 注册已关闭，服务将于 2026 年 2 月 1 日结束",
+        "feedmeExpressDeprecationMessage": "FeedMe Express 注册即日起关闭。现有商家的服务将于 2026 年 2 月 1 日结束。请联系客服了解其他选择。",
+        "feedmeExpressDeprecationThanks": "感谢您一直以来的支持。",
+        "feedmeExpressDeprecationConfirm": "我已了解",
+        "feedmeExpressAdminOnly": "FeedMe Express 设置为只读。如需更改请联系管理员。",
         "fieldCannotBeEmpty": "字段不可为空",
         "followDineIn": "跟随堂食",
         "fixedTime": "固定时间",
@@ -226,6 +231,7 @@
         "qrPay": "二维码支付",
         "terminalScanPay": "终端扫描支付",
         "terminalQrPay": "终端二维码支付",
+        "terminalPaymentDescription": "通过集成的终端设备进行支付。",
         "rate": "费率",
         "remoteId": "平台注册ID",
         "restaurant": "餐厅",

package/src/main.ts

@@ -14,11 +14,13 @@ import { createFeedMeI18n, type I18n, detectLocale } from "@feedmepos/mf-common"
 import enUS from "./locales/en-US.json"
 import zhCN from "./locales/zh-CN.json"
 import thTH from "./locales/th-TH.json"
+import jaJP from "./locales/ja-JP.json"
 
 export const i18nMessages = {
     "en-US": enUS,
     "zh-CN": zhCN,
     "th-TH": thTH,
+    "ja-JP": jaJP,
 }
 
 function initI18n(): I18n {

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

@@ -55,13 +55,14 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
     enabled: false,
     pickUp: defaultPickUp,
     sequenceNumber: FdoOrderKioskDineInSequence.parse({}),
-    displayStand: defaultDisplayStand,
+    displayStand: defaultDisplayStand
   },
   takeaway: defaultTakeaway,
   paymentSetting: {
     paymentTypes: [],
     offlinePaymentTypes: [],
     ePaymentTypes: {
+      terminal: false,
       card: {
         terminal: false,
         nfc: false
@@ -72,10 +73,10 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
         qrPay: false,
         scanPay: false
       }
-    },
+    }
   },
   menuItem: {
-    showAllOnly: false,
+    showAllOnly: false
   }
 }
 
@@ -90,35 +91,46 @@ const convertOrderSettingDto = (dto: OrderSettingsDto): MfOrderSetting => {
   }
 }
 
-const toKiosk = (kioskOrderSettings: OrderKioskSettings | null | undefined, kioskDineInSeq?: OrderKioskDineInSequenceDto): MfKioskOrderSetting => {
+const toKiosk = (
+  kioskOrderSettings: OrderKioskSettings | null | undefined,
+  kioskDineInSeq?: OrderKioskDineInSequenceDto
+): MfKioskOrderSetting => {
   return {
-    dineIn: toKioskDineInSetting(kioskDineInSeq ?? {
-      current: 0,
-      prefix: '#K',
-    }, kioskOrderSettings?.dineIn ?? undefined),
+    dineIn: toKioskDineInSetting(
+      kioskDineInSeq ?? {
+        current: 0,
+        prefix: '#K'
+      },
+      kioskOrderSettings?.dineIn ?? undefined
+    ),
     takeaway: {
       enabled: kioskOrderSettings?.canTakeaway ?? false,
-      submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction ? {
-        payAtCounter: kioskOrderSettings?.takeaway?.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
-        paid: kioskOrderSettings?.takeaway?.submitOrderInstruction?.paid?.['en'] ?? null,
-      } : defaultSubmitOrderInstruction,
+      submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction
+        ? {
+          payAtCounter:
+            kioskOrderSettings?.takeaway?.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
+          paid: kioskOrderSettings?.takeaway?.submitOrderInstruction?.paid?.['en'] ?? null
+        }
+        : defaultSubmitOrderInstruction
     },
     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
-        }
-      }),
+      ePaymentTypes:
+        kioskOrderSettings?.paymentSetting?.ePaymentTypes ??
+        FdoEPaymentMethod.parse({
+          card: {
+            terminal: false,
+            nfc: false
+          },
+          eWallet: {
+            qrPay: false,
+            scanPay: false
+          }
+        })
     },
     menuItem: {
-      showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false,
+      showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false
     }
   }
 }

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

@@ -56,6 +56,7 @@ const paymentCheckboxVal = ref<string[]>([])
 const cardPaymentRadioVal = ref<string>()
 const eWalletPaymentCheckboxVal = ref<string[]>([])
 const useCard = ref(false)
+const useTerminal = ref(false)
 const useEwallet = ref(false)
 
 const checkboxChildren = [
@@ -70,6 +71,10 @@ const initializeCheckboxes = () => {
   paymentCheckboxVal.value = initialValues
   parentCheckbox.value = initialValues.length === checkboxChildren.length
   if (!(Object.keys(props.ePaymentTypes).length === 0)) {
+    if (props.ePaymentTypes.terminal) {
+      useTerminal.value = true;
+    }
+    
     if (props.ePaymentTypes.card.terminal) {
       cardPaymentRadioVal.value = F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL
       useCard.value = true
@@ -195,6 +200,7 @@ const handleEPaymentCardUpdate = (ev: string) => {
 
 const handleEPaymentEWalletUpdate = () => {
   const ePaymentObj = {
+    terminal: false,
     card: {
       terminal: false,
       nfc: false
@@ -218,6 +224,10 @@ const handleEPaymentEWalletUpdate = () => {
       }
     }
 
+    if (useTerminal.value) {
+      ePaymentObj.terminal = true
+    }
+
     if (eWalletPaymentCheckboxVal.value.includes(F_ORDER_E_PAYMENT_TYPE.enum.QRPAY)) {
       ePaymentObj.eWallet.qrPay = true
     }
@@ -346,6 +356,17 @@ onMounted(() => {
         </div>
       </FmCardSection>
     </FmCard>
+    <FmCard variant="outlined" class="mt-2">
+      <FmCardSection>
+        <FmSwitch
+          :label="t('order.terminal')"
+          :sublabel="t('order.terminalPaymentDescription')"
+          label-placement="right"
+          v-model="useTerminal"
+          @update:modelValue="updateCardSwitch"
+        />
+      </FmCardSection>
+    </FmCard>
     <FmCard variant="outlined" class="mt-2">
       <FmCardSection>
         <FmSwitch

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

@@ -165,9 +165,9 @@
 </template>
 
 <script setup lang="ts">
-import { computed, h, ref, watch } from 'vue'
+import { computed, h, ref, watch, onMounted } from 'vue'
 import RestaurantSelector from '../components/RestaurantSelector.vue'
-import { type ColumnDef } from '@feedmepos/ui-library'
+import { type ColumnDef, useDialog } from '@feedmepos/ui-library'
 import type { FdoDeliverooSettings, FdoFoodpandaSettings, FdoExternalSetting } from '@entity'
 import type {
   FdoLinkedDelivery,
@@ -197,6 +197,8 @@ import { useSnackbarFunctions } from '@/components/snackbar'
 import useSearch from '@/composables/search'
 import DeliveryList from './DeliveryList.vue'
 import DeliverooSetting from './integrated-delivery/DeliverooSetting.vue'
+import FeedmeExpressDeprecationNotice from './components/FeedmeExpressDeprecationNotice.vue'
+import { useDeprecationNotice } from '@/composables/useDeprecationNotice'
 import { useI18n, useCoreStore } from '@feedmepos/mf-common'
 
 const { t } = useI18n()
@@ -212,6 +214,40 @@ const {
   currentCountry
 } = useCoreStore()
 const menuStore = useMenuStore()
+const Dialog = useDialog()
+const { shouldShowNotice, markNoticeAsShown } = useDeprecationNotice()
+
+const FEEDME_EXPRESS_DEPRECATION_NOTICE_ID = 'feedme_express_feb_2025'
+
+function showFeedmeExpressDeprecationDialog() {
+  const restaurantId = currentRestaurant.value?._id
+  if (!restaurantId) return
+
+  Dialog.open({
+    title: t('order.feedmeExpressDeprecationTitle'),
+    contentComponent: FeedmeExpressDeprecationNotice,
+    dismissAway: false,
+    primaryActions: {
+      text: t('order.feedmeExpressDeprecationConfirm'),
+      variant: 'primary',
+      close: true
+    }
+  })
+
+  markNoticeAsShown(FEEDME_EXPRESS_DEPRECATION_NOTICE_ID, restaurantId)
+}
+
+function checkAndShowDeprecationNotice() {
+  const restaurantId = currentRestaurant.value?._id
+  const isFeedmeExpressEnabled = currentRestaurant.value?.feedmeDelivery?.enable
+
+  if (restaurantId && isFeedmeExpressEnabled) {
+    if (shouldShowNotice(FEEDME_EXPRESS_DEPRECATION_NOTICE_ID, restaurantId)) {
+      showFeedmeExpressDeprecationDialog()
+    }
+  }
+}
+
 const linkedCompanies = ref<LinkedDeliveryDoc[]>([])
 const deliveryCompanies = ref<DeliveryCompany[]>([])
 export interface DeliveryRow {
@@ -977,7 +1013,13 @@ function handleModelValueUpdateExternal(v: any) {
 }
 
 const feedmeValidate = ref<boolean | null>(null)
+const isAdmin = computed(() => sessionUser.value?.role?.isAdmin ?? false)
+
 const canSave = computed(() => {
+  // For FeedMe Express, only admin can save
+  if (feedMeComponentProps.value?.key === F_ORDER_PLATFORM.enum.FEEDME) {
+    return feedmeValidate.value !== false && isAdmin.value
+  }
   return !feedMeComponentProps.value?.key || feedmeValidate.value !== false
 })
 
@@ -1035,6 +1077,8 @@ watch(
   async (newRestaurant) => {
     if (newRestaurant) {
       await readData()
+      // Check if FeedMe Express deprecation notice should be shown
+      checkAndShowDeprecationNotice()
     }
   },
   { immediate: true }

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

@@ -0,0 +1,16 @@
+<template>
+  <div class="flex flex-col gap-4">
+    <p class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">
+      {{ t('order.feedmeExpressDeprecationMessage') }}
+    </p>
+    <p class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">
+      {{ t('order.feedmeExpressDeprecationThanks') }}
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from '@feedmepos/mf-common'
+
+const { t } = useI18n()
+</script>

package/src/views/order-settings/delivery/integrated-delivery/FeedmeDelivery.vue

@@ -45,7 +45,7 @@ const data = reactive<FdoRestaurantFeedme>(
   props.initialValue ? clone(props.initialValue) : defaultValue
 )
 const { sessionUser } = useCoreStore()
-const canActivateFeedmeExpress = computed(() => sessionUser.value?.isInternal)
+const canActivateFeedmeExpress = computed(() => sessionUser.value?.role?.isAdmin ?? false)
 const { currentRestaurant } = useCoreStore()
 const validatePosVersion = computed<ValidateFeedmeResult>(() => {
   const posVersion = currentRestaurant?.value?.posVersion
@@ -64,21 +64,15 @@ const router = useRouter();
 
 const validatePayoutAccount = computed<ValidateFeedmeResult>(() => {
   const account = currentRestaurant.value?.payoutAccount
+  // Since FeedMe Express is ending, show deprecation message instead of asking to set up payout
   if (!account?.enable) {
     return {
-      message:  `${t('order.feedmeExpressPayoutAccIssue')}`,
-      action: {
-        label: t('order.updatePayoutAccount'),
-        callback: () => {
-          router.push({ name: "mf-payment-payout-account"})
-        }
-      }
+      message: `${t('order.feedmeExpressDeprecationTitle')}\n\n${t('order.feedmeExpressDeprecationMessage')}`
     }
   }
   if (account.status !== F_PAYOUT_ACCOUNT_STATUS.enum.APPROVED) {
     return {
-      message:
-        `${t('order.feedmeExpressNotApproved')}`
+      message: `${t('order.feedmeExpressDeprecationTitle')}\n\n${t('order.feedmeExpressDeprecationMessage')}`
     }
   }
   return true
@@ -113,11 +107,6 @@ const validation = computed<ValidateFeedmeResult>(() => {
 
   emits('validation-result', result === true)
 
-  if (!(props.initialValue?.enable || false) && !canActivateFeedmeExpress.value) {
-    return {
-      message: 'Contact our staff to enable FeedMe Express'
-    }
-  }
   return (
     [validatePosVersion.value, validatePayoutAccount.value, validateRestaurantProfile.value].find(
       (result) => result !== true
@@ -125,6 +114,8 @@ const validation = computed<ValidateFeedmeResult>(() => {
   )
 })
 
+const isReadOnly = computed(() => !canActivateFeedmeExpress.value)
+
 const emits = defineEmits<{
   (event: 'update:model-value', v: FdoRestaurantFeedme): void
   (event: 'validation-result', result: boolean): void
@@ -166,27 +157,36 @@ import { formatAddress } from '@/helpers/profile'
 
 <template>
   <template v-if="validation === true">
-    <FmSwitch :model-value="data.enable" :label="`${t('order.actiavteFeedmeExpress')}`" label-placement="right"
-      :sublabel="t('order.activateFeedmeExpressSublabel')" @update:model-value="updateEnable" />
-    <div v-if="data.enable">
-      <FmCard variant="outlined" class="p-5 mt-10">
-        <div class="flex-grow fm-typo-en-title-sm-600 mb-3">{{ t('order.generalInfo') }}</div>
-
-        <FmSwitch :model-value="data.ignoreStock || false" value="ignoreStock" :label="t('order.ignoreStock')"
-          :sublabel="t('order.ignoreStockSublabel')" label-placement="right"
-          @update:model-value="updateIgnoreStock" />
-
-        <div class="mt-5 mb-3">
-          <FmSelect :model-value="data.catalogId" :label="t('order.catalog')" :items="menuStore.catalogOptions"
-            @update:model-value="updateCatalogId" />
-        </div>
-        <FmTextarea :model-value="data.term ?? undefined" :label="t('order.term')" @update:model-value="updateTerm" />
-
-        <div class="mt-5 mb-3">
-          <FmTextarea :model-value="data.instruction ?? undefined" :label="t('order.deliveryInstruction')"
-            @update:model-value="updateInstruction" />
-        </div>
-      </FmCard>
+    <!-- Read-only banner for non-admin users -->
+    <div v-if="isReadOnly" class="mb-4 p-3 bg-fm-color-system-warning-100 rounded-lg">
+      <div class="text-fm-color-typo-warning fm-typo-en-body-md-600">
+        {{ t('order.feedmeExpressAdminOnly') }}
+      </div>
+    </div>
+
+    <div :class="{ 'opacity-60 pointer-events-none': isReadOnly }">
+      <FmSwitch :model-value="data.enable" :label="`${t('order.actiavteFeedmeExpress')}`" label-placement="right"
+        :sublabel="t('order.activateFeedmeExpressSublabel')" :disabled="isReadOnly" @update:model-value="updateEnable" />
+      <div v-if="data.enable">
+        <FmCard variant="outlined" class="p-5 mt-10">
+          <div class="flex-grow fm-typo-en-title-sm-600 mb-3">{{ t('order.generalInfo') }}</div>
+
+          <FmSwitch :model-value="data.ignoreStock || false" value="ignoreStock" :label="t('order.ignoreStock')"
+            :sublabel="t('order.ignoreStockSublabel')" label-placement="right"
+            :disabled="isReadOnly" @update:model-value="updateIgnoreStock" />
+
+          <div class="mt-5 mb-3">
+            <FmSelect :model-value="data.catalogId" :label="t('order.catalog')" :items="menuStore.catalogOptions"
+              :disabled="isReadOnly" @update:model-value="updateCatalogId" />
+          </div>
+          <FmTextarea :model-value="data.term ?? undefined" :label="t('order.term')" :disabled="isReadOnly" @update:model-value="updateTerm" />
+
+          <div class="mt-5 mb-3">
+            <FmTextarea :model-value="data.instruction ?? undefined" :label="t('order.deliveryInstruction')"
+              :disabled="isReadOnly" @update:model-value="updateInstruction" />
+          </div>
+        </FmCard>
+      </div>
     </div>
   </template>
   <div v-else>
@@ -194,9 +194,9 @@ import { formatAddress } from '@/helpers/profile'
       <img :src="svgPath" alt="" />
       <div class="flex flex-col">
         <div class="text-center mb-5">{{ validation.message }}</div>
-        <FmButton 
-          v-if="validation.action" 
-          variant="primary" 
+        <FmButton
+          v-if="validation.action"
+          variant="primary"
           :label="validation.action.label"
           @click = "(validation as ValidateFeedmeErrorResult).action!.callback"
         />