@feedmepos/mf-order-setting 0.0.48 → 0.0.49

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

@@ -3852,6 +3852,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -3861,7 +3862,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         }, {
             reason?: string | null | undefined;
             priority?: number | null | undefined;
@@ -3943,6 +3943,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -3952,7 +3953,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         }>>, "many">>;
         option: z.ZodDiscriminatedUnion<"type", z.Primitive, z.ZodObject<z.extendShape<{
             type: z.ZodEnum<["DINE_IN", "PICKUP", "DELIVERY"]>;
@@ -6059,6 +6059,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -6068,7 +6069,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[];
         orderAt: string;
     }, {
@@ -6360,6 +6360,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -6369,7 +6370,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[] | undefined;
         option: {
             remark?: string | null | undefined;
@@ -7441,6 +7441,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -7450,7 +7451,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[];
         orderAt: string;
     } | null | undefined;
@@ -7878,6 +7878,7 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 target: "PAYMENT";
             };
             success: boolean;
+            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
             adjustment: {
                 inclusive?: boolean | null | undefined;
                 type: "BY_PERCENTAGE" | "BY_AMOUNT" | "TO_AMOUNT";
@@ -7887,7 +7888,6 @@ export declare const RestaurantQueueDto: z.ZodObject<{
                 };
             };
             referenceId: string;
-            from: "COUNTER" | "PROMOTION" | "VOUCHER" | "MEMBERSHIP" | "FREE_CREDIT";
         })[] | undefined;
         option: {
             remark?: string | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -26,8 +26,8 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@feedmepos/core": "^2.14.57",
-    "@feedmepos/menu": "^1.7.30",
+    "@feedmepos/core": "^2.14.60",
+    "@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",
@@ -70,4 +70,4 @@
     "vite": "^5.1.4",
     "vue-tsc": "^2.2.0"
   }
-}
+}

package/src/api/restaurant-setting/index.ts

@@ -6,6 +6,7 @@ import type { OrderSettingsDto } from '@entity'
 import {
   FdoQueueQrSetting,
   FdoRestaurantDineIn,
+  FdoRestaurantDriveThru,
   FdoRestaurantPickup,
   FdoRestaurantSetting,
   FdoServiceChargeSetting
@@ -34,6 +35,11 @@ export const restaurantApi = {
     return getData(result)
   },
 
+  async updateDriveThruSetting(setting: FdoRestaurantDriveThru) {
+    const result = await restaurantClientInstance().put('/drive-thru', setting)
+    return getData(result)
+  },
+
   async updateServiceCharge(setting: FdoServiceChargeSetting) {
     const result = await restaurantClientInstance().put('/service-charge-setting', setting)
     return getData(result)

package/src/locales/en-US.json

@@ -97,6 +97,10 @@
         "deviceDetails": "Device Details",
         "dineIn": "Dine In",
         "dineInCanTakeaway": "Allow Takeaway",
+        "driveThru": "Drive Thru",
+        "driveThruSettingUpdated": "Drive thru setting updated.",
+        "enableDriveThru": "Enable Drive Thru",
+        "enableDriveThruSublabel": "Enable drive thru ordering for customers",
         "dineInType": "Dine In Type",
         "discountCampaign": "Discount Campaign",
         "displayStand": "Display Stand",

package/src/locales/ja-JP.json

@@ -97,6 +97,10 @@
         "deviceDetails": "デバイス詳細",
         "dineIn": "店内飲食",
         "dineInCanTakeaway": "テイクアウト許可",
+        "driveThru": "ドライブスルー",
+        "driveThruSettingUpdated": "ドライブスルー設定が更新されました。",
+        "enableDriveThru": "ドライブスルーを有効にする",
+        "enableDriveThruSublabel": "お客様向けのドライブスルー注文を有効にする",
         "dineInType": "店内飲食タイプ",
         "discountCampaign": "割引キャンペーン",
         "displayStand": "ディスプレイスタンド",

package/src/locales/th-TH.json

@@ -97,6 +97,10 @@
         "deviceDetails": "รายละเอียดอุปกรณ์",
         "dineIn": "รับประทานอาหารที่ร้าน",
         "dineInCanTakeaway": "อนุญาตให้นำกลับบ้าน",
+        "driveThru": "ไดรฟ์ทรู",
+        "driveThruSettingUpdated": "อัปเดตการตั้งค่าไดรฟ์ทรูแล้ว",
+        "enableDriveThru": "เปิดใช้งานไดรฟ์ทรู",
+        "enableDriveThruSublabel": "เปิดใช้งานการสั่งอาหารไดรฟ์ทรูสำหรับลูกค้า",
         "dineInType": "ประเภทรับประทานอาหารที่ร้าน",
         "discountCampaign": "แคมเปญส่วนลด",
         "displayStand": "แท่นวางสินค้า",

package/src/locales/zh-CN.json

@@ -98,6 +98,10 @@
         "deviceDetails": "设备详情",
         "dineIn": "堂食",
         "dineInCanTakeaway": "允许外带",
+        "driveThru": "得来速",
+        "driveThruSettingUpdated": "得来速设置已更新。",
+        "enableDriveThru": "启用得来速",
+        "enableDriveThruSublabel": "为顾客启用得来速点餐",
         "dineInType": "堂食类型",
         "discountCampaign": "促销活动",
         "displayStand": "桌牌",

package/src/main.ts

@@ -38,9 +38,9 @@ app.use(FeedMeUI, {
     locale: detectLocale(),
 })
 
-app.use(createPinia())
+app.use(createPinia() as any)
 app.use(router)
-app.use(initI18n())
+app.use(initI18n() as any)
 
 
 const CoreStore = useCoreStore();

package/src/stores/restaurant/index.ts

@@ -4,6 +4,7 @@ import {
   F_FEATURE,
   F_PAYOUT_ACCOUNT_STATUS,
   FdoRestaurantDineIn,
+  FdoRestaurantDriveThru,
   FdoRestaurantFeedmeDelivery,
   FdoRestaurantInHouseDelivery,
   FdoRestaurantPickup,
@@ -92,6 +93,10 @@ export const useRestaurantStore = defineStore('restaurant', () => {
     await restaurantApi.updatePickupSetting(setting)
   }
 
+  async function updateDriveThruSetting(setting: FdoRestaurantDriveThru) {
+    await restaurantApi.updateDriveThruSetting(setting)
+  }
+
   async function updateInhouseDelivery(restaurantId: string, dto: FdoRestaurantInHouseDelivery) {
     await remoteOrderApi.integratedDelivery.updateInhouse(restaurantId, dto)
   }
@@ -149,6 +154,7 @@ export const useRestaurantStore = defineStore('restaurant', () => {
     updateServiceCharge,
     updateDineInSetting,
     updatePickupSetting,
+    updateDriveThruSetting,
     updateInhouseDelivery,
     updateFeedmeDelivery,
     updateIntegratedFoodpandaDelivery,

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)
   }

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

@@ -63,8 +63,22 @@
           />
         </div>
 
+        <div class="text-fm-color-neutral-gray-400 fm-typo-cn-body-md-400 mb-5 mt-5">
+          <div v-if="data.updatedAt">
+            {{ t('order.updatedAt') }}:
+            {{ Day(data.updatedAt).format('DD/MM/YYYY hh:mm a') }}
+          </div>
+        </div>
+
         <div class="flex flex-row mt-5">
           <FmButton variant="primary" :label="t('order.syncMenu')" @click="syncMenu()" />
+          <div
+            v-if="data.lastSynchronize"
+            class="m-2 ml-10 text-fm-color-neutral-gray-400 fm-typo-cn-body-md-400"
+          >
+            {{ t('order.lastSync') }}:
+            {{ Day(data.lastSynchronize).format('DD/MM/YYYY hh:mm a') }}
+          </div>
         </div>
       </FmCard>
     </div>
@@ -75,6 +89,7 @@
 import { type PropType, reactive, ref } from 'vue'
 import { F_ORDER_PLATFORM, type FdoExternalSetting } from '@entity'
 import { useI18n } from '@feedmepos/mf-common'
+import Day from 'dayjs'
 import { clone } from '@/helpers/object'
 import { useMenuStore } from '@/stores/menu/menu'
 import { useLoading } from '@/composables/loading'
@@ -147,7 +162,13 @@ function updatePlatform(platform: F_ORDER_PLATFORM) {
 const { startAsyncCallWithErr } = useLoading()
 async function syncMenu() {
   await startAsyncCallWithErr(async () => {
-    await remoteOrderApi.integratedDelivery.syncExternalMenu(data._id ?? '')
+    const res = await remoteOrderApi.integratedDelivery.syncExternalMenu(data._id ?? '')
+    if (res?.lastSynchronize) {
+      data.lastSynchronize = res.lastSynchronize
+    }
+    if (res?.updatedAt) {
+      data.updatedAt = res.updatedAt
+    }
     showSuccess(t('order.syncMenuSuccess'))
   })
 }

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

@@ -0,0 +1,101 @@
+<template>
+  <div class="flex justify-between items-center">
+    <RestaurantSelector />
+  </div>
+  <div v-if="!isLoading">
+    <div class="p-[1.5rem] flex flex-col gap-5 m-5 w-2/3">
+      <div class="flex-grow fm-typo-en-title-sm-600">{{ t('order.generalSetting') }}</div>
+      <FmSwitch
+        v-model="driveThruSetting.enabled"
+        value="enabled"
+        :label="t('order.enableDriveThru')"
+        :sublabel="t('order.enableDriveThruSublabel')"
+        label-placement="right"
+      />
+      <FmSelect
+        v-if="driveThruSetting.enabled"
+        class="w-1/2"
+        :placeholder="t('order.selectItem')"
+        :model-value="driveThruSetting.catalogId"
+        :label="t('order.catalog')"
+        :items="menuStore.catalogOptions"
+        @update:model-value="updateCatalogId"
+      />
+    </div>
+    <div class="fm-corner-radius-lg flex flex-col gap-5 m-5">
+      <FmButton
+        variant="primary"
+        :label="t('order.saveSetting')"
+        class="mr-auto"
+        @click="updateDriveThruSetting"
+      />
+    </div>
+  </div>
+  <FmCircularProgress size="xxl" v-else />
+</template>
+
+<script setup lang="ts">
+import { type FdoRestaurantDriveThru } from '@feedmepos/core/entity'
+import RestaurantSelector from '../components/RestaurantSelector.vue'
+import { onMounted, ref, watch } from 'vue'
+import { useRestaurantStore } from '@/stores/restaurant'
+import { useLoading } from '@/composables/loading'
+import { useCoreStore } from '@feedmepos/mf-common'
+import { utils } from '@feedmepos/core'
+import { useI18n } from '@feedmepos/mf-common'
+import { useSnackbarFunctions } from '@/components/snackbar'
+import { useMenuStore } from '@/stores/menu/menu'
+
+const { t } = useI18n()
+
+const { currentRestaurant } = useCoreStore()
+const menuStore = useMenuStore()
+const driveThruSetting = ref<FdoRestaurantDriveThru>(initDriveThruSetting())
+
+function initDriveThruSetting(): FdoRestaurantDriveThru {
+  return {
+    enabled: false,
+    catalogId: null
+  }
+}
+
+function updateCatalogId(catalogId: string | null) {
+  driveThruSetting.value.catalogId = catalogId
+}
+
+const { showSuccess } = useSnackbarFunctions()
+const restaurantStore = useRestaurantStore()
+const { startAsyncCallWithErr, isLoading } = useLoading()
+
+async function updateDriveThruSetting() {
+  await startAsyncCallWithErr(async () => {
+    const newDriveThruSetting = driveThruSetting.value
+    if (newDriveThruSetting) {
+      await restaurantStore.updateDriveThruSetting(newDriveThruSetting)
+      if (currentRestaurant.value) {
+        ;(currentRestaurant.value as any).driveThru = newDriveThruSetting
+      }
+    }
+  })
+  showSuccess(t('order.driveThruSettingUpdated'))
+}
+
+watch(
+  () => currentRestaurant.value,
+  async (newRestaurant) => {
+    if ((newRestaurant as any)?.driveThru) {
+      driveThruSetting.value = utils.clone((newRestaurant as any).driveThru)
+    } else {
+      driveThruSetting.value = initDriveThruSetting()
+    }
+  },
+  { immediate: true }
+)
+
+onMounted(async () => {
+  const newRestaurant = currentRestaurant.value as any
+  if (newRestaurant?.driveThru) {
+    driveThruSetting.value = utils.clone(newRestaurant.driveThru)
+  }
+})
+</script>