@feedmepos/mf-order-setting 0.0.83 → 0.0.84

package/dist/package/entity/websocket/websocket.dto.d.ts

@@ -493,6 +493,7 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         otaChannel: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         autoCloseBill: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
         printReceiptAfterClose: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
+        languages: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
     }, "strip", z.ZodTypeAny, {
         autoCloseBill?: boolean | null | undefined;
         printReceiptAfterClose?: boolean | null | undefined;
@@ -554,6 +555,7 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         coverImageLandscape?: string | null | undefined;
         coverImagePortrait?: string | null | undefined;
         otaChannel?: string | null | undefined;
+        languages?: string[] | null | undefined;
     }, {
         autoCloseBill?: boolean | null | undefined;
         printReceiptAfterClose?: boolean | null | undefined;
@@ -615,6 +617,7 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         coverImageLandscape?: string | null | undefined;
         coverImagePortrait?: string | null | undefined;
         otaChannel?: string | null | undefined;
+        languages?: string[] | null | undefined;
     }>>;
 }>, "strip", z.ZodTypeAny, {
     data: {
@@ -678,6 +681,7 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         coverImageLandscape?: string | null | undefined;
         coverImagePortrait?: string | null | undefined;
         otaChannel?: string | null | undefined;
+        languages?: string[] | null | undefined;
     };
     type: "KIOSK:UPDATE_SETTING";
 }, {
@@ -742,6 +746,7 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         coverImageLandscape?: string | null | undefined;
         coverImagePortrait?: string | null | undefined;
         otaChannel?: string | null | undefined;
+        languages?: string[] | null | undefined;
     } | undefined;
     type: "KIOSK:UPDATE_SETTING";
 }>>;
@@ -1204,6 +1209,7 @@ export declare const WebSocketReqDto: z.ZodObject<{
             otaChannel: z.ZodNullable<z.ZodOptional<z.ZodString>>;
             autoCloseBill: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
             printReceiptAfterClose: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
+            languages: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
         }, "strip", z.ZodTypeAny, {
             autoCloseBill?: boolean | null | undefined;
             printReceiptAfterClose?: boolean | null | undefined;
@@ -1265,6 +1271,7 @@ export declare const WebSocketReqDto: z.ZodObject<{
             coverImageLandscape?: string | null | undefined;
             coverImagePortrait?: string | null | undefined;
             otaChannel?: string | null | undefined;
+            languages?: string[] | null | undefined;
         }, {
             autoCloseBill?: boolean | null | undefined;
             printReceiptAfterClose?: boolean | null | undefined;
@@ -1326,6 +1333,7 @@ export declare const WebSocketReqDto: z.ZodObject<{
             coverImageLandscape?: string | null | undefined;
             coverImagePortrait?: string | null | undefined;
             otaChannel?: string | null | undefined;
+            languages?: string[] | null | undefined;
         }>>;
     }>, "strip", z.ZodTypeAny, {
         data: {
@@ -1389,6 +1397,7 @@ export declare const WebSocketReqDto: z.ZodObject<{
             coverImageLandscape?: string | null | undefined;
             coverImagePortrait?: string | null | undefined;
             otaChannel?: string | null | undefined;
+            languages?: string[] | null | undefined;
         };
         type: "KIOSK:UPDATE_SETTING";
     }, {
@@ -1453,6 +1462,7 @@ export declare const WebSocketReqDto: z.ZodObject<{
             coverImageLandscape?: string | null | undefined;
             coverImagePortrait?: string | null | undefined;
             otaChannel?: string | null | undefined;
+            languages?: string[] | null | undefined;
         } | undefined;
         type: "KIOSK:UPDATE_SETTING";
     }>>;
@@ -1565,6 +1575,7 @@ export declare const WebSocketReqDto: z.ZodObject<{
             coverImageLandscape?: string | null | undefined;
             coverImagePortrait?: string | null | undefined;
             otaChannel?: string | null | undefined;
+            languages?: string[] | null | undefined;
         };
         type: "KIOSK:UPDATE_SETTING";
     };
@@ -1678,6 +1689,7 @@ export declare const WebSocketReqDto: z.ZodObject<{
             coverImageLandscape?: string | null | undefined;
             coverImagePortrait?: string | null | undefined;
             otaChannel?: string | null | undefined;
+            languages?: string[] | null | undefined;
         } | undefined;
         type: "KIOSK:UPDATE_SETTING";
     };

package/package.json

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

package/src/locales/en-US.json

@@ -313,6 +313,11 @@
         "kioskDevices": "Kiosk devices",
         "kioskDisplay": "Kiosk Display",
         "kioskDisplayDescription": "Click \"Bind device\" to receive a special code for device binding.",
+        "kioskLanguage": "Language",
+        "kioskLanguageAtLeastOne": "Select at least one language, or turn the limit off.",
+        "kioskLanguageHint": "Choose which languages customers can pick from on the kiosk. By default the kiosk offers every language it supports.",
+        "kioskLanguageRestrict": "Limit the languages shown",
+        "kioskLanguageRestrictSublabel": "Off: show every supported language. On: show only the ones ticked below.",
         "kioskOnly": "Kiosk Only",
         "kioskSettingFailed": "Failed to update kiosk order setting",
         "kioskSettingSuccess": "Kiosk order setting updated",

package/src/locales/ja-JP.json

@@ -399,6 +399,11 @@
     "searchDevices": "スロット、マシンID、名前で検索...",
     "allTypes": "すべてのタイプ",
     "tabletOnly": "タブレットのみ",
+    "kioskLanguage": "言語",
+    "kioskLanguageAtLeastOne": "言語を1つ以上選択するか、制限をオフにしてください。",
+    "kioskLanguageHint": "キオスクでお客様が選べる言語を設定します。既定では対応するすべての言語を表示します。",
+    "kioskLanguageRestrict": "表示する言語を制限する",
+    "kioskLanguageRestrictSublabel": "オフ：対応するすべての言語を表示。オン：下でチェックした言語のみ表示。",
     "kioskOnly": "キオスクのみ",
     "showingDevices": "{count} / {total} 件表示",
     "noDevicesMatch": "検索条件に一致するデバイスはありません",

package/src/locales/th-TH.json

@@ -494,6 +494,11 @@
     "searchDevices": "ค้นหาตามสล็อต, ID เครื่อง หรือชื่อ...",
     "allTypes": "ทุกประเภท",
     "tabletOnly": "แท็บเล็ตเท่านั้น",
+    "kioskLanguage": "ภาษา",
+    "kioskLanguageAtLeastOne": "เลือกอย่างน้อยหนึ่งภาษา หรือปิดการจำกัด",
+    "kioskLanguageHint": "เลือกภาษาที่ลูกค้าเลือกใช้ได้บนตู้คีออส ค่าเริ่มต้นคือแสดงทุกภาษาที่รองรับ",
+    "kioskLanguageRestrict": "จำกัดภาษาที่แสดง",
+    "kioskLanguageRestrictSublabel": "ปิด: แสดงทุกภาษาที่รองรับ เปิด: แสดงเฉพาะภาษาที่เลือกด้านล่าง",
     "kioskOnly": "คีออสก์เท่านั้น",
     "showingDevices": "แสดง {count} จาก {total}",
     "noDevicesMatch": "ไม่มีอุปกรณ์ตรงกับเกณฑ์การค้นหาของคุณ",

package/src/locales/zh-CN.json

@@ -499,6 +499,11 @@
     "searchDevices": "按槽位、设备ID或名称搜索...",
     "allTypes": "全部类型",
     "tabletOnly": "仅平板",
+    "kioskLanguage": "语言",
+    "kioskLanguageAtLeastOne": "请至少选择一种语言，或关闭限制。",
+    "kioskLanguageHint": "选择顾客可以在自助点餐机上使用的语言。默认显示所有支持的语言。",
+    "kioskLanguageRestrict": "限制显示的语言",
+    "kioskLanguageRestrictSublabel": "关闭：显示所有支持的语言。开启：只显示下面勾选的语言。",
     "kioskOnly": "仅自助终端",
     "showingDevices": "显示 {count} / {total}",
     "noDevicesMatch": "没有设备符合您的搜索条件",

package/src/modules/order-setting/kiosk/interface.ts

@@ -88,6 +88,10 @@ export interface MfKioskOrderSetting {
     // kiosk field would persist `false` and silently kill inheritance.
     autoCloseBill: boolean | null,
     printReceiptAfterClose: boolean | null,
+    // Locales the kiosk may offer the customer. null or [] = no restriction,
+    // i.e. the kiosk shows every language it ships. Anything else is the exact
+    // allowed set.
+    languages: string[] | null,
 }
 
 export interface MfKioskOrderSettingMenuItemForm {
@@ -107,6 +111,10 @@ export interface MfKioskOrderSettingForm {
     // kiosk field would persist `false` and silently kill inheritance.
     autoCloseBill: boolean | null,
     printReceiptAfterClose: boolean | null,
+    // Locales the kiosk may offer the customer. null or [] = no restriction,
+    // i.e. the kiosk shows every language it ships. Anything else is the exact
+    // allowed set.
+    languages: string[] | null,
 }
 
 export type KioskPickAtCounterSettingForm = MfKioskPickAtCounterSetting;

package/src/modules/order-setting/kiosk/languages.ts

@@ -0,0 +1,29 @@
+import { KIOSK_LOCALES, type KioskLocale } from '@entity'
+
+export interface KioskLanguageOption {
+  code: KioskLocale
+  /** Endonym — the language's own name, so a merchant recognises it on sight. */
+  label: string
+}
+
+/**
+ * Labels for the locales the kiosk app ships (`KIOSK_LOCALES` in the entity
+ * package). Written as endonyms and NOT translated: the merchant is choosing
+ * which languages their customers will see, so "中文" must read as "中文" even
+ * when the portal itself is in English.
+ */
+const LABELS: Record<KioskLocale, string> = {
+  'en-US': 'English',
+  'zh-CN': '中文',
+  'th-TH': 'ไทย',
+  'vi-VN': 'Tiếng Việt',
+  'id-ID': 'Bahasa Indonesia',
+  'ko-KR': '한국어',
+  'ja-JP': '日本語',
+  'ar-SA': 'العربية'
+}
+
+export const KIOSK_LANGUAGE_OPTIONS: KioskLanguageOption[] = KIOSK_LOCALES.map((code) => ({
+  code,
+  label: LABELS[code]
+}))

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

@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest'
+import { OrderSettingMapper, defaultKioskOrderSetting } from './mapper'
+import type { MfKioskOrderSetting } from '@/modules/order-setting/kiosk/interface'
+import type { OrderSettingsDto } from '@entity'
+
+function toKioskForm(kioskSettings: unknown) {
+  return OrderSettingMapper.convertOrderSettingDto({
+    _id: 'r1',
+    kioskSettings
+  } as OrderSettingsDto).kiosk
+}
+
+function saved(kiosk: MfKioskOrderSetting) {
+  return OrderSettingMapper.toOrderKioskSettingsDto(kiosk).kioskSettings
+}
+
+describe('kiosk languages round-trip', () => {
+  it('reads an unset restriction as null', () => {
+    expect(toKioskForm({}).languages).toBeNull()
+  })
+
+  it('reads a stored empty list as null — [] already means "all languages"', () => {
+    expect(toKioskForm({ languages: [] }).languages).toBeNull()
+  })
+
+  it('reads a stored restriction as-is', () => {
+    expect(toKioskForm({ languages: ['en-US', 'zh-CN'] }).languages).toEqual(['en-US', 'zh-CN'])
+  })
+
+  it('omits the field entirely when the merchant restricts nothing', () => {
+    expect(saved({ ...defaultKioskOrderSetting, languages: null }).languages).toBeUndefined()
+  })
+
+  it('omits the field rather than saving an empty restriction', () => {
+    expect(saved({ ...defaultKioskOrderSetting, languages: [] }).languages).toBeUndefined()
+  })
+
+  it('saves the chosen restriction', () => {
+    expect(saved({ ...defaultKioskOrderSetting, languages: ['en-US', 'th-TH'] }).languages).toEqual([
+      'en-US',
+      'th-TH'
+    ])
+  })
+})

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

@@ -82,7 +82,8 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
   coverImagePortrait: null,
   otaChannel: '',
   autoCloseBill: null,
-  printReceiptAfterClose: null
+  printReceiptAfterClose: null,
+  languages: null
 }
 
 export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
@@ -143,7 +144,10 @@ const toKiosk = (
     // 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
+    printReceiptAfterClose: kioskOrderSettings?.printReceiptAfterClose ?? null,
+    // Stored [] means the same thing as unset ("all languages"), so collapse it
+    // to null here — the form only ever has to reason about null vs a real set.
+    languages: kioskOrderSettings?.languages?.length ? [...kioskOrderSettings.languages] : null
   }
 }
 
@@ -239,6 +243,9 @@ const toOrderKioskSettingsDto = (
     // still applies — sending `false` here would pin it off for good.
     autoCloseBill: kioskSetting.autoCloseBill ?? undefined,
     printReceiptAfterClose: kioskSetting.printReceiptAfterClose ?? undefined,
+    // Omit rather than send [] when the merchant restricts nothing, so the
+    // saved document stays free of a field that means "all languages" anyway.
+    languages: kioskSetting.languages?.length ? kioskSetting.languages : undefined,
     paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
     takeaway: kioskSetting.takeaway.submitOrderInstruction
       ? {

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

@@ -155,6 +155,39 @@
       />
     </div>
 
+    <!-- Language Section -->
+    <div class="flex flex-col gap-2">
+      <span class="fm-typo-en-title-sm-600">{{ t('order.kioskLanguage') }}</span>
+      <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">
+        {{ t('order.kioskLanguageHint') }}
+      </span>
+      <div class="border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-4 my-5 w-11/12">
+        <FmSwitch
+          :model-value="restrictLanguages"
+          :label="t('order.kioskLanguageRestrict')"
+          :sublabel="t('order.kioskLanguageRestrictSublabel')"
+          label-placement="right"
+          @update:model-value="onRestrictLanguagesChange"
+        />
+        <div v-show="restrictLanguages" class="grid grid-cols-1 md:grid-cols-2 gap-3">
+          <FmCheckbox
+            v-for="option in languageOptions"
+            :key="option.code"
+            :model-value="selectedLanguages.includes(option.code)"
+            :value="option.code"
+            :label="option.label"
+            @update:model-value="(v: boolean) => toggleLanguage(option.code, v)"
+          />
+        </div>
+        <span
+          v-if="restrictLanguages && selectedLanguages.length === 0"
+          class="fm-typo-en-body-sm-400 text-fm-color-system-error-300"
+        >
+          {{ t('order.kioskLanguageAtLeastOne') }}
+        </span>
+      </div>
+    </div>
+
     <!-- Cover Image Section -->
     <div class="flex flex-col gap-2">
       <span class="fm-typo-en-title-sm-600">{{ t('order.coverImage') }}</span>
@@ -299,6 +332,10 @@ import type {
   MfKioskOrderSettingForm,
   KioskPaymentTypesForm
 } from '@/modules/order-setting/kiosk/interface'
+import {
+  KIOSK_LANGUAGE_OPTIONS,
+  type KioskLanguageOption
+} from '@/modules/order-setting/kiosk/languages'
 import { useLoading } from '@/composables/loading'
 import { useSnackbar } from '@feedmepos/ui-library'
 import { useCoreStore, useI18n } from '@feedmepos/mf-common'
@@ -336,6 +373,28 @@ const onAutoCloseBillChange = (value: boolean) => {
   }
 }
 
+const languageOptions: KioskLanguageOption[] = KIOSK_LANGUAGE_OPTIONS
+
+// `languages: null` is "no restriction" — the kiosk shows everything it ships.
+// The switch is therefore derived from the saved value, not a separate flag, so
+// a merchant who turns the restriction off leaves nothing behind in the record.
+const restrictLanguages = computed(() => kioskOrderSettingForm.value.languages != null)
+
+const selectedLanguages = computed<string[]>(() => kioskOrderSettingForm.value.languages ?? [])
+
+function onRestrictLanguagesChange(value: boolean) {
+  // Seed with English rather than an empty list: an empty list is indistinguishable
+  // from "no restriction" once saved, and the form would open on an error state.
+  kioskOrderSettingForm.value.languages = value ? ['en-US'] : null
+}
+
+function toggleLanguage(code: string, selected: boolean) {
+  const current = kioskOrderSettingForm.value.languages ?? []
+  kioskOrderSettingForm.value.languages = selected
+    ? languageOptions.filter((o) => o.code === code || current.includes(o.code)).map((o) => o.code)
+    : current.filter((c) => c !== code)
+}
+
 // Validation rules
 const nonNegativeRule = (val: any) => {
   if (val < 0) return t('order.nonNegativeRule')
@@ -370,6 +429,10 @@ const validKioskOrderSetting = computed<MfKioskOrderSetting | null>(() => {
     if (!isValid) return null
   }
 
+  // A restriction that allows no language would leave the kiosk with nothing to
+  // render. Saving it would also be a no-op, since [] round-trips as null.
+  if (f.languages != null && f.languages.length === 0) return null
+
   // Validate payment settings
   const payment = f.paymentSetting
   if (payment?.paymentTypes?.includes(F_ORDER_PAYMENT_TYPE.enum.ePayment)) {

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

@@ -61,6 +61,10 @@ const props = defineProps({
   integrationIdReadOnly: {
     type: Boolean,
     default: false
+  },
+  syncMenuLoading: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -402,7 +406,8 @@ const formattedMenuSyncError = computed(() => {
             variant="primary"
             :label="t('order.syncMenu')"
             @click="emits('syncMenu')"
-            :disabled="!canEdit"
+            :loading="syncMenuLoading"
+            :disabled="!canEdit || syncMenuLoading"
           />
 
           <div

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

@@ -85,7 +85,7 @@ function updateVatExclude(vatExclude: boolean) {
 const { t } = useI18n()
 const { currentRestaurant } = useCoreStore()
 const { showSuccess, showError } = useSnackbarFunctions()
-const { startAsyncCallWithErr } = useLoading()
+const { isLoading, startAsyncCallWithErr } = useLoading()
 
 async function syncMenu() {
   await startAsyncCallWithErr(async () => {
@@ -111,6 +111,7 @@ async function syncMenu() {
     :company="company"
     :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
     :show-test-order-actions="false"
+    :sync-menu-loading="isLoading"
     @update:model-value="updateDataPass"
     @sync-menu="syncMenu"
   >