@feedmepos/mf-order-setting 0.0.32 → 0.0.33

package/src/views/order-settings/delivery/delivery.ts

@@ -1,21 +1,22 @@
-import { F_PAYMENT_NAME, FdoLinkedDelivery } from "@feedmepos/core/entity";
+import { F_PAYMENT_NAME, FdoLinkedDelivery, F_COUNTRY} from "@feedmepos/core/entity";
 
-export type LinkedDeliveryDoc = FdoLinkedDelivery & {  _rev: string };
+export type LinkedDeliveryDoc = FdoLinkedDelivery & { _rev: string };
 
 export enum AUTO_INTEGRATION_CLIENT {
   foodpanda = 'foodpanda',
   grabfood = 'grabfood',
   shopeefood = 'shopeefood',
+  deliveroo = 'deliveroo',
   external = 'external'
 }
 
 export interface DeliveryCompany {
-    id: string;
-    name: string;
-    slotPrefix: string;
-    paymentTypeKey: string;
-    key: string;
-  }
+  id: string;
+  name: string;
+  slotPrefix: string;
+  paymentTypeKey: string;
+  key: string;
+}
 
 function formatDeliveryCompanyKey(key: string) {
   return key.toLowerCase().replace('_', '').toLowerCase();
@@ -38,5 +39,29 @@ export function useDelivery() {
     return formatDeliveryCompanyKey(key) === formatDeliveryCompanyKey(targetKey);
   }
 
-  return { getLinkedDeliveryDoc, filterLocalDeliveryCompanies, getPaymentType, equalKey };
+  function isIntegratedPlatformSupported(platform: AUTO_INTEGRATION_CLIENT, country?: F_COUNTRY | null): boolean {
+    country = country || F_COUNTRY.enum.MY
+    const mySupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.shopeefood, AUTO_INTEGRATION_CLIENT.external];
+    const sgSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood,  AUTO_INTEGRATION_CLIENT.deliveroo];
+    const thSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.external ];
+
+    let supportedPlatforms:AUTO_INTEGRATION_CLIENT[] = [];
+    switch (country) {
+      case F_COUNTRY.enum.MY:
+        supportedPlatforms = mySupported
+        break;
+      case F_COUNTRY.enum.SG:
+        supportedPlatforms = sgSupported
+        break;
+      case F_COUNTRY.enum.TH:
+        supportedPlatforms = thSupported
+        break;  
+      default:
+        break;
+    }
+
+    return supportedPlatforms.includes(platform)
+  }
+
+  return { getLinkedDeliveryDoc, filterLocalDeliveryCompanies, getPaymentType, equalKey, isIntegratedPlatformSupported };
 }

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

@@ -0,0 +1,109 @@
+<script setup lang="ts">
+import { computed, type PropType, reactive } from 'vue'
+import type { FdoLinkedDelivery } from '@feedmepos/core/entity'
+import { FdoDeliverooSettings } from '@entity'
+import type { DeliveryCompany } from '../delivery'
+import type { IntegratedDeliverySettingData } from './IntegratedDelivery.vue'
+import { useLoading } from '@/composables/loading'
+import { remoteOrderApi } from '@/api/remoteOrder'
+import IntegratedDelivery from './IntegratedDelivery.vue'
+import { clone } from '@/helpers/object'
+import { useI18n, useCoreStore } from '@feedmepos/mf-common'
+import { useSnackbarFunctions } from '@/components/snackbar'
+
+const { t } = useI18n()
+const { currentRestaurant } = useCoreStore()
+const { showError } = useSnackbarFunctions()
+
+export interface DeliverooDeliveryData {
+  manual: FdoLinkedDelivery | null
+  integrated: FdoDeliverooSettings
+}
+
+const props = defineProps({
+  initialValue: {
+    type: Object as PropType<DeliverooDeliveryData>,
+    required: true
+  },
+  company: {
+    type: Object as PropType<DeliveryCompany>,
+    required: true
+  },
+  canUseAutoDeliveryIntegration: {
+    type: [String, Boolean],
+    required: true
+  }
+})
+
+const data = reactive(clone(props.initialValue))
+const modelValue = computed<IntegratedDeliverySettingData>(() => {
+  const auto = data.integrated
+  return {
+    manual: data.manual,
+    auto: {
+      enable: auto.enable,
+      integrationId: auto.merchantID,
+      autoCloseBill: auto.autoCloseBill || false,
+      catalogId: auto?.catalogId || null,
+      lastSynchronize: auto.lastSynchronize,
+      status: auto.status,
+      updatedAt: auto.updatedAt,
+      printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
+      menuSyncError: auto.menuSyncError,
+      commissionRate: 0 // always 0
+    }
+  }
+})
+
+function updateData({ manual, auto }: IntegratedDeliverySettingData) {
+  data.manual = manual
+  data.integrated = {
+    ...auto,
+    merchantID: auto.integrationId
+  }
+  return { manual: data.manual, integrated: data.integrated }
+}
+
+const emits = defineEmits<{
+  (e: 'update:model-value', payload: { manual: any; auto: any }): void
+}>()
+
+function updateDataPass({ manual, auto }: IntegratedDeliverySettingData) {
+  const updatedData = updateData({ manual, auto })
+  emits('update:model-value', { manual: updatedData.manual, auto: updatedData.integrated })
+}
+
+const { startAsyncCallWithErr } = useLoading()
+async function syncMenu() {
+  const restaurantId = currentRestaurant.value?._id ?? ''
+  await startAsyncCallWithErr(async () => {
+    try {
+      const res = await remoteOrderApi.integratedDelivery.syncDeliverooMernu(restaurantId)
+      const temp = {
+        ...modelValue.value.auto,
+        lastSynchronize: res?.lastSynchronize || modelValue.value.auto.lastSynchronize
+      }
+      updateData({ auto: temp, manual: data.manual })
+    } catch (error) {
+      console.log(error)
+      showError(`${t('order.rateLimitWarning')}`)
+    }
+  })
+}
+
+async function flowTestOrder() {}
+
+async function cancelTestOrder() {}
+</script>
+
+<template>
+  <IntegratedDelivery
+    :model-value="modelValue"
+    :company="company"
+    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    @update:model-value="updateDataPass"
+    @sync-menu="syncMenu"
+    @flow-test-order="flowTestOrder"
+    @cancel-test-order="cancelTestOrder"
+  />
+</template>

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

@@ -102,12 +102,12 @@ function updateIntegrateId(integrationId: InputModel) {
   }))
 }
 
-function updateCommission(commission: InputModel) {
-  updateAuto((oldV) => ({
-    ...oldV,
-    commissionRate: getValue<number>(commission, 'number')
-  }))
-}
+// function updateCommission(commission: InputModel) {
+//   updateAuto((oldV) => ({
+//     ...oldV,
+//     commissionRate: getValue<number>(commission, 'number')
+//   }))
+// }
 
 function updateMenuCatalog(catalogId: string | null) {
   updateAuto((oldV) => ({
@@ -191,12 +191,12 @@ function convertStatusI18n(status: string) {
 </script>
 
 <template>
-  <ManualIntegratedDeliverySetting
+  <!-- <ManualIntegratedDeliverySetting
     :model-value="modelValue.manual"
     :company="company"
     :catalog-options="menuStore.catalogOptions"
     @update:model-value="updateManual"
-  />
+  /> -->
   <div v-if="canUseAutoDeliveryIntegration === true" class="mt-10">
     <FmSwitch
       :disabled="!canEdit"
@@ -230,7 +230,8 @@ function convertStatusI18n(status: string) {
           </div>
         </div>
 
-        <div class="mb-5">
+        <!-- Commision rate not used yet -->
+        <!-- <div class="mb-5">
           <FmTextField
             :model-value="modelValue.auto.commissionRate"
             :label="t('order.commission')"
@@ -239,7 +240,7 @@ function convertStatusI18n(status: string) {
           >
             <template #append>%</template>
           </FmTextField>
-        </div>
+        </div> -->
         <div class="mb-3">
           <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-7">{{ t('order.syncMenu') }}</div>
           <FmSelect