@feedmepos/mf-order-setting 0.0.48 → 0.0.50

package/src/views/kiosk/KioskSummary.vue

@@ -2,44 +2,50 @@
   <div :class="dialogType ? '' : ['p-[1.5rem] border fm-corner-radius-lg flex flex-col gap-5 fixed ml-40 w-[320px]']">
     <span v-if="!dialogType" class="fm-typo-en-title-sm-600">{{ t('order.kioskSummary') }}</span>
     <hr v-if="!dialogType" class="my-[0.25rem]" />
-    <div class="flex flex-col gap-1">
-      <div class="flex flex-col gap-1">
+    <div class="flex flex-col gap-4">
+      <!-- Device Summary -->
+      <div class="flex flex-col gap-2">
         <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.kioskDisplay') }}</span>
-
-        <div class="fm-typo-en-body-lg-600">
-          <div v-if="devices.length > 0">
-            <li class="block" v-for="device in devices" :key="device.machineId">{{ device.name }}</li>
+        <div v-if="devices.length > 0" class="flex flex-col gap-1">
+          <div
+            v-for="device in devices"
+            :key="device.machineId"
+            class="fm-typo-en-body-sm-400 flex items-center gap-2"
+          >
+            <span class="px-1.5 py-0.5 fm-corner-radius-sm bg-fm-color-neutral-gray-100 text-fm-color-typo-secondary fm-typo-en-body-xs-600 uppercase">
+              {{ device.deviceAppType === 'TABLET_APP' ? 'T' : 'K' }}
+            </span>
+            <span v-if="device.slotInfo" class="fm-typo-en-body-sm-600">{{ device.slotInfo }}</span>
+            <span class="text-fm-color-typo-secondary truncate flex-1" :title="device.name">{{ device.name }}</span>
           </div>
-          <div v-else>-</div>
         </div>
+        <div v-else class="fm-typo-en-body-lg-600">-</div>
+      </div>
 
-        <div v-if="dineInStatus === t('order.activated')">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineIn') }}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div>{{ dineInStatus }}</div>
-          </div>
-        </div>
+      <!-- Dine In Status -->
+      <div v-if="dineInStatus === t('order.activated')" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineIn') }}</span>
+        <div class="fm-typo-en-body-lg-600">{{ dineInStatus }}</div>
+      </div>
 
-        <div v-if="dineInStatus === t('order.activated') && dineInType !== t('order.unknown')">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineInType') }}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div>{{ dineInType }}</div>
-          </div>
-        </div>
+      <!-- Dine In Type -->
+      <div v-if="dineInStatus === t('order.activated') && dineInType !== t('order.unknown')" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.dineInType') }}</span>
+        <div class="fm-typo-en-body-lg-600">{{ dineInType }}</div>
+      </div>
 
-        <div v-if="takeAwayStatus === t('order.activated')">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.takeaway') }}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div>{{ takeAwayStatus }}</div>
-          </div>
-        </div>
+      <!-- Takeaway Status -->
+      <div v-if="takeAwayStatus === t('order.activated')" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.takeaway') }}</span>
+        <div class="fm-typo-en-body-lg-600">{{ takeAwayStatus }}</div>
+      </div>
 
-        <div v-if="acceptedPaymentStatus || offlinePaymentStatus">
-          <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{t('order.acceptedPayment')}}</span>
-          <div class="fm-typo-en-body-lg-600 block">
-            <div v-if="offlinePaymentStatus">{{ t('order.offlinePayment') }}</div>
-            <div>{{ acceptedPaymentStatus }}</div>
-          </div>
+      <!-- Payment Status -->
+      <div v-if="acceptedPaymentStatus || offlinePaymentStatus" class="flex flex-col gap-1">
+        <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.acceptedPayment') }}</span>
+        <div class="fm-typo-en-body-lg-600">
+          <div v-if="offlinePaymentStatus">{{ t('order.offlinePayment') }}</div>
+          <div>{{ acceptedPaymentStatus }}</div>
         </div>
       </div>
     </div>

package/src/views/kiosk/KioskView.vue

@@ -29,7 +29,7 @@
             <KioskDevicesView
               v-if="selectedMenuItem == 'device'"
               :devices="devices"
-              :request-otp="requestOtp"
+              @request-otp="requestOtp"
             />
             <KioskSettingView
               :key="`KioskSettingView-${currentRestaurantId}`"
@@ -151,6 +151,9 @@ async function requestOtp() {
     contentComponentProps: {
       otp: KioskStore.state.otp
     }
+  }).onClose(async () => {
+    // Refresh devices after dialog closes (in case a device was bound)
+    await KioskStore.getDevices()
   })
 }
 

package/src/views/kiosk/devices/KioskDeviceCard.vue

@@ -1,104 +1,185 @@
 <template>
-  <div class="border fm-corner-radius-lg flex justify-between pr-[1rem] w-11/12">
-    <FmSideSheet
-      :header="t('order.deviceDetails')"
-      dismiss-away
-      class="w-full"
-      :maxWidth="700"
-      @on:clickedAway="closeUpdateDevicePin"
-    >
-      <template #side-sheet-button>
-        <FmListItem
-          class="flex-1"
-          :label="device.name"
-          :sublabel="`${t('order.activatedDate')}: ${dayjs(device.activatedAt).format('DD MMM YYYY HH:mm')}`"
+  <div class="border fm-corner-radius-lg p-12 hover:bg-fm-color-neutral-gray-50 transition-colors">
+    <!-- Header Row: Type Badge + Slot + Actions -->
+    <div class="flex items-center justify-between mb-2">
+      <div class="flex items-center gap-2">
+        <span
+          class="px-2 py-1 fm-corner-radius-md fm-typo-en-body-sm-600 uppercase bg-fm-color-neutral-gray-200 text-fm-color-typo-secondary"
         >
-        </FmListItem>
-      </template>
-      <div v-if="!showPinSetting" class="py-[1rem] flex flex-col gap-6">
-        <span class="fm-typo-en-title-sm-600">{{ device.name }}</span>
-        <div class="w-full border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-2">
-          <span class="fm-typo-en-title-sm-600 mb-3">App Info</span>
-          <div class="flex flex-col gap-1 mb-2">
-            <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">Type</span>
-            <span class="fm-typo-en-body-lg-600 block">{{ appType }}</span>
-          </div>
-          <div class="flex flex-col gap-1 mb-2">
-            <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">Version</span>
-            <span class="fm-typo-en-body-lg-600 block">{{
-              device.deviceAppVersion ?? 'Below 0.0.42'
-            }}</span>
-          </div>
-          <div class="flex flex-col gap-1 mb-2">
-            <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">OTA Version</span>
-            <span class="fm-typo-en-body-lg-600 block">{{
-              device.deviceAppOTAVersion ?? 'Not available'
-            }}</span>
-          </div>
-          <div class="flex flex-col gap-1 mb-2">
-            <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">PIN Code</span>
-            <span class="fm-typo-en-body-lg-600 block">{{ isPinUpdate ? 'Yes' : 'No' }}</span>
-          </div>
-          <FmButton
-            class="w-auto"
-            variant="primary"
-            :label="device?.pinInfo ? 'Reset Device PIN' : 'Set Device PIN'"
-            @click="showUpdateDevicePin"
-          />
-        </div>
-        <div
-          v-for="config in configs.filter((c) => c[1])"
-          class="w-full border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-2"
+          {{ isTabletApp ? 'Tablet' : 'Kiosk' }}
+        </span>
+        <span
+          v-if="isTabletApp && device.slotInfo"
+          class="fm-typo-en-body-md-600 text-fm-color-typo-primary"
         >
-          <span class="fm-typo-en-title-sm-600" v-if="config[1]">{{ config[0] }}</span>
-          <div
-            class="flex flex-col gap-1"
-            v-if="config[1]"
-            v-for="configEntry in Object.entries(config[1])"
-          >
-            <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{
-              configEntry[0]
-            }}</span>
-            <span class="fm-typo-en-body-lg-600 block">{{
-              configEntry[1] == '' ? '-' : configEntry[1]
-            }}</span>
-          </div>
-        </div>
+          {{ device.slotInfo }}
+        </span>
       </div>
-      <div v-else>
-        <div class="py-[1rem] flex flex-col gap-6 text-center items-center">
-          <div class="flex flex-col gap-1 mb-2">
-            <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ pinText }}</span>
-            <span class="mt-5 block">
-              <FmPinField v-if="!isPinEntered" :length="4" @complete="(val) => pinEntered(val)" />
-              <FmPinField v-if="isPinEntered" :length="4" @complete="(val) => pinEntered(val)" />
-            </span>
+      <div class="flex items-center gap-1">
+        <FmSideSheet
+          :header="t('order.deviceDetails')"
+          dismiss-away
+          :maxWidth="700"
+          @on:clickedAway="closeUpdateDevicePin"
+        >
+          <template #side-sheet-button>
+            <FmButton variant="tertiary" icon="more_vert" />
+          </template>
+          <div v-if="!showPinSetting" class="py-[1rem] flex flex-col gap-6">
+            <span class="fm-typo-en-title-sm-600">{{ device.name }}</span>
+            <div class="w-full border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-2">
+              <span class="fm-typo-en-title-sm-600 mb-3">App Info</span>
+              <div class="flex flex-col gap-1 mb-2">
+                <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">Type</span>
+                <span class="fm-typo-en-body-lg-600 block">{{ appType }}</span>
+              </div>
+              <div class="flex flex-col gap-1 mb-2">
+                <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">Machine ID</span>
+                <span class="fm-typo-en-body-lg-600 block font-mono text-sm break-all">{{
+                  device.machineId
+                }}</span>
+              </div>
+              <div class="flex flex-col gap-1 mb-2">
+                <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">Version</span>
+                <span class="fm-typo-en-body-lg-600 block">{{
+                  device.deviceAppVersion ?? 'Below 0.0.42'
+                }}</span>
+              </div>
+              <div class="flex flex-col gap-1 mb-2">
+                <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">OTA Version</span>
+                <span class="fm-typo-en-body-lg-600 block">{{
+                  device.deviceAppOTAVersion ?? 'Not available'
+                }}</span>
+              </div>
+              <div class="flex flex-col gap-1 mb-2">
+                <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">PIN Code</span>
+                <span class="fm-typo-en-body-lg-600 block">{{ isPinUpdate ? 'Yes' : 'No' }}</span>
+              </div>
+              <FmButton
+                class="w-auto"
+                variant="primary"
+                :label="device?.pinInfo ? 'Reset Device PIN' : 'Set Device PIN'"
+                @click="showUpdateDevicePin"
+              />
+            </div>
+            <div
+              v-for="config in configs.filter((c) => c[1])"
+              :key="config[0]"
+              class="w-full border p-[1.5rem] fm-corner-radius-lg flex flex-col gap-2"
+            >
+              <span class="fm-typo-en-title-sm-600" v-if="config[1]">{{ config[0] }}</span>
+              <div
+                class="flex flex-col gap-1"
+                v-if="config[1]"
+                v-for="configEntry in Object.entries(config[1])"
+                :key="configEntry[0]"
+              >
+                <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{
+                  configEntry[0]
+                }}</span>
+                <span class="fm-typo-en-body-lg-600 block">{{
+                  configEntry[1] == '' ? '-' : configEntry[1]
+                }}</span>
+              </div>
+            </div>
           </div>
-          <FmButton
-            class="w-1/3"
-            variant="secondary"
-            label="Cancel reset PIN"
-            @click="closeUpdateDevicePin"
-          />
-        </div>
+          <div v-else>
+            <div class="py-[1rem] flex flex-col gap-6 text-center items-center">
+              <div class="flex flex-col gap-1 mb-2">
+                <span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{
+                  pinText
+                }}</span>
+                <span class="mt-5 block">
+                  <FmPinField
+                    v-if="!isPinEntered"
+                    :length="4"
+                    @complete="(val) => pinEntered(val)"
+                  />
+                  <FmPinField
+                    v-if="isPinEntered"
+                    :length="4"
+                    @complete="(val) => pinEntered(val)"
+                  />
+                </span>
+              </div>
+              <FmButton
+                class="w-1/3"
+                variant="secondary"
+                label="Cancel reset PIN"
+                @click="closeUpdateDevicePin"
+              />
+            </div>
+          </div>
+        </FmSideSheet>
+        <FmButton
+          variant="plain"
+          icon="link_off"
+          class="text-fm-color-system-error-300"
+          @click="openUnbindDialog"
+        />
       </div>
-    </FmSideSheet>
-    <FmButton
-      variant="plain"
-      append-icon="link_off"
-      class="text-fm-color-system-error-300 align-middle my-auto"
-      @click="openUnbindDialog"
-    />
+    </div>
+
+    <!-- Device Name (truncated for long names) -->
+    <div
+      class="fm-typo-en-body-md-600 text-fm-color-typo-primary mb-1 overflow-hidden text-ellipsis whitespace-nowrap"
+      :title="device.name"
+    >
+      {{ device.name }}
+    </div>
+
+    <!-- Machine ID Row (clickable to copy) -->
+    <div
+      class="flex items-center gap-1 mb-2 cursor-pointer group"
+      @click="copyMachineId"
+      :title="t('order.clickToCopy')"
+    >
+      <span class="fm-typo-en-body-sm-400 text-fm-color-typo-tertiary font-mono">
+        {{ truncatedMachineId }}
+      </span>
+      <FmIcon
+        name="content_copy"
+        class="text-fm-color-typo-tertiary opacity-0 group-hover:opacity-100 transition-opacity"
+      />
+    </div>
+
+    <!-- Info Row: Version, OTA, PIN, Last Startup -->
+    <div
+      class="flex items-center gap-3 flex-wrap fm-typo-en-body-sm-400 text-fm-color-typo-secondary"
+    >
+      <span class="flex items-center gap-1">
+        <FmIcon name="smartphone" />
+        v{{ device.deviceAppVersion ?? '?' }}
+      </span>
+      <span v-if="device.deviceAppOTAVersion" class="flex items-center gap-1">
+        <FmIcon name="system_update" />
+        {{ device.deviceAppOTAVersion }}
+      </span>
+      <span class="flex items-center gap-1">
+        <FmIcon name="lock" />
+        {{ isPinUpdate ? t('order.pinSet') : t('order.noPin') }}
+      </span>
+      <span
+        v-if="device.lastStartup"
+        class="flex items-center gap-1"
+        :title="formatFullDate(device.lastStartup)"
+      >
+        <FmIcon name="schedule" />
+        {{ formatRelativeTime(device.lastStartup) }}
+      </span>
+    </div>
   </div>
 </template>
 <script setup lang="ts">
 import type { MfKioskDevice } from '@/modules/kiosk/interface'
-import { type SnackbarPosition, useDialog, useSnackbar } from '@feedmepos/ui-library'
-import KioskUnbindConfirm from './KioskUnbindConfirm.vue'
-import { computed, onUnmounted, ref } from 'vue'
 import { useKioskStore } from '@/stores/kiosk'
-import dayjs from 'dayjs'
 import { useI18n } from '@feedmepos/mf-common'
+import { useDialog, useSnackbar, type SnackbarPosition } from '@feedmepos/ui-library'
+import dayjs from 'dayjs'
+import relativeTime from 'dayjs/plugin/relativeTime'
+import { computed, ref } from 'vue'
+import KioskUnbindConfirm from './KioskUnbindConfirm.vue'
+dayjs.extend(relativeTime)
 
 const { t } = useI18n()
 
@@ -121,6 +202,41 @@ const appType = computed(() => {
   return props.device?.deviceAppType === 'TABLET_APP' ? 'Tablet App' : 'Kiosk App'
 })
 
+const isTabletApp = computed(() => {
+  return props.device?.deviceAppType === 'TABLET_APP'
+})
+
+const truncatedMachineId = computed(() => {
+  const id = props.device.machineId
+  if (!id || id.length <= 16) return id
+  return `${id.slice(0, 8)}...${id.slice(-4)}`
+})
+
+async function copyMachineId() {
+  try {
+    await navigator.clipboard.writeText(props.device.machineId)
+    Snackbar.open({
+      type: 'success',
+      message: t('order.machineIdCopied'),
+      position: 'bottom' as SnackbarPosition
+    })
+  } catch {
+    Snackbar.open({
+      type: 'error',
+      message: t('order.copyFailed'),
+      position: 'bottom' as SnackbarPosition
+    })
+  }
+}
+
+function formatRelativeTime(date: Date): string {
+  return dayjs(date).fromNow()
+}
+
+function formatFullDate(date: Date): string {
+  return dayjs(date).format('DD MMM YYYY HH:mm:ss')
+}
+
 // function showDeviceDetails() {
 //     Dialog.open({
 //         title: props.device.name,

package/src/views/kiosk/devices/KioskDevicesView.vue

@@ -1,29 +1,145 @@
 <template>
-    <div>
+  <div>
+    <div class="flex flex-col gap-4">
+      <div class="flex items-center justify-between">
         <div class="flex flex-col gap-2">
-            <div class="flex flex-col gap-2">
-                <span class="fm-typo-en-title-sm-600 block"> {{ t('order.kioskDisplay') }} </span>
-                <span class="fm-typo-en-body-md-400 block"> {{ t('order.kioskDisplayDescription') }} </span>
-            </div>
-            <div class="flex flex-col gap-6">
-                <KioskDeviceCard v-for="device in devices" :key="device.machineId" :device="device"></KioskDeviceCard>
-                <FmButton variant="plain" class="w-[10rem] border border-fm-color-primary fm-corner-radius-lg"
-                    :label="t('order.bindDevice')" size="md" prepend-icon="link" @click="requestOtp" />
-            </div>
+          <span class="fm-typo-en-title-sm-600 block"> {{ t('order.kioskDisplay') }} </span>
+          <span class="fm-typo-en-body-md-400 block"> {{ t('order.kioskDisplayDescription') }} </span>
         </div>
+        <FmButton
+          variant="primary"
+          :label="t('order.bindDevice')"
+          size="md"
+          prepend-icon="link"
+          @click="$emit('requestOtp')"
+        />
+      </div>
+
+      <!-- Search and Filter Bar -->
+      <div class="flex items-center gap-3 flex-wrap">
+        <FmSearch
+          v-model:model-value="searchQuery"
+          class="flex-1 min-w-[200px] max-w-[400px]"
+          :placeholder="t('order.searchDevices')"
+        />
+        <FmMenu>
+          <template #menu-button>
+            <FmButton
+              variant="tertiary"
+              prepend-icon="filter_list"
+              :label="activeFilterLabel"
+              class="fm-typo-en-body-md-600"
+            />
+          </template>
+          <FmMenuItem
+            :model-value="filterType === 'all'"
+            :label="t('order.allTypes')"
+            @click="filterType = 'all'"
+          />
+          <FmMenuItem
+            :model-value="filterType === 'tablet'"
+            :label="t('order.tabletOnly')"
+            @click="filterType = 'tablet'"
+          />
+          <FmMenuItem
+            :model-value="filterType === 'kiosk'"
+            :label="t('order.kioskOnly')"
+            @click="filterType = 'kiosk'"
+          />
+        </FmMenu>
+        <span class="fm-typo-en-body-sm-400 text-fm-color-typo-tertiary">
+          {{ t('order.showingDevices', { count: filteredDevices.length, total: devices.length }) }}
+        </span>
+      </div>
+
+      <!-- Device Cards -->
+      <div class="grid grid-cols-2 gap-2 py-8">
+        <KioskDeviceCard
+          v-for="device in filteredDevices"
+          :key="device.machineId"
+          :device="device"
+        />
+        <div
+          v-if="filteredDevices.length === 0 && devices.length > 0"
+          class="text-center py-8 text-fm-color-typo-tertiary fm-typo-en-body-md-400 col-span-2"
+        >
+          {{ t('order.noDevicesMatch') }}
+        </div>
+        <div
+          v-if="devices.length === 0"
+          class="text-center py-8 text-fm-color-typo-tertiary fm-typo-en-body-md-400 col-span-2"
+        >
+          {{ t('order.noDevicesBound') }}
+        </div>
+      </div>
     </div>
+  </div>
 </template>
 <script setup lang="ts">
-import KioskDeviceCard from "./KioskDeviceCard.vue";
-import type { MfKioskDevice } from "@/modules/kiosk/interface";
+import type { MfKioskDevice } from '@/modules/kiosk/interface'
 import { useI18n } from '@feedmepos/mf-common'
+import { computed, ref } from 'vue'
+import KioskDeviceCard from './KioskDeviceCard.vue'
 
-const { t } = useI18n();
+const { t } = useI18n()
 
 interface Props {
-    devices: MfKioskDevice[],
-    requestOtp: () => Promise<void>;
+  devices: MfKioskDevice[]
 }
 
-const props = defineProps<Props>();
-</script>
+const props = defineProps<Props>()
+defineEmits<{
+  (e: 'requestOtp'): void
+}>()
+
+const searchQuery = ref('')
+const filterType = ref<'all' | 'tablet' | 'kiosk'>('all')
+
+const activeFilterLabel = computed(() => {
+  switch (filterType.value) {
+    case 'tablet':
+      return t('order.tabletOnly')
+    case 'kiosk':
+      return t('order.kioskOnly')
+    default:
+      return t('order.allTypes')
+  }
+})
+
+const filteredDevices = computed(() => {
+  let result = props.devices
+
+  // Apply type filter
+  if (filterType.value === 'tablet') {
+    result = result.filter((d) => d.deviceAppType === 'TABLET_APP')
+  } else if (filterType.value === 'kiosk') {
+    result = result.filter((d) => d.deviceAppType !== 'TABLET_APP')
+  }
+
+  // Apply search filter
+  const query = searchQuery.value.toLowerCase().trim()
+  if (query) {
+    result = result.filter((d) => {
+      const name = d.name?.toLowerCase() || ''
+      const machineId = d.machineId?.toLowerCase() || ''
+      const slot = d.slotInfo?.toLowerCase() || ''
+      return name.includes(query) || machineId.includes(query) || slot.includes(query)
+    })
+  }
+
+  // Sort tablets by slot, kiosks by name
+  return result.sort((a, b) => {
+    // Tablets first
+    if (a.deviceAppType === 'TABLET_APP' && b.deviceAppType !== 'TABLET_APP') return -1
+    if (a.deviceAppType !== 'TABLET_APP' && b.deviceAppType === 'TABLET_APP') return 1
+
+    // For tablets, sort by slot
+    if (a.deviceAppType === 'TABLET_APP' && b.deviceAppType === 'TABLET_APP') {
+      return (a.slotInfo || '').localeCompare(b.slotInfo || '')
+    }
+
+    // For kiosks, sort by name
+    return (a.name || '').localeCompare(b.name || '')
+  })
+})
+</script>

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

@@ -72,9 +72,9 @@ const initializeCheckboxes = () => {
   parentCheckbox.value = initialValues.length === checkboxChildren.length
   if (!(Object.keys(props.ePaymentTypes).length === 0)) {
     if (props.ePaymentTypes.terminal) {
-      useTerminal.value = true;
+      useTerminal.value = true
     }
-    
+
     if (props.ePaymentTypes.card.terminal) {
       cardPaymentRadioVal.value = F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL
       useCard.value = true
@@ -157,6 +157,7 @@ const handleChildUpdate = (ev: string[]) => {
 
 const handleEPaymentCardUpdate = (ev: string) => {
   const ePaymentObj = {
+    terminal: false,
     card: {
       terminal: false,
       nfc: false
@@ -195,6 +196,10 @@ const handleEPaymentCardUpdate = (ev: string) => {
     }
   }
 
+  if (useTerminal.value) {
+    ePaymentObj.terminal = true
+  }
+
   emits('update:ePaymentTypes', ePaymentObj)
 }
 
@@ -209,7 +214,7 @@ const handleEPaymentEWalletUpdate = () => {
       qrPay: false,
       scanPay: false,
       terminalScanPay: false,
-      terminalQrPay: false,
+      terminalQrPay: false
     }
   } as FdoEPaymentMethod
 

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

@@ -19,6 +19,7 @@ import { type FmTabProps } from '@feedmepos/ui-library'
 import { ref, computed, onMounted, watch } from 'vue'
 import DeliverySetting from './delivery/DeliverySetting.vue'
 import DineInSetting from './dine-in/DineInSetting.vue'
+import DriveThruSetting from './drive-thru/DriveThruSetting.vue'
 import PickUpSetting from './pickup/PickUpSetting.vue'
 import SmsSetting from './sms/SmsSetting.vue'
 // import ServiceChargeSetting from './servicecharge/ServiceChargeSetting.vue'
@@ -38,6 +39,7 @@ type OrderSettingMenuItemValue =
   | 'delivery'
   | 'pickup'
   | 'dinein'
+  | 'driveThru'
   // | 'servicecharge'
   | 'sms'
   // | 'discountRule'
@@ -49,6 +51,7 @@ const settingItem = computed<FmTabProps[]>(() => [
   { label: t('order.delivery'), value: 'delivery' },
   { label: t('order.pickup'), value: 'pickup' },
   { label: t('order.dineIn'), value: 'dinein' },
+  { label: t('order.driveThru'), value: 'driveThru' },
   // { label: t('order.serviceCharge'), value: 'servicecharge' },
   // { label: t('order.discountRule.title'), value: 'discountRule' },
   { label: t('order.sms'), value: 'sms' },
@@ -62,6 +65,8 @@ const currentComponent = computed(() => {
       return DeliverySetting
     case 'dinein':
       return DineInSetting
+    case 'driveThru':
+      return DriveThruSetting
     case 'pickup':
       return PickUpSetting
     case 'sms':
@@ -83,7 +88,7 @@ onMounted(async () => {
   }
 })
 
-watch(currentRestaurant, async (newRestaurant) => {
+watch(currentRestaurant, async (newRestaurant: any) => {
   if (newRestaurant?._id) {
     await menuStore.loadCatalogOptions(newRestaurant._id)
   }