@feedmepos/mf-order-setting 0.0.70-prod → 0.0.71-prod

package/src/stores/restaurant/index.ts

@@ -20,6 +20,7 @@ import {
   FdoGrabfoodSettings,
   FdoExternalSetting,
   FdoFoodpandaSettings,
+  FdoGoFoodSettings,
   FdoShopeeFoodSettings
 } from '@entity'
 import { FeatureFlag, Pos } from '@feedmepos/core'
@@ -112,6 +113,9 @@ export const useRestaurantStore = defineStore('restaurant', () => {
   async function updateIntegratedShopeefoodDelivery(restaurantId: string, dto: FdoShopeeFoodSettings) {
     await remoteOrderApi.integratedDelivery.updateShopeefood(restaurantId, dto)
   }
+  async function updateIntegratedGofoodDelivery(restaurantId: string, dto: FdoGoFoodSettings) {
+    await remoteOrderApi.integratedDelivery.updateGofood(restaurantId, dto)
+  }
 
   async function updateIntegratedDeliverooDelivery(restaurantId: string, dto: FdoDeliverooSettings) {
     await remoteOrderApi.integratedDelivery.updateDeliveroo(restaurantId, dto)
@@ -160,6 +164,7 @@ export const useRestaurantStore = defineStore('restaurant', () => {
     updateIntegratedFoodpandaDelivery,
     updateIntegratedGrabfoodDelivery,
     updateIntegratedShopeefoodDelivery,
+    updateIntegratedGofoodDelivery,
     updateIntegratedDeliverooDelivery,
     updateExternalDelivery,
     getRestaurantEPayment,

package/src/views/order-settings/delivery/DeliverySetting.vue

@@ -62,6 +62,13 @@
       :can-use-auto-delivery-integration="componentProps.canUseAuto"
       @update:model-value="handleModelValueUpdate"
     />
+    <GoFoodSetting
+      v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.gofood"
+      :initial-value="componentProps.initialValue"
+      :company="componentProps.company"
+      :can-use-auto-delivery-integration="componentProps.canUseAuto"
+      @update:model-value="handleModelValueUpdate"
+    />
     <DeliverooSetting
       v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.deliveroo"
       :initial-value="componentProps.initialValue"
@@ -175,7 +182,7 @@ import type {
   FdoRestaurantInHouseDelivery
 } from '@feedmepos/core/entity'
 import { F_DELIVERY_TYPE, F_ORDER_PLATFORM, F_RESTAURANT_FEATURE } from '@feedmepos/core/entity'
-import { FdoGrabfoodSettings, FdoShopeeFoodSettings } from '@entity'
+import { FdoGoFoodSettings, FdoGrabfoodSettings, FdoShopeeFoodSettings } from '@entity'
 import deliveryData from './delivery.data'
 import { useDelivery, type DeliveryCompany, type LinkedDeliveryDoc } from './delivery'
 import { useLoading } from '@/composables/loading'
@@ -188,6 +195,7 @@ import type { FdoRestaurantFeedme } from '../delivery/integrated-delivery/Feedme
 import FoodpandaSetting from './integrated-delivery/FoodpandaSetting.vue'
 import GrabfoodSetting from './integrated-delivery/GrabfoodSetting.vue'
 import ShopeefoodSetting from './integrated-delivery/ShopeefoodSetting.vue'
+import GoFoodSetting from './integrated-delivery/GoFoodSetting.vue'
 import ExternalSetting from './integrated-delivery/ExternalSetting.vue'
 import { useRestaurantStore } from '@/stores/restaurant'
 import FeedmeDelivery from './integrated-delivery/FeedmeDelivery.vue'
@@ -264,6 +272,7 @@ type IntegratedDeliveryCompany =
   | FdoFoodpandaSettings
   | FdoGrabfoodSettings
   | FdoShopeeFoodSettings
+  | FdoGoFoodSettings
   | FdoExternalSetting
 export interface IntegratedDeliveryRow extends DeliveryRow {
   setting: IntegratedDeliveryCompany
@@ -310,6 +319,10 @@ async function toggleIntegratedSidesheet(data: any) {
       title.value = `${t('order.manageDelivery', { company: 'shopeefood' })}`
       updateIntegratedDeliveryType(rowData)
       break
+    case AUTO_INTEGRATION_CLIENT.gofood:
+      title.value = `${t('order.manageDelivery', { company: 'gofood' })}`
+      updateIntegratedDeliveryType(rowData)
+      break
     case AUTO_INTEGRATION_CLIENT.deliveroo:
       title.value = 'Manage deliveroo deivery'
       updateIntegratedDeliveryType(rowData)
@@ -536,6 +549,13 @@ const shopee = computed<FdoShopeeFoodSettings>(() => {
   }
 })
 
+const gofood = computed<FdoGoFoodSettings>(() => {
+  return {
+    ...deliveryData.initGoFoodDelivery(),
+    ...gofoodSetting.value
+  }
+})
+
 const deliveroo = computed<FdoDeliverooSettings>(() => {
   return {
     ...deliveryData.initDeliverooDelivery(),
@@ -594,6 +614,7 @@ const integratedCompanies = computed<IntegratedDeliveryRow[]>(() => {
   const fpIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.foodpanda)
   const grabIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.grabfood)
   const sfIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.shopeefood)
+  const gofoodIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.gofood)
   const drIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.deliveroo)
 
   const generateStatus = (integrateActive: boolean) => {
@@ -661,6 +682,19 @@ const integratedCompanies = computed<IntegratedDeliveryRow[]>(() => {
         AUTO_INTEGRATION_CLIENT.shopeefood
       )
     },
+    {
+      id: loadingKey.value.gofood,
+      name: 'GoFood delivery',
+      key: AUTO_INTEGRATION_CLIENT.gofood,
+      company: gofoodIntegrate,
+      paymentType: 'Default',
+      status: [generateStatus(gofood.value.enable)],
+      setting: gofood.value,
+      catalog: getCatalog(gofood.value.catalogId || null),
+      canUseAutoDeliveryIntegration: canUseAutoDeliveryIntegration(
+        AUTO_INTEGRATION_CLIENT.gofood
+      )
+    },
     {
       id: loadingKey.value.dr,
       name: 'Deliveroo delivery',
@@ -700,6 +734,7 @@ const loadingKey = computed(() => {
     fp: `${id}_fp`,
     gf: `${id}_gf`,
     sf: `${id}_sf`,
+    gofood: `${id}_gofood`,
     fm: `${id}_fm`,
     dr: `${id}_dr`,
     external: `${id}_external`,
@@ -718,6 +753,9 @@ async function updateIntegratedDeliveryCompany() {
     case AUTO_INTEGRATION_CLIENT.shopeefood:
       await updateIntegratedDeliverySetting()
       break
+    case AUTO_INTEGRATION_CLIENT.gofood:
+      await updateIntegratedDeliverySetting()
+      break
     case AUTO_INTEGRATION_CLIENT.deliveroo:
       await updateIntegratedDeliverySetting()
       break
@@ -751,6 +789,7 @@ const filteredCompanies = computed(() => {
 const grabfoodSetting = ref<FdoGrabfoodSettings | null>(null)
 const foodpandaSetting = ref<FdoFoodpandaSettings | null>(null)
 const shopeefoodSetting = ref<FdoShopeeFoodSettings | null>(null)
+const gofoodSetting = ref<FdoGoFoodSettings | null>(null)
 const deliverooSetting = ref<FdoDeliverooSettings | null>(null)
 const externalSetting = ref<FdoExternalSetting | null>(null)
 const loadingDpi = ref<boolean>(false)
@@ -782,6 +821,12 @@ async function readData() {
     )
       ? await remoteOrderApi.integratedDelivery.readShopeefood(currentRestaurant.value?._id || '')
       : null
+    gofoodSetting.value = isIntegratedPlatformSupported(
+      AUTO_INTEGRATION_CLIENT.gofood,
+      currentCountry.value
+    )
+      ? await remoteOrderApi.integratedDelivery.readGofood(currentRestaurant.value?._id || '')
+      : null
     deliverooSetting.value = isIntegratedPlatformSupported(
       AUTO_INTEGRATION_CLIENT.deliveroo,
       currentCountry.value
@@ -952,7 +997,11 @@ async function updateDelivery(
     company: DeliveryCompany
     data: FdoLinkedDelivery | null
   },
-  integrated: FdoFoodpandaSettings | FdoGrabfoodSettings | FdoShopeeFoodSettings,
+  integrated:
+    | FdoFoodpandaSettings
+    | FdoGrabfoodSettings
+    | FdoShopeeFoodSettings
+    | FdoGoFoodSettings,
   hasOriDeliverySetting: boolean,
   canUseAutoDeliveryIntegration?: string | boolean
 ) {
@@ -979,6 +1028,12 @@ async function updateDelivery(
           integrated as FdoShopeeFoodSettings
         )
         break
+      case AUTO_INTEGRATION_CLIENT.gofood:
+        await restaurantStore.updateIntegratedGofoodDelivery(
+          currentRestaurant.value?._id ?? '',
+          integrated as FdoGoFoodSettings
+        )
+        break
       case AUTO_INTEGRATION_CLIENT.deliveroo:
         await restaurantStore.updateIntegratedDeliverooDelivery(
           currentRestaurant.value?._id ?? '',
@@ -1052,6 +1107,7 @@ type companyName =
   | 'Food Panda delivery'
   | 'Grab Food delivery'
   | 'ShopeeFood delivery'
+  | 'GoFood delivery'
   | 'Deliveroo delivery'
   | 'External delivery'
 
@@ -1067,6 +1123,8 @@ function convertIntegratedCompanyName(name: companyName): string {
       return `${t('order.deliveryTitle', { company: 'Grab Food' })}`
     case 'ShopeeFood delivery':
       return `${t('order.deliveryTitle', { company: 'ShopeeFood' })}`
+    case 'GoFood delivery':
+      return `${t('order.deliveryTitle', { company: 'GoFood' })}`
     case 'Deliveroo delivery':
       return `${t('order.deliveryTitle', { company: 'Deliveroo' })}`
     case 'External delivery':

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

@@ -3,7 +3,8 @@ import type {
   FdoExternalSetting,
   FdoGrabfoodSettings,
   FdoShopeeFoodSettings,
-  FdoFoodpandaSettings
+  FdoFoodpandaSettings,
+  FdoGoFoodSettings
 } from '@entity';
 import {
   FdoRestaurantFeedmeDelivery,
@@ -78,6 +79,15 @@ function initDeliverooDelivery(): FdoDeliverooSettings {
     autoCloseBill: false
   }
 }
+
+function initGoFoodDelivery(): FdoGoFoodSettings {
+  return {
+    enable: false,
+    outletId: '',
+    catalogId: null,
+    autoCloseBill: false
+  }
+}
 function initExternalDelivery(): FdoExternalSetting {
   return {
     _id: '',
@@ -99,5 +109,6 @@ export default {
   initGrabfoodDelivery,
   initShopeefoodDelivery,
   initDeliverooDelivery,
+  initGoFoodDelivery,
   initExternalDelivery
 }

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

@@ -8,6 +8,7 @@ export enum AUTO_INTEGRATION_CLIENT {
   grabfood = 'grabfood',
   shopeefood = 'shopeefood',
   deliveroo = 'deliveroo',
+  gofood = 'gofood',
   external = 'external'
 }
 
@@ -46,7 +47,7 @@ export function useDelivery() {
     const sgSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.deliveroo];
     const thSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.external];
     const pkSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.external];
-    const idSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.external];
+    const idSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.gofood, AUTO_INTEGRATION_CLIENT.external];
 
     let supportedPlatforms: AUTO_INTEGRATION_CLIENT[] = [];
     switch (country) {

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

@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { FdoLinkedDelivery } from '@feedmepos/core/entity'
+import { FdoGoFoodSettings } from '@entity'
+import { computed, type PropType, reactive } from 'vue'
+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 } from '@feedmepos/mf-common'
+import { useSnackbarFunctions } from '@/components/snackbar'
+
+export interface GoFoodDeliveryData {
+  manual: FdoLinkedDelivery | null
+  integrated: FdoGoFoodSettings
+}
+
+const { t } = useI18n()
+const { showSuccess } = useSnackbarFunctions()
+
+const props = defineProps({
+  initialValue: {
+    type: Object as PropType<GoFoodDeliveryData>,
+    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.outletId,
+      autoCloseBill: auto.autoCloseBill || false,
+      catalogId: auto?.catalogId || null,
+      printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
+      commissionRate: 0,
+      lastSynchronize: auto.lastSynchronize,
+      status: auto.status,
+      updatedAt: auto.updatedAt,
+      menuSyncError: auto.menuSyncError
+    }
+  }
+})
+
+function updateData({ manual, auto }: IntegratedDeliverySettingData) {
+  data.manual = manual
+  data.integrated = {
+    ...auto,
+    outletId: 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() {
+  await startAsyncCallWithErr(async () => {
+    const res = await remoteOrderApi.integratedDelivery.syncGofoodMenu(data.integrated._id || '')
+    const temp = {
+      ...modelValue.value.auto,
+      lastSynchronize: res?.lastSynchronize || modelValue.value.auto.lastSynchronize
+    }
+    updateData({ auto: temp, manual: data.manual })
+    showSuccess(t('order.syncMenuSuccess'))
+  })
+}
+</script>
+
+<template>
+  <div class="px-4 pt-2 pb-3 mb-3 bg-fm-color-system-info-100 fm-corner-radius-md fm-typo-en-body-md-400 text-fm-color-typo-info">
+    Restart POS after saving for changes to take effect.
+  </div>
+  <IntegratedDelivery
+    :model-value="modelValue"
+    :company="company"
+    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    @update:model-value="updateDataPass"
+    @sync-menu="syncMenu"
+  />
+</template>

package/vite.config.ts

@@ -11,6 +11,7 @@ export default defineConfig((env) => {
     plugins: [vue()],
     resolve: {
       preserveSymlinks: true,
+      dedupe: ['vue', 'pinia', 'vue-i18n'],
       alias: {
         '@': fileURLToPath(new URL('./src', import.meta.url)),
         '@entity': fileURLToPath(new URL('./../../package/entity', import.meta.url)),