@feedmepos/mf-order-setting 0.0.87 → 0.0.88

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

@@ -1277,6 +1277,7 @@ async function updateDelivery(
             autoCloseBill: integratedDocument.autoCloseBill,
             printReceiptAfterClose: integratedDocument.printReceiptAfterClose,
             canRemark: integratedDocument.canRemark,
+            allowReject: integratedDocument.allowReject,
             status: integratedDocument.status,
             dineIn: cleanFulfillment(integratedDocument.dineIn),
             pickup: cleanFulfillment(integratedDocument.pickup),

package/src/views/order-settings/delivery/inhouse/InHouseDelivery.vue

@@ -114,6 +114,10 @@ function updatePrintReceiptAfterClose(printReceiptAfterClose: boolean) {
   emits('update:order-settings', { ...props.orderInhouseDeliverySettings, printReceiptAfterClose })
 }
 
+function updateAllowReject(allowReject: boolean) {
+  emits('update:order-settings', { ...props.orderInhouseDeliverySettings, allowReject })
+}
+
 const inhouse = reactive<InhouseDialogData>(
   props.initialValue
     ? clone(props.initialValue)
@@ -326,6 +330,17 @@ const actualDeliveryTime = computed({
         />
       </div>
 
+      <div class="mb-5">
+        <FmSwitch
+          :model-value="orderInhouseDeliverySettings.allowReject ?? true"
+          value="allowReject"
+          :label="t('order.allowRejectOnPos')"
+          :sublabel="t('order.allowRejectOnPosSublabel')"
+          label-placement="right"
+          @update:model-value="updateAllowReject"
+        />
+      </div>
+
       <div class="mb-5">
         <FmSelect
           :model-value="inhouse.catalogId"

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

@@ -50,6 +50,7 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       updatedAt: auto.updatedAt,
       printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
       menuSyncError: auto.menuSyncError,
+      allowReject: auto.allowReject,
       commissionRate: 0 // always 0
     }
   }
@@ -102,6 +103,7 @@ async function cancelTestOrder() {}
     :model-value="modelValue"
     :company="company"
     :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    show-allow-reject
     @update:model-value="updateDataPass"
     @sync-menu="syncMenu"
     @flow-test-order="flowTestOrder"

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

@@ -31,6 +31,15 @@
           value=""
         />
       </div>
+      <div class="mt-3">
+        <FmSwitch
+          :model-value="data.config.allowReject ?? true"
+          :label="t('order.allowRejectOnPos')"
+          :sublabel="t('order.allowRejectOnPosSublabel')"
+          label-placement="right"
+          @update:model-value="updateAllowReject"
+        />
+      </div>
     </div>
     <div v-if="data.enable">
       <FmCard variant="outlined" class="mt-6 p-5">
@@ -149,7 +158,10 @@ const data = reactive<FdoExternalSetting>({
     printReceiptAfterClose: props.initialValue.config?.printReceiptAfterClose,
     bypass: props.initialValue.config?.bypass,
     skipAllocateTax: props.initialValue.config?.skipAllocateTax,
-    groupItemsBySubCategory: props.initialValue.config?.groupItemsBySubCategory
+    groupItemsBySubCategory: props.initialValue.config?.groupItemsBySubCategory,
+    // Left undefined when unset so the backend's per-key config merge keeps the
+    // stored value; nullish means reject allowed.
+    allowReject: props.initialValue.config?.allowReject
   },
   platform: props.initialValue.platform ?? F_ORDER_PLATFORM.enum.ZUS,
   delivery: cloneMenuOrderTypeSetting(props.initialValue.delivery),
@@ -212,6 +224,11 @@ function updatePrintReceiptAfterClose(value: boolean) {
   emitUpdatedValue()
 }
 
+function updateAllowReject(value: boolean) {
+  data.config.allowReject = value
+  emitUpdatedValue()
+}
+
 function updateEnable(value: boolean) {
   data.enable = value
   emitUpdatedValue()

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

@@ -53,7 +53,8 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       lastSynchronize: auto.lastSynchronize,
       status: auto.status,
       updatedAt: auto.updatedAt,
-      menuSyncError: auto.menuSyncError
+      menuSyncError: auto.menuSyncError,
+      allowReject: auto.allowReject
     }
   }
 })
@@ -100,6 +101,7 @@ async function syncMenu() {
     :model-value="modelValue"
     :company="company"
     :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    show-allow-reject
     @update:model-value="updateDataPass"
     @sync-menu="syncMenu"
   />

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

@@ -57,7 +57,8 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       ignoreDiscount: auto.ignoreDiscount ?? false,
       status: auto.status,
       updatedAt: auto.updatedAt,
-      menuSyncError: auto.menuSyncError
+      menuSyncError: auto.menuSyncError,
+      allowReject: auto.allowReject
     }
   }
 })
@@ -147,6 +148,7 @@ async function startSelfServeFlow() {
     :company="company"
     :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
     :always-show-menu-sync-error="true"
+    show-allow-reject
     @update:model-value="updateDataPass"
     @sync-menu="syncMenu"
     @flow-test-order="flowTestOrder"

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

@@ -30,6 +30,9 @@ export interface AutoIntegrateData {
   menuSyncError?: string | null
   sstInclusive?: boolean | null
   printReceiptAfterClose?: boolean | null
+  // Unset means "reject allowed"; it stays undefined until the merchant toggles
+  // it, so saving another field never writes it.
+  allowReject?: boolean | null
 }
 
 export interface IntegratedDeliverySettingData {
@@ -73,6 +76,13 @@ const props = defineProps({
   syncMenuLoading: {
     type: Boolean,
     default: false
+  },
+  // Opt-in rather than presence-gated like the order-setting checkboxes: an
+  // unset `allowReject` loads as undefined, which presence-gating would read
+  // as "platform has no such setting".
+  showAllowReject: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -268,6 +278,13 @@ function updateOrderSettings(orderSettingKeys: OrderSettingKey[]) {
   }))
 }
 
+function updateAllowReject(allowReject: boolean) {
+  updateAuto((oldV) => ({
+    ...oldV,
+    allowReject
+  }))
+}
+
 function convertStatusI18n(status: string) {
   switch (status) {
     case 'PROCESSING':
@@ -351,6 +368,17 @@ const formattedMenuSyncError = computed(() => {
             />
           </div>
 
+          <FmSwitch
+            v-if="showAllowReject"
+            class="mt-3"
+            :disabled="!canEdit"
+            :model-value="modelValue.auto.allowReject ?? true"
+            :label="t('order.allowRejectOnPos')"
+            :sublabel="t('order.allowRejectOnPosSublabel')"
+            label-placement="right"
+            @update:model-value="updateAllowReject"
+          />
+
           <slot name="order-setting" :editable="!canEdit" />
         </div>
 

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

@@ -52,7 +52,8 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       ignoreDiscount: auto.ignoreDiscount ?? false,
       status: auto.status,
       updatedAt: auto.updatedAt,
-      menuSyncError: auto.menuSyncError
+      menuSyncError: auto.menuSyncError,
+      allowReject: auto.allowReject
     }
   }
 })
@@ -126,6 +127,7 @@ async function cancelTestOrder() {
     :model-value="modelValue"
     :company="company"
     :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    show-allow-reject
     @update:model-value="updateDataPass"
     @sync-menu="syncMenu"
     @flow-test-order="flowTestOrder"

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

@@ -117,7 +117,8 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       status: auto.status,
       updatedAt: auto.updatedAt,
       lastSynchronize: auto.lastSynchronize,
-      menuSyncError: auto.menuSyncError?.message ?? null
+      menuSyncError: auto.menuSyncError?.message ?? null,
+      allowReject: auto.allowReject
     }
   }
 })
@@ -169,7 +170,8 @@ function updateModelValue({ manual, auto }: IntegratedDeliverySettingData) {
     autoCloseBill,
     printReceiptAfterClose,
     canRemark,
-    status
+    status,
+    allowReject
   } = auto
 
   data.manual = manual
@@ -181,7 +183,8 @@ function updateModelValue({ manual, auto }: IntegratedDeliverySettingData) {
     printReceiptAfterClose: printReceiptAfterClose ?? true,
     canRemark: canRemark ?? true,
     partnerMerchantId: integrationId,
-    status: status ?? data.integrated.status
+    status: status ?? data.integrated.status,
+    allowReject
   }
 
   emitUpdatedTngSettings()
@@ -484,6 +487,7 @@ function toggleItemSelection(itemId: string, isSelected: boolean) {
       :company="company"
       :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
       :show-test-order-actions="false"
+      show-allow-reject
       @update:model-value="updateModelValue"
       @sync-menu="syncMenu"
     >

package/src/views/order-settings/dine-in/DineInSetting.vue

@@ -143,6 +143,14 @@
         label-placement="right"
         @update:model-value="updatePrintReceiptAfterClose"
       ></FmSwitch>
+
+      <FmSwitch
+        :model-value="orderSetting?.dineInSettings?.allowReject ?? true"
+        :label="t('order.allowRejectOnPos')"
+        :sublabel="t('order.allowRejectOnPosSublabel')"
+        label-placement="right"
+        @update:model-value="updateAllowReject"
+      ></FmSwitch>
     </div>
     <div class="p-[1.5rem] flex flex-col gap-2 m-5 w-2/3">
       <PaymentType
@@ -313,6 +321,12 @@ function updatePrintReceiptAfterClose(v: boolean) {
   if (dineInSettings) dineInSettings.printReceiptAfterClose = v
 }
 
+// Unset means "reject allowed"; only a merchant toggle writes an explicit value.
+function updateAllowReject(v: boolean) {
+  const dineInSettings = ensureOrderDineInSettings()
+  if (dineInSettings) dineInSettings.allowReject = v
+}
+
 // Threshold mirrors backend `posSupportsDineInRemarkMerge` — must be kept
 // in lockstep. Restaurants on older POS see the toggle disabled with a
 // "requires version X+" hint instead of a hidden control.

package/src/views/order-settings/pickup/PickUpSettingDialogContent.vue

@@ -49,6 +49,15 @@
     label-placement="right"
     @update:model-value="updatePrintReceiptAfterClose"
   />
+  <FmSwitch
+    class="mt-5"
+    :model-value="orderPickupSettings.allowReject ?? true"
+    value="allowReject"
+    :label="t('order.allowRejectOnPos')"
+    :sublabel="t('order.allowRejectOnPosSublabel')"
+    label-placement="right"
+    @update:model-value="updateAllowReject"
+  />
   <FmCard variant="outlined" class="p-5 mt-10">
     <Preorder :model-value="pickupData" @update:model-value="updatePickupSetting" />
   </FmCard>
@@ -173,6 +182,10 @@ const {
 function updatePrintReceiptAfterClose(printReceiptAfterClose: boolean) {
   emits('update-order-settings', { ...props.orderPickupSettings, printReceiptAfterClose })
 }
+
+function updateAllowReject(allowReject: boolean) {
+  emits('update-order-settings', { ...props.orderPickupSettings, allowReject })
+}
 const pickupSetting = ref<FdoRestaurantPickup>(defaultPickupSetting())
 const pickupData = computed<PreorderData | null>(() => {
   if (!pickupSetting.value.pickupTime) {