@feedmepos/mf-order-setting 0.0.51 → 0.0.52-dev.0

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

@@ -488,7 +488,6 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         }, {
             showAllOnly: boolean;
         }>>>;
-        otaChannel: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
         dineIn?: {
             requiredSlot?: boolean | null | undefined;
@@ -545,7 +544,6 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         menuItem?: {
             showAllOnly: boolean;
         } | null | undefined;
-        otaChannel?: string | null | undefined;
     }, {
         dineIn?: {
             requiredSlot?: boolean | null | undefined;
@@ -602,7 +600,6 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         menuItem?: {
             showAllOnly: boolean;
         } | null | undefined;
-        otaChannel?: string | null | undefined;
     }>>;
 }>, "strip", z.ZodTypeAny, {
     data: {
@@ -661,7 +658,6 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         menuItem?: {
             showAllOnly: boolean;
         } | null | undefined;
-        otaChannel?: string | null | undefined;
     };
     type: "KIOSK:UPDATE_SETTING";
 }, {
@@ -721,7 +717,6 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
         menuItem?: {
             showAllOnly: boolean;
         } | null | undefined;
-        otaChannel?: string | null | undefined;
     } | undefined;
     type: "KIOSK:UPDATE_SETTING";
 }>>;
@@ -1179,7 +1174,6 @@ export declare const WebSocketReqDto: z.ZodObject<{
             }, {
                 showAllOnly: boolean;
             }>>>;
-            otaChannel: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         }, "strip", z.ZodTypeAny, {
             dineIn?: {
                 requiredSlot?: boolean | null | undefined;
@@ -1236,7 +1230,6 @@ export declare const WebSocketReqDto: z.ZodObject<{
             menuItem?: {
                 showAllOnly: boolean;
             } | null | undefined;
-            otaChannel?: string | null | undefined;
         }, {
             dineIn?: {
                 requiredSlot?: boolean | null | undefined;
@@ -1293,7 +1286,6 @@ export declare const WebSocketReqDto: z.ZodObject<{
             menuItem?: {
                 showAllOnly: boolean;
             } | null | undefined;
-            otaChannel?: string | null | undefined;
         }>>;
     }>, "strip", z.ZodTypeAny, {
         data: {
@@ -1352,7 +1344,6 @@ export declare const WebSocketReqDto: z.ZodObject<{
             menuItem?: {
                 showAllOnly: boolean;
             } | null | undefined;
-            otaChannel?: string | null | undefined;
         };
         type: "KIOSK:UPDATE_SETTING";
     }, {
@@ -1412,7 +1403,6 @@ export declare const WebSocketReqDto: z.ZodObject<{
             menuItem?: {
                 showAllOnly: boolean;
             } | null | undefined;
-            otaChannel?: string | null | undefined;
         } | undefined;
         type: "KIOSK:UPDATE_SETTING";
     }>>;
@@ -1520,7 +1510,6 @@ export declare const WebSocketReqDto: z.ZodObject<{
             menuItem?: {
                 showAllOnly: boolean;
             } | null | undefined;
-            otaChannel?: string | null | undefined;
         };
         type: "KIOSK:UPDATE_SETTING";
     };
@@ -1629,7 +1618,6 @@ export declare const WebSocketReqDto: z.ZodObject<{
             menuItem?: {
                 showAllOnly: boolean;
             } | null | undefined;
-            otaChannel?: string | null | undefined;
         } | undefined;
         type: "KIOSK:UPDATE_SETTING";
     };

package/dist/style.css

@@ -0,0 +1 @@
+.scrollbar-thin[data-v-fc459980]::-webkit-scrollbar{width:6px}.scrollbar-thin[data-v-fc459980]::-webkit-scrollbar-track{background:transparent;border-radius:3px;margin:4px 0}.scrollbar-thin[data-v-fc459980]::-webkit-scrollbar-thumb{background:#d1d5db;border-radius:3px}.scrollbar-thin[data-v-fc459980]::-webkit-scrollbar-thumb:hover{background:#9ca3af}.time-picker-field[data-v-fc459980] .fm-text-field-input{border-width:2px;border-radius:.75rem;padding:12px 16px;font-size:1.125rem;transition:all .2s}.time-picker-field[data-v-fc459980] .fm-text-field-input:not(:focus):not(:focus-within){border-color:#d1d5db;background-color:#fff}.time-picker-field[data-v-fc459980] .fm-text-field-input:not(:focus):not(:focus-within):hover{border-color:#9ca3af}.time-picker-field.focused[data-v-fc459980] .fm-text-field-input,.time-picker-field[data-v-fc459980] .fm-text-field-input:focus,.time-picker-field[data-v-fc459980] .fm-text-field-input:focus-within{border-color:#f97316!important;background-color:#fff7ed!important}.fm-text-field-input[data-v-6a4bdab2]{font-size:1.125rem;line-height:1.75rem}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.51",
+  "version": "0.0.52-dev.0",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -30,7 +30,7 @@
     "@feedmepos/menu": "^1.7.32",
     "@feedmepos/mf-common": "1.20.0-beta.2",
     "@feedmepos/ordering": "^0.0.3",
-    "@feedmepos/ui-library": "1.5.2-beta.1",
+    "@feedmepos/ui-library": "^1.8.8",
     "@types/googlemaps": "^3.43.3",
     "axios": "^1.7.2",
     "change-case": "^5.4.4",
@@ -70,4 +70,4 @@
     "vite": "^5.1.4",
     "vue-tsc": "^2.2.0"
   }
-}
+}

package/src/api/reservation/index.ts

@@ -0,0 +1,28 @@
+import { baseClientInstance, getData } from '@/api'
+import { FdoOrderReservationSettingsV2 } from '@entity'
+
+// const baseClientInstance = () =>
+//   _baseClientInstance(undefined, 'portal', {
+//     url: 'http://localhost:3000/portal'
+//   })
+
+async function getReservationSetting(restaurantId: string): Promise<FdoOrderReservationSettingsV2> {
+  const result = await baseClientInstance().get(`/reservation/restaurant/${restaurantId}/setting`)
+  return getData<FdoOrderReservationSettingsV2>(result)
+}
+
+async function updateReservationSetting(
+  restaurantId: string,
+  payload: FdoOrderReservationSettingsV2
+): Promise<FdoOrderReservationSettingsV2> {
+  const result = await baseClientInstance().put(
+    `/reservation/restaurant/${restaurantId}/setting`,
+    payload
+  )
+  return getData<FdoOrderReservationSettingsV2>(result)
+}
+
+export const ReservationApi = {
+  getReservationSetting,
+  updateReservationSetting
+}

package/src/locales/en-US.json

@@ -95,8 +95,6 @@
         "deliveryZone": "Delivery Zone",
         "deviceBinding": "Device Binding",
         "deviceDetails": "Device Details",
-        "otaChannel": "OTA channel",
-        "otaChannelHint": "Optional. Leave blank to use the default OTA feed.",
         "dineIn": "Dine In",
         "dineInCanTakeaway": "Allow Takeaway",
         "driveThru": "Drive Thru",
@@ -233,6 +231,62 @@
         "current": "Current",
         "paxMin": "Pax Min",
         "paxMax": "Pax Max",
+        "reservation": "Reservation",
+        "reservationStatus": "Reservation Status",
+        "reservationSettings": "Reservation Settings",
+        "reservationRanges": "Reservation Ranges",
+        "reservationAvailability": "Reservation Availability",
+        "addRange": "Add Range",
+        "range": "Range",
+        "rangeName": "Range Name",
+        "priority": "Priority",
+        "priorityDescription": "Higher number = higher priority when matching slots",
+        "capacity": "Capacity",
+        "capacityDescription": "Maximum concurrent reservations for this range",
+        "minPax": "Min Pax",
+        "maxPax": "Max Pax",
+        "slotInterval": "Slot Interval",
+        "slotIntervalDescription": "Time between each available booking slot (e.g., 30 mins)",
+        "bookingDuration": "Booking Duration",
+        "bookingDurationDescription": "Duration of each reservation (e.g., 60 mins)",
+        "minLeadDays": "Min Lead Days",
+        "minLeadDaysDescription": "Minimum days in advance customers must book (0 = same day)",
+        "maxLeadDays": "Max Lead Days",
+        "maxLeadDaysDescription": "Maximum days in advance customers can book",
+        "operatingWindows": "Operating Windows",
+        "addWindow": "Add Window",
+        "startTime": "Start Time",
+        "endTime": "End Time",
+        "customPresetRemarks": "Custom Preset Remarks",
+        "addRemark": "Add Remark",
+        "noRangesConfigured": "No reservation ranges configured. Click 'Add Range' to get started.",
+        "addFirstRange": "Add your first reservation range to get started",
+        "globalSettings": "Global Settings",
+        "paxRange": "Pax Range",
+        "noOperatingHours": "No operating hours",
+        "saveAllChanges": "Save All Changes",
+        "confirmDeleteRange": "Are you sure you want to delete {name}?",
+        "settingUpdated": "Settings updated successfully",
+        "newReservationRange": "New Reservation Range",
+        "basicInformation": "Basic Information",
+        "guestRequirements": "Guest Requirements",
+        "bookingConfiguration": "Booking Configuration",
+        "rangeNamePlaceholder": "e.g., VIP Room, Main Hall",
+        "presetRemarkPlaceholder": "e.g., Window seat, Quiet area",
+        "saveRange": "Save Range",
+        "draftHoldTimeMinutes": "Draft Hold Time (Minutes)",
+        "draftHoldTimeDescription": "How long to hold a draft reservation before it expires",
+        "posCanOverbook": "POS Can Overbook",
+        "posCanOverbookDescription": "Allow POS to create reservations even when capacity is full",
+        "notificationSettings": "Notification Settings",
+        "smsEnabled": "Enable SMS Notifications",
+        "smsEnabledDescription": "Send SMS notifications to customers for reservation updates",
+        "emailEnabled": "Enable Email Notifications",
+        "emailEnabledDescription": "Send email notifications to customers for reservation updates",
+        "notifyOnConfirm": "Notify on Confirmation",
+        "notifyOnConfirmDescription": "Send notifications when a reservation is confirmed",
+        "notifyOnCancel": "Notify on Cancellation",
+        "notifyOnCancelDescription": "Send notifications when a reservation is cancelled",
         "qrPay": "QR Pay",
         "terminalScanPay": "Terminal Scan Pay",
         "terminalQrPay": "Terminal QR Pay",
@@ -356,4 +410,4 @@
             "voucher": "Voucher"
         }
     }
-}
+}

package/src/locales/ja-JP.json

@@ -91,17 +91,15 @@
         "deliveryOrder": "配達注文",
         "deliveryTerm": "配達条件",
         "deliveryTime": "配達時間",
-        "deliveryTitle": "{company}配達",
-        "deliveryZone": "配達エリア",
-        "deviceBinding": "デバイス紐付け",
-        "deviceDetails": "デバイス詳細",
-        "otaChannel": "OTAチャネル",
-        "otaChannelHint": "任意。空欄の場合はデフォルトのOTAフィードを使用します。",
-        "dineIn": "店内飲食",
-        "dineInCanTakeaway": "テイクアウト許可",
-        "driveThru": "ドライブスルー",
-        "driveThruSettingUpdated": "ドライブスルー設定が更新されました。",
-        "enableDriveThru": "ドライブスルーを有効にする",
+        "deliveryTitle": "{company}配達",
+        "deliveryZone": "配達エリア",
+        "deviceBinding": "デバイス紐付け",
+        "deviceDetails": "デバイス詳細",
+        "dineIn": "店内飲食",
+        "dineInCanTakeaway": "テイクアウト許可",
+        "driveThru": "ドライブスルー",
+        "driveThruSettingUpdated": "ドライブスルー設定が更新されました。",
+        "enableDriveThru": "ドライブスルーを有効にする",
         "enableDriveThruSublabel": "お客様向けのドライブスルー注文を有効にする",
         "dineInType": "店内飲食タイプ",
         "discountCampaign": "割引キャンペーン",

package/src/locales/th-TH.json

@@ -95,8 +95,6 @@
         "deliveryZone": "โซนการจัดส่ง",
         "deviceBinding": "การผูกอุปกรณ์",
         "deviceDetails": "รายละเอียดอุปกรณ์",
-        "otaChannel": "ช่อง OTA",
-        "otaChannelHint": "ไม่บังคับ เว้นว่างเพื่อใช้ฟีด OTA เริ่มต้น",
         "dineIn": "รับประทานอาหารที่ร้าน",
         "dineInCanTakeaway": "อนุญาตให้นำกลับบ้าน",
         "driveThru": "ไดรฟ์ทรู",
@@ -230,6 +228,60 @@
         "current": "ปัจจุบัน",
         "paxMin": "จำนวนผู้โดยสารขั้นต่ำ",
         "paxMax": "จำนวนผู้โดยสารสูงสุด",
+        "reservation": "การจอง",
+        "reservationSettings": "การตั้งค่าการจอง",
+        "reservationRanges": "ช่วงการจอง",
+        "addRange": "เพิ่มช่วง",
+        "range": "ช่วง",
+        "rangeName": "ชื่อช่วง",
+        "priority": "ลำดับความสำคัญ",
+        "priorityDescription": "ตัวเลขที่สูงกว่า = ลำดับความสำคัญสูงกว่าเมื่อจับคู่ช่วงเวลา",
+        "capacity": "ความจุ",
+        "capacityDescription": "จำนวนการจองพร้อมกันสูงสุดสำหรับช่วงนี้",
+        "minPax": "จำนวนผู้โดยสารขั้นต่ำ",
+        "maxPax": "จำนวนผู้โดยสารสูงสุด",
+        "slotInterval": "ช่วงเวลา",
+        "slotIntervalDescription": "เวลาระหว่างช่วงการจองที่ว่าง (เช่น 30 นาที)",
+        "bookingDuration": "ระยะเวลาการจอง",
+        "bookingDurationDescription": "ระยะเวลาของการจองแต่ละครั้ง (เช่น 60 นาที)",
+        "minLeadDays": "จำนวนวันล่วงหน้าขั้นต่ำ",
+        "minLeadDaysDescription": "จำนวนวันขั้นต่ำที่ลูกค้าต้องจองล่วงหน้า (0 = วันเดียวกัน)",
+        "maxLeadDays": "จำนวนวันล่วงหน้าสูงสุด",
+        "maxLeadDaysDescription": "จำนวนวันสูงสุดที่ลูกค้าสามารถจองล่วงหน้าได้",
+        "operatingWindows": "ช่วงเวลาทำการ",
+        "addWindow": "เพิ่มช่วงเวลา",
+        "startTime": "เวลาเริ่มต้น",
+        "endTime": "เวลาสิ้นสุด",
+        "customPresetRemarks": "หมายเหตุที่กำหนดไว้ล่วงหน้า",
+        "addRemark": "เพิ่มหมายเหตุ",
+        "noRangesConfigured": "ยังไม่มีการกำหนดช่วงการจอง คลิก 'เพิ่มช่วง' เพื่อเริ่มต้น",
+        "addFirstRange": "เพิ่มช่วงการจองแรกของคุณเพื่อเริ่มต้น",
+        "globalSettings": "การตั้งค่าทั่วไป",
+        "paxRange": "ช่วงจำนวนผู้โดยสาร",
+        "noOperatingHours": "ไม่มีเวลาทำการ",
+        "saveAllChanges": "บันทึกการเปลี่ยนแปลงทั้งหมด",
+        "confirmDeleteRange": "คุณแน่ใจหรือไม่ว่าต้องการลบ {name}?",
+        "settingUpdated": "อัปเดตการตั้งค่าสำเร็จ",
+        "newReservationRange": "ช่วงการจองใหม่",
+        "basicInformation": "ข้อมูลพื้นฐาน",
+        "guestRequirements": "ความต้องการของแขก",
+        "bookingConfiguration": "การกำหนดค่าการจอง",
+        "rangeNamePlaceholder": "เช่น ห้อง VIP, ห้องโถง",
+        "presetRemarkPlaceholder": "เช่น ที่นั่งริมหน้าต่าง, พื้นที่เงียบ",
+        "saveRange": "บันทึกช่วง",
+        "draftHoldTimeMinutes": "เวลาเก็บร่าง (นาที)",
+        "draftHoldTimeDescription": "ระยะเวลาในการเก็บการจองแบบร่างก่อนที่จะหมดอายุ",
+        "posCanOverbook": "POS สามารถจองเกินได้",
+        "posCanOverbookDescription": "อนุญาตให้ POS สร้างการจองแม้ว่าความจุเต็มแล้ว",
+        "notificationSettings": "การตั้งค่าการแจ้งเตือน",
+        "smsEnabled": "เปิดใช้งานการแจ้งเตือนผ่าน SMS",
+        "smsEnabledDescription": "ส่งการแจ้งเตือนผ่าน SMS ให้กับลูกค้าสำหรับการอัพเดทการจอง",
+        "emailEnabled": "เปิดใช้งานการแจ้งเตือนผ่านอีเมล",
+        "emailEnabledDescription": "ส่งการแจ้งเตือนผ่านอีเมลให้กับลูกค้าสำหรับการอัพเดทการจอง",
+        "notifyOnConfirm": "แจ้งเตือนเมื่อยืนยัน",
+        "notifyOnConfirmDescription": "ส่งการแจ้งเตือนเมื่อการจองได้รับการยืนยัน",
+        "notifyOnCancel": "แจ้งเตือนเมื่อยกเลิก",
+        "notifyOnCancelDescription": "ส่งการแจ้งเตือนเมื่อการจองถูกยกเลิก",
         "qrPay": "ชำระเงินด้วย QR",
         "terminalScanPay": "ชำระเงินด้วยการสแกนเทอร์มินัล",
         "terminalQrPay": "ชำระเงินด้วย QR เทอร์มินัล",
@@ -351,4 +403,4 @@
             "voucher": "บัตรกำนัล"
         }
     }
-}
+}

package/src/locales/zh-CN.json

@@ -96,8 +96,6 @@
         "deliveryZone": "配送区域",
         "deviceBinding": "设备绑定",
         "deviceDetails": "设备详情",
-        "otaChannel": "OTA 渠道",
-        "otaChannelHint": "可选。留空将使用默认的 OTA 源。",
         "dineIn": "堂食",
         "dineInCanTakeaway": "允许外带",
         "driveThru": "得来速",
@@ -234,6 +232,60 @@
         "current": "当前",
         "paxMin": "最少人数",
         "paxMax": "最多人数",
+        "reservation": "预订",
+        "reservationSettings": "预订设置",
+        "reservationRanges": "预订范围",
+        "addRange": "添加范围",
+        "range": "范围",
+        "rangeName": "范围名称",
+        "priority": "优先级",
+        "priorityDescription": "数字越大，匹配时段时优先级越高",
+        "capacity": "容量",
+        "capacityDescription": "此范围的最大并发预订数",
+        "minPax": "最少人数",
+        "maxPax": "最多人数",
+        "slotInterval": "时段间隔",
+        "slotIntervalDescription": "每个可预订时段之间的时间（例如30分钟）",
+        "bookingDuration": "预订时长",
+        "bookingDurationDescription": "每次预订的持续时间（例如60分钟）",
+        "minLeadDays": "最少提前天数",
+        "minLeadDaysDescription": "顾客必须提前预订的最少天数（0 = 当天）",
+        "maxLeadDays": "最多提前天数",
+        "maxLeadDaysDescription": "顾客可以提前预订的最多天数",
+        "operatingWindows": "营业时段",
+        "addWindow": "添加时段",
+        "startTime": "开始时间",
+        "endTime": "结束时间",
+        "customPresetRemarks": "自定义预设备注",
+        "addRemark": "添加备注",
+        "noRangesConfigured": "未配置预订范围。点击\"添加范围\"开始",
+        "addFirstRange": "添加您的第一个预订范围以开始",
+        "globalSettings": "全局设置",
+        "paxRange": "人数范围",
+        "noOperatingHours": "无营业时间",
+        "saveAllChanges": "保存所有更改",
+        "confirmDeleteRange": "您确定要删除{name}吗？",
+        "settingUpdated": "设置已成功更新",
+        "newReservationRange": "新预订范围",
+        "basicInformation": "基本信息",
+        "guestRequirements": "客人要求",
+        "bookingConfiguration": "预订配置",
+        "rangeNamePlaceholder": "例如：VIP包厢、大厅",
+        "presetRemarkPlaceholder": "例如：靠窗座位、安静区域",
+        "saveRange": "保存范围",
+        "draftHoldTimeMinutes": "草稿保留时间（分钟）",
+        "draftHoldTimeDescription": "在草稿预订过期前保留的时间",
+        "posCanOverbook": "POS可以超额预订",
+        "posCanOverbookDescription": "允许POS在容量已满时创建预订",
+        "notificationSettings": "通知设置",
+        "smsEnabled": "启用短信通知",
+        "smsEnabledDescription": "向客户发送预订更新的短信通知",
+        "emailEnabled": "启用电子邮件通知",
+        "emailEnabledDescription": "向客户发送预订更新的电子邮件通知",
+        "notifyOnConfirm": "确认时通知",
+        "notifyOnConfirmDescription": "当预订被确认时发送通知",
+        "notifyOnCancel": "取消时通知",
+        "notifyOnCancelDescription": "当预订被取消时发送通知",
         "qrPay": "二维码支付",
         "terminalScanPay": "终端扫描支付",
         "terminalQrPay": "终端二维码支付",
@@ -359,4 +411,4 @@
             "voucher": "代金券"
         }
     }
-}
+}

package/src/main.ts

@@ -16,6 +16,8 @@ import zhCN from "./locales/zh-CN.json"
 import thTH from "./locales/th-TH.json"
 import jaJP from "./locales/ja-JP.json"
 
+import { setEnabledLocales } from "@feedmepos/mf-common"
+
 export const i18nMessages = {
     "en-US": enUS,
     "zh-CN": zhCN,
@@ -34,15 +36,15 @@ function initI18n(): I18n {
 
 const app = createApp(Entry)
 
+app.use(initI18n())
+app.use(createPinia())
+app.use(router)
+
+
 app.use(FeedMeUI, {
     locale: detectLocale(),
 })
 
-app.use(createPinia() as any)
-app.use(router)
-app.use(initI18n() as any)
-
-
 const CoreStore = useCoreStore();
 const iframeMode = computed(() => {
     return new URLSearchParams(window.location.search).get('iframe') === 'true';

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

@@ -75,25 +75,23 @@ export type KioskPaymentTypesForm = MfKioskPaymentTypes;
 
 export type KioskPaymentSettingForm = MfKioskPaymentSetting;
 
-export interface MfKioskOrderSetting {
-    dineIn: MfKioskDineInSetting,
-    takeaway: MfKioskTakeawaySetting,
-    paymentSetting: MfKioskPaymentSetting,
-    menuItem: MfKioskOrderSettingMenuItemForm,
-    otaChannel?: string | null,
-}
+export interface MfKioskOrderSetting {
+    dineIn: MfKioskDineInSetting,
+    takeaway: MfKioskTakeawaySetting,
+    paymentSetting: MfKioskPaymentSetting,
+    menuItem: MfKioskOrderSettingMenuItemForm,
+}
 
 export interface MfKioskOrderSettingMenuItemForm {
     showAllOnly: boolean,
 }
 
-export interface MfKioskOrderSettingForm {
-    dineIn: KioskDineInSettingForm,
-    takeaway: KioskTakeawaySettingForm,
-    paymentSetting: KioskPaymentSettingForm,
-    menuItem: KioskMenuItemSettingForm,
-    otaChannel?: string | null,
-}
+export interface MfKioskOrderSettingForm {
+    dineIn: KioskDineInSettingForm,
+    takeaway: KioskTakeawaySettingForm,
+    paymentSetting: KioskPaymentSettingForm,
+    menuItem: KioskMenuItemSettingForm,
+}
 
 export type KioskPickAtCounterSettingForm = MfKioskPickAtCounterSetting;
 export type KioskMenuItemSettingForm = MfKioskOrderSettingMenuItemForm;
@@ -102,4 +100,4 @@ export interface KioskDineInSettingForm {
     sequenceNumber: MfKioskSequenceNumberSetting,
     displayStand: DisplayStandSettingForm,
     pickUp: KioskPickAtCounterSettingForm,
-}
+}

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

@@ -77,8 +77,7 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
   },
   menuItem: {
     showAllOnly: false
-  },
-  otaChannel: ''
+  }
 }
 
 export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
@@ -108,10 +107,10 @@ const toKiosk = (
       enabled: kioskOrderSettings?.canTakeaway ?? false,
       submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction
         ? {
-          payAtCounter:
-            kioskOrderSettings?.takeaway?.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
-          paid: kioskOrderSettings?.takeaway?.submitOrderInstruction?.paid?.['en'] ?? null
-        }
+            payAtCounter:
+              kioskOrderSettings?.takeaway?.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
+            paid: kioskOrderSettings?.takeaway?.submitOrderInstruction?.paid?.['en'] ?? null
+          }
         : defaultSubmitOrderInstruction
     },
     paymentSetting: {
@@ -132,8 +131,7 @@ const toKiosk = (
     },
     menuItem: {
       showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false
-    },
-    otaChannel: kioskOrderSettings?.otaChannel ?? ''
+    }
   }
 }
 
@@ -146,35 +144,35 @@ const toKioskDineInSetting = (
     sequenceNumber: kioskDineInSeq,
     pickUp: kioskDineInSetting?.pickUp
       ? {
-        ...kioskDineInSetting.pickUp,
-        submitOrderInstruction: kioskDineInSetting.pickUp.submitOrderInstruction
-          ? {
-            payAtCounter:
-              kioskDineInSetting.pickUp.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
-            paid: kioskDineInSetting.pickUp.submitOrderInstruction?.paid?.['en'] ?? null
-          }
-          : defaultSubmitOrderInstruction,
-        enablePaxDialog: kioskDineInSetting.pickUp.enablePaxDialog
-          ? kioskDineInSetting.pickUp.enablePaxDialog
-          : false
-      }
+          ...kioskDineInSetting.pickUp,
+          submitOrderInstruction: kioskDineInSetting.pickUp.submitOrderInstruction
+            ? {
+                payAtCounter:
+                  kioskDineInSetting.pickUp.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
+                paid: kioskDineInSetting.pickUp.submitOrderInstruction?.paid?.['en'] ?? null
+              }
+            : defaultSubmitOrderInstruction,
+          enablePaxDialog: kioskDineInSetting.pickUp.enablePaxDialog
+            ? kioskDineInSetting.pickUp.enablePaxDialog
+            : false
+        }
       : defaultPickUp,
     displayStand: kioskDineInSetting?.displayStand
       ? {
-        enabled: kioskDineInSetting.displayStand.enabled,
-        standSlotRange: kioskDineInSetting.displayStand.standSlotRange,
-        prefix: kioskDineInSetting.displayStand.prefix,
-        padDigit: kioskDineInSetting.displayStand.padDigit,
-        enablePaxDialog: kioskDineInSetting.displayStand.enablePaxDialog ?? false,
-        submitOrderInstruction: kioskDineInSetting.displayStand.submitOrderInstruction
-          ? {
-            payAtCounter:
-              kioskDineInSetting.displayStand.submitOrderInstruction?.payAtCounter?.['en'] ??
-              null,
-            paid: kioskDineInSetting.displayStand.submitOrderInstruction?.paid?.['en'] ?? null
-          }
-          : defaultSubmitOrderInstruction
-      }
+          enabled: kioskDineInSetting.displayStand.enabled,
+          standSlotRange: kioskDineInSetting.displayStand.standSlotRange,
+          prefix: kioskDineInSetting.displayStand.prefix,
+          padDigit: kioskDineInSetting.displayStand.padDigit,
+          enablePaxDialog: kioskDineInSetting.displayStand.enablePaxDialog ?? false,
+          submitOrderInstruction: kioskDineInSetting.displayStand.submitOrderInstruction
+            ? {
+                payAtCounter:
+                  kioskDineInSetting.displayStand.submitOrderInstruction?.payAtCounter?.['en'] ??
+                  null,
+                paid: kioskDineInSetting.displayStand.submitOrderInstruction?.paid?.['en'] ?? null
+              }
+            : defaultSubmitOrderInstruction
+        }
       : defaultDisplayStand
   }
 }
@@ -191,13 +189,13 @@ const toOrderKioskSettingsDto = (
       submitOrderInstruction: {
         payAtCounter: dineInSetting.displayStand.submitOrderInstruction?.payAtCounter
           ? {
-            en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter
-          }
+              en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter
+            }
           : null,
         paid: dineInSetting.displayStand.submitOrderInstruction?.paid
           ? {
-            en: dineInSetting.displayStand.submitOrderInstruction.paid
-          }
+              en: dineInSetting.displayStand.submitOrderInstruction.paid
+            }
           : null
       }
     },
@@ -206,13 +204,13 @@ const toOrderKioskSettingsDto = (
       submitOrderInstruction: {
         payAtCounter: dineInSetting.pickUp.submitOrderInstruction?.payAtCounter
           ? {
-            en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter
-          }
+              en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter
+            }
           : null,
         paid: dineInSetting.pickUp.submitOrderInstruction?.paid
           ? {
-            en: dineInSetting.pickUp.submitOrderInstruction.paid
-          }
+              en: dineInSetting.pickUp.submitOrderInstruction.paid
+            }
           : null
       }
     }
@@ -223,7 +221,6 @@ const toOrderKioskSettingsDto = (
     dineIn,
     menuItem: kioskSetting.menuItem,
     paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
-    otaChannel: kioskSetting.otaChannel || undefined,
     takeaway: kioskSetting.takeaway.submitOrderInstruction
       ? {
           submitOrderInstruction: {
@@ -237,8 +234,8 @@ const toOrderKioskSettingsDto = (
                   en: kioskSetting.takeaway.submitOrderInstruction.paid
                 }
               : null
+          }
         }
-      }
       : undefined
   })