@feedmepos/mf-order-setting 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",

package/src/api/remoteOrder/index.ts

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

package/src/locales/en-US.json

@@ -183,6 +183,7 @@
         "pickupPoint": "Pickup point",
         "pleaseCompleteProfile": "please complete your restaurant profile to enable FeedMe Express",
         "pleaseSelectRestaurant": "Please select a restaurant.",
+        "printReceiptAfterClose": "Print receipt after auto close bill",
         "prefix": "Prefix",
         "preOrder": "Pre-order",
         "preOrderHint": "Order on {today}, Customer can order between {start} and {end}. Max 7 days.",

package/src/locales/th-TH.json

@@ -184,6 +184,7 @@
         "preOrder": "สั่งซื้อล่วงหน้า",
         "preOrderHint": "สั่งซื้อในวันที่ {today} ลูกค้าสามารถสั่งซื้อได้ระหว่าง  {start} และ {end} สูงสุด 7 วัน",
         "pricePerMessage": "ราคาต่อข้อความ",
+        "printReceiptAfterClose": "พิมพ์ใบเสร็จหลังจากปิดบิลอัตโนมัติ",
         "processing": "กำลังประมวลผล",
         "productSelected": "ผลิตภัณฑ์ที่เลือก",
         "promptAnonymousLoginDialog": "กล่องโต้ตอบพร้อมท์เข้าสู่ระบบสำหรับคำสั่งซื้อแบบไม่เปิดเผยตัวตน",

package/src/locales/zh-CN.json

@@ -187,6 +187,7 @@
         "prefix": "前缀",
         "preOrder": "预订",
         "preOrderHint": "于今日 {today} 下单，客户可以在 {start} 和 {end} 之间预订。最多 7 天。",
+        "printReceiptAfterClose": "自动关闭账单后打印收据",
         "pricePerMessage": "每条短信的价格",
         "processing": "处理中",
         "productSelected": "已选择商品",

package/src/views/order-settings/delivery/DeliverySetting.vue

@@ -348,6 +348,8 @@ async function updateIntegratedDeliveryType({
     },
     canUseAuto: canUseAutoDeliveryIntegration as boolean | string
   }
+  localAuto.value = setting ?? localAuto.value
+  localManual.value = doc ?? localManual.value
 }
 
 async function updateFeedmeExpress({ key, setting }: IntegratedDeliveryRow) {

package/src/views/order-settings/delivery/delivery.data.ts

@@ -73,8 +73,9 @@ function initExternalDelivery(): FdoExternalSetting {
     enable: false,
     config: {
       autoAccept: true,
-      autoSend: false,
+      autoSend: true,
       autoCloseBill: false,
+      printReceiptAfterClose: false,
     },
     platform: 'ZUS',
   }

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

@@ -7,11 +7,30 @@
       @update:model-value="updateEnable"
       :disabled="!canEdit"
     />
+    <div class="mt-6">
+      <div>
+        <FmCheckbox
+          :model-value="data.config.autoCloseBill"
+          :label="t('order.allowedAutoCloseBill')"
+          @update:model-value="updateAutoCloseBill"
+          :disabled="!canEdit"
+          value=""
+        />
+      </div>
+      <div>
+        <FmCheckbox
+          :model-value="data.config.printReceiptAfterClose ?? true"
+          :label="t('order.printReceiptAfterClose')"
+          @update:model-value="updatePrintReceiptAfterClose"
+          value=""
+          :disabled="!canEdit"
+        />
+      </div>
+    </div>
     <div v-if="data.enable">
-      <FmCard variant="outlined" class="mt-10 p-5">
+      <FmCard variant="outlined" class="mt-6 p-5">
         <div class="mb-3">
           <div class="flex-grow fm-typo-en-title-sm-600 mb-5">{{ t('order.syncMenu') }}</div>
-
           <FmSelect
             :placeholder="t('order.selectPlatform')"
             :model-value="data.platform"
@@ -96,6 +115,16 @@ function emitUpdatedValue() {
   emits('update:model-value', { ...data })
 }
 
+function updateAutoCloseBill(value: boolean) {
+  data.config.autoCloseBill = value
+  emitUpdatedValue()
+}
+
+function updatePrintReceiptAfterClose(value: boolean) {
+  data.config.printReceiptAfterClose = value
+  emitUpdatedValue()
+}
+
 function updateEnable(value: boolean) {
   data.enable = value
   emitUpdatedValue()

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

@@ -50,6 +50,7 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       commissionRate: auto.reportConfig?.commissionRate ?? 0,
       lastSynchronize: auto.lastSynchronize ?? '',
       autoAccept: true,
+      printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
       ignoreDiscount: auto.ignoreDiscount ?? false,
       status: auto.status,
       updatedAt: auto.updatedAt,
@@ -76,6 +77,7 @@ function updateData({ manual, auto }: IntegratedDeliverySettingData) {
       commissionRate: auto.commissionRate
     }
   }
+
   return { manual: data.manual, integrated: data.integrated }
 }
 

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

@@ -43,6 +43,7 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       autoCloseBill: auto.autoCloseBill || false,
       catalogId: auto?.catalogId || null,
       commissionRate: auto.commissionRate,
+      printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
       lastSynchronize: auto.lastSynchronize,
       status: auto.status,
       updatedAt: auto.updatedAt,
@@ -118,9 +119,9 @@ async function startSelfServeFlow() {
 
   if (!url) {
     showError(`Failed to get integration url for ${currentRestaurant?.value?._id}`)
+  } else {
+    window.open(url, '_blank')
   }
-
-  window.open(url, '_blank')
 }
 </script>
 

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

@@ -23,6 +23,7 @@ export interface AutoIntegrateData {
   updatedAt?: string | null
   menuSyncError?: string | null
   sstInclusive?: boolean | null
+  printReceiptAfterClose?: boolean | null
 }
 
 export interface IntegratedDeliverySettingData {
@@ -115,13 +116,21 @@ function updateMenuCatalog(catalogId: string | null) {
   }))
 }
 
-type OrderSettingKey = 'autoAcceptOrder' | 'autoCloseBill' | 'ignoreDiscount' | 'sstInclusive'
+type OrderSettingKey =
+  | 'autoAcceptOrder'
+  | 'autoCloseBill'
+  | 'ignoreDiscount'
+  | 'sstInclusive'
+  | 'printReceiptAfterClose'
 const orderSettingValue = computed(() => {
-  const { autoAccept, autoCloseBill, ignoreDiscount, sstInclusive } = props.modelValue.auto
+  const { autoAccept, autoCloseBill, ignoreDiscount, sstInclusive, printReceiptAfterClose } =
+    props.modelValue.auto
   const value: OrderSettingKey[] = []
   if (autoCloseBill) value.push('autoCloseBill')
   if (ignoreDiscount) value.push('ignoreDiscount')
   if (sstInclusive) value.push('sstInclusive')
+  if (printReceiptAfterClose) value.push('printReceiptAfterClose')
+
   return value
 })
 const orderSettingOptions = computed<
@@ -137,6 +146,10 @@ const orderSettingOptions = computed<
     {
       label: t('order.allowedAutoCloseBill'),
       value: 'autoCloseBill'
+    },
+    {
+      label: t('order.printReceiptAfterClose'),
+      value: 'printReceiptAfterClose'
     }
   ]
   if (props.modelValue.auto.autoAccept !== undefined) {
@@ -159,6 +172,7 @@ function updateOrderSettings(orderSettingKeys: OrderSettingKey[]) {
     ...oldV,
     autoAccept: orderSettingKeys.includes('autoAcceptOrder'),
     autoCloseBill: orderSettingKeys.includes('autoCloseBill'),
+    printReceiptAfterClose: orderSettingKeys.includes('printReceiptAfterClose'),
     ignoreDiscount: orderSettingKeys.includes('ignoreDiscount'),
     sstInclusive: orderSettingKeys.includes('sstInclusive')
   }))

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

@@ -43,6 +43,7 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       integrationId: auto.storeID,
       autoCloseBill: auto.autoCloseBill || false,
       catalogId: auto?.catalogId || null,
+      printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
       commissionRate: auto.reportConfig?.commissionRate || 0,
       lastSynchronize: auto.lastSynchronize,
       status: auto.status,

package/src/views/order-settings/discount-rule/DiscountRuleSetting.vue

@@ -44,12 +44,18 @@
                 />
               </div>
               <FmTextField
-                v-model="group.maxApplicableEffects"
+                :model-value="group.maxApplicableEffects"
                 :label="t('order.discountRule.maxTotalUses')"
                 type="number"
                 :rules="maxApplicableEffectsRules"
                 :min="1"
                 :helper-text="t('order.discountRule.maxTotalUsesSublabel')"
+                @update:model-value="
+                  (newValue) => {
+                    const parsedValue = parseInt(newValue)
+                    group.maxApplicableEffects = isNaN(parsedValue) ? 1 : parsedValue
+                  }
+                "
               />
             </FmCard>
             <FmCard
@@ -408,7 +414,6 @@ async function _updateDiscountRule(effectGroups: FdoEffectGroup[]) {
       lastUpdatedAt: lastUpdatedAt.value || ''
     })
     applyDiscountRuleSettings(discountRule)
-    await initSetting()
   })
 }