@feedmepos/mf-order-setting 0.0.7 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/mf-order-setting",
-  "version": "0.0.7",
+  "version": "0.0.12",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",
@@ -25,7 +25,7 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@feedmepos/core": "^2.12.4",
+    "@feedmepos/core": "^2.12.14",
     "@feedmepos/menu": "^1.2.4",
     "@feedmepos/mf-common": "^1.7.2-rc.2",
     "@feedmepos/ordering": "^0.0.3",
@@ -45,7 +45,6 @@
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
-    "dotenv-cli": "^7.4.2",
     "@babel/types": "^7.24.7",
     "@rushstack/eslint-patch": "^1.3.3",
     "@tsconfig/node18": "^18.2.2",
@@ -57,6 +56,7 @@
     "@vue/tsconfig": "^0.4.0",
     "autoprefixer": "^10.4.16",
     "cross-env": "^7.0.3",
+    "dotenv-cli": "^7.4.2",
     "eslint": "^8.49.0",
     "eslint-plugin-vue": "^9.17.0",
     "npm-run-all2": "^6.0.6",

package/src/api/index.ts

@@ -3,15 +3,15 @@ import { F_COUNTRY } from '@feedmepos/core/entity'
 import { useCoreStore } from '@feedmepos/mf-common'
 
 export const defaultCountry = F_COUNTRY.enum.MY
-type ApiVariant = 'portal' | 'auth' | 'localhost';
+type ApiVariant = 'portal' | 'auth' | 'localhost'
 
 interface ApiUrl {
   portalBackendUrl: string
   websocketBackendUrl: string
   linkedDeliveryBackend: string
-  menuBackendUrl: string;
-  smsBackendUrl: string;
-  accountBackendUrl: string;
+  menuBackendUrl: string
+  smsBackendUrl: string
+  accountBackendUrl: string
 }
 
 let apiUrl: ApiUrl | null = null
@@ -22,7 +22,7 @@ export const SvcConfig = {
     return idToken ?? null
   },
   getBusinessId(): string | null {
-    return useCoreStore().currentBusiness.value?._id ?? null;
+    return useCoreStore().currentBusiness.value?._id ?? null
   },
   getRestaurantId(): string | null {
     return useCoreStore().currentRestaurant.value?._id ?? null
@@ -52,11 +52,11 @@ export const SvcConfig = {
 
 function generateBackendUrl(country: F_COUNTRY): ApiUrl {
   const { namespace } = useCoreStore()
-  const isDev = namespace.value === "dev"
-  const area = country !== F_COUNTRY.enum.MY ? `.${country.toLowerCase()}` : '';
-  const domain = `${isDev ? '-dev' : ''}${area}.feedmeapi.com`;
-  const portalBackendUrl = `https://portal-v2${domain}`;
-  const accountBackendUrl = `https://account${domain}`;
+  const isDev = namespace.value === 'dev'
+  const area = country !== F_COUNTRY.enum.MY ? `.${country.toLowerCase()}` : ''
+  const domain = `${isDev ? '-dev' : ''}${area}.feedmeapi.com`
+  const portalBackendUrl = `https://portal-v2${domain}`
+  const accountBackendUrl = `https://account${domain}`
   return {
     portalBackendUrl,
     websocketBackendUrl: `wss://94ilf9iqc0.execute-api.ap-southeast-1.amazonaws.com/${isDev ? 'dev' : 'prod'}`,
@@ -65,7 +65,7 @@ function generateBackendUrl(country: F_COUNTRY): ApiUrl {
     smsBackendUrl: `https://sms${domain}`,
     accountBackendUrl
   }
-};
+}
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 interface SvcMasterCompanyResponse<T = {}> {
@@ -99,22 +99,22 @@ export class SvcCompanyApiError extends ApiError {
 function getBaseUrl(variant: ApiVariant, port?: string): string {
   switch (variant) {
     case 'portal':
-      return SvcConfig.getBackendUrl().portalBackendUrl;
+      return SvcConfig.getBackendUrl().portalBackendUrl
     case 'auth':
-      return SvcConfig.getBackendUrl().accountBackendUrl;
+      return SvcConfig.getBackendUrl().accountBackendUrl
     case 'localhost':
-      return `http://localhost${port ? `:${port}` : ''}`;
+      return `http://localhost${port ? `:${port}` : ''}`
   }
 }
 
 export const baseClientInstance = (
   path = '',
   variant: ApiVariant = 'portal',
-  config?: { noIdRequired?: boolean, url?: string, customIdToken?: string },
-  port?: string,
+  config?: { noIdRequired?: boolean; url?: string; customIdToken?: string },
+  port?: string
 ): AxiosInstance => {
   const url = config?.url ?? getBaseUrl(variant, port)
-  const idToken = SvcConfig.getIdToken();
+  const idToken = SvcConfig.getIdToken()
   if (idToken || config?.noIdRequired || config?.customIdToken) {
     const client = axios.create({
       baseURL: `${url}${path}`,
@@ -139,32 +139,45 @@ export const baseClientInstance = (
   }
 }
 
-export const authInstance = (config?: { noIdRequired?: boolean, url?: string, customIdToken?: string },): AxiosInstance => {
-  return baseClientInstance('/', 'auth', config);
-};
+export const authInstance = (config?: {
+  noIdRequired?: boolean
+  url?: string
+  customIdToken?: string
+}): AxiosInstance => {
+  return baseClientInstance('/', 'auth', config)
+}
+
+export const businessClientInstance = (businessId?: string): AxiosInstance => {
+  const path = `/businesses/${businessId}`
+  if (businessId) {
+    return baseClientInstance(path)
+  } else {
+    throw new Error('Invalid business')
+  }
+}
 
 export const restaurantClientInstance = (prefix?: string): AxiosInstance => {
-  const restaurantId = SvcConfig.getRestaurantId();
-  const restaurantPath = `${prefix ?? ''}/restaurants/${restaurantId}`;
+  const restaurantId = SvcConfig.getRestaurantId()
+  const restaurantPath = `${prefix ?? ''}/restaurants/${restaurantId}`
   if (restaurantId) {
-    return baseClientInstance(restaurantPath);
+    return baseClientInstance(restaurantPath)
   } else {
-    throw new Error('Invalid restaurant');
+    throw new Error('Invalid restaurant')
   }
 }
 
 export const menuClientInstance = (): AxiosInstance => {
-  const businessId = SvcConfig.getBusinessId();
-  if (!businessId) throw new Error('Invalid business ID');
-  const { menuBackendUrl } = SvcConfig.getBackendUrl();
-  const url = `${menuBackendUrl}/businesses/${businessId}/menu-v4`;
-  return baseClientInstance('', 'portal', { url });
-};
+  const businessId = SvcConfig.getBusinessId()
+  if (!businessId) throw new Error('Invalid business ID')
+  const { menuBackendUrl } = SvcConfig.getBackendUrl()
+  const url = `${menuBackendUrl}/businesses/${businessId}/menu-v4`
+  return baseClientInstance('', 'portal', { url })
+}
 
 export const smsBackendClientInstance = (): AxiosInstance => {
-  const { smsBackendUrl } = SvcConfig.getBackendUrl();
-  return baseClientInstance('', 'portal', { url: smsBackendUrl });
-};
+  const { smsBackendUrl } = SvcConfig.getBackendUrl()
+  return baseClientInstance('', 'portal', { url: smsBackendUrl })
+}
 
 export function getData<T>(response: AxiosResponse<T>): T {
   return response.data

package/src/api/restaurant-setting/index.ts

@@ -1,5 +1,7 @@
-import { baseClientInstance, getData, restaurantClientInstance } from '@/api'
-import type { ExtendedRestaurant } from '@/stores/restaurant'
+import {
+  getData,
+  restaurantClientInstance
+} from '@/api'
 import type { OrderSettingsDto } from '@entity'
 import {
   FdoRestaurantDineIn,
@@ -8,7 +10,6 @@ import {
   FdoServiceChargeSetting
 } from '@feedmepos/core/entity'
 
-
 interface EntityDocument {
   _rev: string
   _id: string
@@ -17,22 +18,16 @@ interface EntityDocument {
 export type RestaurantSettingDoc = EntityDocument & FdoRestaurantSetting
 
 export const restaurantApi = {
-  async readRestaurantSetting(restaurantId: string): Promise<RestaurantSettingDoc> {
+  async readRestaurantSetting(): Promise<RestaurantSettingDoc> {
     const result = await restaurantClientInstance().get('/restaurant-setting')
     return getData<RestaurantSettingDoc>(result)
   },
-
-  async readRestaurant(restaurantId: string): Promise<ExtendedRestaurant> {
-    const result = await restaurantClientInstance().get('/restaurant-setting')
-    return getData(result)
-  },
-
-  async updateDineInSetting(restaurantId: string, setting: FdoRestaurantDineIn) {
+  async updateDineInSetting(setting: FdoRestaurantDineIn) {
     const result = await restaurantClientInstance().put('/dine-in', setting)
     return getData(result)
   },
 
-  async updatePickupSetting(restaurantId: string, setting: FdoRestaurantPickup) {
+  async updatePickupSetting(setting: FdoRestaurantPickup) {
     const result = await restaurantClientInstance().put('/pickup', setting)
     return getData(result)
   },
@@ -44,11 +39,5 @@ export const restaurantApi = {
 
   async getMobileOrderSetting(): Promise<OrderSettingsDto> {
     return await getData(await restaurantClientInstance().get('/order-settings'))
-  },
-
-  admin: {
-    async readAllManagable(): Promise<ExtendedRestaurant[]> {
-      return getData(await baseClientInstance().get('/my/restaurants'));
-    },
   }
 }

package/src/helpers/menu.ts

@@ -1,5 +1,7 @@
 import { fullVariantCombination } from '@feedmepos/menu';
 import { FdoItemOverriderV4, FdoMenuV4Item, FdoItemVariant, FdoMenuV4VariantGroup, FdoProductTaxSetting, FdtoV4Tax } from '@feedmepos/menu/entity';
+import { Country, Dinero } from '@feedmepos/core';
+import { useAppStore } from '@/stores/app'
 
 import { useMenuStore } from '@/stores/menu/menu';
 import type { CheckboxOption, } from '@/components/type';
@@ -69,6 +71,19 @@ export class ItemTax {
     return { systemCode, taxCode };
   }
 
+  static taxSetting() {
+    const countryFlattenTaxes = Country.getCountryFlattenTaxes(useAppStore().country.code);
+    return {
+      systemCode: [...new Set(countryFlattenTaxes.map((tax) => tax.systemCode))].join('/'),
+      countryTaxOptions: countryFlattenTaxes.map((tax) => ({
+        label: `${tax.name} (${   Dinero.fromFdoDecimal({
+          decimal: tax.rate
+        }).multiply(100).toFormat(false)}%)`,
+        value: ItemTax.encodeTax(tax),
+      })),
+    };
+  }
+
   static getSelectedTax(tax: Tax, fallbackTax: Tax, taxOptions: { label: string, value: string }[]): string | undefined {
     return (tax ?? fallbackTax ?? [])
       .map((t) => ItemTax.encodeTax(t))

package/src/stores/order-setting/index.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { OrderSettingApi } from '@/api/order-setting';
-import type { MfKioskDineInSetting, MfKioskOrderSetting, MfKioskTakeawaySetting } from '@/modules/order-setting/kiosk/interface'
+import type { MfKioskOrderSetting } from '@/modules/order-setting/kiosk/interface'
 import { OrderSettingMapper } from './mapper';
 import { ref } from 'vue';
 import { OrderSettingsDto, OrderSettingUpdateDto } from '@entity';

package/src/stores/order-setting/mapper.ts

@@ -56,7 +56,7 @@ const toKioskDineInSetting = (kioskDineInSeq: OrderKioskDineInSequenceDto, kiosk
             sequenceNumber: kioskDineInSeq,
             pickUp,
             displayStand: displayStand ? {
-                enabled: true,
+                enabled: displayStand.enabled,
                 standSlotRange: displayStand.standSlotRange,
                 prefix: displayStand.prefix,
                 padDigit: displayStand.padDigit,
@@ -103,6 +103,7 @@ const toOrderKioskSettingsDto = (kioskSetting: MfKioskOrderSetting): {
         return {
             kioskSettings: {
                 canTakeaway: kioskSetting.takeaway.enabled,
+                dineIn: undefined,
             }
         };
     }

package/src/stores/restaurant/index.ts

@@ -1,9 +1,7 @@
 import { defineStore } from 'pinia'
 import { restaurantApi, type RestaurantSettingDoc } from '@/api/restaurant-setting'
 import {
-  F_PAYOUT_ACCOUNT_STATUS,
   FdoFoodpandaSettings,
-  FdoPayoutAccount,
   FdoRestaurantDineIn,
   FdoRestaurantFeedmeDelivery,
   FdoRestaurantInHouseDelivery,
@@ -66,22 +64,10 @@ export const useRestaurantStore = defineStore('restaurant', {
   getters: {
     currentRestaurant: (state) => state.businessRestaurants.find((r) => r.id === state.currentRestaurantId),
     currentRestaurantSetting: (state) => state.restaurantSettings[state.currentRestaurantId || ''],
-    payoutAccount() {
-      const account: FdoPayoutAccount = this.currentRestaurant?.payoutAccount || {
-        enable: false,
-        methods: [],
-        status: F_PAYOUT_ACCOUNT_STATUS.enum.NEW
-      }
-      return {
-        isActive: account.enable,
-        canUpdate: account.status === F_PAYOUT_ACCOUNT_STATUS.enum.NEW,
-        approved: account.status === F_PAYOUT_ACCOUNT_STATUS.enum.APPROVED
-      }
-    }
   },
   actions: {
     async readRestaurantSetting(restaurantId: string) {
-      const restaurantSetting = await restaurantApi.readRestaurantSetting(restaurantId)
+      const restaurantSetting = await restaurantApi.readRestaurantSetting()
       this.restaurantSettings = {
         ...this.restaurantSettings,
         [restaurantId]: restaurantSetting
@@ -99,11 +85,11 @@ export const useRestaurantStore = defineStore('restaurant', {
     async updateServiceCharge(serviceCharge: FdoServiceChargeSetting) {
       await restaurantApi.updateServiceCharge(serviceCharge)
     },
-    async updateDineInSetting(restaurantId: string, setting: FdoRestaurantDineIn) {
-      await restaurantApi.updateDineInSetting(restaurantId, setting)
+    async updateDineInSetting(setting: FdoRestaurantDineIn) {
+      await restaurantApi.updateDineInSetting(setting)
     },
-    async updatePickupSetting(restaurantId: string, setting: FdoRestaurantPickup) {
-      await restaurantApi.updatePickupSetting(restaurantId, setting)
+    async updatePickupSetting(setting: FdoRestaurantPickup) {
+      await restaurantApi.updatePickupSetting(setting)
     },
 
     async updateInhouseDelivery(restaurantId: string, dto: FdoRestaurantInHouseDelivery) {

package/src/views/kiosk/settings/KioskDineInSection.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="flex flex-col gap-5">
         <div class="flex flex-col gap-16">
-            <FmSwitch v-model="enableDineIn" label="Dine In" label-placement="right" />
-            <div v-show="enableDineIn" class="flex flex-col gap-16">
+            <FmSwitch v-model="form.enabled" label="Dine In" label-placement="right" />
+            <div v-show="form.enabled" class="flex flex-col gap-16">
                 <KioskPickAtCounterSection v-if="form.pickUp" :enabled="form.pickUp.enabled"
                     @update-pick-up="updatePickUp" />
                 <KioskDisplayStandSection v-if="form.displayStand" :display-stand="form.displayStand"
@@ -43,7 +43,6 @@ function updateDisplayStand(v: DisplayStandSettingForm) {
 const props = defineProps<Props>();
 const emits = defineEmits<Emits>();
 const form = ref<KioskDineInSettingForm>(ObjectUtil.clone<KioskDineInSettingForm>(props.getSetting()));
-const enableDineIn = ref<boolean>(ObjectUtil.clone(form.value.enabled));
 
 watch(() => props.restaurantId, () => {
     form.value = props.getSetting();

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

@@ -1,68 +1,144 @@
 <template>
   <div class="flex flex-col lg:flex-row md:flex-row sm:flex-row xs:flex-wrap justify-between">
-    <RestaurantSelector :model-value="currentRestaurant?._id ?? undefined" class="xs:order-2 xs:mb-3" />
+    <RestaurantSelector
+      :model-value="currentRestaurant?._id ?? undefined"
+      class="xs:order-2 xs:mb-3"
+    />
     <FmSearch v-model="searchKey" placeholder="Search" class="mx-5 xs:my-3 xs:order-1" />
   </div>
   <div class="block">
-    <FmPageHead class="flex-grow" title="Integrated delivery company"
-      description="We integrated with these deliveries with your POS system. You can deliver meal to your customers in faster and more secure way." />
+    <FmPageHead
+      class="flex-grow"
+      title="Integrated delivery company"
+      description="We integrated with these deliveries with your POS system. You can deliver meal to your customers in faster and more secure way."
+    />
     <div v-if="!isLoading">
-      <DeliveryList :filteredCompanies="filteredCompanies" class="mt-5 md:hidden lg:hidden xl:hidden"
-        @toggleIntegratedSidesheet="toggleIntegratedSidesheet"></DeliveryList>
-      <FmTable v-model="model" class="h-[500px] m-5 xs:hidden sm:hidden" :row-data="filteredCompanies"
-        :column-defs="columns" :hideFooter="true" :loading="loading"
-        @row-click="(rowData: any) => toggleIntegratedSidesheet(rowData)" />
+      <DeliveryList
+        :filteredCompanies="filteredCompanies"
+        class="mt-5 md:hidden lg:hidden xl:hidden"
+        @toggleIntegratedSidesheet="toggleIntegratedSidesheet"
+      ></DeliveryList>
+      <FmTable
+        v-model="model"
+        class="h-[500px] m-5 xs:hidden sm:hidden"
+        :row-data="filteredCompanies"
+        :column-defs="columns"
+        :hideFooter="true"
+        :loading="loading"
+        @row-click="(rowData: any) => toggleIntegratedSidesheet(rowData)"
+      />
     </div>
     <div v-else>
       <FmCircularProgress size="xxl" />
     </div>
   </div>
 
-  <FmSideSheet :header="title" dismiss-away :maxWidth="600" :model-value="sideSheetIntegrated"
-    @update:model-value="sideSheetIntegrated = $event">
-    <FoodpandaSetting v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.foodpanda"
-      :initial-value="componentProps.initialValue" :company="componentProps.company"
-      :can-use-auto-delivery-integration="componentProps.canUseAuto" @update:model-value="handleModelValueUpdate" />
-    <GrabfoodSetting v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.grabfood"
-      :initial-value="componentProps.initialValue" :company="componentProps.company"
-      :can-use-auto-delivery-integration="componentProps.canUseAuto" @update:model-value="handleModelValueUpdate" />
-    <ShopeefoodSetting v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.shopeefood"
-      :initial-value="componentProps.initialValue" :company="componentProps.company"
-      :can-use-auto-delivery-integration="componentProps.canUseAuto" @update:model-value="handleModelValueUpdate" />
-    <FeedmeDelivery v-if="feedMeComponentProps.key === F_ORDER_PLATFORM.enum.FEEDME"
-      :initial-value="feedMeComponentProps.initialValue" @update:model-value="handleModelValueUpdateFeedme"
-      @validation-result="handleValidationResult" />
-
-    <InHouseDelivery v-if="inHouseComponentProps.key === F_ORDER_PLATFORM.enum.IN_HOUSE"
-      :initial-value="inHouseComponentProps.initialValue" :allow-e-payment="inHouseComponentProps.allowEPayment"
+  <FmSideSheet
+    :header="title"
+    dismiss-away
+    :maxWidth="600"
+    :model-value="sideSheetIntegrated"
+    @update:model-value="sideSheetIntegrated = $event"
+  >
+    <FoodpandaSetting
+      v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.foodpanda"
+      :initial-value="componentProps.initialValue"
+      :company="componentProps.company"
+      :can-use-auto-delivery-integration="componentProps.canUseAuto"
+      @update:model-value="handleModelValueUpdate"
+    />
+    <GrabfoodSetting
+      v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.grabfood"
+      :initial-value="componentProps.initialValue"
+      :company="componentProps.company"
+      :can-use-auto-delivery-integration="componentProps.canUseAuto"
+      @update:model-value="handleModelValueUpdate"
+    />
+    <ShopeefoodSetting
+      v-if="componentProps.key === AUTO_INTEGRATION_CLIENT.shopeefood"
+      :initial-value="componentProps.initialValue"
+      :company="componentProps.company"
+      :can-use-auto-delivery-integration="componentProps.canUseAuto"
+      @update:model-value="handleModelValueUpdate"
+    />
+    <FeedmeDelivery
+      v-if="feedMeComponentProps.key === F_ORDER_PLATFORM.enum.FEEDME"
+      :initial-value="feedMeComponentProps.initialValue"
+      @update:model-value="handleModelValueUpdateFeedme"
+      @validation-result="handleValidationResult"
+    />
+
+    <InHouseDelivery
+      v-if="inHouseComponentProps.key === F_ORDER_PLATFORM.enum.IN_HOUSE"
+      :initial-value="inHouseComponentProps.initialValue"
+      :allow-e-payment="inHouseComponentProps.allowEPayment"
       :address="formatAddress(currentRestaurant?.profile.address)"
-      @update:model-value="handleModelValueUpdateInHouse" />
+      @update:model-value="handleModelValueUpdateInHouse"
+    />
     <template #side-sheet-footer v-if="feedmeValidate !== false">
       <div class="flex gap-8 items-center justify-start">
-        <FmButton variant="primary" label="Save" size="lg" @click="updateIntegratedDeliveryCompany" />
-        <FmButton variant="secondary" label="Cancel" size="lg" @click="closeIntegratedDeliverySideSheet" />
+        <FmButton
+          variant="primary"
+          label="Save"
+          size="lg"
+          @click="updateIntegratedDeliveryCompany"
+        />
+        <FmButton
+          variant="secondary"
+          label="Cancel"
+          size="lg"
+          @click="closeIntegratedDeliverySideSheet"
+        />
       </div>
     </template>
   </FmSideSheet>
 
   <div class="block">
-    <FmPageHead class="flex-grow" title="Local delivery company"
-      description="Activate the delivery companies to create new order at POS system." />
-    <FmTable v-model="model" class="h-[500px] m-5 xs:hidden sm:hidden" :row-data="localDeliveryCompanies"
-      :column-defs="columns" :hideFooter="true" :pageSize="100" :loading="loading" @row-click="toggleLocalSidesheet" />
-    <DeliveryList :filteredCompanies="localDeliveryCompanies" class="mt-5 md:hidden lg:hidden xl:hidden"
-      @toggleIntegratedSidesheet="toggleLocalSidesheet"></DeliveryList>
+    <FmPageHead
+      class="flex-grow"
+      title="Local delivery company"
+      description="Activate the delivery companies to create new order at POS system."
+    />
+    <FmTable
+      v-model="model"
+      class="h-[500px] m-5 xs:hidden sm:hidden"
+      :row-data="localDeliveryCompanies"
+      :column-defs="columns"
+      :hideFooter="true"
+      :pageSize="100"
+      :loading="loading"
+      @row-click="toggleLocalSidesheet"
+    />
+    <DeliveryList
+      :filteredCompanies="localDeliveryCompanies"
+      class="mt-5 md:hidden lg:hidden xl:hidden"
+      @toggleIntegratedSidesheet="toggleLocalSidesheet"
+    ></DeliveryList>
   </div>
 
   <div class="flex">
-    <FmSideSheet header="Update delivery company" dismiss-away :maxWidth="600" :model-value="sideSheet"
-      @update:model-value="sideSheet = $event">
-      <ManualIntegratedDeliverySetting :model-value="localDoc" :company="selectedLocalRow.doc"
-        :catalog-options="menuStore.catalogOptions" @update:model-value="(v: any) => (localDocUpdate = v)" />
+    <FmSideSheet
+      header="Update delivery company"
+      dismiss-away
+      :maxWidth="600"
+      :model-value="sideSheet"
+      @update:model-value="sideSheet = $event"
+    >
+      <ManualIntegratedDeliverySetting
+        :model-value="localDoc"
+        :company="selectedLocalRow.doc"
+        :catalog-options="menuStore.catalogOptions"
+        @update:model-value="(v: any) => (localDocUpdate = v)"
+      />
       <template #side-sheet-footer>
         <div class="flex gap-8 items-center justify-start">
           <FmButton variant="primary" label="Save" size="lg" @click="updateLocalDeliveryCompany" />
-          <FmButton variant="secondary" label="Cancel" size="lg" @click="closeLocalDeliverySideSheet" />
+          <FmButton
+            variant="secondary"
+            label="Cancel"
+            size="lg"
+            @click="closeLocalDeliverySideSheet"
+          />
         </div>
       </template>
     </FmSideSheet>
@@ -78,11 +154,17 @@ import { useCoreStore } from '@feedmepos/mf-common'
 import type { FdoFoodpandaSettings } from '@entity'
 import type {
   FdoLinkedDelivery,
+  FdoRestaurant,
   FdoRestaurantFeedmeDelivery,
   FdoRestaurantInHouseDelivery
 } from '@feedmepos/core/entity'
 import { FdoGrabfoodSettings, FdoShopeeFoodSettings } from '@entity'
-import { F_DELIVERY_TYPE, F_ORDER_PLATFORM } from '@feedmepos/core/entity'
+import {
+  F_DELIVERY_TYPE,
+  F_FEATURE,
+  F_ORDER_PLATFORM,
+  F_PAYOUT_ACCOUNT_STATUS
+} from '@feedmepos/core/entity'
 import deliveryData from './delivery.data'
 import { useDelivery, type DeliveryCompany, type LinkedDeliveryDoc } from './delivery'
 import { useLoading } from '@/composables/loading'
@@ -102,6 +184,7 @@ import { formatAddress } from '@/helpers/profile'
 import { useSnackbarFunctions } from '@/components/snackbar'
 import useSearch from '@/composables/search'
 import DeliveryList from './DeliveryList.vue'
+import { Pos } from '@feedmepos/core'
 
 const { searchKey, filter } = useSearch()
 const { showSuccess } = useSnackbarFunctions()
@@ -251,11 +334,31 @@ async function updateFeedmeExpress({ key, setting }: IntegratedDeliveryRow) {
   }
 }
 
+function getRestaurantEPayment({ posVersion, payoutAccount }: FdoRestaurant): true | string {
+  const validPosVersion =
+    !!posVersion &&
+    Pos.canUse({
+      feature: F_FEATURE.enum.qrEPayment,
+      posVersion
+    })
+
+  if (!validPosVersion) return `For POS ${Pos.minVersionToUse(F_FEATURE.enum.qrEPayment)} or above`
+  if (!payoutAccount || !payoutAccount.enable) {
+    return 'Payout account is required';
+  }
+  if (payoutAccount.status !== F_PAYOUT_ACCOUNT_STATUS.enum.APPROVED) {
+    return 'Payout account under review';
+  }
+  return true;
+}
+
 async function updateInHouse({ key, setting }: IntegratedDeliveryRow) {
   clearComponentProps()
 
   const inhouseSetting = setting as FdoRestaurantInHouseDelivery
-  const allowEPayment = restaurantStore.currentRestaurant?.allowEPayment || false
+  const allowEPayment = currentRestaurant.value
+    ? getRestaurantEPayment(currentRestaurant.value)
+    : false
 
   inHouseComponentProps.value = {
     key,
@@ -264,7 +367,8 @@ async function updateInHouse({ key, setting }: IntegratedDeliveryRow) {
       deliveryTime: inhouseSetting.deliveryTime || null,
       paymentTypes: inhouseSetting.paymentTypes || [],
       offlinePaymentTypes: inhouseSetting.offlinePaymentTypes || [],
-      ignoreStock: inhouseSetting.ignoreStock || false
+      ignoreStock: inhouseSetting.ignoreStock || false,
+      taxes: inhouseSetting.taxes || {}
     },
     allowEPayment
   }