@feedmepos/mf-order-setting 0.0.85 → 0.0.86

package/src/locales/th-TH.json

@@ -130,8 +130,12 @@
     "integrationReferenceId": "รหัสอ้างอิงการเชื่อมต่อ",
     "platformStoreId": "รหัสร้านค้าบนแพลตฟอร์ม",
     "copy": "คัดลอก",
-    "integrationIdCopied": "คัดลอกรหัสการเชื่อมต่อแล้ว",
-    "integrationIdCopyFailed": "ไม่สามารถคัดลอกรหัสการเชื่อมต่อได้",
+    "copiedToClipboard": "คัดลอก{label}แล้ว",
+    "copyToClipboardFailed": "ไม่สามารถคัดลอก{label}ได้",
+    "restaurantId": "รหัสร้านอาหาร",
+    "supportSummary": "ข้อมูลสำหรับฝ่ายสนับสนุน",
+    "lastAcceptedSyncRequestId": "รหัสคำขอซิงค์ล่าสุดที่ได้รับการตอบรับ",
+    "linemanSyncDiagnosticsGuidance": "Lineman จะยืนยันผลการซิงค์เมนูแบบอะซิงโครนัส รหัสนี้เป็นของคำขอซิงค์ครั้งล่าสุดที่ Lineman ตอบรับ หากการซิงค์ครั้งล่าสุดถูกปฏิเสธทันที ข้อความแสดงข้อผิดพลาดด้านล่างจะเป็นของครั้งนั้น ขณะที่รหัสยังคงอ้างถึงครั้งก่อนที่ได้รับการตอบรับ กรุณาคัดลอกทั้งสองอย่างแนบไปกับเรื่องที่แจ้งฝ่ายสนับสนุน",
     "primaryStore": "ร้านค้าหลัก",
     "removeStore": "ลบ",
     "removeStoreConfirm": "ลบร้าน '{merchantID}' ใช่หรือไม่?",

package/src/locales/zh-CN.json

@@ -130,8 +130,12 @@
     "integrationReferenceId": "集成参考 ID",
     "platformStoreId": "平台门店 ID",
     "copy": "复制",
-    "integrationIdCopied": "集成 ID 已复制",
-    "integrationIdCopyFailed": "无法复制集成 ID",
+    "copiedToClipboard": "已复制{label}",
+    "copyToClipboardFailed": "无法复制{label}",
+    "restaurantId": "餐厅 ID",
+    "supportSummary": "支持信息",
+    "lastAcceptedSyncRequestId": "最近一次受理的同步请求 ID",
+    "linemanSyncDiagnosticsGuidance": "Lineman 会以异步方式确认菜单同步结果。此 ID 属于 Lineman 最近一次受理的同步请求。如果最新一次尝试被直接拒绝，下方的错误信息属于该次尝试，而此 ID 仍指向此前受理的那一次。请将两者一并复制到支持工单中。",
     "primaryStore": "主门店",
     "removeStore": "删除",
     "removeStoreConfirm": "确定删除门店「{merchantID}」吗？",

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

@@ -94,6 +94,12 @@ export interface MfKioskOrderSetting {
     autoSendKitchen: boolean | null,
     autoCloseBill: boolean | null,
     printReceiptAfterClose: boolean | null,
+    // Whether POS may reject a kiosk order (KDI-5089). No form control edits it
+    // — ops set it — but it MUST be carried here anyway: the mapper rebuilds
+    // kioskSettings field by field and the backend $sets the whole
+    // subdocument, so a field the mapper drops is deleted on the next save of
+    // an unrelated kiosk field. That is how prod MY lost it on 2026-09-22.
+    allowReject: 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.
@@ -122,6 +128,12 @@ export interface MfKioskOrderSettingForm {
     autoSendKitchen: boolean | null,
     autoCloseBill: boolean | null,
     printReceiptAfterClose: boolean | null,
+    // Whether POS may reject a kiosk order (KDI-5089). No form control edits it
+    // — ops set it — but it MUST be carried here anyway: the mapper rebuilds
+    // kioskSettings field by field and the backend $sets the whole
+    // subdocument, so a field the mapper drops is deleted on the next save of
+    // an unrelated kiosk field. That is how prod MY lost it on 2026-09-22.
+    allowReject: 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.

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

@@ -68,3 +68,39 @@ describe('kiosk cover carousel round-trip', () => {
     expect(saved(form).coverCarousel).toBeNull()
   })
 })
+
+describe('kiosk allowReject round-trip (KDI-5089)', () => {
+  // The regression this guards, found on prod MY 2026-09-22: no form control
+  // edits allowReject — ops set it — so the mapper has to carry it purely to
+  // hand it back. While it was missing, every portal kiosk save rebuilt
+  // kioskSettings without it and the backend's whole-subdocument $set deleted
+  // it, which turns the POS reject button back on for kiosk orders.
+  it('reads a stored allowReject: false back onto the form', () => {
+    expect(toKioskForm({ allowReject: false }).allowReject).toBe(false)
+  })
+
+  it('reads a stored allowReject: true back onto the form', () => {
+    expect(toKioskForm({ allowReject: true }).allowReject).toBe(true)
+  })
+
+  // null, not false: unset means "inherit dineInSettings", and collapsing it to
+  // a boolean here is what would pin the value and kill that inheritance.
+  it('reads an unset allowReject as null, not false', () => {
+    expect(toKioskForm({}).allowReject).toBeNull()
+  })
+
+  it('saves the merchant choice back', () => {
+    expect(saved({ ...defaultKioskOrderSetting, allowReject: false }).allowReject).toBe(false)
+  })
+
+  it('omits the field when unset, so the backend keeps inheriting', () => {
+    expect(saved({ ...defaultKioskOrderSetting, allowReject: null }).allowReject).toBeUndefined()
+  })
+
+  it('survives a full read-then-save round trip of an unrelated edit', () => {
+    const form = toKioskForm({ allowReject: false, canTakeaway: true })
+    // The merchant toggles something else entirely.
+    form.takeaway.enabled = false
+    expect(saved(form).allowReject).toBe(false)
+  })
+})

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

@@ -84,6 +84,7 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
   autoSendKitchen: null,
   autoCloseBill: null,
   printReceiptAfterClose: null,
+  allowReject: null,
   languages: null
 }
 
@@ -154,6 +155,9 @@ const toKiosk = (
     autoSendKitchen: kioskOrderSettings?.autoSendKitchen ?? null,
     autoCloseBill: kioskOrderSettings?.autoCloseBill ?? null,
     printReceiptAfterClose: kioskOrderSettings?.printReceiptAfterClose ?? null,
+    // Read back purely so the write side can hand it straight back. Nothing in
+    // the form touches it; dropping it here deletes it on the next save.
+    allowReject: kioskOrderSettings?.allowReject ?? 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
@@ -255,6 +259,7 @@ const toOrderKioskSettingsDto = (
     autoSendKitchen: kioskSetting.autoSendKitchen ?? undefined,
     autoCloseBill: kioskSetting.autoCloseBill ?? undefined,
     printReceiptAfterClose: kioskSetting.printReceiptAfterClose ?? undefined,
+    allowReject: kioskSetting.allowReject ?? 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,

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

@@ -216,12 +216,13 @@ import deliveryData from './delivery.data'
 import {
   getInvalidExternalMenuCatalogOrderTypes,
   useDelivery,
+  isHiddenDeliveryKey,
+  AUTO_INTEGRATION_CLIENT,
   type DeliveryCompany,
   type LinkedDeliveryDoc
 } from './delivery'
 import { useLoading } from '@/composables/loading'
 import { remoteOrderApi } from '@/api/remoteOrder'
-import { AUTO_INTEGRATION_CLIENT } from '../delivery/delivery'
 import { useMenuStore } from '@/stores/menu/menu'
 import ManualIntegratedDeliverySetting from './components/ManualIntegratedDeliverySetting.vue'
 import { insertOrUpdate, remove, sort } from '@/helpers/iteration'
@@ -850,14 +851,13 @@ const integratedCompanies = computed<IntegratedDeliveryRow[]>(() => {
   ]
 
   return [
-    // FeedMe's own online-ordering-dependent delivery (In-house + FeedMe Express)
-    // is part of "FeedMe online ordering", so it stays hidden when QR ordering is
-    // off (e.g. Go plan). Third-party delivery integrations remain available.
+    // In-house delivery is part of "FeedMe online ordering", so it stays hidden when
+    // QR ordering is off (e.g. Go plan). Third-party delivery integrations remain available.
     ...(qrEnabled.value ? feedmeDelivery : []),
     ...integratedDelivery.filter((delivery) => {
       return isIntegratedPlatformSupported(delivery.key, currentCountry.value)
     })
-  ]
+  ].filter((row) => !isHiddenDeliveryKey(row.key))
 })
 
 const loadingKey = computed(() => {

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

@@ -0,0 +1,34 @@
+import { F_DELIVERY_TYPE } from '@feedmepos/core/entity'
+import { describe, expect, it, vi } from 'vitest'
+import { AUTO_INTEGRATION_CLIENT, isHiddenDeliveryKey } from './delivery'
+
+// delivery.ts pulls in @feedmepos/mf-common for useCoreStore, whose dist bundle
+// crashes under vitest; isHiddenDeliveryKey never touches it, so stub it out.
+vi.mock('@feedmepos/mf-common', () => ({ useCoreStore: () => ({}) }))
+
+describe('isHiddenDeliveryKey', () => {
+  it('hides the TNG integration (pending TNGD delivery/pickup support)', () => {
+    expect(isHiddenDeliveryKey(AUTO_INTEGRATION_CLIENT.tng)).toBe(true)
+  })
+
+  it('hides FeedMe Express (service ended 1 Feb 2026)', () => {
+    expect(isHiddenDeliveryKey(F_DELIVERY_TYPE.enum.FEEDME)).toBe(true)
+  })
+
+  it('keeps every other delivery row visible', () => {
+    const stillShown = [
+      AUTO_INTEGRATION_CLIENT.foodpanda,
+      AUTO_INTEGRATION_CLIENT.grabfood,
+      AUTO_INTEGRATION_CLIENT.lineman,
+      AUTO_INTEGRATION_CLIENT.shopeefood,
+      AUTO_INTEGRATION_CLIENT.gofood,
+      AUTO_INTEGRATION_CLIENT.deliveroo,
+      AUTO_INTEGRATION_CLIENT.external,
+      F_DELIVERY_TYPE.enum.IN_HOUSE
+    ]
+
+    for (const key of stillShown) {
+      expect(isHiddenDeliveryKey(key)).toBe(false)
+    }
+  })
+})

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

@@ -1,4 +1,9 @@
-import { F_PAYMENT_NAME, FdoLinkedDelivery, F_COUNTRY } from '@feedmepos/core/entity'
+import {
+  F_PAYMENT_NAME,
+  FdoLinkedDelivery,
+  F_COUNTRY,
+  F_DELIVERY_TYPE
+} from '@feedmepos/core/entity'
 import { useCoreStore } from '@feedmepos/mf-common'
 import { F_ORDER_PLATFORM, type FdoExternalSetting } from '@entity'
 
@@ -29,6 +34,10 @@ export type ExternalMenuOrderTypeWithRequiredCatalog = Extract<
   'delivery' | 'pickup'
 >
 
+// Pending TNGD delivery/pickup support on the Near Me SPI.
+const TNG_PENDING_DELIVERY_KEYS: string[] = [AUTO_INTEGRATION_CLIENT.tng]
+const DISCONTINUED_DELIVERY_KEYS: string[] = [F_DELIVERY_TYPE.enum.FEEDME]
+
 export function externalMenuOrderTypeRequiresCatalog(
   platform: FdoExternalSetting['platform'],
   orderType: ExternalMenuOrderType
@@ -59,6 +68,10 @@ export function getInvalidExternalMenuCatalogOrderTypes(
   })
 }
 
+export function isHiddenDeliveryKey(key: string): boolean {
+  return TNG_PENDING_DELIVERY_KEYS.includes(key) || DISCONTINUED_DELIVERY_KEYS.includes(key)
+}
+
 function formatDeliveryCompanyKey(key: string) {
   return key.toLowerCase().replace('_', '').toLowerCase()
 }

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

@@ -54,6 +54,14 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  // Lineman renders the same error inside the diagnostics card below, where it
+  // is copyable. Rendering it here as well would show support the same string
+  // twice, so that panel suppresses this tooltip and takes the formatted value
+  // through the `integration-details` slot instead.
+  hideMenuSyncErrorTooltip: {
+    type: Boolean,
+    default: false
+  },
   showTestOrderActions: {
     type: Boolean,
     default: true
@@ -346,7 +354,7 @@ const formattedMenuSyncError = computed(() => {
           <slot name="order-setting" :editable="!canEdit" />
         </div>
 
-        <slot name="integration-details" />
+        <slot name="integration-details" :menu-sync-error="formattedMenuSyncError" />
 
         <!-- Commision rate not used yet -->
         <!-- <div class="mb-5">
@@ -386,6 +394,7 @@ const formattedMenuSyncError = computed(() => {
             </div>
             <FmTooltip
               v-if="
+                !hideMenuSyncErrorTooltip &&
                 (modelValue.auto.status === 'FAILED' || alwaysShowMenuSyncError) &&
                 formattedMenuSyncError !== null
               "

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

@@ -3,6 +3,11 @@ import { computed } from 'vue'
 import { useI18n } from '@feedmepos/mf-common'
 import { useSnackbarFunctions } from '@/components/snackbar'
 
+interface SupportSummaryRow {
+  label: string
+  value?: string | null
+}
+
 const props = defineProps<{
   integrationId?: string | null
   partnerId?: string | null
@@ -10,68 +15,135 @@ const props = defineProps<{
   providerId?: string | null
   providerLabel?: string
   storeLabel?: string
+  // Drops the id rows and keeps only the support diagnostics below. For
+  // Lineman there is no FeedMe-side integration identity worth showing — it
+  // reuses the restaurant id — so the rows would only be noise.
+  hideIdentity?: boolean
+  // Overrides the tooltip next to the title. The default text describes
+  // GrabFood/Foodpanda/ShopeeFood multi-store ids; platforms whose FeedMe
+  // identity works differently pass their own.
+  guidance?: string
+  // Support-facing extras: the id the platform gave us for the last async menu
+  // sync, and whatever message came back with it. Neither carries its own copy
+  // button - both are lines in `supportSummary`, and a per-row button would
+  // only offer support a worse paste than the block below.
+  referenceId?: string | null
+  referenceLabel?: string
+  message?: string | null
+  messageLabel?: string
+  // The backend nulls `message` out when a sync starts and again when it
+  // succeeds, so hiding the row leaves support unable to tell "no failure" from
+  // "not wired up". Callers that want the state either way render a dash.
+  showEmptyMessage?: boolean
+  // Rows for the one-press support block. The card cannot build this itself -
+  // platform, restaurant and status live on the caller - so it takes the lines
+  // already composed and only owns the formatting. Empty values are dropped so
+  // a half-populated record still yields a clean paste.
+  supportSummary?: SupportSummaryRow[]
 }>()
 
 const { t } = useI18n()
 const { showSuccess, showError } = useSnackbarFunctions()
 
 const visiblePartnerId = computed(() => props.partnerId || null)
+const guidanceText = computed(() => props.guidance || t('order.integrationIdGuidance'))
+const showIdentity = computed(() => !props.hideIdentity)
+const showCard = computed(
+  () =>
+    (showIdentity.value &&
+      Boolean(props.integrationId || props.partnerId || props.providerId || props.storeLabel)) ||
+    Boolean(props.referenceId || props.message || props.showEmptyMessage)
+)
+
+// The record is destructive - the next sync nulls the error and replaces the
+// request id - so this block is often the only surviving evidence of a failure
+// once support has pasted it into the ticket.
+const supportSummaryText = computed(() =>
+  (props.supportSummary ?? [])
+    .filter((row) => row.value)
+    .map((row) => `${row.label}: ${row.value}`)
+    .join('\n')
+)
 
-async function copyIntegrationId() {
-  if (!props.integrationId) return
+async function copySupportSummary() {
+  await copyValue(supportSummaryText.value, t('order.supportSummary'))
+}
+
+async function copyValue(value: string | null | undefined, label: string) {
+  if (!value) return
   try {
-    await navigator.clipboard.writeText(props.integrationId)
-    showSuccess(t('order.integrationIdCopied'))
+    await navigator.clipboard.writeText(value)
+    showSuccess(t('order.copiedToClipboard', { label }))
   } catch {
-    showError(t('order.integrationIdCopyFailed'))
+    showError(t('order.copyToClipboardFailed', { label }))
   }
 }
 </script>
 
 <template>
   <div
-    v-if="integrationId || partnerId || providerId || storeLabel"
+    v-if="showCard"
     class="integration-details"
     :class="{ 'integration-details--owned': storeLabel }"
   >
     <div class="integration-details__header">
       <div class="integration-details__title">
         <div class="fm-typo-en-title-sm-600">{{ t('order.integrationDetails') }}</div>
-        <FmTooltip :content="t('order.integrationIdGuidance')" :z-index="1000">
-          <FmIcon
-            name="info"
-            size="sm"
-            class="cursor-help text-fm-color-neutral-gray-400"
-          />
+        <FmTooltip :content="guidanceText" :z-index="1000">
+          <FmIcon name="info" size="sm" class="cursor-help text-fm-color-neutral-gray-400" />
         </FmTooltip>
       </div>
       <span v-if="storeLabel" class="integration-details__store-label fm-typo-en-body-sm-600">
         {{ storeLabel }}
       </span>
     </div>
-    <div class="integration-details__row fm-typo-cn-body-md-400">
+    <div v-if="showIdentity" class="integration-details__row fm-typo-cn-body-md-400">
       <span class="text-fm-color-neutral-gray-400">{{ t('order.feedmeIntegrationId') }}</span>
       <div class="integration-details__value">
         <code>{{ integrationId || t('order.integrationIdNotAssigned') }}</code>
-        <FmButton
-          v-if="integrationId"
-          variant="tertiary"
-          size="md"
-          :label="t('order.copy')"
-          @click="copyIntegrationId"
-        />
+        <span v-if="integrationId" class="integration-details__action">
+          <FmButton
+            variant="tertiary"
+            size="md"
+            :label="t('order.copy')"
+            @click="copyValue(integrationId, t('order.feedmeIntegrationId'))"
+          />
+        </span>
       </div>
     </div>
-    <div v-if="visiblePartnerId" class="integration-details__row fm-typo-cn-body-md-400">
+    <div
+      v-if="showIdentity && visiblePartnerId"
+      class="integration-details__row fm-typo-cn-body-md-400"
+    >
       <span class="text-fm-color-neutral-gray-400">{{ partnerLabel || t('order.partnerId') }}</span>
       <code>{{ visiblePartnerId }}</code>
     </div>
-    <div v-if="providerId" class="integration-details__row fm-typo-cn-body-md-400">
+    <div v-if="showIdentity && providerId" class="integration-details__row fm-typo-cn-body-md-400">
       <span class="text-fm-color-neutral-gray-400">{{
         providerLabel || t('order.platformStoreId')
       }}</span>
       <code>{{ providerId }}</code>
     </div>
+    <div v-if="referenceId" class="integration-details__row fm-typo-cn-body-md-400">
+      <span class="text-fm-color-neutral-gray-400">{{
+        referenceLabel || t('order.integrationReferenceId')
+      }}</span>
+      <code>{{ referenceId }}</code>
+    </div>
+    <div v-if="message || showEmptyMessage" class="integration-details__row fm-typo-cn-body-md-400">
+      <span class="text-fm-color-neutral-gray-400">{{
+        messageLabel || t('order.menuSyncError')
+      }}</span>
+      <code class="integration-details__message">{{ message || '-' }}</code>
+    </div>
+    <div v-if="supportSummaryText" class="integration-details__summary">
+      <FmButton
+        variant="secondary"
+        size="md"
+        :label="t('order.copy')"
+        @click="copySupportSummary"
+      />
+    </div>
   </div>
 </template>
 
@@ -126,6 +198,33 @@ async function copyIntegrationId() {
   gap: 0.5rem;
 }
 
+/* FmButton's root is a flex box with `overflow: hidden` and no
+   `flex-shrink: 0`, so an opaque single-token value would squeeze it until its
+   own label was clipped. Pin the button at its natural width and make the
+   value the only thing that gives. */
+.integration-details__action {
+  display: inline-flex;
+  flex: 0 0 auto;
+}
+
+.integration-details__value > code {
+  flex: 1 1 auto;
+}
+
+.integration-details__summary {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 0.25rem;
+}
+
+/* A sync message can be a long JSON blob: keep it in its own column like every
+   other value and let it scroll rather than stretch the card. */
+.integration-details__message {
+  max-height: 9rem;
+  overflow-y: auto;
+  white-space: pre-wrap;
+}
+
 code {
   min-width: 0;
   overflow-wrap: anywhere;