@feedmepos/mf-order-setting 0.0.88 → 0.0.89

package/src/locales/en-US.json

@@ -384,6 +384,10 @@
         "osVersion": "OS Version",
         "otaChannel": "OTA channel",
         "otaChannelHint": "Optional. Leave blank to use the default OTA feed.",
+        "minWeighGrams": "Minimum weight",
+        "minWeighGramsLabel": "Minimum weight (g)",
+        "minWeighGramsPlaceholder": "No minimum",
+        "minWeighGramsHint": "For items sold by weight. The kiosk will not sell a lighter portion. Leave empty for no minimum (any weight above 0 g, like POS).",
         "other": "Other",
         "onlinePaxDialog": "Pax Dialog (Online Ordering)",
         "onlinePaxDialogSublabel": "Ask customers for the number of people when they order online. POS keeps its own pax dialog setting.",

package/src/locales/ja-JP.json

@@ -171,6 +171,10 @@
     "deviceDetails": "デバイス詳細",
     "otaChannel": "OTAチャネル",
     "otaChannelHint": "任意。空欄の場合はデフォルトのOTAフィードを使用します。",
+    "minWeighGrams": "最低重量",
+    "minWeighGramsLabel": "最低重量（g）",
+    "minWeighGramsPlaceholder": "最低なし",
+    "minWeighGramsHint": "重量販売の商品が対象です。キオスクはこれより軽い量を販売しません。空欄の場合は最低なし（POS と同じく 0 g より重ければ可）。",
     "dineIn": "店内飲食",
     "dineInCanTakeaway": "テイクアウト許可",
     "driveThru": "ドライブスルー",

package/src/locales/th-TH.json

@@ -264,6 +264,10 @@
     "deviceDetails": "รายละเอียดอุปกรณ์",
     "otaChannel": "ช่อง OTA",
     "otaChannelHint": "ไม่บังคับ เว้นว่างเพื่อใช้ฟีด OTA เริ่มต้น",
+    "minWeighGrams": "น้ำหนักขั้นต่ำ",
+    "minWeighGramsLabel": "น้ำหนักขั้นต่ำ (กรัม)",
+    "minWeighGramsPlaceholder": "ไม่มีขั้นต่ำ",
+    "minWeighGramsHint": "สำหรับสินค้าที่ขายตามน้ำหนัก ตู้คีออสก์จะไม่ขายปริมาณที่เบากว่านี้ เว้นว่างไว้หากไม่ต้องการกำหนดขั้นต่ำ (มากกว่า 0 กรัม เหมือน POS)",
     "dineIn": "ทานที่ร้าน",
     "dineInCanTakeaway": "อนุญาตให้สั่งกลับบ้าน",
     "dineInRemarkEnabled": "หมายเหตุการสั่งอาหาร",

package/src/locales/zh-CN.json

@@ -265,6 +265,10 @@
     "deviceDetails": "设备详情",
     "otaChannel": "OTA 渠道",
     "otaChannelHint": "可选。留空将使用默认的 OTA 源。",
+    "minWeighGrams": "最低重量",
+    "minWeighGramsLabel": "最低重量（克）",
+    "minWeighGramsPlaceholder": "不设最低",
+    "minWeighGramsHint": "适用于按重量出售的商品。自助点餐机不会出售低于此重量的份量。留空则不设最低（与 POS 相同，只要大于 0 克即可）。",
     "dineIn": "堂食",
     "dineInCanTakeaway": "允许外带",
     "driveThru": "得来速",

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

@@ -104,6 +104,11 @@ export interface MfKioskOrderSetting {
     // i.e. the kiosk shows every language it ships. Anything else is the exact
     // allowed set.
     languages: string[] | null,
+    // Smallest weight (whole grams) the kiosk may sell for an item sold by
+    // weight (KDI-5138). null = no minimum beyond "more than 0 g", like POS.
+    // Carried end-to-end like allowReject, or a save of any other kiosk field
+    // would delete it.
+    minWeighGrams: number | null,
 }
 
 export interface MfKioskOrderSettingMenuItemForm {
@@ -138,6 +143,11 @@ export interface MfKioskOrderSettingForm {
     // i.e. the kiosk shows every language it ships. Anything else is the exact
     // allowed set.
     languages: string[] | null,
+    // Smallest weight (whole grams) the kiosk may sell for an item sold by
+    // weight (KDI-5138). null = no minimum beyond "more than 0 g", like POS.
+    // Carried end-to-end like allowReject, or a save of any other kiosk field
+    // would delete it.
+    minWeighGrams: number | null,
 }
 
 export type KioskPickAtCounterSettingForm = MfKioskPickAtCounterSetting;

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

@@ -104,3 +104,24 @@ describe('kiosk allowReject round-trip (KDI-5089)', () => {
     expect(saved(form).allowReject).toBe(false)
   })
 })
+
+describe('kiosk minWeighGrams round-trip (KDI-5138)', () => {
+  it('reads a stored minimum back onto the form', () => {
+    expect(toKioskForm({ minWeighGrams: 20 }).minWeighGrams).toBe(20)
+  })
+
+  it('reads an unset minimum as null', () => {
+    expect(toKioskForm({}).minWeighGrams).toBeNull()
+  })
+
+  it('writes a set minimum and omits a cleared one', () => {
+    expect(saved({ ...defaultKioskOrderSetting, minWeighGrams: 20 }).minWeighGrams).toBe(20)
+    expect(saved({ ...defaultKioskOrderSetting, minWeighGrams: null }).minWeighGrams).toBeUndefined()
+  })
+
+  it('survives a save of an unrelated kiosk field', () => {
+    const form = toKioskForm({ minWeighGrams: 50, canTakeaway: true })
+    form.takeaway.enabled = false
+    expect(saved(form).minWeighGrams).toBe(50)
+  })
+})

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

@@ -85,7 +85,8 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
   autoCloseBill: null,
   printReceiptAfterClose: null,
   allowReject: null,
-  languages: null
+  languages: null,
+  minWeighGrams: null
 }
 
 export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
@@ -160,7 +161,9 @@ const toKiosk = (
     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
+    languages: kioskOrderSettings?.languages?.length ? [...kioskOrderSettings.languages] : null,
+    // KDI-5138. Read back so a save of any other kiosk field keeps it.
+    minWeighGrams: kioskOrderSettings?.minWeighGrams ?? null
   }
 }
 
@@ -263,6 +266,9 @@ const toOrderKioskSettingsDto = (
     // 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,
+    // Omitted when unset: the backend $sets the whole kiosk subdocument, so a
+    // cleared minimum is removed instead of being stored as null.
+    minWeighGrams: kioskSetting.minWeighGrams ?? undefined,
     paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
     takeaway: kioskSetting.takeaway.submitOrderInstruction
       ? {

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

@@ -303,6 +303,24 @@
       </div>
     </div>
 
+    <!-- Weighing scale: minimum weight (KDI-5138) -->
+    <div class="flex flex-col gap-2">
+      <span class="fm-typo-en-title-sm-600">{{ t('order.minWeighGrams') }}</span>
+      <div class="w-11/12">
+        <FmStepperField
+          v-model="minWeighGrams"
+          class="max-w-[240px]"
+          :label="t('order.minWeighGramsLabel')"
+          :min="1"
+          :max="MAX_MIN_WEIGH_GRAMS"
+          :placeholder="t('order.minWeighGramsPlaceholder')"
+        />
+        <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">{{
+          t('order.minWeighGramsHint')
+        }}</span>
+      </div>
+    </div>
+
     <!-- Display Pax Dialog Section -->
     <div class="flex flex-col gap-2">
       <span class="fm-typo-en-title-sm-600">{{ t('order.displayPaxDialogTitle') }}</span>
@@ -496,6 +514,14 @@ const validKioskOrderSetting = computed<MfKioskOrderSetting | null>(() => {
   // render. Saving it would also be a no-op, since [] round-trips as null.
   if (f.languages != null && f.languages.length === 0) return null
 
+  // A minimum weight must be a whole number of grams, at least 1 (KDI-5138).
+  if (
+    f.minWeighGrams != null &&
+    (!Number.isInteger(f.minWeighGrams) || f.minWeighGrams < 1 || f.minWeighGrams > MAX_MIN_WEIGH_GRAMS)
+  ) {
+    return null
+  }
+
   // Validate payment settings
   const payment = f.paymentSetting
   if (payment?.paymentTypes?.includes(F_ORDER_PAYMENT_TYPE.enum.ePayment)) {
@@ -596,6 +622,17 @@ function removeCoverImage(orientation: CoverOrientation, index: number) {
   setCoverImages(orientation, next)
 }
 
+// Minimum sellable weight for sold-by-weight items, in whole grams (KDI-5138).
+// Empty = no minimum (more than 0 g, like POS). 100 kg is far above any kiosk scale.
+const MAX_MIN_WEIGH_GRAMS = 100000
+const minWeighGrams = computed<number | null>({
+  get: () => kioskOrderSettingForm.value.minWeighGrams ?? null,
+  set: (grams) => {
+    kioskOrderSettingForm.value.minWeighGrams =
+      typeof grams === 'number' && Number.isFinite(grams) && grams >= 1 ? Math.trunc(grams) : null
+  }
+})
+
 const coverIntervalSeconds = computed<number | null>({
   get: () => readIntervalSeconds(kioskOrderSettingForm.value),
   set: (seconds) => {

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

@@ -1,9 +1,9 @@
-import { F_DELIVERY_TYPE } from '@feedmepos/core/entity'
+import { F_COUNTRY, F_DELIVERY_TYPE } from '@feedmepos/core/entity'
 import { describe, expect, it, vi } from 'vitest'
-import { AUTO_INTEGRATION_CLIENT, isHiddenDeliveryKey } from './delivery'
+import { AUTO_INTEGRATION_CLIENT, isHiddenDeliveryKey, useDelivery } 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.
+// crashes under vitest; the functions under test never touch it, so stub it out.
 vi.mock('@feedmepos/mf-common', () => ({ useCoreStore: () => ({}) }))
 
 describe('isHiddenDeliveryKey', () => {
@@ -32,3 +32,23 @@ describe('isHiddenDeliveryKey', () => {
     }
   })
 })
+
+describe('isIntegratedPlatformSupported', () => {
+  const { isIntegratedPlatformSupported } = useDelivery()
+
+  it('offers external delivery in the UK (GB)', () => {
+    expect(isIntegratedPlatformSupported(AUTO_INTEGRATION_CLIENT.external, F_COUNTRY.enum.GB)).toBe(
+      true
+    )
+  })
+
+  it('offers no other integrated platform in the UK (GB)', () => {
+    const others = Object.values(AUTO_INTEGRATION_CLIENT).filter(
+      (key) => key !== AUTO_INTEGRATION_CLIENT.external
+    )
+
+    for (const key of others) {
+      expect(isIntegratedPlatformSupported(key, F_COUNTRY.enum.GB)).toBe(false)
+    }
+  })
+})

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

@@ -124,6 +124,7 @@ export function useDelivery() {
       AUTO_INTEGRATION_CLIENT.gofood,
       AUTO_INTEGRATION_CLIENT.external
     ]
+    const gbSupported = [AUTO_INTEGRATION_CLIENT.external]
 
     let supportedPlatforms: AUTO_INTEGRATION_CLIENT[] = []
     switch (country) {
@@ -142,6 +143,9 @@ export function useDelivery() {
       case F_COUNTRY.enum.ID:
         supportedPlatforms = idSupported
         break
+      case F_COUNTRY.enum.GB:
+        supportedPlatforms = gbSupported
+        break
       default:
         break
     }