@feedmepos/mf-order-setting 0.0.72-prod → 0.0.73-dev

package/src/api/remoteOrder/index.ts

@@ -1,7 +1,15 @@
-import type { AxiosInstance } from 'axios';
-import { baseClientInstance, getData, SvcConfig } from '..';
-import type { DeliveryCompany, LinkedDeliveryDoc } from '../../views/order-settings/delivery/delivery';
-import { FdoLinkedDelivery, FdoRestaurant, FdoRestaurantFeedmeDelivery, FdoRestaurantInHouseDelivery } from '@feedmepos/core/entity';
+import type { AxiosInstance } from 'axios'
+import { baseClientInstance, getData, SvcConfig } from '..'
+import type {
+  DeliveryCompany,
+  LinkedDeliveryDoc
+} from '../../views/order-settings/delivery/delivery'
+import {
+  FdoLinkedDelivery,
+  FdoRestaurant,
+  FdoRestaurantFeedmeDelivery,
+  FdoRestaurantInHouseDelivery
+} from '@feedmepos/core/entity'
 import type {
   FdoDeliverooSettings,
   FdoExternalSetting,
@@ -10,189 +18,247 @@ import type {
   FdoGoFoodSettings,
   FdoGrabfoodOrderOutput,
   FdoGrabfoodSettings,
+  FdoLinemanSettings,
   FdoShopeeFoodOrder,
   FdoShopeeFoodOrderOutput,
   FdoShopeeFoodSettings,
-  FdtoGetOrderReq
-} from '@entity';
+  FdtoGetOrderReq,
+  FdoTngSettings
+} from '@entity'
 
-type DeliveryCompanyUrl = 'foodpanda' | 'grabfood' | 'shopeefood' | 'deliveroo' | 'gofood' | 'external'
+type DeliveryCompanyUrl =
+  | 'foodpanda'
+  | 'grabfood'
+  | 'shopeefood'
+  | 'deliveroo'
+  | 'gofood'
+  | 'tng'
+  | 'external'
+  | 'lineman'
 
-const deliveryClientInstance = (
-  deliveryCompany: DeliveryCompanyUrl
-): AxiosInstance => {
+const deliveryClientInstance = (deliveryCompany: DeliveryCompanyUrl): AxiosInstance => {
   //https://portal-v2-dev.feedmeapi.com/deliveroo/setting/:restaurantId
-  const path = `/${deliveryCompany}`;
-  return baseClientInstance(path, 'portal');
-};
+  const path = `/${deliveryCompany}`
+  return baseClientInstance(path, 'portal')
+}
 
 const linkedDeliveryClientInstance = () => {
-  const restaurantId = SvcConfig.getRestaurantId();
-  if (!restaurantId) throw new Error('Invalid restaurant ID');
-  const { linkedDeliveryBackend } = SvcConfig.getBackendUrl();
-  const url = `${linkedDeliveryBackend}/restaurants/${restaurantId}/linked-deliveries`;
-  return baseClientInstance('', 'portal', { url });
-};
-
+  const restaurantId = SvcConfig.getRestaurantId()
+  if (!restaurantId) throw new Error('Invalid restaurant ID')
+  const { linkedDeliveryBackend } = SvcConfig.getBackendUrl()
+  const url = `${linkedDeliveryBackend}/restaurants/${restaurantId}/linked-deliveries`
+  return baseClientInstance('', 'portal', { url })
+}
 
 export const remoteOrderApi = {
   async readLinkedDeliveryCompanies(): Promise<LinkedDeliveryDoc[]> {
-    return getData(await linkedDeliveryClientInstance().get(''));
+    return getData(await linkedDeliveryClientInstance().get(''))
   },
   async readLocalDeliveryCompanies(): Promise<DeliveryCompany[]> {
-    return getData(await baseClientInstance().get('/deliveries'));
+    return getData(await baseClientInstance().get('/deliveries'))
   },
   async createDeliveryCompany(delivery: FdoLinkedDelivery): Promise<LinkedDeliveryDoc> {
-    return getData(await linkedDeliveryClientInstance().post('', delivery));
+    return getData(await linkedDeliveryClientInstance().post('', delivery))
   },
   async updateDeliveryCompany(delivery: LinkedDeliveryDoc): Promise<LinkedDeliveryDoc> {
-    return getData(await linkedDeliveryClientInstance().put(`/${delivery._id}`, delivery));
+    return getData(await linkedDeliveryClientInstance().put(`/${delivery._id}`, delivery))
   },
   async deleteDeliveryCompany(delivery: LinkedDeliveryDoc): Promise<LinkedDeliveryDoc> {
-    return getData(await linkedDeliveryClientInstance().delete(`/${delivery._id}`));
+    return getData(await linkedDeliveryClientInstance().delete(`/${delivery._id}`))
   },
   integratedDelivery: {
-    async updateInhouse(restaurantId: string, dto: FdoRestaurantInHouseDelivery): Promise<FdoRestaurant> {
-      return getData(await baseClientInstance().put(`/restaurants/${restaurantId}/in-house-delivery`, dto));
+    async updateInhouse(
+      restaurantId: string,
+      dto: FdoRestaurantInHouseDelivery
+    ): Promise<FdoRestaurant> {
+      return getData(
+        await baseClientInstance().put(`/restaurants/${restaurantId}/in-house-delivery`, dto)
+      )
     },
-    async updateFeedme(restaurantId: string, dto: FdoRestaurantFeedmeDelivery): Promise<FdoRestaurant> {
-      return getData(await baseClientInstance().put(`/restaurants/${restaurantId}/feedme-delivery`, dto));
+    async updateFeedme(
+      restaurantId: string,
+      dto: FdoRestaurantFeedmeDelivery
+    ): Promise<FdoRestaurant> {
+      return getData(
+        await baseClientInstance().put(`/restaurants/${restaurantId}/feedme-delivery`, dto)
+      )
     },
     async readFoodpanda(restaurantId: string): Promise<FdoFoodpandaSettings | null> {
-      return getData(await deliveryClientInstance('foodpanda').get(`/setting/${restaurantId}`));
+      return getData(await deliveryClientInstance('foodpanda').get(`/setting/${restaurantId}`))
     },
     async readFoodpandaOrders(req: FdtoGetOrderReq): Promise<FdoFoodpandaOrderOutput[]> {
-      return getData(await deliveryClientInstance('foodpanda').get('/order', { params: req }));
+      return getData(await deliveryClientInstance('foodpanda').get('/order', { params: req }))
     },
     async reflowFoodpandaOrders(orderId: string): Promise<FdoFoodpandaOrderOutput> {
-      return getData(await deliveryClientInstance('foodpanda').put(`/order/reflow/${orderId}`));
+      return getData(await deliveryClientInstance('foodpanda').put(`/order/reflow/${orderId}`))
     },
     async rejectFoodpandaOrders(orderId: string): Promise<FdoFoodpandaOrderOutput> {
-      return getData(await deliveryClientInstance('foodpanda').put(`/order/void/${orderId}`));
+      return getData(await deliveryClientInstance('foodpanda').put(`/order/void/${orderId}`))
     },
-    async updateFoodpanda(restaurantId: string, dto: FdoFoodpandaSettings): Promise<FdoFoodpandaSettings> {
-      return getData(await deliveryClientInstance('foodpanda').put(`/setting/${restaurantId}`, {
-        _id: restaurantId,
-        ...dto,
-      }));
+    async updateFoodpanda(
+      restaurantId: string,
+      dto: FdoFoodpandaSettings
+    ): Promise<FdoFoodpandaSettings> {
+      return getData(
+        await deliveryClientInstance('foodpanda').put(`/setting/${restaurantId}`, {
+          _id: restaurantId,
+          ...dto
+        })
+      )
     },
     async syncFoodpandaMenu(restaurantId: string): Promise<FdoFoodpandaSettings> {
-      return getData(await deliveryClientInstance('foodpanda').put(`/menu-sync/${restaurantId}`));
+      return getData(await deliveryClientInstance('foodpanda').put(`/menu-sync/${restaurantId}`))
     },
     async readGrabfood(restaurantId: string): Promise<FdoGrabfoodSettings | null> {
-      return getData(await deliveryClientInstance('grabfood').get(`/setting/${restaurantId}`));
+      return getData(await deliveryClientInstance('grabfood').get(`/setting/${restaurantId}`))
     },
     async readGrabfoodOrders(req: FdtoGetOrderReq): Promise<FdoGrabfoodOrderOutput[]> {
-      return getData(await deliveryClientInstance('grabfood').get('/order', { params: req }));
+      return getData(await deliveryClientInstance('grabfood').get('/order', { params: req }))
     },
     async reflowGrabfoodOrders(orderId: string): Promise<FdoGrabfoodOrderOutput> {
-      return getData(await deliveryClientInstance('grabfood').put(`/order/reflow/${orderId}`));
+      return getData(await deliveryClientInstance('grabfood').put(`/order/reflow/${orderId}`))
     },
     async rejectGrabfoodOrders(orderId: string): Promise<FdoGrabfoodOrderOutput> {
-      return getData(await deliveryClientInstance('grabfood').put(`/order/void/${orderId}`));
+      return getData(await deliveryClientInstance('grabfood').put(`/order/void/${orderId}`))
     },
 
     async updateGrabfood(restaurantId: string, dto: FdoGrabfoodSettings): Promise<FdoRestaurant> {
-      return getData(await deliveryClientInstance('grabfood').put(`/setting/${restaurantId}`, {
-        _id: restaurantId,
-        ...dto,
-      }));
+      return getData(
+        await deliveryClientInstance('grabfood').put(`/setting/${restaurantId}`, {
+          _id: restaurantId,
+          ...dto
+        })
+      )
     },
     async syncGrabfoodMenu(merchantId: string): Promise<FdoGrabfoodSettings> {
-      return getData(await deliveryClientInstance('grabfood').get(`/menu-sync/${merchantId}`));
+      return getData(await deliveryClientInstance('grabfood').get(`/menu-sync/${merchantId}`))
     },
-    async startSelfServeFlow(restaurantId: string): Promise<string|null> {
-      return getData(await deliveryClientInstance('grabfood').get(`/setting/integration-url/${restaurantId}`));
+    async startSelfServeFlow(restaurantId: string): Promise<string | null> {
+      return getData(
+        await deliveryClientInstance('grabfood').get(`/setting/integration-url/${restaurantId}`)
+      )
     },
 
     async readShopeefood(restaurantId: string): Promise<FdoShopeeFoodSettings | null> {
-      return getData(await deliveryClientInstance('shopeefood').get(`/setting/${restaurantId}`));
+      return getData(await deliveryClientInstance('shopeefood').get(`/setting/${restaurantId}`))
     },
-    async readShopeefoodOrders(req: FdtoGetOrderReq): Promise<(FdoShopeeFoodOrderOutput & FdoShopeeFoodOrder)[]> {
-      return getData(await deliveryClientInstance('shopeefood').get('/order', { params: req }));
+    async readShopeefoodOrders(
+      req: FdtoGetOrderReq
+    ): Promise<(FdoShopeeFoodOrderOutput & FdoShopeeFoodOrder)[]> {
+      return getData(await deliveryClientInstance('shopeefood').get('/order', { params: req }))
     },
     async reflowShopeefoodOrders(orderId: string): Promise<FdoShopeeFoodOrderOutput> {
-      return getData(await deliveryClientInstance('shopeefood').put(`/order/reflow/${orderId}`));
+      return getData(await deliveryClientInstance('shopeefood').put(`/order/reflow/${orderId}`))
     },
     async rejectShopeefoodOrders(orderId: string): Promise<FdoShopeeFoodOrderOutput> {
-      return getData(await deliveryClientInstance('shopeefood').put(`/order/void/${orderId}`));
+      return getData(await deliveryClientInstance('shopeefood').put(`/order/void/${orderId}`))
     },
-    async updateShopeefood(restaurantId: string, dto: FdoShopeeFoodSettings): Promise<FdoRestaurant> {
-      return getData(await deliveryClientInstance('shopeefood').put(`/setting/${restaurantId}`, {
-        _id: restaurantId,
-        ...dto,
-      }));
+    async updateShopeefood(
+      restaurantId: string,
+      dto: FdoShopeeFoodSettings
+    ): Promise<FdoRestaurant> {
+      return getData(
+        await deliveryClientInstance('shopeefood').put(`/setting/${restaurantId}`, {
+          _id: restaurantId,
+          ...dto
+        })
+      )
     },
     async syncShopeefoodMenu(storeId: string): Promise<FdoShopeeFoodSettings> {
-      return getData(await deliveryClientInstance('shopeefood').get(`/menu-sync/${storeId}`));
+      return getData(await deliveryClientInstance('shopeefood').get(`/menu-sync/${storeId}`))
     },
     async readGofood(restaurantId: string): Promise<FdoGoFoodSettings | null> {
-      return getData(await deliveryClientInstance('gofood').get(`/setting/${restaurantId}`));
+      return getData(await deliveryClientInstance('gofood').get(`/setting/${restaurantId}`))
     },
-    async updateGofood(restaurantId: string, dto: FdoGoFoodSettings): Promise<FdoGoFoodSettings | null> {
-      return getData(await deliveryClientInstance('gofood').put(`/setting/${restaurantId}`, {
-        ...dto,
-        _id: restaurantId,
-      }));
+    async updateGofood(
+      restaurantId: string,
+      dto: FdoGoFoodSettings
+    ): Promise<FdoGoFoodSettings | null> {
+      return getData(
+        await deliveryClientInstance('gofood').put(`/setting/${restaurantId}`, {
+          ...dto,
+          _id: restaurantId
+        })
+      )
     },
     async syncGofoodMenu(restaurantId: string): Promise<FdoGoFoodSettings> {
-      return getData(await deliveryClientInstance('gofood').get(`/menu-sync/${restaurantId}`));
+      return getData(await deliveryClientInstance('gofood').get(`/menu-sync/${restaurantId}`))
+    },
+    async readLineman(restaurantId: string): Promise<FdoLinemanSettings | null> {
+      return getData(await deliveryClientInstance('lineman').get(`/setting/${restaurantId}`))
+    },
+    async updateLineman(
+      restaurantId: string,
+      dto: FdoLinemanSettings
+    ): Promise<FdoLinemanSettings> {
+      return getData(
+        await deliveryClientInstance('lineman').put(`/setting/${restaurantId}`, {
+          ...dto,
+          _id: restaurantId
+        })
+      )
     },
     async updateDeliveroo(restaurantId: string, dto: FdoDeliverooSettings): Promise<FdoRestaurant> {
-      return getData(await deliveryClientInstance('deliveroo').put(`/setting/${restaurantId}`, {
-        _id: restaurantId,
-        ...dto
-      }))
+      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}`));
+      return getData(await deliveryClientInstance('deliveroo').get(`/setting/${restaurantId}`))
+    },
+    async syncDeliverooMenu(merchantID: string): Promise<FdoDeliverooSettings> {
+      return getData(await deliveryClientInstance('deliveroo').get(`/menu-sync/${merchantID}`))
     },
-    async syncDeliverooMernu(merchantID: string): Promise<FdoDeliverooSettings> {
-      try {
-        const res = getData(await deliveryClientInstance('deliveroo').get(`/menu-sync/${merchantID}`))
-        return res
-      } catch(err) {
-        throw err
-      }
+    async readTng(restaurantId: string): Promise<FdoTngSettings | null> {
+      return getData(await deliveryClientInstance('tng').get(`/setting/${restaurantId}`))
+    },
+    async updateTng(restaurantId: string, dto: FdoTngSettings): Promise<FdoTngSettings> {
+      return getData(
+        await deliveryClientInstance('tng').put(`/setting/${restaurantId}`, {
+          _id: restaurantId,
+          ...dto
+        })
+      )
+    },
+    async syncTngMenu(restaurantId: string): Promise<{ taskId?: string | null }> {
+      return getData(await deliveryClientInstance('tng').put(`/menu-sync/${restaurantId}`))
     },
     async readExternal(restaurantId: string): Promise<FdoExternalSetting | null> {
       return getData(await deliveryClientInstance('external').get(`/setting/${restaurantId}`))
     },
-    async updateExternal(restaurantId: string, dto: FdoExternalSetting): Promise<FdoExternalSetting> {
-      return getData(await deliveryClientInstance('external').put(`setting/${restaurantId}`, {
-        ...dto
-      }))
+    async updateExternal(
+      restaurantId: string,
+      dto: FdoExternalSetting
+    ): Promise<FdoExternalSetting> {
+      return getData(
+        await deliveryClientInstance('external').put(`setting/${restaurantId}`, {
+          ...dto
+        })
+      )
     },
     async syncExternalMenu(restaurantId: string): Promise<FdoExternalSetting> {
-      return getData(await deliveryClientInstance('external').get(`/menu-sync/${restaurantId}`));
+      return getData(await deliveryClientInstance('external').get(`/menu-sync/${restaurantId}`))
     },
-    async flowTestOrder(
-      restaurantId: string,
-      platform: DeliveryCompanyUrl
-    ): Promise<void> {
-      return getData(
-        await deliveryClientInstance(platform).put(`/test-order/${restaurantId}`)
-      );
+    async flowTestOrder(restaurantId: string, platform: DeliveryCompanyUrl): Promise<void> {
+      return getData(await deliveryClientInstance(platform).put(`/test-order/${restaurantId}`))
     },
-    async cancelTestOrder(
-      restaurantId: string,
-      platform: DeliveryCompanyUrl
-    ): Promise<void> {
+    async cancelTestOrder(restaurantId: string, platform: DeliveryCompanyUrl): Promise<void> {
       return getData(
-        await deliveryClientInstance(platform).put(
-          `/test-order/cancel/${restaurantId}`,
-        )
-      );
+        await deliveryClientInstance(platform).put(`/test-order/cancel/${restaurantId}`)
+      )
     },
     async reflowFpOrderNotInDb(payload: { restaurantId: string; slot: string }): Promise<void> {
-      return getData(
-        await deliveryClientInstance('foodpanda').put('/order/reconcile', payload)
-      );
-    },
-    async reflowGfOrderNotInDb(payload: { restaurantId: string; slot: string; date: string }): Promise<void> {
-      return getData(
-        await deliveryClientInstance('grabfood').put('/order/reconcile', payload)
-      );
+      return getData(await deliveryClientInstance('foodpanda').put('/order/reconcile', payload))
+    },
+    async reflowGfOrderNotInDb(payload: {
+      restaurantId: string
+      slot: string
+      date: string
+    }): Promise<void> {
+      return getData(await deliveryClientInstance('grabfood').put('/order/reconcile', payload))
     }
-  },
-};
+  }
+}

package/src/composables/useQrOrderingEnabled.ts

@@ -0,0 +1,66 @@
+import { computed, watch, type ComputedRef } from 'vue'
+import { useFeatureFlag } from '@feedmepos/feature-flag'
+import { useCoreStore } from '@feedmepos/mf-common'
+
+/**
+ * Whether QR / online ordering is enabled for the currently-selected restaurant,
+ * read from Flagsmith (the same source the backend enforces). Gates the Order
+ * Setting UI (tabs + integrated delivery section) in mf-order.
+ *
+ * - Reads `ordering_enable_qr` per-restaurant via Flagsmith identity (`setUser`).
+ * - Fails OPEN: until flags load, if the flag is missing, or if Flagsmith/init is
+ *   unavailable (e.g. key not configured) => treated as ENABLED, so the UI is never
+ *   hidden by a flag-infra blip.
+ *
+ * The portal host does not initialize `@feedmepos/feature-flag`, so we init it
+ * lazily here against the shared FeedMe Flagsmith environment (same public client
+ * keys admin-space + inventory use), picking dev/prod from the core-store namespace
+ * (the host-driven dev/prod signal mf-order already uses elsewhere).
+ */
+const QR_ORDERING_FLAG_KEY = 'ordering_enable_qr'
+
+const FLAGSMITH_URL = 'https://flag.feedme.farm/api/v1/'
+const FLAGSMITH_KEY_BY_NAMESPACE = {
+  dev: 'MaGoXrEWuEJNpWgKTqseee',
+  prod: '6GhcttsJ9Rj9cTevcdrpin'
+} as const
+
+let initPromise: Promise<void> | null = null
+
+function ensureInit(
+  ff: ReturnType<typeof useFeatureFlag>,
+  namespace: keyof typeof FLAGSMITH_KEY_BY_NAMESPACE
+): Promise<void> {
+  if (ff.isInitialized.value) return Promise.resolve()
+  if (!initPromise) {
+    initPromise = ff
+      .init({ apiKey: FLAGSMITH_KEY_BY_NAMESPACE[namespace], url: FLAGSMITH_URL })
+      .catch(() => undefined) // init failure => fail open
+  }
+  return initPromise
+}
+
+export function useQrOrderingEnabled(): ComputedRef<boolean> {
+  const ff = useFeatureFlag()
+  const { currentRestaurant, namespace } = useCoreStore()
+
+  watch(
+    () => currentRestaurant.value?._id,
+    async (restaurantId) => {
+      if (!restaurantId) return
+      await ensureInit(ff, namespace.value === 'dev' ? 'dev' : 'prod')
+      try {
+        await ff.setUser(restaurantId)
+      } catch {
+        // fail open — leave flags as-is
+      }
+    },
+    { immediate: true }
+  )
+
+  return computed(() => {
+    // Re-evaluate when the flag set updates (after init / setUser).
+    void ff.flags.value
+    return ff.getFlag(QR_ORDERING_FLAG_KEY)?.enabled ?? true
+  })
+}

package/src/helpers/menu.ts

@@ -1,5 +1,5 @@
 import { fullVariantCombination } from '@feedmepos/menu';
-import { FdoItemOverriderV4, FdoMenuV4Item, FdoItemVariant, FdoMenuV4VariantGroup, FdoProductTaxSetting, FdtoV4Tax } from '@feedmepos/menu/entity';
+import { FdoItemOverriderV4, FdoMenuV4Item, FdoItemVariant, FdoMenuV4VariantGroup, FdoProductTaxSetting, FdtoV4Tax } from '@feedmepos/entity';
 import { Country, Dinero } from '@feedmepos/core';
 import { F_COUNTRY } from '@feedmepos/core/entity';
 import { useCoreStore } from '@feedmepos/mf-common';