@feedmepos/mf-order-setting 0.0.32 → 0.0.34

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

@@ -3697,12 +3697,18 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: z.ZodObject<{
                     qrPay: z.ZodDefault<z.ZodBoolean>;
                     scanPay: z.ZodDefault<z.ZodBoolean>;
+                    terminalScanPay: z.ZodDefault<z.ZodBoolean>;
+                    terminalQrPay: z.ZodDefault<z.ZodBoolean>;
                 }, "strip", z.ZodTypeAny, {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 }, {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 }>;
             }, "strip", z.ZodTypeAny, {
                 card: {
@@ -3712,6 +3718,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             }, {
                 card: {
@@ -3721,6 +3729,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             }>>>;
         }, "strip", z.ZodTypeAny, {
@@ -3737,6 +3747,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             } | null | undefined;
         }, {
@@ -3753,6 +3765,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             } | null | undefined;
         }>>>;
@@ -3810,6 +3824,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             } | null | undefined;
         } | null | undefined;
@@ -3863,6 +3879,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             } | null | undefined;
         } | null | undefined;
@@ -4082,6 +4100,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             } | null | undefined;
         } | null | undefined;
@@ -4275,6 +4295,8 @@ export declare const RestaurantCustomerKioskDto: z.ZodObject<{
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             } | null | undefined;
         } | null | undefined;

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

@@ -403,12 +403,18 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: z.ZodObject<{
                     qrPay: z.ZodDefault<z.ZodBoolean>;
                     scanPay: z.ZodDefault<z.ZodBoolean>;
+                    terminalScanPay: z.ZodDefault<z.ZodBoolean>;
+                    terminalQrPay: z.ZodDefault<z.ZodBoolean>;
                 }, "strip", z.ZodTypeAny, {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 }, {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 }>;
             }, "strip", z.ZodTypeAny, {
                 card: {
@@ -418,6 +424,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             }, {
                 card: {
@@ -427,6 +435,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             }>>>;
         }, "strip", z.ZodTypeAny, {
@@ -443,6 +453,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             } | null | undefined;
         }, {
@@ -459,6 +471,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             } | null | undefined;
         }>>>;
@@ -516,6 +530,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             } | null | undefined;
         } | null | undefined;
@@ -569,6 +585,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             } | null | undefined;
         } | null | undefined;
@@ -624,6 +642,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay: boolean;
                     scanPay: boolean;
+                    terminalScanPay: boolean;
+                    terminalQrPay: boolean;
                 };
             } | null | undefined;
         } | null | undefined;
@@ -680,6 +700,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
                 eWallet: {
                     qrPay?: boolean | undefined;
                     scanPay?: boolean | undefined;
+                    terminalScanPay?: boolean | undefined;
+                    terminalQrPay?: boolean | undefined;
                 };
             } | null | undefined;
         } | null | undefined;
@@ -1058,12 +1080,18 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: z.ZodObject<{
                         qrPay: z.ZodDefault<z.ZodBoolean>;
                         scanPay: z.ZodDefault<z.ZodBoolean>;
+                        terminalScanPay: z.ZodDefault<z.ZodBoolean>;
+                        terminalQrPay: z.ZodDefault<z.ZodBoolean>;
                     }, "strip", z.ZodTypeAny, {
                         qrPay: boolean;
                         scanPay: boolean;
+                        terminalScanPay: boolean;
+                        terminalQrPay: boolean;
                     }, {
                         qrPay?: boolean | undefined;
                         scanPay?: boolean | undefined;
+                        terminalScanPay?: boolean | undefined;
+                        terminalQrPay?: boolean | undefined;
                     }>;
                 }, "strip", z.ZodTypeAny, {
                     card: {
@@ -1073,6 +1101,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay: boolean;
                         scanPay: boolean;
+                        terminalScanPay: boolean;
+                        terminalQrPay: boolean;
                     };
                 }, {
                     card: {
@@ -1082,6 +1112,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay?: boolean | undefined;
                         scanPay?: boolean | undefined;
+                        terminalScanPay?: boolean | undefined;
+                        terminalQrPay?: boolean | undefined;
                     };
                 }>>>;
             }, "strip", z.ZodTypeAny, {
@@ -1098,6 +1130,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay: boolean;
                         scanPay: boolean;
+                        terminalScanPay: boolean;
+                        terminalQrPay: boolean;
                     };
                 } | null | undefined;
             }, {
@@ -1114,6 +1148,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay?: boolean | undefined;
                         scanPay?: boolean | undefined;
+                        terminalScanPay?: boolean | undefined;
+                        terminalQrPay?: boolean | undefined;
                     };
                 } | null | undefined;
             }>>>;
@@ -1171,6 +1207,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay: boolean;
                         scanPay: boolean;
+                        terminalScanPay: boolean;
+                        terminalQrPay: boolean;
                     };
                 } | null | undefined;
             } | null | undefined;
@@ -1224,6 +1262,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay?: boolean | undefined;
                         scanPay?: boolean | undefined;
+                        terminalScanPay?: boolean | undefined;
+                        terminalQrPay?: boolean | undefined;
                     };
                 } | null | undefined;
             } | null | undefined;
@@ -1279,6 +1319,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay: boolean;
                         scanPay: boolean;
+                        terminalScanPay: boolean;
+                        terminalQrPay: boolean;
                     };
                 } | null | undefined;
             } | null | undefined;
@@ -1335,6 +1377,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay?: boolean | undefined;
                         scanPay?: boolean | undefined;
+                        terminalScanPay?: boolean | undefined;
+                        terminalQrPay?: boolean | undefined;
                     };
                 } | null | undefined;
             } | null | undefined;
@@ -1439,6 +1483,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay: boolean;
                         scanPay: boolean;
+                        terminalScanPay: boolean;
+                        terminalQrPay: boolean;
                     };
                 } | null | undefined;
             } | null | undefined;
@@ -1544,6 +1590,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
                     eWallet: {
                         qrPay?: boolean | undefined;
                         scanPay?: boolean | undefined;
+                        terminalScanPay?: boolean | undefined;
+                        terminalQrPay?: boolean | undefined;
                     };
                 } | null | undefined;
             } | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "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",
@@ -192,6 +193,8 @@
         "productSelected": "product(s) selected",
         "promptAnonymousLoginDialog": "Prompt Login Dialog For Anonymous Order",
         "qrPay": "QR Pay",
+        "terminalScanPay": "Terminal Scan Pay",
+        "terminalQrPay": "Terminal QR Pay",
         "rate": "Rate",
         "remoteId": "Remote ID",
         "restaurant": "Restaurant",

package/src/locales/th-TH.json

@@ -35,6 +35,7 @@
         "auto": "อัตโนมัติ",
         "autoIntegration": "รวมอัตโนมัติ",
         "autoIntegrationWarning": "การรวมระบบการจัดส่งอัตโนมัติไม่พร้อมใช้งาน โปรดติดต่อเจ้าหน้าที่ของเราเพื่อขอข้อมูลเพิ่มเติม เหตุผล:  {reason}",
+        "autoIntegrationCountryNotSupport": "แพลตฟอร์มไม่รองรับการเชื่อมต่อการจัดส่งแบบไดนามิกในประเทศ/ภูมิภาคปัจจุบัน",
         "autoSendKitchen": "ส่งอัตโนมัติครัว",
         "autoSendKitchenSublabel": "ต้องใช้ POS เวอร์ชัน 7 ขึ้นไป",
         "balance": "ยอดคงเหลือ",
@@ -189,6 +190,8 @@
         "productSelected": "ผลิตภัณฑ์ที่เลือก",
         "promptAnonymousLoginDialog": "กล่องโต้ตอบพร้อมท์เข้าสู่ระบบสำหรับคำสั่งซื้อแบบไม่เปิดเผยตัวตน",
         "qrPay": "ชำระเงินด้วย QR",
+        "terminalScanPay": "ชำระเงินด้วยการสแกนเทอร์มินัล",
+        "terminalQrPay": "ชำระเงินด้วย QR เทอร์มินัล",
         "rate": "อัตรา",
         "remoteId": "รหัสประจำตัวระยะไกล",
         "restaurant": "ร้านอาหาร",

package/src/locales/zh-CN.json

@@ -35,6 +35,7 @@
         "auto": "自动",
         "autoIntegration": "自动对接",
         "autoIntegrationWarning": "自动配送对接不可用， 请联络我们的工作人员了解更多信息。 原因: {reason}",
+        "autoIntegrationCountryNotSupport": "平台不支持当前国家/地区的自动配送对接。",
         "autoSendKitchen": "自动发送至厨房",
         "autoSendKitchenSublabel": "需要POS版本7或以上",
         "balance": "余额",
@@ -193,6 +194,8 @@
         "productSelected": "已选择商品",
         "promptAnonymousLoginDialog": "为匿名用户弹出登入对话框",
         "qrPay": "二维码支付",
+        "terminalScanPay": "终端扫描支付",
+        "terminalQrPay": "终端二维码支付",
         "rate": "费率",
         "remoteId": "平台注册ID",
         "restaurant": "餐厅",
@@ -274,6 +277,7 @@
         "DeliverySettingUpdated": "配送设置已更新",
         "selectPlatform": "选择平台",
         "platform": "平台",
+        "rateLimitWarning": "每分钟只允许一次请求。请稍后再试",
         "discountRule": {
             "add": "添加折扣规则",
             "description": "定义折扣在账单中如何应用。仅适用于POS版本{minPosVersion}或更高版本。",