@feedmepos/mf-order-setting 0.0.56 → 0.0.57

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

@@ -92,6 +92,16 @@ const initializeCheckboxes = () => {
       eWalletPaymentCheckboxVal.value.push(F_ORDER_E_PAYMENT_TYPE.enum.SCANPAY)
       useEwallet.value = true
     }
+
+    if (props.ePaymentTypes.eWallet.terminalScanPay) {
+      eWalletPaymentCheckboxVal.value.push(F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL_SCAN_PAY)
+      useEwallet.value = true
+    }
+
+    if (props.ePaymentTypes.eWallet.terminalQrPay) {
+      eWalletPaymentCheckboxVal.value.push(F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL_QR_PAY)
+      useEwallet.value = true
+    }
   }
 }
 
@@ -154,7 +164,9 @@ const handleEPaymentCardUpdate = (ev: string) => {
     },
     eWallet: {
       qrPay: false,
-      scanPay: false
+      scanPay: false,
+      terminalScanPay: false,
+      terminalQrPay: false,
     }
   } as FdoEPaymentMethod
 
@@ -175,6 +187,12 @@ const handleEPaymentCardUpdate = (ev: string) => {
       if (eWalletPaymentCheckboxVal.value.includes(F_ORDER_E_PAYMENT_TYPE.enum.SCANPAY)) {
         ePaymentObj.eWallet.scanPay = true
       }
+      if (eWalletPaymentCheckboxVal.value.includes(F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL_SCAN_PAY)) {
+        ePaymentObj.eWallet.terminalScanPay = true
+      }
+      if (eWalletPaymentCheckboxVal.value.includes(F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL_QR_PAY)) {
+        ePaymentObj.eWallet.terminalQrPay = true
+      }
     }
   }
 

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

@@ -1,5 +1,20 @@
 <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>
@@ -140,65 +155,65 @@
       />
     </div>
 
-    <!-- Cover Image Section -->
-    <div class="flex flex-col gap-2">
-      <span class="fm-typo-en-title-sm-600">{{ t('order.coverImage') }}</span>
-      <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">{{
-        t('order.coverImageFallbackHint')
-      }}</span>
-
-      <div class="border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-4 my-5 w-11/12">
-        <span class="fm-typo-en-body-md-600">{{ t('order.coverImageLandscape') }}</span>
-        <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">{{
-          t('order.coverImageLandscapeHint')
-        }}</span>
-        <FmDropField
-          v-if="!getCoverImagePreview('coverImageLandscape')"
-          accept="image/*"
-          :max-file-size="MAX_IMAGE_FILE_SIZE"
-          content-class="w-full max-w-[400px] aspect-video"
-          @file-upload="uploadCoverImage('coverImageLandscape', $event)"
-          @file-rejected="handleCoverImageRejected('coverImageLandscape', $event)"
-        />
+    <!-- Cover Image Section -->
+    <div class="flex flex-col gap-2">
+      <span class="fm-typo-en-title-sm-600">{{ t('order.coverImage') }}</span>
+      <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">{{
+        t('order.coverImageFallbackHint')
+      }}</span>
+
+      <div class="border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-4 my-5 w-11/12">
+        <span class="fm-typo-en-body-md-600">{{ t('order.coverImageLandscape') }}</span>
+        <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">{{
+          t('order.coverImageLandscapeHint')
+        }}</span>
+        <FmDropField
+          v-if="!getCoverImagePreview('coverImageLandscape')"
+          accept="image/*"
+          :max-file-size="MAX_IMAGE_FILE_SIZE"
+          content-class="w-full max-w-[400px] aspect-video"
+          @file-upload="uploadCoverImage('coverImageLandscape', $event)"
+          @file-rejected="handleCoverImageRejected('coverImageLandscape', $event)"
+        />
         <div v-else class="flex flex-col gap-2">
           <img
             :src="getCoverImagePreview('coverImageLandscape')!"
             :alt="t('order.coverImageLandscape')"
-            class="max-w-[400px] aspect-video object-cover rounded-md border border-fm-color-neutral-gray-200"
-          />
-          <FmButton
-            variant="tertiary"
-            class="mr-auto"
-            :label="t('common.delete')"
-            @click="clearCoverImage('coverImageLandscape')"
+            class="max-w-[400px] aspect-video object-cover rounded-md border border-fm-color-neutral-gray-200"
+          />
+          <FmButton
+            variant="tertiary"
+            class="mr-auto"
+            :label="t('common.delete')"
+            @click="clearCoverImage('coverImageLandscape')"
           />
         </div>
       </div>
 
-      <div class="border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-4 my-5 w-11/12">
-        <span class="fm-typo-en-body-md-600">{{ t('order.coverImagePortrait') }}</span>
-        <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">{{
-          t('order.coverImagePortraitHint')
-        }}</span>
-        <FmDropField
-          v-if="!getCoverImagePreview('coverImagePortrait')"
-          accept="image/*"
-          :max-file-size="MAX_IMAGE_FILE_SIZE"
-          content-class="w-[240px] aspect-[9/16]"
-          @file-upload="uploadCoverImage('coverImagePortrait', $event)"
-          @file-rejected="handleCoverImageRejected('coverImagePortrait', $event)"
+      <div class="border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-4 my-5 w-11/12">
+        <span class="fm-typo-en-body-md-600">{{ t('order.coverImagePortrait') }}</span>
+        <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">{{
+          t('order.coverImagePortraitHint')
+        }}</span>
+        <FmDropField
+          v-if="!getCoverImagePreview('coverImagePortrait')"
+          accept="image/*"
+          :max-file-size="MAX_IMAGE_FILE_SIZE"
+          content-class="w-[240px] aspect-[9/16]"
+          @file-upload="uploadCoverImage('coverImagePortrait', $event)"
+          @file-rejected="handleCoverImageRejected('coverImagePortrait', $event)"
         />
         <div v-else class="flex flex-col gap-2">
           <img
             :src="getCoverImagePreview('coverImagePortrait')!"
             :alt="t('order.coverImagePortrait')"
-            class="max-w-[200px] aspect-[9/16] object-cover rounded-md border border-fm-color-neutral-gray-200"
-          />
-          <FmButton
-            variant="tertiary"
-            class="mr-auto"
-            :label="t('common.delete')"
-            @click="clearCoverImage('coverImagePortrait')"
+            class="max-w-[200px] aspect-[9/16] object-cover rounded-md border border-fm-color-neutral-gray-200"
+          />
+          <FmButton
+            variant="tertiary"
+            class="mr-auto"
+            :label="t('common.delete')"
+            @click="clearCoverImage('coverImagePortrait')"
           />
         </div>
       </div>
@@ -258,9 +273,12 @@ import type {
 import { useLoading } from '@/composables/loading'
 import { useSnackbar } from '@feedmepos/ui-library'
 import { useI18n } from '@feedmepos/mf-common'
+import { useCoreStore } from '@feedmepos/mf-common'
 import { uploadImageFile } from '@/utils/firebase-storage'
 
 const { t } = useI18n()
+const CoreStore = useCoreStore()
+const isAdmin = computed(() => CoreStore.sessionUser.value?.role.isAdmin ?? false)
 
 interface Props {
   restaurantId: string
@@ -298,6 +316,7 @@ const maxRules = computed(() => [nonNegativeRule, greaterThanMinRule])
 
 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) {
@@ -315,6 +334,7 @@ const validKioskOrderSetting = computed<MfKioskOrderSetting | null>(() => {
   // Return the form as-is if valid, with display stand disabled when dineIn is disabled
   return {
     ...f,
+    otaChannel: otaChannel || undefined,
     dineIn: {
       ...f.dineIn,
       displayStand: {
@@ -341,8 +361,8 @@ function updateEPaymentSetting(form: FdoEPaymentMethod) {
   kioskOrderSettingForm.value.paymentSetting.ePaymentTypes = form
 }
 
-type CoverImageField = 'coverImageLandscape' | 'coverImagePortrait'
-const MAX_IMAGE_FILE_SIZE = 10 * 1000 * 1000
+type CoverImageField = 'coverImageLandscape' | 'coverImagePortrait'
+const MAX_IMAGE_FILE_SIZE = 10 * 1000 * 1000
 
 function clearCoverImage(field: CoverImageField) {
   kioskOrderSettingForm.value[field] = null

package/src/views/order-settings/OrderSettingsView.vue

@@ -88,7 +88,7 @@ onMounted(async () => {
   }
 })
 
-watch(currentRestaurant, async (newRestaurant) => {
+watch(currentRestaurant, async (newRestaurant: any) => {
   if (newRestaurant?._id) {
     await menuStore.loadCatalogOptions(newRestaurant._id)
   }

package/src/views/order-settings/drive-thru/DriveThruSetting.vue

@@ -74,7 +74,7 @@ async function updateDriveThruSetting() {
     if (newDriveThruSetting) {
       await restaurantStore.updateDriveThruSetting(newDriveThruSetting)
       if (currentRestaurant.value) {
-        currentRestaurant.value.driveThru = newDriveThruSetting
+        ;(currentRestaurant.value as any).driveThru = newDriveThruSetting
       }
     }
   })
@@ -84,8 +84,8 @@ async function updateDriveThruSetting() {
 watch(
   () => currentRestaurant.value,
   async (newRestaurant) => {
-    if (newRestaurant?.driveThru) {
-      driveThruSetting.value = utils.clone(newRestaurant.driveThru)
+    if ((newRestaurant as any)?.driveThru) {
+      driveThruSetting.value = utils.clone((newRestaurant as any).driveThru)
     } else {
       driveThruSetting.value = initDriveThruSetting()
     }
@@ -94,7 +94,7 @@ watch(
 )
 
 onMounted(async () => {
-  const newRestaurant = currentRestaurant.value
+  const newRestaurant = currentRestaurant.value as any
   if (newRestaurant?.driveThru) {
     driveThruSetting.value = utils.clone(newRestaurant.driveThru)
   }

package/src/views/order-settings/servicecharge/ServiceChargeRule.vue

@@ -480,11 +480,7 @@ watch(
         />
       </div>
       <div class="fm-corner-radius-lg flex flex-col" v-if="showTable">
-        <div
-          v-for="(item, index) in filteredTable"
-          :key="index"
-          class="flex flex-col pl-6"
-        >
+        <div v-for="(item, index) in filteredTable" :key="index" class="flex flex-col pl-6">
           <FmCheckbox
             :value="item.name"
             :model-value="selectedTables[item.name].isSelected"