@feedmepos/mf-order-setting 0.0.32 → 0.0.33

package/dist/package/entity/order-platform/external/setting/external-setting.do.d.ts

@@ -48,7 +48,7 @@ export declare const FdoExternalSetting: z.ZodObject<{
         autoSend: boolean;
         autoCloseBill: boolean;
     }>;
-    platform: z.ZodEnum<["FOOD_PANDA", "GRAB_FOOD", "SHOPEE_FOOD", "DELIVEROO", "FEEDME", "IN_HOUSE", "ZUS"]>;
+    platform: z.ZodEnum<["DELIVEROO", "FOOD_PANDA", "GRAB_FOOD", "SHOPEE_FOOD", "DELIVEROO", "FEEDME", "IN_HOUSE", "ZUS"]>;
     delivery: z.ZodNullable<z.ZodOptional<z.ZodObject<{
         catalogId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         deliveryFeeTax: z.ZodNullable<z.ZodOptional<z.ZodObject<{
@@ -100,7 +100,7 @@ export declare const FdoExternalSetting: z.ZodObject<{
     } | null | undefined;
     _id: string;
     enable: boolean;
-    platform: "IN_HOUSE" | "FEEDME" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "DELIVEROO" | "ZUS";
+    platform: "IN_HOUSE" | "FEEDME" | "DELIVEROO" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "ZUS";
     config: {
         printReceiptAfterClose?: boolean | null | undefined;
         autoAccept: boolean;
@@ -121,7 +121,7 @@ export declare const FdoExternalSetting: z.ZodObject<{
     } | null | undefined;
     _id: string;
     enable: boolean;
-    platform: "IN_HOUSE" | "FEEDME" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "DELIVEROO" | "ZUS";
+    platform: "IN_HOUSE" | "FEEDME" | "DELIVEROO" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "ZUS";
     config: {
         printReceiptAfterClose?: boolean | null | undefined;
         autoAccept: boolean;

package/dist/package/entity/order-platform/external/setting/external-setting.dto.d.ts

@@ -18,7 +18,7 @@ export declare const FdtoExternalSettingCreateOrUpdate: z.ZodObject<Omit<{
         autoSend: boolean;
         autoCloseBill: boolean;
     }>;
-    platform: z.ZodEnum<["FOOD_PANDA", "GRAB_FOOD", "SHOPEE_FOOD", "DELIVEROO", "FEEDME", "IN_HOUSE", "ZUS"]>;
+    platform: z.ZodEnum<["DELIVEROO", "FOOD_PANDA", "GRAB_FOOD", "SHOPEE_FOOD", "DELIVEROO", "FEEDME", "IN_HOUSE", "ZUS"]>;
     delivery: z.ZodNullable<z.ZodOptional<z.ZodObject<{
         catalogId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         deliveryFeeTax: z.ZodNullable<z.ZodOptional<z.ZodObject<{
@@ -69,7 +69,7 @@ export declare const FdtoExternalSettingCreateOrUpdate: z.ZodObject<Omit<{
         } | null | undefined;
     } | null | undefined;
     enable: boolean;
-    platform: "IN_HOUSE" | "FEEDME" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "DELIVEROO" | "ZUS";
+    platform: "IN_HOUSE" | "FEEDME" | "DELIVEROO" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "ZUS";
     config: {
         printReceiptAfterClose?: boolean | null | undefined;
         autoAccept: boolean;
@@ -89,7 +89,7 @@ export declare const FdtoExternalSettingCreateOrUpdate: z.ZodObject<Omit<{
         } | null | undefined;
     } | null | undefined;
     enable: boolean;
-    platform: "IN_HOUSE" | "FEEDME" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "DELIVEROO" | "ZUS";
+    platform: "IN_HOUSE" | "FEEDME" | "DELIVEROO" | "FOOD_PANDA" | "GRAB_FOOD" | "SHOPEE_FOOD" | "ZUS";
     config: {
         printReceiptAfterClose?: boolean | null | undefined;
         autoAccept: boolean;

package/dist/package/entity/order-platform/order-platform.enum.d.ts

@@ -1,11 +1,15 @@
 import { z } from 'zod';
 export declare const F_ORDER_PLATFORM_ACTION: z.ZodEnum<["SYNC_MENU", "UPDATE_ORDER", "GET_OR_UPDATE_SETTING"]>;
-export declare const F_ORDER_PLATFORM: z.ZodEnum<["FOOD_PANDA", "GRAB_FOOD", "SHOPEE_FOOD", "DELIVEROO", "FEEDME", "IN_HOUSE", "ZUS"]>;
+export declare const F_ORDER_PLATFORM: z.ZodEnum<["DELIVEROO", "FOOD_PANDA", "GRAB_FOOD", "SHOPEE_FOOD", "DELIVEROO", "FEEDME", "IN_HOUSE", "ZUS"]>;
 export declare const F_MENU_SYNCING_STATUS: z.ZodEnum<["SUCCESS", "FAILED", "PROCESSING"]>;
 export declare const F_SF_MENU_SYNCING_STATUS: z.ZodNativeEnum<{
     readonly SUCCESS: 0;
     readonly FAILED: 1;
 }>;
+export declare const F_DR_MENU_SYNCING_STATUS: z.ZodNativeEnum<{
+    readonly SUCCESS: 200;
+    readonly FAILED: number;
+}>;
 export declare const F_GF_MENU_SYNCING_STATUS: z.ZodEnum<["PROCESSING", "QUEUEING", "SUCCESS", "FAILED"]>;
 export declare const F_FP_MENU_SYNCING_STATUS: z.ZodEnum<["in_progress", "done", "failed", "done_with_errors"]>;
 export type F_ORDER_PLATFORM_ACTION = z.infer<typeof F_ORDER_PLATFORM_ACTION>;
@@ -14,3 +18,4 @@ export type F_MENU_SYNCING_STATUS = z.infer<typeof F_MENU_SYNCING_STATUS>;
 export type F_GF_MENU_SYNCING_STATUS = z.infer<typeof F_GF_MENU_SYNCING_STATUS>;
 export type F_SF_MENU_SYNCING_STATUS = z.infer<typeof F_SF_MENU_SYNCING_STATUS>;
 export type F_FP_MENU_SYNCING_STATUS = z.infer<typeof F_FP_MENU_SYNCING_STATUS>;
+export type F_DR_MENU_SYNCING_STATUS = z.infer<typeof F_DR_MENU_SYNCING_STATUS>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",

package/src/api/remoteOrder/index.ts

@@ -2,13 +2,14 @@ import type { AxiosInstance } from 'axios';
 import { baseClientInstance, getData, SvcConfig } from '..';
 import type { DeliveryCompany, LinkedDeliveryDoc } from '../../views/order-settings/delivery/delivery';
 import { FdoFoodpandaSettings, FdoLinkedDelivery, FdoRestaurant, FdoRestaurantFeedmeDelivery, FdoRestaurantInHouseDelivery, FdoShopeeFoodOrder } from '@feedmepos/core/entity';
-import type { FdoExternalSetting, FdoFoodpandaOrderOutput, FdoGrabfoodOrderOutput, FdoGrabfoodSettings, FdoShopeeFoodOrderOutput, FdoShopeeFoodSettings, FdtoGetOrderReq } from '@entity';
+import type { FdoDeliverooSettings, FdoExternalSetting, FdoFoodpandaOrderOutput, FdoGrabfoodOrderOutput, FdoGrabfoodSettings, FdoShopeeFoodOrderOutput, FdoShopeeFoodSettings, FdtoGetOrderReq } from '@entity';
 
-type DeliveryCompanyUrl = 'foodpanda' | 'grabfood' | 'shopeefood' | 'external'
+type DeliveryCompanyUrl = 'foodpanda' | 'grabfood' | 'shopeefood' | 'deliveroo' | 'external'
 
 const deliveryClientInstance = (
   deliveryCompany: DeliveryCompanyUrl
 ): AxiosInstance => {
+  //https://portal-v2-dev.feedmeapi.com/deliveroo/setting/:restaurantId
   const path = `/${deliveryCompany}`;
   return baseClientInstance(path, 'portal');
 };
@@ -113,6 +114,23 @@ export const remoteOrderApi = {
     async syncShopeefoodMenu(storeId: string): Promise<FdoShopeeFoodSettings> {
       return getData(await deliveryClientInstance('shopeefood').get(`/menu-sync/${storeId}`));
     },
+    async updateDeliveroo(restaurantId: string, dto: FdoDeliverooSettings): Promise<FdoRestaurant> {
+      return getData(await deliveryClientInstance('deliveroo').put(`/setting/${restaurantId}`, {
+        _id: restaurantId,
+        ...dto
+      }))
+    },
+    async readDeliveroo(restaurantId: string): Promise<FdoDeliverooSettings | null> {
+      return getData(await deliveryClientInstance('deliveroo').get(`/setting/${restaurantId}`));
+    },
+    async syncDeliverooMernu(merchantID: string): Promise<FdoDeliverooSettings> {
+      try {
+        const res = getData(await deliveryClientInstance('deliveroo').get(`/menu-sync/${merchantID}`))
+        return res
+      } catch(err) {
+        throw err
+      }
+    },
     async readExternal(restaurantId: string): Promise<FdoExternalSetting | null> {
       return getData(await deliveryClientInstance('external').get(`/setting/${restaurantId}`))
     },

package/src/locales/en-US.json

@@ -35,6 +35,7 @@
         "auto": "Auto",
         "autoIntegration": "Auto Integration",
         "autoIntegrationWarning": "Auto delivery integration not available, contact our staff for more information. Reason: {reason}",
+        "autoIntegrationCountryNotSupport": "Platform not support auto integration in current country.",
         "autoSendKitchen": "Auto Send Kitchen",
         "autoSendKitchenSublabel": "Required POS version 7 or above",
         "balance": "Balance",

package/src/locales/th-TH.json

@@ -35,6 +35,7 @@
         "auto": "อัตโนมัติ",
         "autoIntegration": "รวมอัตโนมัติ",
         "autoIntegrationWarning": "การรวมระบบการจัดส่งอัตโนมัติไม่พร้อมใช้งาน โปรดติดต่อเจ้าหน้าที่ของเราเพื่อขอข้อมูลเพิ่มเติม เหตุผล:  {reason}",
+        "autoIntegrationCountryNotSupport": "แพลตฟอร์มไม่รองรับการเชื่อมต่อการจัดส่งแบบไดนามิกในประเทศ/ภูมิภาคปัจจุบัน",
         "autoSendKitchen": "ส่งอัตโนมัติครัว",
         "autoSendKitchenSublabel": "ต้องใช้ POS เวอร์ชัน 7 ขึ้นไป",
         "balance": "ยอดคงเหลือ",

package/src/locales/zh-CN.json

@@ -35,6 +35,7 @@
         "auto": "自动",
         "autoIntegration": "自动对接",
         "autoIntegrationWarning": "自动配送对接不可用， 请联络我们的工作人员了解更多信息。 原因: {reason}",
+        "autoIntegrationCountryNotSupport": "平台不支持当前国家/地区的自动配送对接。",
         "autoSendKitchen": "自动发送至厨房",
         "autoSendKitchenSublabel": "需要POS版本7或以上",
         "balance": "余额",
@@ -274,6 +275,7 @@
         "DeliverySettingUpdated": "配送设置已更新",
         "selectPlatform": "选择平台",
         "platform": "平台",
+        "rateLimitWarning": "每分钟只允许一次请求。请稍后再试",
         "discountRule": {
             "add": "添加折扣规则",
             "description": "定义折扣在账单中如何应用。仅适用于POS版本{minPosVersion}或更高版本。",

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/order-settings/delivery/DeliverySetting.vue

@@ -39,7 +39,7 @@
     dismiss-away
     :maxWidth="600"
     :model-value="sideSheetIntegrated"
-    @update:model-value="sideSheetIntegrated = $event"
+    @update:model-value="(v: boolean) => handleSideSheet(v)"
   >
     <FoodpandaSetting
       v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.foodpanda"
@@ -62,6 +62,14 @@
       :can-use-auto-delivery-integration="componentProps.canUseAuto"
       @update:model-value="handleModelValueUpdate"
     />
+    <DeliverooSetting
+      v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.deliveroo"
+      :initial-value="componentProps.initialValue"
+      :company="componentProps.company"
+      :can-use-auto-delivery-integration="componentProps.canUseAuto"
+      @update:model-value="handleModelValueUpdate"
+    />
+
     <FeedmeDelivery
       v-if="feedMeComponentProps.key === F_ORDER_PLATFORM.enum.FEEDME"
       :initial-value="feedMeComponentProps.initialValue"
@@ -160,13 +168,14 @@
 import { computed, h, ref, watch } from 'vue'
 import RestaurantSelector from '../components/RestaurantSelector.vue'
 import { type ColumnDef } from '@feedmepos/ui-library'
-import type { FdoExternalSetting, FdoFoodpandaSettings } from '@entity'
+import type { FdoDeliverooSettings, FdoFoodpandaSettings, FdoExternalSetting } from '@entity'
 import type {
   FdoLinkedDelivery,
   FdoRestaurantFeedmeDelivery,
   FdoRestaurantInHouseDelivery
 } from '@feedmepos/core/entity'
 import {
+  F_COUNTRY,
   F_DELIVERY_TYPE,
   F_FEATURE,
   F_ORDER_PLATFORM,
@@ -193,6 +202,7 @@ import { formatAddress } from '@/helpers/profile'
 import { useSnackbarFunctions } from '@/components/snackbar'
 import useSearch from '@/composables/search'
 import DeliveryList from './DeliveryList.vue'
+import DeliverooSetting from './integrated-delivery/DeliverooSetting.vue'
 import { Pos } from '@feedmepos/core'
 import { useI18n, useCoreStore } from '@feedmepos/mf-common'
 
@@ -200,8 +210,14 @@ const { t } = useI18n()
 const { searchKey, filter } = useSearch()
 const { showSuccess } = useSnackbarFunctions()
 const restaurantStore = useRestaurantStore()
-const { currentRestaurant, currentBusiness, readRestaurants, changeRestaurant, sessionUser } =
-  useCoreStore()
+const {
+  currentRestaurant,
+  currentBusiness,
+  readRestaurants,
+  changeRestaurant,
+  sessionUser,
+  currentCountry
+} = useCoreStore()
 const menuStore = useMenuStore()
 const linkedCompanies = ref<LinkedDeliveryDoc[]>([])
 const deliveryCompanies = ref<DeliveryCompany[]>([])
@@ -243,6 +259,11 @@ async function toggleLocalSidesheet(rowData: any) {
 }
 
 const title = ref('')
+
+function handleSideSheet(v: boolean) {
+  sideSheetIntegrated.value = v
+  feedmeValidate.value = true
+}
 async function toggleIntegratedSidesheet(data: any) {
   const rowData = data.original ?? data
 
@@ -261,6 +282,10 @@ async function toggleIntegratedSidesheet(data: any) {
       title.value = `${t('order.manageDelivery', { company: 'shopeefood' })}`
       updateIntegratedDeliveryType(rowData)
       break
+    case AUTO_INTEGRATION_CLIENT.deliveroo:
+      title.value = 'Manage deliveroo deivery'
+      updateIntegratedDeliveryType(rowData)
+      break
     case F_ORDER_PLATFORM.enum.FEEDME:
       title.value = `${t('order.feedmeExpressTitle')}`
       updateFeedmeExpress(rowData)
@@ -481,6 +506,13 @@ const shopee = computed<FdoShopeeFoodSettings>(() => {
   }
 })
 
+const deliveroo = computed<FdoDeliverooSettings>(() => {
+  return {
+    ...deliveryData.initDeliverooDelivery(),
+    ...deliverooSetting.value
+  }
+})
+
 const external = computed<FdoExternalSetting>(() => {
   return {
     ...deliveryData.initExternalDelivery(),
@@ -488,7 +520,7 @@ const external = computed<FdoExternalSetting>(() => {
   }
 })
 const localDeliveryCompanies = computed<DeliveryRow[]>(() => {
-  const res = filterLocalDeliveryCompanies(deliveryCompanies.value).map<DeliveryRow>((company) => {
+  const res = deliveryCompanies.value.map<DeliveryRow>((company) => {
     const { name, paymentTypeKey, key } = company
     const doc = getLinkedDeliveryDoc(linkedCompanies.value, key)
 
@@ -506,20 +538,13 @@ const localDeliveryCompanies = computed<DeliveryRow[]>(() => {
   return res.filter((r) => filter([r.name, r.paymentType, r.status.join(' ')]))
 })
 
-const { getLinkedDeliveryDoc, filterLocalDeliveryCompanies, getPaymentType, equalKey } =
+const { getLinkedDeliveryDoc, getPaymentType, equalKey, isIntegratedPlatformSupported } =
   useDelivery()
 
 function getCatalog(catalogId: string | null) {
   return menuStore.catalogOptions.find(({ value }) => value === catalogId)?.label || ''
 }
 
-const reachMinPosVersion = computed<string | boolean>(() => {
-  const posVersion = currentRestaurant.value?.posVersion
-  if (!posVersion) return t('order.invalidPosVersion')
-  const res = Pos.canUse({ feature: F_FEATURE.enum.deliveryIntegration, posVersion })
-  return res === true ? true : res.toString()
-})
-
 function hasPurchaseFeature(deliveryType: string) {
   const features = currentRestaurant.value?.features || []
   const featureKey = equalKey(deliveryType, AUTO_INTEGRATION_CLIENT.foodpanda)
@@ -528,30 +553,35 @@ function hasPurchaseFeature(deliveryType: string) {
   return features.includes(featureKey) || t('order.restaurantHaveNotPurchase', { featureKey })
 }
 
-function canUseAutoDeliveryIntegration(deliveryType: string) {
-  if (reachMinPosVersion.value !== true) return reachMinPosVersion.value
-  return hasPurchaseFeature(deliveryType)
+const canUseAutoDeliveryIntegration = (client: string) => {
+  const hasFeature = hasPurchaseFeature(client)
+  if (typeof hasFeature === 'string') {
+    return hasFeature
+  }
+  switch (client) {
+    case 'deliveroo':
+      return (
+        currentCountry.value === F_COUNTRY.enum.SG ||
+        `${t('order.autoIntegrationCountryNotSupport')}`
+      )
+    default:
+      return true
+  }
 }
 
 const integratedCompanies = computed<IntegratedDeliveryRow[]>(() => {
-  const fpManual = getLinkedDeliveryDoc(linkedCompanies.value, AUTO_INTEGRATION_CLIENT.foodpanda)
-  const gfManual = getLinkedDeliveryDoc(linkedCompanies.value, AUTO_INTEGRATION_CLIENT.grabfood)
-  const sfManual = getLinkedDeliveryDoc(linkedCompanies.value, AUTO_INTEGRATION_CLIENT.shopeefood)
-
   const getIntegrateDoc = (client: AUTO_INTEGRATION_CLIENT) =>
     deliveryCompanies.value.find(({ key }) => equalKey(key, client))
   const fpIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.foodpanda)
   const grabIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.grabfood)
   const sfIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.shopeefood)
+  const drIntegrate = getIntegrateDoc(AUTO_INTEGRATION_CLIENT.deliveroo)
 
-  const generateStatus = (manualActive: boolean, integrateActive: boolean) => {
-    if (manualActive && integrateActive) return 'Active'
-    if (manualActive) return 'Manual'
-    if (integrateActive) return 'Active'
-    return 'Inactive'
+  const generateStatus = (integrateActive: boolean) => {
+    return integrateActive ? 'Active' : 'Inactive'
   }
 
-  return [
+  const feedmeDelivery = [
     {
       id: loadingKey.value.inhouse,
       name: 'In house delivery',
@@ -571,31 +601,32 @@ const integratedCompanies = computed<IntegratedDeliveryRow[]>(() => {
       status: feedmeExpress.value.enable ? ['Active'] : ['Inactive'],
       setting: feedmeExpress.value,
       catalog: getCatalog(feedmeExpress.value.catalogId || null)
-    },
+    }
+  ]
+
+  const integratedDelivery = [
     {
       id: loadingKey.value.fp,
-      name: 'FoodPanda delivery',
+      name: 'Food Panda delivery',
       key: AUTO_INTEGRATION_CLIENT.foodpanda,
       company: fpIntegrate,
-      paymentType: foodpanda.value.enable ? getPaymentType(fpManual?.paymentTypeKey) : '-',
-      status: [generateStatus(!!fpManual, foodpanda.value.enable)],
+      paymentType: 'Default',
+      status: [generateStatus(foodpanda.value.enable)],
       setting: foodpanda.value,
-      doc: fpManual,
-      catalog: getCatalog(fpManual?.catalogId || null),
+      catalog: getCatalog(foodpanda.value.catalogId ?? null),
       canUseAutoDeliveryIntegration: canUseAutoDeliveryIntegration(
         AUTO_INTEGRATION_CLIENT.foodpanda
       )
     },
     {
       id: loadingKey.value.gf,
-      name: 'GrabFood delivery',
+      name: 'Grab Food delivery',
       key: AUTO_INTEGRATION_CLIENT.grabfood,
       company: grabIntegrate,
-      paymentType: grabfood.value.enable ? getPaymentType(gfManual?.paymentTypeKey) : '-',
-      status: [generateStatus(!!gfManual, grabfood.value.enable)],
+      paymentType: 'Default',
+      status: [generateStatus(grabfood.value.enable)],
       setting: grabfood.value,
-      doc: gfManual,
-      catalog: getCatalog(gfManual?.catalogId || null),
+      catalog: getCatalog(grabfood.value?.catalogId || null),
       canUseAutoDeliveryIntegration: canUseAutoDeliveryIntegration(AUTO_INTEGRATION_CLIENT.grabfood)
     },
     {
@@ -603,15 +634,27 @@ const integratedCompanies = computed<IntegratedDeliveryRow[]>(() => {
       name: 'ShopeeFood delivery',
       key: AUTO_INTEGRATION_CLIENT.shopeefood,
       company: sfIntegrate,
-      paymentType: shopee.value.enable ? getPaymentType(sfManual?.paymentTypeKey) : '-',
-      status: [generateStatus(!!sfManual, shopee.value.enable)],
+      paymentType: 'Default',
+      status: [generateStatus(shopee.value.enable)],
       setting: shopee.value,
-      doc: sfManual,
-      catalog: getCatalog(sfManual?.catalogId || null),
+      catalog: getCatalog(shopee.value.catalogId || null),
       canUseAutoDeliveryIntegration: canUseAutoDeliveryIntegration(
         AUTO_INTEGRATION_CLIENT.shopeefood
       )
     },
+    {
+      id: loadingKey.value.dr,
+      name: 'Deliveroo delivery',
+      key: AUTO_INTEGRATION_CLIENT.deliveroo,
+      company: drIntegrate,
+      paymentType: 'Default',
+      status: [generateStatus(deliveroo.value.enable)],
+      setting: deliveroo.value,
+      catalog: getCatalog(deliveroo.value?.catalogId || null),
+      canUseAutoDeliveryIntegration: canUseAutoDeliveryIntegration(
+        AUTO_INTEGRATION_CLIENT.deliveroo
+      )
+    },
     {
       id: loadingKey.value.external,
       name: 'External delivery',
@@ -619,9 +662,16 @@ const integratedCompanies = computed<IntegratedDeliveryRow[]>(() => {
       setting: external.value,
       catalog: '-',
       paymentType: '-',
-      status: [generateStatus(false, external.value.enable)]
+      status: [generateStatus(external.value.enable)]
     }
   ]
+
+  return [
+    ...feedmeDelivery,
+    ...integratedDelivery.filter((delivery) => {
+      return isIntegratedPlatformSupported(delivery.key, currentCountry.value)
+    })
+  ]
 })
 
 const loadingKey = computed(() => {
@@ -632,12 +682,13 @@ const loadingKey = computed(() => {
     gf: `${id}_gf`,
     sf: `${id}_sf`,
     fm: `${id}_fm`,
+    dr: `${id}_dr`,
     external: `${id}_external`,
     local: (deliveryName: string) => `${id}_${deliveryName}`
   }
 })
 
-async function updateIntegratedDeliveryCompany(company: IntegratedDeliveryRow) {
+async function updateIntegratedDeliveryCompany() {
   switch (selectedIntegratedRow.value) {
     case AUTO_INTEGRATION_CLIENT.foodpanda:
       await updateIntegratedDeliverySetting()
@@ -648,6 +699,9 @@ async function updateIntegratedDeliveryCompany(company: IntegratedDeliveryRow) {
     case AUTO_INTEGRATION_CLIENT.shopeefood:
       await updateIntegratedDeliverySetting()
       break
+    case AUTO_INTEGRATION_CLIENT.deliveroo:
+      await updateIntegratedDeliverySetting()
+      break
     case F_ORDER_PLATFORM.enum.FEEDME:
       await updateFeedmeExpressSetting()
       break
@@ -678,6 +732,7 @@ const filteredCompanies = computed(() => {
 const grabfoodSetting = ref<FdoGrabfoodSettings | null>(null)
 const foodpandaSetting = ref<FdoFoodpandaSettings | null>(null)
 const shopeefoodSetting = ref<FdoShopeeFoodSettings | null>(null)
+const deliverooSetting = ref<FdoDeliverooSettings | null>(null)
 const externalSetting = ref<FdoExternalSetting | null>(null)
 const loadingDpi = ref<boolean>(false)
 
@@ -685,20 +740,41 @@ async function readData() {
   await startAsyncCallWithErr(async () => {
     loadingDpi.value = true
     linkedCompanies.value = await remoteOrderApi.readLinkedDeliveryCompanies()
+
     const resp = await remoteOrderApi.readLocalDeliveryCompanies()
     deliveryCompanies.value = sort(resp, { selector: 'name' })
-    grabfoodSetting.value = await remoteOrderApi.integratedDelivery.readGrabfood(
-      currentRestaurant.value?._id || ''
+
+    grabfoodSetting.value = isIntegratedPlatformSupported(
+      AUTO_INTEGRATION_CLIENT.grabfood,
+      currentCountry.value
+    )
+      ? await remoteOrderApi.integratedDelivery.readGrabfood(currentRestaurant.value?._id || '')
+      : null
+
+    foodpandaSetting.value = isIntegratedPlatformSupported(
+      AUTO_INTEGRATION_CLIENT.foodpanda,
+      currentCountry.value
     )
-    foodpandaSetting.value = await remoteOrderApi.integratedDelivery.readFoodpanda(
-      currentRestaurant.value?._id || ''
+      ? await remoteOrderApi.integratedDelivery.readFoodpanda(currentRestaurant.value?._id || '')
+      : null
+    shopeefoodSetting.value = isIntegratedPlatformSupported(
+      AUTO_INTEGRATION_CLIENT.shopeefood,
+      currentCountry.value
     )
-    shopeefoodSetting.value = await remoteOrderApi.integratedDelivery.readShopeefood(
-      currentRestaurant.value?._id || ''
+      ? await remoteOrderApi.integratedDelivery.readShopeefood(currentRestaurant.value?._id || '')
+      : null
+    deliverooSetting.value = isIntegratedPlatformSupported(
+      AUTO_INTEGRATION_CLIENT.deliveroo,
+      currentCountry.value
     )
-    externalSetting.value = await remoteOrderApi.integratedDelivery.readExternal(
-      currentRestaurant.value?._id || ''
+      ? await remoteOrderApi.integratedDelivery.readDeliveroo(currentRestaurant.value?._id || '')
+      : null
+    externalSetting.value = isIntegratedPlatformSupported(
+      AUTO_INTEGRATION_CLIENT.external,
+      currentCountry.value
     )
+      ? await remoteOrderApi.integratedDelivery.readExternal(currentRestaurant.value?._id || '')
+      : null
   })
   loadingDpi.value = false
 }
@@ -872,6 +948,11 @@ async function updateDelivery(
           integrated as FdoShopeeFoodSettings
         )
         break
+      case AUTO_INTEGRATION_CLIENT.deliveroo:
+        await restaurantStore.updateIntegratedDeliverooDelivery(
+          currentRestaurant.value?._id ?? '',
+          integrated as FdoDeliverooSettings
+        )
     }
   }
 }
@@ -927,9 +1008,10 @@ function convertStatustoI18(status: status): [string] {
 type companyName =
   | 'In house delivery'
   | 'FeedMe express'
-  | 'FoodPanda delivery'
-  | 'GrabFood delivery'
+  | 'Food Panda delivery'
+  | 'Grab Food delivery'
   | 'ShopeeFood delivery'
+  | 'Deliveroo delivery'
   | 'External delivery'
 
 function convertIntegratedCompanyName(name: companyName): string {
@@ -938,12 +1020,14 @@ function convertIntegratedCompanyName(name: companyName): string {
       return `${t('order.deliveryTitle', { company: 'In House' })}`
     case 'FeedMe express':
       return `${t('order.feedMeExpress')}`
-    case 'FoodPanda delivery':
-      return `${t('order.deliveryTitle', { company: 'FoodPanda' })}`
-    case 'GrabFood delivery':
-      return `${t('order.deliveryTitle', { company: 'GrabFood' })}`
+    case 'Food Panda delivery':
+      return `${t('order.deliveryTitle', { company: 'Food Panda' })}`
+    case 'Grab Food delivery':
+      return `${t('order.deliveryTitle', { company: 'Grab Food' })}`
     case 'ShopeeFood delivery':
       return `${t('order.deliveryTitle', { company: 'ShopeeFood' })}`
+    case 'Deliveroo delivery':
+      return `${t('order.deliveryTitle', { company: 'Deliveroo' })}`
     case 'External delivery':
       return `${t('order.externalDelivery')}`
     default:

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

@@ -1,4 +1,4 @@
-import type { FdoExternalSetting } from '@entity';
+import type { FdoDeliverooSettings, FdoExternalSetting } from '@entity';
 import {
   FdoRestaurantFeedmeDelivery,
   FdoGrabfoodSettings,
@@ -67,6 +67,14 @@ function initShopeefoodDelivery(): FdoShopeeFoodSettings {
   }
 }
 
+function initDeliverooDelivery(): FdoDeliverooSettings {
+  return {
+    enable: false,
+    merchantID: '',
+    catalogId: null,
+    autoCloseBill: false
+  }
+}
 function initExternalDelivery(): FdoExternalSetting {
   return {
     _id: '',
@@ -87,5 +95,6 @@ export default {
   initFoodpandaDelivery,
   initGrabfoodDelivery,
   initShopeefoodDelivery,
+  initDeliverooDelivery,
   initExternalDelivery
 }