@feedmepos/mf-order-setting 0.0.50 → 0.0.52

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

@@ -77,7 +77,8 @@ export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
   },
   menuItem: {
     showAllOnly: false
-  }
+  },
+  otaChannel: ''
 }
 
 export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
@@ -131,7 +132,8 @@ const toKiosk = (
     },
     menuItem: {
       showAllOnly: kioskOrderSettings?.menuItem?.showAllOnly ?? false
-    }
+    },
+    otaChannel: kioskOrderSettings?.otaChannel ?? ''
   }
 }
 
@@ -221,19 +223,20 @@ const toOrderKioskSettingsDto = (
     dineIn,
     menuItem: kioskSetting.menuItem,
     paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
+    otaChannel: kioskSetting.otaChannel || undefined,
     takeaway: kioskSetting.takeaway.submitOrderInstruction
       ? {
-        submitOrderInstruction: {
-          payAtCounter: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
-            ? {
-              en: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
-            }
-            : null,
-          paid: kioskSetting.takeaway.submitOrderInstruction.paid
-            ? {
-              en: kioskSetting.takeaway.submitOrderInstruction.paid
-            }
-            : null
+          submitOrderInstruction: {
+            payAtCounter: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
+              ? {
+                  en: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
+                }
+              : null,
+            paid: kioskSetting.takeaway.submitOrderInstruction.paid
+              ? {
+                  en: kioskSetting.takeaway.submitOrderInstruction.paid
+                }
+              : null
         }
       }
       : undefined

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

@@ -1,8 +1,23 @@
-<template>
-  <div v-if="!!kioskOrderSettingForm" class="flex flex-col gap-32">
-    <!-- Dine In Section -->
-    <div class="flex flex-col gap-2">
-      <span class="fm-typo-en-title-sm-600">{{ t('order.dineIn') }}</span>
+<template>
+  <div v-if="!!kioskOrderSettingForm" class="flex flex-col gap-32">
+    <!-- OTA Channel Section -->
+    <div v-if="isAdmin" class="flex flex-col gap-2">
+      <span class="fm-typo-en-title-sm-600">{{ t('order.otaChannel') }}</span>
+      <div class="flex flex-col gap-1 w-full md:w-1/2">
+        <FmTextField
+          v-model="kioskOrderSettingForm.otaChannel"
+          :label="t('order.otaChannel')"
+          :placeholder="t('order.otaChannelHint')"
+        />
+        <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">
+          {{ t('order.otaChannelHint') }}
+        </span>
+      </div>
+    </div>
+
+    <!-- Dine In Section -->
+    <div class="flex flex-col gap-2">
+      <span class="fm-typo-en-title-sm-600">{{ t('order.dineIn') }}</span>
       <div class="flex flex-col gap-5">
         <FmSwitch
           v-model="kioskOrderSettingForm.dineIn.enabled"
@@ -183,19 +198,22 @@
 </template>
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import KioskPaymentTypeSection from './KioskPaymentTypeSection.vue'
-import { FdoOfflinePaymentMethod } from '@feedmepos/core/entity'
-import { FdoEPaymentMethod, F_ORDER_PAYMENT_TYPE } from '@entity'
-import type {
-  MfKioskOrderSetting,
+import KioskPaymentTypeSection from './KioskPaymentTypeSection.vue'
+import { FdoOfflinePaymentMethod } from '@feedmepos/core/entity'
+import { FdoEPaymentMethod, F_ORDER_PAYMENT_TYPE } from '@entity'
+import type {
+  MfKioskOrderSetting,
   MfKioskOrderSettingForm,
   KioskPaymentTypesForm
 } from '@/modules/order-setting/kiosk/interface'
-import { useLoading } from '@/composables/loading'
-import { useSnackbar } from '@feedmepos/ui-library'
-import { useI18n } from '@feedmepos/mf-common'
-
-const { t } = useI18n()
+import { useLoading } from '@/composables/loading'
+import { useSnackbar } from '@feedmepos/ui-library'
+import { useI18n } from '@feedmepos/mf-common'
+import { useCoreStore } from '@feedmepos/mf-common'
+
+const { t } = useI18n()
+const CoreStore = useCoreStore()
+const isAdmin = computed(() => CoreStore.sessionUser.value?.role.isAdmin ?? false)
 
 interface Props {
   restaurantId: string
@@ -231,8 +249,9 @@ const padDigitRules = computed(() => [nonNegativeRule])
 const minRules = computed(() => [nonNegativeRule])
 const maxRules = computed(() => [nonNegativeRule, greaterThanMinRule])
 
-const validKioskOrderSetting = computed<MfKioskOrderSetting | null>(() => {
-  const f = kioskOrderSettingForm.value
+const validKioskOrderSetting = computed<MfKioskOrderSetting | null>(() => {
+  const f = kioskOrderSettingForm.value
+  const otaChannel = f.otaChannel?.trim()
 
   // Validate display stand settings if both dineIn and displayStand are enabled
   if (f.dineIn.enabled && f.dineIn.displayStand.enabled) {
@@ -247,12 +266,13 @@ const validKioskOrderSetting = computed<MfKioskOrderSetting | null>(() => {
     if (!isValid) return null
   }
 
-  // Return the form as-is if valid, with display stand disabled when dineIn is disabled
-  return {
-    ...f,
-    dineIn: {
-      ...f.dineIn,
-      displayStand: {
+  // Return the form as-is if valid, with display stand disabled when dineIn is disabled
+  return {
+    ...f,
+    otaChannel: otaChannel || undefined,
+    dineIn: {
+      ...f.dineIn,
+      displayStand: {
         ...f.dineIn.displayStand,
         enabled: f.dineIn.enabled && f.dineIn.displayStand.enabled,
         padDigit: f.dineIn.displayStand.padDigit ?? 0,

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

@@ -56,7 +56,9 @@ const emits = defineEmits<{
 const menuStore = useMenuStore()
 const CoreStore = useCoreStore()
 
-const canEdit = computed(() => CoreStore.sessionUser.value?.role.isAdmin ?? false)
+// const canEdit = computed(() => CoreStore.sessionUser.value?.role.isAdmin ?? false)
+// For now, allow all users to edit, but added detail logging in backend
+const canEdit = computed(() => true)
 
 function updateManual(manual: FdoLinkedDelivery | null) {
   emits('update:model-value', {