@feedmepos/mf-order-setting 0.0.32 → 0.0.34

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

@@ -1,206 +1,268 @@
-import { OrderSettingsDto, OrderKioskDineIn, OrderKioskDineInSequenceDto, FdoOrderKioskDineInSequence, FdoEPaymentMethod } from "@entity";
-import type { MfKioskOrderSetting, MfKioskDineInSetting, MfDisplayStandSetting, KioskTakeawaySettingForm, MfKioskOrderSettingForm, MfKioskPaymentSetting, MfKioskSubmitOrderInstruction, KioskPickAtCounterSettingForm } from '@/modules/order-setting/kiosk/interface';
-import type { MfOrderSetting } from "@/modules/order-setting/interface";
-import type { OrderKioskSettings, OrderKioskPaymentSetting } from "@entity";
+import {
+  OrderSettingsDto,
+  OrderKioskDineIn,
+  OrderKioskDineInSequenceDto,
+  FdoOrderKioskDineInSequence,
+  FdoEPaymentMethod
+} from '@entity'
+import type {
+  MfKioskOrderSetting,
+  MfKioskDineInSetting,
+  MfDisplayStandSetting,
+  KioskTakeawaySettingForm,
+  MfKioskOrderSettingForm,
+  MfKioskPaymentSetting,
+  MfKioskSubmitOrderInstruction,
+  KioskPickAtCounterSettingForm
+} from '@/modules/order-setting/kiosk/interface'
+import type { MfOrderSetting } from '@/modules/order-setting/interface'
+import type { OrderKioskSettings, OrderKioskPaymentSetting } from '@entity'
 
 export const defaultDisplayStand: MfDisplayStandSetting = {
-    enabled: false,
-    prefix: null,
-    padDigit: 0,
-    standSlotRange: {
-        min: 1,
-        max: 10,
-    },
-    enablePaxDialog: false,
-    submitOrderInstruction: {
-        payAtCounter: null,
-        paid: null,
-    },
+  enabled: false,
+  prefix: null,
+  padDigit: 0,
+  standSlotRange: {
+    min: 1,
+    max: 10
+  },
+  enablePaxDialog: false,
+  submitOrderInstruction: {
+    payAtCounter: null,
+    paid: null
+  }
 }
 
 export const defaultTakeaway: KioskTakeawaySettingForm = {
-    enabled: false,
-    submitOrderInstruction: {
-        payAtCounter: null,
-        paid: null,
-    },
+  enabled: false,
+  submitOrderInstruction: {
+    payAtCounter: null,
+    paid: null
+  }
 }
 
 export const defaultPickUp: KioskPickAtCounterSettingForm = {
-    enabled: false,
-    submitOrderInstruction: {
-        payAtCounter: null,
-        paid: null,
-    },
-    enablePaxDialog: false,
+  enabled: false,
+  submitOrderInstruction: {
+    payAtCounter: null,
+    paid: null
+  },
+  enablePaxDialog: false
 }
 
 export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
-    dineIn: {
-        enabled: false,
-        pickUp: defaultPickUp,
-        sequenceNumber: FdoOrderKioskDineInSequence.parse({}),
-        displayStand: defaultDisplayStand,
-    },
-    takeaway: defaultTakeaway,
-    paymentSetting: {
-        paymentTypes: [],
-        offlinePaymentTypes: [],
-        ePaymentTypes: {
-            card: {
-                terminal: false,
-                nfc: false
-            },
-            eWallet: {
-                qrPay: false,
-                scanPay: false
-            }
-        },
-    },
-    menuItem: {
-        showAllOnly: false,
+  dineIn: {
+    enabled: false,
+    pickUp: defaultPickUp,
+    sequenceNumber: FdoOrderKioskDineInSequence.parse({}),
+    displayStand: defaultDisplayStand
+  },
+  takeaway: defaultTakeaway,
+  paymentSetting: {
+    paymentTypes: [],
+    offlinePaymentTypes: [],
+    ePaymentTypes: {
+      card: {
+        terminal: false,
+        nfc: false
+      },
+      eWallet: {
+        qrPay: false,
+        scanPay: false,
+        terminalScanPay: false,
+        terminalQrPay: false
+      }
     }
+  },
+  menuItem: {
+    showAllOnly: false
+  }
 }
 
 export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
-    payAtCounter: null,
-    paid: null,
+  payAtCounter: null,
+  paid: null
 }
 
 const convertOrderSettingDto = (dto: OrderSettingsDto): MfOrderSetting => {
-    return {
-        kiosk: toKiosk(dto.kioskSettings, dto.sequenceSettings?.kioskDineIn),
-    };
+  return {
+    kiosk: toKiosk(dto.kioskSettings, dto.sequenceSettings?.kioskDineIn)
+  }
 }
 
-const toKiosk = (kioskOrderSettings: OrderKioskSettings, kioskDineInSeq?: OrderKioskDineInSequenceDto): MfKioskOrderSetting => {
-    return {
-        dineIn: toKioskDineInSetting(kioskDineInSeq ?? {
-            current: 0,
-            prefix: '#K',
-        }, kioskOrderSettings.dineIn ?? undefined),
-        takeaway: {
-            enabled: kioskOrderSettings?.canTakeaway ?? false,
-            submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction ? {
-                payAtCounter: kioskOrderSettings.takeaway.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
-                paid: kioskOrderSettings.takeaway.submitOrderInstruction?.paid?.['en'] ?? null,
-            } : defaultSubmitOrderInstruction,
-        },
-        paymentSetting: {
-            paymentTypes: kioskOrderSettings?.paymentSetting?.paymentTypes ?? [],
-            offlinePaymentTypes: kioskOrderSettings?.paymentSetting?.offlinePaymentTypes ?? [],
-            ePaymentTypes: kioskOrderSettings?.paymentSetting?.ePaymentTypes ?? FdoEPaymentMethod.parse({
-                card: {
-                    terminal: false,
-                    nfc: false
-                },
-                eWallet: {
-                    qrPay: false,
-                    scanPay: false
-                }
-            }),
-        },
-        menuItem: {
-            showAllOnly: kioskOrderSettings.menuItem?.showAllOnly ?? false,
-        }
+const toKiosk = (
+  kioskOrderSettings: OrderKioskSettings,
+  kioskDineInSeq?: OrderKioskDineInSequenceDto
+): MfKioskOrderSetting => {
+  return {
+    dineIn: toKioskDineInSetting(
+      kioskDineInSeq ?? {
+        current: 0,
+        prefix: '#K'
+      },
+      kioskOrderSettings.dineIn ?? undefined
+    ),
+    takeaway: {
+      enabled: kioskOrderSettings?.canTakeaway ?? false,
+      submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction
+        ? {
+            payAtCounter:
+              kioskOrderSettings.takeaway.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
+            paid: kioskOrderSettings.takeaway.submitOrderInstruction?.paid?.['en'] ?? null
+          }
+        : defaultSubmitOrderInstruction
+    },
+    paymentSetting: {
+      paymentTypes: kioskOrderSettings?.paymentSetting?.paymentTypes ?? [],
+      offlinePaymentTypes: kioskOrderSettings?.paymentSetting?.offlinePaymentTypes ?? [],
+      ePaymentTypes:
+        kioskOrderSettings?.paymentSetting?.ePaymentTypes ??
+        FdoEPaymentMethod.parse({
+          card: {
+            terminal: false,
+            nfc: false
+          },
+          eWallet: {
+            qrPay: false,
+            scanPay: false,
+            terminalScanPay: false,
+            terminalQrPay: false
+          }
+        })
+    },
+    menuItem: {
+      showAllOnly: kioskOrderSettings.menuItem?.showAllOnly ?? false
     }
+  }
 }
 
-const toKioskDineInSetting = (kioskDineInSeq: OrderKioskDineInSequenceDto, kioskDineInSetting?: OrderKioskDineIn): MfKioskDineInSetting => {
-    return {
-        enabled: !!kioskDineInSetting,
-        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,
-        } : 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,
-        } : defaultDisplayStand
-    }
+const toKioskDineInSetting = (
+  kioskDineInSeq: OrderKioskDineInSequenceDto,
+  kioskDineInSetting?: OrderKioskDineIn
+): MfKioskDineInSetting => {
+  return {
+    enabled: !!kioskDineInSetting,
+    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
+        }
+      : 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
+        }
+      : defaultDisplayStand
+  }
 }
-const toOrderKioskSettingsDto = (kioskSetting: MfKioskOrderSetting): {
-    kioskSettings: OrderKioskSettings,
-    kioskDineIn?: OrderKioskDineInSequenceDto
+const toOrderKioskSettingsDto = (
+  kioskSetting: MfKioskOrderSetting
+): {
+  kioskSettings: OrderKioskSettings
+  kioskDineIn?: OrderKioskDineInSequenceDto
 } => {
-    const createDineInSettings = (dineInSetting: MfKioskDineInSetting): OrderKioskDineIn => ({
-        requiredSlot: !!dineInSetting.displayStand,
-        displayStand: {
-            ...dineInSetting.displayStand,
-            submitOrderInstruction: {
-                payAtCounter: dineInSetting.displayStand.submitOrderInstruction?.payAtCounter ? {
-                    en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter,
-                } : null,
-                paid: dineInSetting.displayStand.submitOrderInstruction?.paid ? {
-                    en: dineInSetting.displayStand.submitOrderInstruction.paid,
-                } : null,
+  const createDineInSettings = (dineInSetting: MfKioskDineInSetting): OrderKioskDineIn => ({
+    requiredSlot: !!dineInSetting.displayStand,
+    displayStand: {
+      ...dineInSetting.displayStand,
+      submitOrderInstruction: {
+        payAtCounter: dineInSetting.displayStand.submitOrderInstruction?.payAtCounter
+          ? {
+              en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter
             }
-        },
-        pickUp: {
-            ...dineInSetting.pickUp,
-            submitOrderInstruction: {
-                payAtCounter: dineInSetting.pickUp.submitOrderInstruction?.payAtCounter ? {
-                    en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter,
-                } : null,
-                paid: dineInSetting.pickUp.submitOrderInstruction?.paid ? {
-                    en: dineInSetting.pickUp.submitOrderInstruction.paid,
-                } : null,
+          : null,
+        paid: dineInSetting.displayStand.submitOrderInstruction?.paid
+          ? {
+              en: dineInSetting.displayStand.submitOrderInstruction.paid
             }
-        }
-    })
-
-    const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
-        canTakeaway: kioskSetting.takeaway.enabled,
-        dineIn,
-        menuItem: kioskSetting.menuItem,
-        paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
-        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,
+          : null
+      }
+    },
+    pickUp: {
+      ...dineInSetting.pickUp,
+      submitOrderInstruction: {
+        payAtCounter: dineInSetting.pickUp.submitOrderInstruction?.payAtCounter
+          ? {
+              en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter
             }
-        } : undefined
-    })
-
-    const createPaymentSettings = (paymentSetting: MfKioskPaymentSetting): OrderKioskPaymentSetting | undefined => {
-        return {
-            paymentTypes: paymentSetting.paymentTypes,
-            offlinePaymentTypes: paymentSetting.offlinePaymentTypes,
-            ePaymentTypes: paymentSetting.ePaymentTypes,
-        }
+          : null,
+        paid: dineInSetting.pickUp.submitOrderInstruction?.paid
+          ? {
+              en: dineInSetting.pickUp.submitOrderInstruction.paid
+            }
+          : null
+      }
     }
+  })
 
-    if (!kioskSetting.dineIn.enabled) {
-        return {
-            kioskSettings: createKioskSettings()
+  const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
+    canTakeaway: kioskSetting.takeaway.enabled,
+    dineIn,
+    menuItem: kioskSetting.menuItem,
+    paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
+    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
+          }
         }
-    }
+      : undefined
+  })
 
+  const createPaymentSettings = (
+    paymentSetting: MfKioskPaymentSetting
+  ): OrderKioskPaymentSetting | undefined => {
     return {
-        kioskSettings: createKioskSettings(createDineInSettings(kioskSetting.dineIn)),
-        kioskDineIn: kioskSetting.dineIn.sequenceNumber,
+      paymentTypes: paymentSetting.paymentTypes,
+      offlinePaymentTypes: paymentSetting.offlinePaymentTypes,
+      ePaymentTypes: paymentSetting.ePaymentTypes
     }
-}
+  }
 
+  if (!kioskSetting.dineIn.enabled) {
+    return {
+      kioskSettings: createKioskSettings()
+    }
+  }
 
+  return {
+    kioskSettings: createKioskSettings(createDineInSettings(kioskSetting.dineIn)),
+    kioskDineIn: kioskSetting.dineIn.sequenceNumber
+  }
+}
 
 export const OrderSettingMapper = {
-    convertOrderSettingDto,
-    toOrderKioskSettingsDto,
-};
+  convertOrderSettingDto,
+  toOrderKioskSettingsDto
+}

package/src/stores/restaurant/index.ts

@@ -16,12 +16,12 @@ import {
   FdoRestaurantSetting,
   type FdoEffectGroup
 } from '@feedmepos/core/entity'
-import { FdoExternalSetting, FdoGrabfoodSettings } from '@entity'
+import { FdoDeliverooSettings, FdoGrabfoodSettings, FdoExternalSetting } from '@entity'
 import { FeatureFlag, Pos } from '@feedmepos/core'
 import { SvcConfig } from '@/api'
 import { remoteOrderApi } from '@/api/remoteOrder'
-import { useI18n, useCoreStore} from '@feedmepos/mf-common'
-import { computed, ref, watch} from 'vue'
+import { useI18n, useCoreStore } from '@feedmepos/mf-common'
+import { computed, ref, watch } from 'vue'
 
 
 export interface Profile extends FdoProfile {
@@ -56,10 +56,10 @@ function initRestaurantState(): RestaurantState {
   }
 }
 
-export const useRestaurantStore = defineStore('restaurant', () =>  {
+export const useRestaurantStore = defineStore('restaurant', () => {
   const CoreStore = useCoreStore()
   const state = ref(initRestaurantState())
-  const currentRestaurantSetting = computed<RestaurantSettingDoc| undefined>(() => state.value.restaurantSettings[CoreStore.currentRestaurant.value?._id || ''])
+  const currentRestaurantSetting = computed<RestaurantSettingDoc | undefined>(() => state.value.restaurantSettings[CoreStore.currentRestaurant.value?._id || ''])
 
   async function readRestaurantSetting(restaurantId: string) {
     const restaurantSetting = await restaurantApi.readRestaurantSetting(restaurantId)
@@ -103,10 +103,14 @@ export const useRestaurantStore = defineStore('restaurant', () =>  {
   async function updateIntegratedShopeefoodDelivery(restaurantId: string, dto: FdoShopeeFoodSettings) {
     await remoteOrderApi.integratedDelivery.updateShopeefood(restaurantId, dto)
   }
+
+  async function updateIntegratedDeliverooDelivery(restaurantId: string, dto: FdoDeliverooSettings) {
+    await remoteOrderApi.integratedDelivery.updateDeliveroo(restaurantId, dto)
+  }
   async function updateExternalDelivery(restaurantId: string, dto: FdoExternalSetting) {
     await remoteOrderApi.integratedDelivery.updateExternal(restaurantId, dto)
   }
-  
+
   function getRestaurantEPayment(): true | string {
     const { t } = useI18n()
     if (!CoreStore.currentRestaurant.value) {
@@ -135,7 +139,7 @@ export const useRestaurantStore = defineStore('restaurant', () =>  {
 
   return {
     state: state.value,
-    currentRestaurantSetting : currentRestaurantSetting.value,
+    currentRestaurantSetting: currentRestaurantSetting.value,
     readRestaurantSetting,
     selectRestaurant,
     updateServiceCharge,
@@ -146,6 +150,7 @@ export const useRestaurantStore = defineStore('restaurant', () =>  {
     updateIntegratedFoodpandaDelivery,
     updateIntegratedGrabfoodDelivery,
     updateIntegratedShopeefoodDelivery,
+    updateIntegratedDeliverooDelivery,
     updateExternalDelivery,
     getRestaurantEPayment,
   }

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

@@ -87,6 +87,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
+    }
   }
 }
 
@@ -148,7 +158,9 @@ const handleEPaymentCardUpdate = (ev: string) => {
     },
     eWallet: {
       qrPay: false,
-      scanPay: false
+      scanPay: false,
+      terminalScanPay: false,
+      terminalQrPay: false,
     }
   } as FdoEPaymentMethod
 
@@ -169,6 +181,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
+      }
     }
   }
 
@@ -342,6 +360,18 @@ onMounted(() => {
               :value="F_ORDER_E_PAYMENT_TYPE.enum.SCANPAY"
               @update:model-value="handleEPaymentEWalletUpdate"
             />
+            <FmCheckbox
+              v-model="eWalletPaymentCheckboxVal"
+              :label="t('order.terminalScanPay')"
+              :value="F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL_SCAN_PAY"
+              @update:model-value="handleEPaymentEWalletUpdate"
+            />
+            <FmCheckbox
+              v-model="eWalletPaymentCheckboxVal"
+              :label="t('order.terminalQrPay')"
+              :value="F_ORDER_E_PAYMENT_TYPE.enum.TERMINAL_QR_PAY"
+              @update:model-value="handleEPaymentEWalletUpdate"
+            />
           </div>
         </div>
       </FmCardSection>