@feedmepos/mf-order-setting 0.0.72-test.1 → 0.0.73-dev

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

@@ -1,77 +1,109 @@
-import { F_PAYMENT_NAME, FdoLinkedDelivery, F_COUNTRY } from "@feedmepos/core/entity";
-import { useCoreStore } from '@feedmepos/mf-common';
+import { F_PAYMENT_NAME, FdoLinkedDelivery, F_COUNTRY } from '@feedmepos/core/entity'
+import { useCoreStore } from '@feedmepos/mf-common'
 
-export type LinkedDeliveryDoc = FdoLinkedDelivery & { _rev: string };
+export type LinkedDeliveryDoc = FdoLinkedDelivery & { _rev: string }
 
 export enum AUTO_INTEGRATION_CLIENT {
   foodpanda = 'foodpanda',
   grabfood = 'grabfood',
+  lineman = 'lineman',
   shopeefood = 'shopeefood',
   deliveroo = 'deliveroo',
+  tng = 'tng',
   gofood = 'gofood',
   external = 'external'
 }
 
 export interface DeliveryCompany {
-  id: string;
-  name: string;
-  slotPrefix: string;
-  paymentTypeKey: string;
-  key: string;
+  id: string
+  name: string
+  slotPrefix: string
+  paymentTypeKey: string
+  key: string
 }
 
 function formatDeliveryCompanyKey(key: string) {
-  return key.toLowerCase().replace('_', '').toLowerCase();
+  return key.toLowerCase().replace('_', '').toLowerCase()
 }
 
 export function useDelivery() {
   function getLinkedDeliveryDoc(docs: LinkedDeliveryDoc[], key: string) {
-    return docs.find((doc) => formatDeliveryCompanyKey(doc.key) === formatDeliveryCompanyKey(key));
+    return docs.find((doc) => formatDeliveryCompanyKey(doc.key) === formatDeliveryCompanyKey(key))
   }
 
   function filterLocalDeliveryCompanies(companies: DeliveryCompany[]) {
-    return companies.filter(({ key }) => !Object.keys(AUTO_INTEGRATION_CLIENT).includes(formatDeliveryCompanyKey(key)));
+    return companies.filter(
+      ({ key }) => !Object.keys(AUTO_INTEGRATION_CLIENT).includes(formatDeliveryCompanyKey(key))
+    )
   }
 
   function getPaymentType(paymentTypeKey?: string) {
-    return paymentTypeKey === F_PAYMENT_NAME.enum.CASH ? 'Cash' : 'Default';
+    return paymentTypeKey === F_PAYMENT_NAME.enum.CASH ? 'Cash' : 'Default'
   }
 
   function equalKey(key: string, targetKey: string) {
-    return formatDeliveryCompanyKey(key) === formatDeliveryCompanyKey(targetKey);
+    return formatDeliveryCompanyKey(key) === formatDeliveryCompanyKey(targetKey)
   }
 
-  function isIntegratedPlatformSupported(platform: AUTO_INTEGRATION_CLIENT, country?: F_COUNTRY | null): boolean {
+  function isIntegratedPlatformSupported(
+    platform: AUTO_INTEGRATION_CLIENT,
+    country?: F_COUNTRY | null
+  ): boolean {
     country = country || useCoreStore().currentCountry.value || F_COUNTRY.enum.MY
-    const mySupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.shopeefood, AUTO_INTEGRATION_CLIENT.external];
-    const sgSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.deliveroo];
-    const thSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.external];
-    const pkSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.external];
-    const idSupported = [AUTO_INTEGRATION_CLIENT.grabfood, AUTO_INTEGRATION_CLIENT.gofood, AUTO_INTEGRATION_CLIENT.external];
+    const mySupported = [
+      AUTO_INTEGRATION_CLIENT.foodpanda,
+      AUTO_INTEGRATION_CLIENT.grabfood,
+      AUTO_INTEGRATION_CLIENT.shopeefood,
+      AUTO_INTEGRATION_CLIENT.tng,
+      AUTO_INTEGRATION_CLIENT.external
+    ]
+    const sgSupported = [
+      AUTO_INTEGRATION_CLIENT.foodpanda,
+      AUTO_INTEGRATION_CLIENT.grabfood,
+      AUTO_INTEGRATION_CLIENT.deliveroo,
+      AUTO_INTEGRATION_CLIENT.external
+    ]
+    const thSupported = [
+      AUTO_INTEGRATION_CLIENT.grabfood,
+      AUTO_INTEGRATION_CLIENT.external,
+      AUTO_INTEGRATION_CLIENT.lineman
+    ]
+    const pkSupported = [AUTO_INTEGRATION_CLIENT.foodpanda, AUTO_INTEGRATION_CLIENT.external]
+    const idSupported = [
+      AUTO_INTEGRATION_CLIENT.grabfood,
+      AUTO_INTEGRATION_CLIENT.gofood,
+      AUTO_INTEGRATION_CLIENT.external
+    ]
 
-    let supportedPlatforms: AUTO_INTEGRATION_CLIENT[] = [];
+    let supportedPlatforms: AUTO_INTEGRATION_CLIENT[] = []
     switch (country) {
       case F_COUNTRY.enum.MY:
         supportedPlatforms = mySupported
-        break;
+        break
       case F_COUNTRY.enum.SG:
         supportedPlatforms = sgSupported
-        break;
+        break
       case F_COUNTRY.enum.TH:
         supportedPlatforms = thSupported
-        break;
+        break
       case F_COUNTRY.enum.PK:
         supportedPlatforms = pkSupported
-        break;
+        break
       case F_COUNTRY.enum.ID:
         supportedPlatforms = idSupported
-        break;
+        break
       default:
-        break;
+        break
     }
 
     return supportedPlatforms.includes(platform)
   }
 
-  return { getLinkedDeliveryDoc, filterLocalDeliveryCompanies, getPaymentType, equalKey, isIntegratedPlatformSupported };
-}
+  return {
+    getLinkedDeliveryDoc,
+    filterLocalDeliveryCompanies,
+    getPaymentType,
+    equalKey,
+    isIntegratedPlatformSupported
+  }
+}

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

@@ -9,8 +9,9 @@ import type {
   FdoOfflinePaymentMethod,
   FdoRestaurantInHouseDelivery
 } from '@feedmepos/core/entity'
+import type { OrderInhouseDeliverySettingsDto } from '@entity'
 import { F_FEATURE } from '@feedmepos/core/entity'
-import { FdoProductTaxSetting } from '@feedmepos/menu/entity'
+import { FdoProductTaxSetting } from '@feedmepos/entity'
 import { computed, reactive, watch, type PropType } from 'vue'
 import Preorder from '../../pickup/Preorder.vue'
 import DeliveryTime from './DeliveryTime.vue'
@@ -73,9 +74,24 @@ const props = defineProps({
   address: {
     type: Object as PropType<Address | undefined>,
     required: true
+  },
+  // Bill auto-close / receipt-print preferences live on
+  // `orderSetting.inhouseDeliverySettings`, a separate doc from the
+  // restaurant-level in-house delivery setting bound to `inhouse` below.
+  orderInhouseDeliverySettings: {
+    type: Object as PropType<OrderInhouseDeliverySettingsDto>,
+    default: () => ({})
   }
 })
 
+function updateAutoCloseBill(autoCloseBill: boolean) {
+  emits('update:order-settings', { ...props.orderInhouseDeliverySettings, autoCloseBill })
+}
+
+function updatePrintReceiptAfterClose(printReceiptAfterClose: boolean) {
+  emits('update:order-settings', { ...props.orderInhouseDeliverySettings, printReceiptAfterClose })
+}
+
 const inhouse = reactive<InhouseDialogData>(
   props.initialValue
     ? clone(props.initialValue)
@@ -161,6 +177,7 @@ function updateTaxInclusive(taxOption: TaxOption): void {
 
 const emits = defineEmits<{
   (event: 'update:model-value', v: FdoRestaurantInHouseDelivery): void
+  (event: 'update:order-settings', v: OrderInhouseDeliverySettingsDto): void
 }>()
 
 function emitUpdatedValue() {
@@ -252,6 +269,28 @@ const actualDeliveryTime = computed({
         />
       </div>
 
+      <div class="mb-5">
+        <FmSwitch
+          :model-value="orderInhouseDeliverySettings.autoCloseBill ?? false"
+          value="autoCloseBill"
+          :label="t('order.autoCloseBill')"
+          :sublabel="t('order.autoCloseBillSublabel')"
+          label-placement="right"
+          @update:model-value="updateAutoCloseBill"
+        />
+      </div>
+
+      <div class="mb-5">
+        <FmSwitch
+          :model-value="orderInhouseDeliverySettings.printReceiptAfterClose ?? false"
+          value="printReceiptAfterClose"
+          :label="t('order.printReceiptAfterClose')"
+          :sublabel="t('order.printReceiptAfterCloseSublabel')"
+          label-placement="right"
+          @update:model-value="updatePrintReceiptAfterClose"
+        />
+      </div>
+
       <div class="mb-5">
         <FmSelect
           :model-value="inhouse.catalogId"

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

@@ -78,7 +78,7 @@ async function syncMenu() {
   const restaurantId = currentRestaurant.value?._id ?? ''
   await startAsyncCallWithErr(async () => {
     try {
-      const res = await remoteOrderApi.integratedDelivery.syncDeliverooMernu(restaurantId)
+      const res = await remoteOrderApi.integratedDelivery.syncDeliverooMenu(restaurantId)
       const temp = {
         ...modelValue.value.auto,
         lastSynchronize: res?.lastSynchronize || modelValue.value.auto.lastSynchronize

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, type PropType, reactive } from 'vue'
 
-import type { FdoLinkedDelivery } from '@feedmepos/core/entity'
+import { F_COUNTRY, type FdoLinkedDelivery } from '@feedmepos/core/entity'
 import { FdoGrabfoodSettings } from '@entity'
 import type { DeliveryCompany } from '../delivery'
 import type { IntegratedDeliverySettingData } from './IntegratedDelivery.vue'
@@ -16,6 +16,12 @@ export interface GrabfoodDeliveryData {
   integrated: FdoGrabfoodSettings
 }
 const { t } = useI18n()
+const GRABFOOD_LEARN_MORE_URL_DEFAULT =
+  'https://scribehow.com/o/5CPW6fuHTOe954ExNOUUvw/viewer/How_To_Activate_GrabFood_Auto_Integration_For_Your_Restaurant__Premium_POS__-pyKp4jcTKGDihKX7pfFWg'
+const GRABFOOD_LEARN_MORE_URL_BY_COUNTRY: Partial<Record<F_COUNTRY, string>> = {
+  [F_COUNTRY.enum.TH]:
+    'https://scribehow.com/o/5CPW6fuHTOe954ExNOUUvw/page/__Grab__FeedMe_POS__kLI64nZATuq4G_v0Z3ziKQ'
+}
 
 const props = defineProps({
   initialValue: {
@@ -41,10 +47,12 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       enable: auto.enable,
       integrationId: auto.merchantID,
       autoCloseBill: auto.autoCloseBill || false,
+      autoCloseOnDelivered: auto.autoCloseOnDelivered ?? false,
       catalogId: auto?.catalogId || null,
       commissionRate: auto.commissionRate,
       printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
       lastSynchronize: auto.lastSynchronize,
+      ignoreDiscount: auto.ignoreDiscount ?? false,
       status: auto.status,
       updatedAt: auto.updatedAt,
       menuSyncError: auto.menuSyncError
@@ -52,7 +60,11 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
   }
 })
 
-const { currentRestaurant } = useCoreStore()
+const { currentRestaurant, currentCountry } = useCoreStore()
+const learnMoreUrl = computed(() => {
+  const country = (currentCountry.value || F_COUNTRY.enum.MY) as F_COUNTRY
+  return GRABFOOD_LEARN_MORE_URL_BY_COUNTRY[country] || GRABFOOD_LEARN_MORE_URL_DEFAULT
+})
 
 function updateData({ manual, auto }: IntegratedDeliverySettingData) {
   data.manual = manual
@@ -150,11 +162,7 @@ async function startSelfServeFlow() {
     </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"
-      >
+      <a :href="learnMoreUrl" target="_blank" style="color: blue; text-decoration: underline">
         {{ t('order.selfServeActivation.learnMore') }}</a
       >.
     </div>

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

@@ -17,6 +17,8 @@ export interface AutoIntegrateData {
   catalogId: string | null
   autoAccept?: boolean | null
   autoCloseBill: boolean
+  autoCloseOnDelivered?: boolean | null
+  canRemark?: boolean | null
   commissionRate: number
   lastSynchronize?: string | null
   ignoreDiscount?: boolean
@@ -48,6 +50,10 @@ const props = defineProps({
   alwaysShowMenuSyncError: {
     type: Boolean,
     default: false
+  },
+  showTestOrderActions: {
+    type: Boolean,
+    default: true
   }
 })
 
@@ -62,10 +68,15 @@ const menuStore = useMenuStore()
 const CoreStore = useCoreStore()
 const taxSystemCode = computed(() => ItemTax.taxSetting().systemCode)
 
-// const canEdit = computed(() => CoreStore.sessionUser.value?.role.isAdmin ?? false)
 // For now, allow all users to edit, but added detail logging in backend
 const canEdit = computed(() => true)
 
+// FeedMe-internal (staff/admin) only. Merchants/business owners must not edit
+// the platform integration id or place test orders; both gated on this below.
+const isInternal = computed(
+  () => (CoreStore.sessionUser.value?.role?.isStaff || CoreStore.sessionUser.value?.role?.isAdmin) ?? false
+)
+
 function updateManual(manual: FdoLinkedDelivery | null) {
   emits('update:model-value', {
     ...props.modelValue,
@@ -95,10 +106,11 @@ function getValue<T>(value: InputModel, type: 'string' | 'number'): T {
     case 'string':
       result = (value || '').toString()
       break
-    case 'number':
+    case 'number': {
       const v = Number.parseFloat((value || '').toString())
       result = Number.isNaN(v) ? 0 : v
       break
+    }
   }
   return result as unknown as T
 }
@@ -127,14 +139,23 @@ function updateMenuCatalog(catalogId: string | null) {
 type OrderSettingKey =
   | 'autoAcceptOrder'
   | 'autoCloseBill'
+  | 'autoCloseOnDelivered'
   | 'ignoreDiscount'
   | 'sstInclusive'
   | 'printReceiptAfterClose'
 const orderSettingValue = computed(() => {
-  const { autoAccept, autoCloseBill, ignoreDiscount, sstInclusive, printReceiptAfterClose } =
-    props.modelValue.auto
+  const {
+    autoAccept,
+    autoCloseBill,
+    autoCloseOnDelivered,
+    ignoreDiscount,
+    sstInclusive,
+    printReceiptAfterClose
+  } = props.modelValue.auto
   const value: OrderSettingKey[] = []
+  if (autoAccept !== undefined && autoAccept) value.push('autoAcceptOrder')
   if (autoCloseBill) value.push('autoCloseBill')
+  if (autoCloseOnDelivered) value.push('autoCloseOnDelivered')
   if (ignoreDiscount) value.push('ignoreDiscount')
   if (sstInclusive) value.push('sstInclusive')
   if (printReceiptAfterClose) value.push('printReceiptAfterClose')
@@ -151,6 +172,10 @@ const orderSettingOptions = computed<
     label: string
     value: OrderSettingKey
   }[] = [
+    {
+      label: t('order.allowedAutoAcceptOrder'),
+      value: 'autoAcceptOrder'
+    },
     {
       label: t('order.allowedAutoCloseBill'),
       value: 'autoCloseBill'
@@ -160,7 +185,10 @@ const orderSettingOptions = computed<
       value: 'printReceiptAfterClose'
     }
   ]
-  if (props.modelValue.auto.autoAccept !== undefined) {
+  if (props.modelValue.auto.autoAccept === undefined) {
+    options.splice(0, 1)
+  }
+  if (props.modelValue.auto.ignoreDiscount !== undefined) {
     options.push({
       label: t('order.ignoreDiscount'),
       value: 'ignoreDiscount'
@@ -172,14 +200,27 @@ const orderSettingOptions = computed<
       value: 'sstInclusive'
     })
   }
+  // GrabFood/ShopeeFood only — presence-gated like the options above so it
+  // doesn't render for platforms whose mapper never sets the field.
+  if (props.modelValue.auto.autoCloseOnDelivered !== undefined) {
+    options.push({
+      label: t('order.allowedAutoCloseOnDelivered'),
+      value: 'autoCloseOnDelivered'
+    })
+  }
   return options
 })
 
 function updateOrderSettings(orderSettingKeys: OrderSettingKey[]) {
   updateAuto((oldV) => ({
     ...oldV,
-    autoAccept: oldV.autoAccept ?? true,
+    autoAccept:
+      oldV.autoAccept === undefined ? undefined : orderSettingKeys.includes('autoAcceptOrder'),
     autoCloseBill: orderSettingKeys.includes('autoCloseBill'),
+    autoCloseOnDelivered:
+      oldV.autoCloseOnDelivered === undefined
+        ? undefined
+        : orderSettingKeys.includes('autoCloseOnDelivered'),
     printReceiptAfterClose: orderSettingKeys.includes('printReceiptAfterClose'),
     ignoreDiscount: orderSettingKeys.includes('ignoreDiscount'),
     sstInclusive: orderSettingKeys.includes('sstInclusive')
@@ -228,7 +269,7 @@ const formattedMenuSyncError = computed(() => {
     :catalog-options="menuStore.catalogOptions"
     @update:model-value="updateManual"
   /> -->
-  <div v-if="canUseAutoDeliveryIntegration === true" class="mt-10">
+  <div v-if="canUseAutoDeliveryIntegration === true" class="my-10">
     <FmSwitch
       :disabled="!canEdit"
       :model-value="modelValue.auto.enable"
@@ -240,17 +281,17 @@ const formattedMenuSyncError = computed(() => {
     <div v-if="modelValue.auto.enable">
       <FmCard variant="outlined" class="mt-10 p-5">
         <FmTextField
-          :disabled="!canEdit"
+          :disabled="!isInternal"
           :model-value="modelValue.auto.integrationId"
-          :label="t('order.remoteId')"
+          :label="t('order.integrationId')"
           @update:model-value="updateIntegrateId"
         />
-        <div class="mb-5">
+        <div>
           <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-7">
             {{ t('order.orderSetting') }}
           </div>
 
-          <div v-for="(item, index) in orderSettingOptions" :key="index" class="flex flex-col">
+          <div v-for="(item, index) in orderSettingOptions" :key="index" class="flex-1 flex-col">
             <FmCheckbox
               :model-value="orderSettingValue"
               :label="item.label"
@@ -259,6 +300,8 @@ const formattedMenuSyncError = computed(() => {
               :disabled="!canEdit"
             />
           </div>
+
+          <slot name="order-setting" :editable="!canEdit" />
         </div>
 
         <!-- Commision rate not used yet -->
@@ -272,17 +315,25 @@ const formattedMenuSyncError = computed(() => {
             <template #append>%</template>
           </FmTextField>
         </div> -->
-        <div class="mb-3">
-          <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-7">{{ t('order.syncMenu') }}</div>
-          <FmSelect
-            :placeholder="t('order.selectItem')"
-            :model-value="modelValue.auto.catalogId"
-            :label="t('order.catalog')"
-            :items="menuStore.catalogOptions"
-            @update:model-value="updateMenuCatalog"
-            :disabled="!canEdit"
-          />
-        </div>
+        <slot
+          name="sync-menu"
+          :editable="!canEdit"
+          :catalog-options="menuStore.catalogOptions"
+          :catalog-id="modelValue.auto.catalogId"
+          :update-catalog="updateMenuCatalog"
+        >
+          <div class="mb-3">
+            <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-7">{{ t('order.syncMenu') }}</div>
+            <FmSelect
+              :placeholder="t('order.selectItem')"
+              :model-value="modelValue.auto.catalogId"
+              :label="t('order.catalog')"
+              :items="menuStore.catalogOptions"
+              @update:model-value="updateMenuCatalog"
+              :disabled="!canEdit"
+            />
+          </div>
+        </slot>
 
         <div class="text-fm-color-neutral-gray-400 fm-typo-cn-body-md-400 mb-5 mt-5">
           <div class="flex flex-row">
@@ -290,7 +341,10 @@ const formattedMenuSyncError = computed(() => {
               {{ t('order.status') }}: {{ convertStatusI18n(modelValue.auto.status) }}
             </div>
             <FmTooltip
-              v-if="(modelValue.auto.status === 'FAILED' || alwaysShowMenuSyncError) && formattedMenuSyncError !== null"
+              v-if="
+                (modelValue.auto.status === 'FAILED' || alwaysShowMenuSyncError) &&
+                formattedMenuSyncError !== null
+              "
               :content="formattedMenuSyncError"
               :zIndex="1000"
             >
@@ -319,7 +373,6 @@ const formattedMenuSyncError = computed(() => {
             {{ Day(modelValue.auto.lastSynchronize).format('DD/MM/YYYY hh:mm a') }}
           </div>
         </div>
-
         <slot :editable="!canEdit" />
       </FmCard>
     </div>
@@ -331,8 +384,12 @@ const formattedMenuSyncError = computed(() => {
       variant="warning"
     />
   </div>
-  <!-- Hidden: merchants were creating mock orders here, then asking support to void the resulting bills. Platform-side simulator covers this need. Un-comment the entire block to restore for internal QA.
-  <div class="flex flex-row mt-5" v-if="canUseAutoDeliveryIntegration === true && canEdit">
+  <!-- Test order (mock order → POS) for sales demo / training. FeedMe-internal only
+       (isInternal) so merchants can't self-serve mock orders that leave bills to void. -->
+  <div
+    class="flex flex-row mt-5"
+    v-if="canUseAutoDeliveryIntegration === true && isInternal && showTestOrderActions"
+  >
     <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-5">{{ t('order.createTestOrder') }}</div>
     <FmButton
       variant="primary"
@@ -347,5 +404,4 @@ const formattedMenuSyncError = computed(() => {
       class="m-1"
     />
   </div>
-  -->
 </template>

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

@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import { computed, type PropType, reactive } from 'vue'
+
+import type { FdoLinkedDelivery } from '@feedmepos/core/entity'
+import { type FdoLinemanSettings } from '@entity'
+import type { DeliveryCompany } from '../delivery'
+import type { IntegratedDeliverySettingData } from './IntegratedDelivery.vue'
+import IntegratedDelivery from './IntegratedDelivery.vue'
+import { clone } from '@/helpers/object'
+
+export interface LinemanDeliveryData {
+  manual: FdoLinkedDelivery | null
+  integrated: FdoLinemanSettings
+}
+
+const props = defineProps({
+  initialValue: {
+    type: Object as PropType<LinemanDeliveryData>,
+    required: true
+  },
+  company: {
+    type: Object as PropType<DeliveryCompany>,
+    required: true
+  },
+  canUseAutoDeliveryIntegration: {
+    type: [String, Boolean],
+    required: true
+  }
+})
+
+const data = reactive(clone(props.initialValue))
+const modelValue = computed<IntegratedDeliverySettingData>(() => {
+  const auto = data.integrated
+  return {
+    manual: data.manual,
+    auto: {
+      enable: auto.enable,
+      integrationId: auto.partnerID,
+      autoCloseBill: auto.autoCloseBill || false,
+      catalogId: auto?.catalogId || null,
+      commissionRate: 0,
+      printReceiptAfterClose: auto.printReceiptAfterClose ?? true
+    }
+  }
+})
+
+function updateData({ manual, auto }: IntegratedDeliverySettingData) {
+  data.manual = manual
+  data.integrated = {
+    ...data.integrated,
+    enable: auto.enable,
+    autoCloseBill: auto.autoCloseBill,
+    catalogId: auto.catalogId,
+    printReceiptAfterClose: auto.printReceiptAfterClose,
+    partnerID: auto.integrationId
+  }
+  return { manual: data.manual, integrated: data.integrated }
+}
+
+const emits = defineEmits<{
+  (e: 'update:model-value', payload: { manual: any; auto: any }): void
+}>()
+
+function updateDataPass({ manual, auto }: IntegratedDeliverySettingData) {
+  const updatedData = updateData({ manual, auto })
+  emits('update:model-value', { manual: updatedData.manual, auto: updatedData.integrated })
+}
+</script>
+
+<template>
+  <IntegratedDelivery
+    :model-value="modelValue"
+    :company="company"
+    :can-use-auto-delivery-integration="canUseAutoDeliveryIntegration"
+    :show-menu-sync-actions="false"
+    :show-test-order-actions="false"
+    @update:model-value="updateDataPass"
+  />
+</template>

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

@@ -42,10 +42,12 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
       enable: auto.enable,
       integrationId: auto.storeID,
       autoCloseBill: auto.autoCloseBill || false,
+      autoCloseOnDelivered: auto.autoCloseOnDelivered ?? false,
       catalogId: auto?.catalogId || null,
       printReceiptAfterClose: auto.printReceiptAfterClose ?? true,
       commissionRate: auto.reportConfig?.commissionRate || 0,
       lastSynchronize: auto.lastSynchronize,
+      ignoreDiscount: auto.ignoreDiscount ?? false,
       status: auto.status,
       updatedAt: auto.updatedAt,
       menuSyncError: auto.menuSyncError