@feedmepos/mf-order-setting 0.0.27 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "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.10",
-    "@feedmepos/menu": "^1.5.14",
+    "@feedmepos/core": "^2.14.19",
+    "@feedmepos/menu": "^1.5.21",
     "@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/remoteOrder/index.ts

@@ -88,6 +88,9 @@ export const remoteOrderApi = {
     async syncGrabfoodMenu(merchantId: string): Promise<FdoGrabfoodSettings> {
       return getData(await deliveryClientInstance('grabfood').get(`/menu-sync/${merchantId}`));
     },
+    async startSelfServeFlow(restaurantId: string): Promise<string> {
+      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}`));

package/src/locales/en-US.json

@@ -207,6 +207,11 @@
         "selectRestaurant": "Select Restaurant",
         "selectServiceChargeType": "Select service charge type",
         "selectTable": "Select table",
+        "selfServeActivation": {
+            "title": "Self Serve Activation",
+            "subTitle": "New to the flow? Click here to",
+            "learnMore": "learn more"
+        },
         "serve": "serve",
         "serviceCharge": "Service Charge",
         "serviceChargeRule": "* Service Charge required POS version 4.0.0 or higher",
@@ -264,6 +269,31 @@
         "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",
+            "promotion": "Promotion",
+            "voucher": "Voucher"
+        }
     }
 }

package/src/locales/th-TH.json

@@ -203,6 +203,11 @@
         "selectRestaurant": "เลือกร้านอาหาร",
         "selectServiceChargeType": "เลือกประเภทค่าบริการ",
         "selectTable": "เลือกโต๊ะ",
+        "selfServeActivation": {
+            "title": "เปิดใช้งานการบริการตนเอง",
+            "subTitle": "เปิดใช้งานการบริการตนเองเพื่อให้ลูกค้าสามารถสั่งซื้อได้ด้วยตนเอง",
+            "learnMore": "เรียนรู้เพิ่มเติม"
+        },
         "serve": "เสิร์ฟ",
         "serviceCharge": "ค่าบริการ",
         "serviceChargeRule": "* ค่าบริการจำเป็นต้องใช้ POS เวอร์ชัน 4.0.0 ขึ้นไป",
@@ -259,6 +264,31 @@
         "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": "เวอร์ชัน",
+            "promotion": "โปรโมชั่น",
+            "voucher": "บัตรกำนัล"
+        }
     }
 }

package/src/locales/zh-CN.json

@@ -91,6 +91,7 @@
         "edit": "编辑",
         "editOfflinePayment": "编辑线下支付方式",
         "editPickupPoint": "编辑取货地点",
+        "effectSelected": "已选择效果",
         "enableServiceCharge": "启用服务费",
         "end": "结束",
         "enterAddress": "输入地址",
@@ -203,10 +204,17 @@
         "search": "搜索",
         "searchRestaurant": "搜索餐厅",
         "selectAllItemsIncludeCustomItem": "全部 （包括自定义商品）",
+        "selectEffects": "选择效果",
+        "selectAllEffects": "选择所有效果",
         "selectItem": "请选择",
         "selectRestaurant": "选择餐厅",
         "selectServiceChargeType": "选择服务费类型",
         "selectTable": "选择餐桌",
+        "selfServeActivation": {
+            "title": "自助激活对接",
+            "subTitle": "第一次使用这个流程？点击此处",
+            "learnMore": "了解更多"
+        },
         "serve": "服务",
         "serviceCharge": "服务费",
         "serviceChargeRule": "* 服务费功能仅适用于POS版本4.0.0或更高版本。",
@@ -264,6 +272,31 @@
         "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": "版本",
+            "promotion": "促销",
+            "voucher": "代金券"
+        }
     }
 }

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/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,
   }
 })

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

@@ -1,9 +1,9 @@
 <template>
   <div class="py-[1.5rem]">
-    <FmPageHead :title="t('order.orderSetting')"/>
+    <FmPageHead :title="t('order.orderSetting')" />
     <div class="flex px-[1.5rem]">
       <div class="flex-[2_2_0%] overflow-auto">
-        <FmTabs v-model:model-value="selectedOrderSetting" :items="settingItem" />
+        <FmTabs v-model:model-value="selectedOrderSetting" :items="settingItem" :showMoreAt="99" />
       </div>
     </div>
   </div>
@@ -18,11 +18,20 @@ import DineInSetting from './dine-in/DineInSetting.vue'
 import PickUpSetting from './pickup/PickUpSetting.vue'
 import SmsSetting from './sms/SmsSetting.vue'
 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'
 
 const { t } = useI18n()
-type OrderSettingMenuItemValue = 'delivery' | 'pickup' | 'dinein' | 'servicecharge' | 'sms' | 'general'
+type OrderSettingMenuItemValue =
+  | 'delivery'
+  | 'pickup'
+  | 'dinein'
+  | 'servicecharge'
+  | 'sms'
+  | 'discountRule'
+  | 'general'
 const selectedOrderSetting = ref<OrderSettingMenuItemValue>('delivery')
 
 const settingItem = computed<FmTabProps[]>(() => [
@@ -30,8 +39,9 @@ const settingItem = computed<FmTabProps[]>(() => [
   { label: t('order.pickup'), value: 'pickup' },
   { label: t('order.dineIn'), value: 'dinein' },
   { label: t('order.serviceCharge'), value: 'servicecharge' },
+  { label: t('order.discountRule.title'), value: 'discountRule' },
   { label: t('order.sms'), value: 'sms' },
-  { label: t('order.general'), value: 'general'},
+  { label: t('order.general'), value: 'general' }
 ])
 
 const currentComponent = computed(() => {
@@ -46,7 +56,9 @@ const currentComponent = computed(() => {
       return SmsSetting
     case 'servicecharge':
       return ServiceChargeSetting
-    case 'general': 
+    case 'discountRule':
+      return DiscountRuleSetting
+    case 'general':
       return GeneralSetting
   }
 })

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

@@ -88,7 +88,7 @@ async function syncMenu() {
 }
 
 import { useSnackbarFunctions } from '@/components/snackbar'
-const { showSuccess } = useSnackbarFunctions()
+const { showSuccess, showError } = useSnackbarFunctions()
 
 async function flowTestOrder() {
   await startAsyncCallWithErr(async () => {
@@ -108,6 +108,20 @@ async function cancelTestOrder() {
   })
   showSuccess('Completed. ')
 }
+
+async function startSelfServeFlow() {
+  const url = await startAsyncCallWithErr(async () => {
+    return await remoteOrderApi.integratedDelivery.startSelfServeFlow(
+      currentRestaurant.value?._id ?? ''
+    )
+  })
+
+  if (!url) {
+    showError(`Failed to get integration url for ${currentRestaurant?.value?._id}`)
+  }
+
+  window.open(url, '_blank')
+}
 </script>
 
 <template>
@@ -120,4 +134,27 @@ async function cancelTestOrder() {
     @flow-test-order="flowTestOrder"
     @cancel-test-order="cancelTestOrder"
   />
+  <div v-if="canUseAutoDeliveryIntegration === true">
+    <div class="flex flex-row mt-5 items-center">
+      <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-3">
+        {{ t('order.selfServeActivation.title') }}
+      </div>
+      <FmButton
+        variant="primary"
+        :label="t('order.start')"
+        @click="startSelfServeFlow"
+        class="m-1"
+      />
+    </div>
+    <div>
+      {{ t('order.selfServeActivation.subTitle') }}
+      <a
+        href="https://doc.clickup.com/25608366/d/h/rdg5e-52596/7d44e2bd89752e0"
+        target="_blank"
+        style="color: blue; text-decoration: underline"
+      >
+        {{ t('order.selfServeActivation.learnMore') }}</a
+      >.
+    </div>
+  </div>
 </template>