@feedmepos/mf-order-setting 0.0.26 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -21,12 +21,13 @@
     "build:dev": "cross-env NODE_ENV=dev vite build --mode dev",
     "build:prod": "vite build --mode prod",
     "type-check": "set NODE_OPTIONS=--max-old-space-size=16384 && vue-tsc --noEmit -p tsconfig.app.json --composite false",
+    "type-check:mac": "export NODE_OPTIONS=--max-old-space-size=16384 && vue-tsc --noEmit -p tsconfig.app.json --composite false",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@feedmepos/core": "^2.14.0",
-    "@feedmepos/menu": "^1.5.6",
+    "@feedmepos/core": "^2.14.19",
+    "@feedmepos/menu": "^1.5.18",
     "@feedmepos/mf-common": "1.20.0-beta.2",
     "@feedmepos/ordering": "^0.0.3",
     "@feedmepos/ui-library": "1.5.2-beta.1",

package/src/api/business/index.ts

@@ -0,0 +1,16 @@
+import { getData, businessClientInstance } from '@/api'
+import { FdtoDiscountRuleRes, FdoDiscountRule } from '@feedmepos/core/entity'
+
+export const businessApi = {
+  async readDiscountRule(businessId: string): Promise<FdtoDiscountRuleRes> {
+    const result = await businessClientInstance(businessId).get('/discount-rule')
+    return getData(result)
+  },
+  async updateDiscountRule(
+    businessId: string,
+    discountRule: FdoDiscountRule
+  ): Promise<FdtoDiscountRuleRes> {
+    const result = await businessClientInstance(businessId).put('/discount-rule', discountRule)
+    return getData(result)
+  }
+}

package/src/api/effects/index.ts

@@ -0,0 +1,7 @@
+import { getData, marketingBackendClientInstance } from '..';
+
+export const effectApi = {
+  async getEffects(businessId:string): Promise<any> {
+    return getData(await marketingBackendClientInstance().get(`/businesses/${businessId}/effects`)).data;
+  }
+};

package/src/api/index.ts

@@ -12,6 +12,7 @@ interface ApiUrl {
   menuBackendUrl: string
   smsBackendUrl: string
   accountBackendUrl: string
+  marketingBackendUrl: string
 }
 
 let apiUrl: ApiUrl | null = null
@@ -57,13 +58,15 @@ function generateBackendUrl(country: F_COUNTRY): ApiUrl {
   const domain = `${isDev ? '-dev' : ''}${area}.feedmeapi.com`
   const portalBackendUrl = `https://portal-v2${domain}`
   const accountBackendUrl = `https://account${domain}`
+  const marketingBackendUrl = `https://portal-marketing${domain}`
   return {
     portalBackendUrl,
     websocketBackendUrl: `wss://94ilf9iqc0.execute-api.ap-southeast-1.amazonaws.com/${isDev ? 'dev' : 'prod'}`,
     linkedDeliveryBackend: `${portalBackendUrl}/linked-deliveries`,
     menuBackendUrl: `${portalBackendUrl}/menu-v4`,
     smsBackendUrl: `https://sms${domain}`,
-    accountBackendUrl
+    accountBackendUrl,
+    marketingBackendUrl
   }
 }
 
@@ -179,6 +182,11 @@ export const smsBackendClientInstance = (): AxiosInstance => {
   return baseClientInstance('', 'portal', { url: smsBackendUrl })
 }
 
+export const marketingBackendClientInstance = (): AxiosInstance => {
+  const { marketingBackendUrl } = SvcConfig.getBackendUrl()
+  return baseClientInstance('', 'portal', { url: marketingBackendUrl })
+}
+
 export function getData<T>(response: AxiosResponse<T>): T {
   return response.data
 }

package/src/api/kiosk/index.ts

@@ -1,22 +1,27 @@
 import { getData, restaurantClientInstance } from '@/api';
 import { KioskOtpDto, KioskDeviceDto } from '@entity';
 
-async function requestOtp() : Promise<KioskOtpDto>{
+async function requestOtp(): Promise<KioskOtpDto> {
     const result = await restaurantClientInstance().get('/kiosk/otp');
     return getData<KioskOtpDto>(result);
 }
 
-async function getDevices(): Promise<KioskDeviceDto[]>{
+async function getDevices(): Promise<KioskDeviceDto[]> {
     const result = await restaurantClientInstance().get('/kiosk/devices');
     return getData<KioskDeviceDto[]>(result);
 }
 
-async function unbind(machineId: string): Promise<void>{
+async function unbind(machineId: string): Promise<void> {
     await restaurantClientInstance().delete(`/kiosk/unbind/${machineId}`);
 }
 
+async function updateDevicePin(pinInfo: string, machineId: string): Promise<void> {
+    await restaurantClientInstance().put(`/kiosk/updateDevicePin/${machineId}`, { pinInfo });
+}
+
 export const KioskApi = {
     requestOtp,
     getDevices,
-    unbind
+    unbind,
+    updateDevicePin
 };

package/src/app.ts

@@ -1,10 +1,13 @@
 import enUS from "./locales/en-US.json"
 import zhCN from "./locales/zh-CN.json"
+import thTh from "./locales/th-TH.json"
+
 export type AppMessagesSchema = typeof enUS
 
 export const i18nMessages = {
     "en-US": enUS,
-    "zh-CN": zhCN
+    "zh-CN": zhCN,
+    "th-TH": thTh,
 }
 
 export { default as FmApp } from './App.vue'

package/src/locales/en-US.json

@@ -264,6 +264,29 @@
         "pickupCatalog": "Pickup catalog",
         "DeliverySettingUpdated": "Delivery setting updated.",
         "selectPlatform": "Select Platform",
-        "platform": "Platform"
+        "platform": "Platform",
+        "discountRule": {
+            "add": "Add discount rule",
+            "description": "Define how the discount is applied to the bill. Require POS version {minPosVersion} or above.",
+            "effect": "Promotion/Vouchers",
+            "effectSelected": "{count} selected",
+            "effectUsedInOtherGroup": "Used in another rule",
+            "forceSync": "Force sync",
+            "latest": "Latest",
+            "loadingRestaurants": "Loading restaurants",
+            "maxTotalUses": "Max total uses",
+            "maxTotalUsesSublabel": "Maximum times promotions/vouchers can be used per bill",
+            "outdated": "Outdated",
+            "restaurantName": "Restaurant Name",
+            "restaurants": "Restaurants",
+            "restaurantsDescription": "Sync status of the discount rule across all restaurants",
+            "selectAllEffects": "Select all promotions/vouchers",
+            "selectEffects": "Select promotions/vouchers",
+            "status": "Status",
+            "syncSuccess": "Discount rule setting synced to all restaurants",
+            "title": "Discount Rule",
+            "updateSuccess": "Discount rule setting updated",
+            "version": "Version"
+        }
     }
 }

package/src/locales/th-TH.json

@@ -252,6 +252,36 @@
         "updatePickupSetting": "อัปเดตการตั้งค่าการรับสินค้า",
         "updateSetting": "อัปเดตการตั้งค่า",
         "vendorBearPercentage": "เปอร์เซ็นต์ที่ผู้ขายรับผิดชอบ",
-        "wednesday": "วันพุธ"
+        "wednesday": "วันพุธ",
+        "externalDelivery": "จัดการการจัดส่ง External",
+        "manageExternalDelivery": "จัดการการจัดส่งภายนอก",
+        "deliveryCatalog": "แคตตาล็อกการจัดส่ง",
+        "pickupCatalog": "แคตตาล็อกการรับสินค้า",
+        "DeliverySettingUpdated": "อัปเดตการตั้งค่าการจัดส่งแล้ว",
+        "selectPlatform": "เลือกแพลตฟอร์ม",
+        "platform": "แพลตฟอร์ม",
+        "discountRule": {
+            "add": "เพิ่มกฎส่วนลด",
+            "description": "กำหนดวิธีการใช้ส่วนลดในบิล ใช้ได้กับ POS เวอร์ชัน {minPosVersion} หรือใหม่กว่าเท่านั้น",
+            "effect": "โปรโมชั่น/บัตรกำนัล",
+            "effectSelected": "เลือกแล้ว {count} รายการ",
+            "effectUsedInOtherGroup": "ถูกใช้ในกฎอื่น",
+            "forceSync": "ซิงค์ข้อมูลแบบบังคับ",
+            "latest": "เผยแพร่ล่าสุด",
+            "loadingRestaurants": "กำลังโหลดร้านอาหาร",
+            "maxTotalUses": "จำนวนการใช้งานสูงสุด",
+            "maxTotalUsesSublabel": "จำนวนครั้งสูงสุดที่สามารถใช้โปรโมชั่น/บัตรกำนัลต่อบิล",
+            "outdated": "ล้าสมัย",
+            "restaurantName": "ชื่อร้านอาหาร",
+            "restaurants": "ร้านอาหาร",
+            "restaurantsDescription": "สถานะการซิงค์กฎส่วนลดของทุกร้านอาหาร",
+            "selectAllEffects": "เลือกโปรโมชั่น/บัตรกำนัลทั้งหมด",
+            "selectEffects": "เลือกโปรโมชั่น/บัตรกำนัล",
+            "status": "สถานะ",
+            "syncSuccess": "ซิงค์กฎส่วนลดไปยังร้านอาหารทั้งหมดเรียบร้อยแล้ว",
+            "title": "กฎส่วนลด",
+            "updateSuccess": "อัปเดตกฎส่วนลดเรียบร้อยแล้ว",
+            "version": "เวอร์ชัน"
+        }
     }
 }

package/src/locales/zh-CN.json

@@ -91,6 +91,7 @@
         "edit": "编辑",
         "editOfflinePayment": "编辑线下支付方式",
         "editPickupPoint": "编辑取货地点",
+        "effectSelected": "已选择效果",
         "enableServiceCharge": "启用服务费",
         "end": "结束",
         "enterAddress": "输入地址",
@@ -203,6 +204,8 @@
         "search": "搜索",
         "searchRestaurant": "搜索餐厅",
         "selectAllItemsIncludeCustomItem": "全部 （包括自定义商品）",
+        "selectEffects": "选择效果",
+        "selectAllEffects": "选择所有效果",
         "selectItem": "请选择",
         "selectRestaurant": "选择餐厅",
         "selectServiceChargeType": "选择服务费类型",
@@ -264,6 +267,29 @@
         "pickupCatalog": "自取目录",
         "DeliverySettingUpdated": "配送设置已更新",
         "selectPlatform": "选择平台",
-        "platform": "平台"
+        "platform": "平台",
+        "discountRule": {
+            "add": "添加折扣规则",
+            "description": "定义折扣在账单中如何应用。仅适用于POS版本{minPosVersion}或更高版本。",
+            "effect": "促销/代金券",
+            "effectSelected": "已选择{count}个",
+            "effectUsedInOtherGroup": "已在其他规则中使用",
+            "forceSync": "强制同步",
+            "latest": "已发布",
+            "loadingRestaurants": "正在加载餐厅",
+            "maxTotalUses": "最大使用次数",
+            "maxTotalUsesSublabel": "每张账单最多可使用促销/代金券次数",
+            "outdated": "过时",
+            "restaurantName": "餐厅名称",
+            "restaurants": "餐厅",
+            "restaurantsDescription": "所有餐厅的折扣规则同步状态",
+            "selectAllEffects": "选择所有促销/代金券",
+            "selectEffects": "选择促销/代金券",
+            "status": "状态",
+            "syncSuccess": "折扣规则设置已同步到所有餐厅",
+            "title": "折扣规则",
+            "updateSuccess": "折扣规则设置已更新",
+            "version": "版本"
+        }
     }
 }

package/src/modules/kiosk/interface.ts

@@ -1,4 +1,4 @@
-import { Printer, ScannerInfoDto, KioskTerminalInfoDto } from '@entity';
+import { Printer, ScannerInfoDto, KioskTerminalInfoDto, F_ORDER_PLATFORM_TYPE } from '@entity';
 export interface MfKioskDeviceConfigs {
     printerInfo?: Printer,
     scannerInfo?: ScannerInfoDto,
@@ -10,6 +10,10 @@ export interface MfKioskDevice {
     machineId: string,
     config: MfKioskDeviceConfigs,
     activatedAt: Date,
+    deviceAppType?: F_ORDER_PLATFORM_TYPE,
+    slotInfo?: string,
+    pinInfo?: string,
+    deviceAppVersion?: string,
 }
 
 

package/src/stores/business/index.ts

@@ -0,0 +1,45 @@
+import { defineStore } from 'pinia'
+import { FdtoDiscountRuleRes, FdoDiscountRule } from '@feedmepos/core/entity'
+import { useCoreStore } from '@feedmepos/mf-common'
+import { ref } from 'vue'
+import { businessApi } from '@/api/business'
+
+interface BusinessState {
+  discountRule?: FdtoDiscountRuleRes
+}
+
+function initBusinessState(): BusinessState {
+  return {
+    discountRule: undefined
+  }
+}
+
+export const useBusinessStore = defineStore('business', () => {
+  const coreStore = useCoreStore()
+  const state = ref(initBusinessState())
+
+  async function readDiscountRule(): Promise<FdtoDiscountRuleRes> {
+    if (!coreStore.currentBusiness.value?._id) {
+      throw new Error('No business selected.')
+    }
+    const discountRule = await businessApi.readDiscountRule(coreStore.currentBusiness.value._id)
+    state.value.discountRule = discountRule
+    return discountRule
+  }
+  async function updateDiscountRule(discountRule: FdoDiscountRule): Promise<FdtoDiscountRuleRes> {
+    if (!coreStore.currentBusiness.value?._id) {
+      throw new Error('No business selected.')
+    }
+    const updatedRule = await businessApi.updateDiscountRule(
+      coreStore.currentBusiness.value._id,
+      discountRule
+    )
+    state.value.discountRule = updatedRule
+    return updatedRule
+  }
+  return {
+    state: state.value,
+    readDiscountRule,
+    updateDiscountRule
+  }
+})

package/src/stores/kiosk/index.ts

@@ -5,7 +5,7 @@ import { type MfKioskDevice } from "../../modules/kiosk/interface";
 import { KioskMapper } from "./mapper";
 
 interface State {
-    otp : string;
+    otp: string;
     devices: MfKioskDevice[];
 }
 
@@ -16,25 +16,30 @@ export const useKioskStore = defineStore('kiosk', () => {
         devices: [],
     });
 
-    async function requestOtp(){
+    async function requestOtp() {
         const result = await KioskApi.requestOtp();
         state.value.otp = result.otp;
     }
 
-    async function getDevices(){
+    async function getDevices() {
         const result = await KioskApi.getDevices();
         state.value.devices = result.map((r) => KioskMapper.toMfKioskDevice(r));
     }
 
-    async function unbind(machineId: string){
+    async function unbind(machineId: string) {
         await KioskApi.unbind(machineId);
         await getDevices();
     }
 
+    async function updateDevicePin(pinInfo: string, machineId: string) {
+        await KioskApi.updateDevicePin(pinInfo, machineId);
+    }
+
     return {
         state: state.value,
         requestOtp,
         getDevices,
         unbind,
+        updateDevicePin
     }
 });

package/src/stores/kiosk/mapper.ts

@@ -1,7 +1,7 @@
 import { type MfKioskDevice } from "@/modules/kiosk/interface";
 import type { KioskDeviceDto } from "@entity";
 
-const toMfKioskDevice = (dto : KioskDeviceDto) : MfKioskDevice => {
+const toMfKioskDevice = (dto: KioskDeviceDto): MfKioskDevice => {
     return {
         name: dto.name ?? 'N/A',
         machineId: dto.machineId,
@@ -11,6 +11,10 @@ const toMfKioskDevice = (dto : KioskDeviceDto) : MfKioskDevice => {
             terminalInfo: dto.terminalInfo ?? undefined,
         },
         activatedAt: tokenToActivatedAt(dto.token),
+        deviceAppType: dto.deviceAppType ?? undefined,
+        slotInfo: dto.slotInfo ?? undefined,
+        pinInfo: dto.pinInfo ?? undefined,
+        deviceAppVersion: dto.deviceAppVersion ?? undefined,
     };
 };
 

package/src/stores/restaurant/index.ts

@@ -13,6 +13,8 @@ import {
   type FdoAddress,
   type FdoProfile,
   FdoRestaurant,
+  FdoRestaurantSetting,
+  type FdoEffectGroup
 } from '@feedmepos/core/entity'
 import { FdoExternalSetting, FdoGrabfoodSettings } from '@entity'
 import { FeatureFlag, Pos } from '@feedmepos/core'
@@ -145,6 +147,6 @@ export const useRestaurantStore = defineStore('restaurant', () =>  {
     updateIntegratedGrabfoodDelivery,
     updateIntegratedShopeefoodDelivery,
     updateExternalDelivery,
-    getRestaurantEPayment
+    getRestaurantEPayment,
   }
 })