@feedmepos/mf-order-setting 0.0.37 → 0.0.38

package/dist/package/entity/restaurant/restaurant.dto.d.ts

@@ -3955,7 +3955,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
     paymentGateways: z.ZodArray<z.ZodDiscriminatedUnion<"paymentGateway", z.Primitive, z.ZodObject<z.extendShape<{
         _id: z.ZodString;
         _rev: z.ZodString;
-        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "REVENUE_MONSTER", "E_GHL", "RAZER_MERCHANT_SERVICE", "MACAU_PASS"]>;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
         active: z.ZodBoolean;
     }, {
         paymentGateway: z.ZodLiteral<"REVENUE_MONSTER">;
@@ -4000,7 +4000,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
     }> | z.ZodObject<z.extendShape<{
         _id: z.ZodString;
         _rev: z.ZodString;
-        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "REVENUE_MONSTER", "E_GHL", "RAZER_MERCHANT_SERVICE", "MACAU_PASS"]>;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
         active: z.ZodBoolean;
     }, {
         paymentGateway: z.ZodLiteral<"RAZER_MERCHANT_SERVICE">;
@@ -4055,7 +4055,7 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
     }> | z.ZodObject<z.extendShape<{
         _id: z.ZodString;
         _rev: z.ZodString;
-        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "REVENUE_MONSTER", "E_GHL", "RAZER_MERCHANT_SERVICE", "MACAU_PASS"]>;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
         active: z.ZodBoolean;
     }, {
         paymentGateway: z.ZodLiteral<"E_GHL">;
@@ -4092,6 +4092,191 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             terminalId: string;
             privateKey: string;
         };
+    }> | z.ZodObject<z.extendShape<{
+        _id: z.ZodString;
+        _rev: z.ZodString;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
+        active: z.ZodBoolean;
+    }, {
+        paymentGateway: z.ZodLiteral<"MACAU_PASS">;
+        config: z.ZodObject<{
+            merchantId: z.ZodString;
+            merchantName: z.ZodString;
+            merchantCategoryCode: z.ZodString;
+            storeID: z.ZodString;
+            storeName: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            merchantId: string;
+            merchantName: string;
+            merchantCategoryCode: string;
+            storeID: string;
+            storeName: string;
+        }, {
+            merchantId: string;
+            merchantName: string;
+            merchantCategoryCode: string;
+            storeID: string;
+            storeName: string;
+        }>;
+    }>, "strip", z.ZodTypeAny, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "MACAU_PASS";
+        active: boolean;
+        config: {
+            merchantId: string;
+            merchantName: string;
+            merchantCategoryCode: string;
+            storeID: string;
+            storeName: string;
+        };
+    }, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "MACAU_PASS";
+        active: boolean;
+        config: {
+            merchantId: string;
+            merchantName: string;
+            merchantCategoryCode: string;
+            storeID: string;
+            storeName: string;
+        };
+    }> | z.ZodObject<z.extendShape<{
+        _id: z.ZodString;
+        _rev: z.ZodString;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
+        active: z.ZodBoolean;
+    }, {
+        paymentGateway: z.ZodLiteral<"GRAB">;
+        config: z.ZodObject<{
+            merchantId: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            merchantId: string;
+        }, {
+            merchantId: string;
+        }>;
+    }>, "strip", z.ZodTypeAny, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "GRAB";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    }, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "GRAB";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    }> | z.ZodObject<z.extendShape<{
+        _id: z.ZodString;
+        _rev: z.ZodString;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
+        active: z.ZodBoolean;
+    }, {
+        paymentGateway: z.ZodLiteral<"SOFTSPACE">;
+        config: z.ZodObject<{
+            mid: z.ZodString;
+            tid: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            mid: string;
+            tid: string;
+        }, {
+            mid: string;
+            tid: string;
+        }>;
+    }>, "strip", z.ZodTypeAny, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "SOFTSPACE";
+        active: boolean;
+        config: {
+            mid: string;
+            tid: string;
+        };
+    }, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "SOFTSPACE";
+        active: boolean;
+        config: {
+            mid: string;
+            tid: string;
+        };
+    }> | z.ZodObject<z.extendShape<{
+        _id: z.ZodString;
+        _rev: z.ZodString;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
+        active: z.ZodBoolean;
+    }, {
+        paymentGateway: z.ZodLiteral<"DIGIO">;
+        config: z.ZodObject<{
+            merchantId: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            merchantId: string;
+        }, {
+            merchantId: string;
+        }>;
+    }>, "strip", z.ZodTypeAny, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "DIGIO";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    }, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "DIGIO";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    }> | z.ZodObject<z.extendShape<{
+        _id: z.ZodString;
+        _rev: z.ZodString;
+        paymentGateway: z.ZodEnum<["FEEDME", "FEEDME_TERMINAL", "E_GHL", "GHL", "MACAU_PASS", "REVENUE_MONSTER", "RAZER_MERCHANT_SERVICE", "MAYBANK", "MAYBANK2", "MAYBANK3", "NETS", "CASH", "SOFTSPACE", "GRAB", "DIGIO", "KBANK", "ADYEN"]>;
+        active: z.ZodBoolean;
+    }, {
+        paymentGateway: z.ZodLiteral<"ADYEN">;
+        config: z.ZodObject<{
+            merchantAccount: z.ZodString;
+            username: z.ZodString;
+            apiKey: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            merchantAccount: string;
+            username: string;
+            apiKey: string;
+        }, {
+            merchantAccount: string;
+            username: string;
+            apiKey: string;
+        }>;
+    }>, "strip", z.ZodTypeAny, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "ADYEN";
+        active: boolean;
+        config: {
+            merchantAccount: string;
+            username: string;
+            apiKey: string;
+        };
+    }, {
+        _id: string;
+        _rev: string;
+        paymentGateway: "ADYEN";
+        active: boolean;
+        config: {
+            merchantAccount: string;
+            username: string;
+            apiKey: string;
+        };
     }>>, "many">;
     posHeartbeat: z.ZodNullable<z.ZodOptional<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
@@ -4288,6 +4473,53 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             terminalId: string;
             privateKey: string;
         };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "MACAU_PASS";
+        active: boolean;
+        config: {
+            merchantId: string;
+            merchantName: string;
+            merchantCategoryCode: string;
+            storeID: string;
+            storeName: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "GRAB";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "SOFTSPACE";
+        active: boolean;
+        config: {
+            mid: string;
+            tid: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "DIGIO";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "ADYEN";
+        active: boolean;
+        config: {
+            merchantAccount: string;
+            username: string;
+            apiKey: string;
+        };
     })[];
 }, {
     catalogId?: string | null | undefined;
@@ -4483,6 +4715,53 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
             terminalId: string;
             privateKey: string;
         };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "MACAU_PASS";
+        active: boolean;
+        config: {
+            merchantId: string;
+            merchantName: string;
+            merchantCategoryCode: string;
+            storeID: string;
+            storeName: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "GRAB";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "SOFTSPACE";
+        active: boolean;
+        config: {
+            mid: string;
+            tid: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "DIGIO";
+        active: boolean;
+        config: {
+            merchantId: string;
+        };
+    } | {
+        _id: string;
+        _rev: string;
+        paymentGateway: "ADYEN";
+        active: boolean;
+        config: {
+            merchantAccount: string;
+            username: string;
+            apiKey: string;
+        };
     })[];
 }>;
 export type RestaurantCustomerKioskDto = z.infer<typeof RestaurantCustomerKioskDto>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -26,7 +26,7 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@feedmepos/core": "^2.14.35",
+    "@feedmepos/core": "^2.14.40",
     "@feedmepos/menu": "^1.7.6",
     "@feedmepos/mf-common": "1.20.0-beta.2",
     "@feedmepos/ordering": "^0.0.3",
@@ -34,7 +34,6 @@
     "@types/googlemaps": "^3.43.3",
     "axios": "^1.7.2",
     "change-case": "^5.4.4",
-    "zod-openapi": "^4.1.0",
     "date-fns": "^3.6.0",
     "dayjs": "^1.11.12",
     "firebase": "^10.13.1",
@@ -45,7 +44,8 @@
     "pinia": "^2.1.7",
     "vue": "^3.3.8",
     "vue-i18n": "^10.0.5",
-    "vue-router": "^4.2.5"
+    "vue-router": "^4.2.5",
+    "zod-openapi": "^4.1.0"
   },
   "devDependencies": {
     "@babel/types": "^7.24.7",

package/src/api/menu/index.ts

@@ -10,4 +10,7 @@ export const menuApi = {
   async readMenu(): Promise<MenuV4Doc> {
     return getData(await menuClientInstance().get(''));
   },
-};
+  async readCatalogOptions(restaurantId: string): Promise<Record<string, Array<{ _id: string; name: string }>>> {
+    return getData(await menuClientInstance().post('/restaurant-catalog-list', {restaurantIds: [restaurantId]}));
+  },
+};

package/src/locales/en-US.json

@@ -106,6 +106,7 @@
         "eWalletDescription": "Scan QR Code to make payment with phone",
         "exclusive": "Exclulsive",
         "failed": "FAILED",
+        "failedToLoadCatalogOptions": "Failed to load catalog options, please refresh again",
         "failedToUpdateSetting": "Failed to update setting",
         "feedMeExpress": "FeedMe express",
         "feedmeExpressNotApproved": "Your payout account is under review. Please contact our staff for further assistant.",

package/src/locales/th-TH.json

@@ -104,6 +104,7 @@
         "eWalletDescription": "สแกนรหัส QR เพื่อชำระเงินด้วยโทรศัพท์",
         "exclusive": "พิเศษ",
         "failed": "ล้มเหลว",
+        "failedToLoadCatalogOptions": "ไม่สามารถโหลดตัวเลือกแค็ตตาล็อกได้ กรุณารีเฟรชอีกครั้ง",
         "failedToUpdateSetting": "ไม่สามารถอัปเดตการตั้งค่า",
         "feedMeExpress": "FeedMe express",
         "feedmeExpressNotApproved": "บัญชีการจ่ายเงินของคุณอยู่ระหว่างการตรวจสอบ โปรดติดต่อเจ้าหน้าที่ของเราเพื่อรับความช่วยเหลือเพิ่มเติม",

package/src/locales/zh-CN.json

@@ -108,6 +108,7 @@
         "eWalletDescription": "使用手机扫描二维码进行支付",
         "exclusive": "不包括",
         "failed": "失败",
+        "failedToLoadCatalogOptions": "目录选项加载失败，请重新刷新",
         "failedToUpdateSetting": "设置更新失败",
         "feedMeExpress": "FeedMe 外卖快递",
         "feedmeExpressNotApproved": "您的支付账户正在审核中，请联系我们的工作人员获取进一步的帮助。",

package/src/stores/menu/menu.ts

@@ -13,6 +13,9 @@ interface MenuState {
   menu: { _rev: string } & FdoMenuV4;
   currentCatalogId: string | null;
   currentSchedulerId: string;
+  catalogOptions: { label: string; value: string | null }[];
+  loadingCatalogOptions: boolean;
+  catalogOptionsError: string | null;
 }
 
 function initMenuState(): MenuState {
@@ -21,6 +24,9 @@ function initMenuState(): MenuState {
     menu: { ...generator.initMenuV4(), _rev: '' },
     currentCatalogId: null,
     currentSchedulerId: '',
+    catalogOptions: [],
+    loadingCatalogOptions: false,
+    catalogOptionsError: null,
   };
 }
 
@@ -120,19 +126,6 @@ export const useMenuStore = defineStore('menu', {
         (catalog) => catalog._id === state.currentCatalogId
       );
     },
-
-    catalogOptions(): { label: string; value: string | null }[] {
-      return [
-        {
-          label: 'Main',
-          value: null,
-        },
-        ...this.catalogs.map((catalog) => ({
-          label: catalog.name,
-          value: catalog._id,
-        })),
-      ];
-    },
     categories(): (Omit<FdoMenuV4Category, '_id'> & { _id: string | null })[] {
       const categories = this.mergedMenu.modules.category;
       return [
@@ -250,9 +243,35 @@ export const useMenuStore = defineStore('menu', {
       this.menu = await menuApi.readMenu();
       this.selectCatalog(null);
     },
+
+    async loadCatalogOptions(restaurantId: string) {
+      this.loadingCatalogOptions = true;
+      this.catalogOptionsError = null;
+      const options: {label:string, value: string | null}[] = [{
+        label: 'Main',
+        value: null,
+      }];
+
+      try {
+       const resp = await menuApi.readCatalogOptions(restaurantId);
+       const restaurntCatalogOptions = resp[restaurantId] ?? [];
+       for (let index = 0; index < restaurntCatalogOptions.length; index++) {
+        const opt = restaurntCatalogOptions[index];
+          options.push({
+            label: opt.name,
+            value: opt._id
+          })
+       }
+       this.catalogOptions = options;
+      } catch (error) {
+        console.error('Failed to load catalog options:', error)
+        this.catalogOptionsError = 'order.failedToLoadCatalogOptions';
+      } finally {
+        this.loadingCatalogOptions = false;
+      }
+    },
     selectCatalog(id: string | null) {
       this.currentCatalogId = id;
     },
   }
-  
 });

package/src/views/order-settings/OrderSettingsView.vue

@@ -1,10 +1,14 @@
 <template>
   <div class="py-[1.5rem]">
     <FmPageHead :title="t('order.orderSetting')" />
-    <div class="flex px-[1.5rem]">
+    <div class="flex px-[1.5rem] items-center">
       <div class="flex-[2_2_0%] overflow-auto">
         <FmTabs v-model:model-value="selectedOrderSetting" :items="settingItem" :showMoreAt="99" />
       </div>
+      <div v-if="menuStore.loadingCatalogOptions" class="flex items-center gap-2 ml-4">
+        <FmCircularProgress size="md" />
+        <span class="text-sm text-gray-600">{{ t('order.loadingCatalogs') }}</span>
+      </div>
     </div>
   </div>
   <component :is="currentComponent" />
@@ -12,7 +16,7 @@
 
 <script setup lang="ts">
 import { type FmTabProps } from '@feedmepos/ui-library'
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import DeliverySetting from './delivery/DeliverySetting.vue'
 import DineInSetting from './dine-in/DineInSetting.vue'
 import PickUpSetting from './pickup/PickUpSetting.vue'
@@ -21,9 +25,14 @@ import ServiceChargeSetting from './servicecharge/ServiceChargeSetting.vue'
 import DiscountRuleSetting from './discount-rule/DiscountRuleSetting.vue'
 
 import GeneralSetting from './general/GeneralSetting.vue'
-import { useI18n } from '@feedmepos/mf-common'
+import { useI18n, useCoreStore } from '@feedmepos/mf-common'
+import { useMenuStore } from '@/stores/menu/menu'
+import { useSnackbarFunctions } from '@/components/snackbar'
 
 const { t } = useI18n()
+const { currentRestaurant } = useCoreStore()
+const menuStore = useMenuStore()
+const { showError } = useSnackbarFunctions()
 type OrderSettingMenuItemValue =
   | 'delivery'
   | 'pickup'
@@ -62,4 +71,22 @@ const currentComponent = computed(() => {
       return GeneralSetting
   }
 })
+
+onMounted(async () => {
+  if (currentRestaurant.value?._id) {
+    await menuStore.loadCatalogOptions(currentRestaurant.value._id)
+  }
+})
+
+watch(currentRestaurant, async (newRestaurant) => {
+  if (newRestaurant?._id) {
+    await menuStore.loadCatalogOptions(newRestaurant._id)
+  }
+})
+
+watch(() => menuStore.catalogOptionsError, (errorKey) => {
+  if (errorKey) {
+    showError(t(errorKey))
+  }
+})
 </script>

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

@@ -262,7 +262,6 @@ function convertStatusI18n(status: string) {
               v-if="modelValue.auto.status === 'FAILED' && modelValue.auto.menuSyncError !== null"
               :content="modelValue.auto.menuSyncError"
               :zIndex="1000"
-              :disabled="!canEdit"
             >
               <FmIcon name="info" size="sm" />
             </FmTooltip>