@feedmepos/mf-order-setting 0.0.7 → 0.0.12

package/src/views/order-settings/delivery/components/TaxInput.vue

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { PropType } from 'vue';
+import { ItemTax } from  '@/helpers/menu';
+import type { Tax } from '@/helpers/menu';
+import { FdoProductTaxSetting } from '@feedmepos/menu/entity';
+
+const props = defineProps({
+  modelValue: {
+    type: Object as PropType<Tax>,
+    default: null,
+  },
+  fallback: {
+    type: Object as PropType<Tax>,
+    default: null,
+  },
+  taxOptions: {
+    type: Object as PropType<{label: string, value: string}[]>,
+    required: true,
+  },
+  disable: {
+    type: Boolean,
+    default: false,
+  },
+  title: {
+    type: String,
+    default: '',
+  },
+});
+
+const emits = defineEmits<{
+  (ev: 'update:model-value', value: FdoProductTaxSetting[]): void;
+}>();
+
+const selectedTax = computed(() => {
+  return ItemTax.getSelectedTax(props.modelValue, props.fallback, props.taxOptions);
+});
+</script>
+
+<template>
+  <div>
+    <FmSelect 
+      :model-value="selectedTax || null" 
+      label-mark="required"
+      :label="title" 
+      :items="taxOptions"
+      :disable="disable"
+      @update:model-value="
+        (ev) => {
+          if (ev) {
+            emits('update:model-value', [ItemTax.decodeTax(ev)]);
+          }
+        }
+      " 
+    />
+  </div>
+</template>

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

@@ -4,15 +4,23 @@ import { useMenuStore } from '@/stores/menu/menu'
 import type {
   F_ORDER_PAYMENT_TYPE,
   FdoDeliveryArea,
+  FdoDeliveryTaxSetting,
   FdoDeliveryTime,
   FdoOfflinePaymentMethod,
   FdoRestaurantInHouseDelivery
 } from '@feedmepos/core/entity'
+import { F_FEATURE } from '@feedmepos/core/entity'
+import { FdoProductTaxSetting } from '@feedmepos/menu/entity'
 import { computed, reactive, watch, type PropType } from 'vue'
 import Preorder from '../../pickup/Preorder.vue'
 import DeliveryTime from './DeliveryTime.vue'
 import DeliveryOrder, { type Address } from './DeliveryOrder.vue'
 import PaymentSidesheet from '../../pickup/PaymentSidesheet.vue'
+import { ItemTax } from '@/helpers/menu'
+import { Pos } from '@feedmepos/core'
+import TaxInput from '../components/TaxInput.vue'
+import { useCoreStore } from '@feedmepos/mf-common'
+import { useSnackbar } from '@feedmepos/ui-library'
 
 export interface InhouseDialogData {
   enable: boolean
@@ -23,8 +31,39 @@ export interface InhouseDialogData {
   offlinePaymentTypes: FdoOfflinePaymentMethod[] | undefined | null
   ignoreStock: boolean
   deliveryTime: FdoDeliveryTime | null
+  taxes: { [key: string]: FdoDeliveryTaxSetting }
 }
 
+enum TaxOption {
+  inclusive,
+  exclusive
+}
+
+const taxInclusiveOptions = [
+  {
+    label: 'Inclusive',
+    value: TaxOption.inclusive
+  },
+  {
+    label: 'Exclusive',
+    value: TaxOption.exclusive
+  }
+]
+
+const snackBar = useSnackbar()
+const { currentRestaurant } = useCoreStore()
+const minVersionForTax = Pos.minVersionToUse(F_FEATURE.Enum.calculatorV4)
+const validatePosVersion = computed<string>(() => {
+  const posVersion = currentRestaurant.value?.posVersion ?? ''
+  const feature = F_FEATURE.Enum.calculatorV4
+  const res = Pos.canUse({ feature, posVersion })
+  if (!res) {
+    const minVersion = Pos.minVersionToUse(feature)
+    return `*POS version ${minVersion} or above`
+  }
+  return ''
+})
+
 const props = defineProps({
   initialValue: {
     type: Object as PropType<InhouseDialogData>,
@@ -44,17 +83,85 @@ const inhouse = reactive<InhouseDialogData>(
   props.initialValue
     ? clone(props.initialValue)
     : {
-      enable: false,
-      catalogId: null,
-      term: '',
-      areas: [],
-      ignoreStock: false,
-      paymentTypes: [],
-      offlinePaymentTypes: [],
-      deliveryTime: null
-    }
+        enable: false,
+        catalogId: null,
+        term: '',
+        areas: [],
+        ignoreStock: false,
+        paymentTypes: [],
+        offlinePaymentTypes: [],
+        deliveryTime: null,
+        taxes: {}
+      }
 )
 
+const tax = computed(() => ItemTax.taxSetting())
+const taxOptions = computed(() => tax.value.countryTaxOptions)
+
+const hasInhouseDeliveryTax = computed(() => {
+  return Object.keys(inhouse.taxes).length > 0
+})
+
+const taxSettings = computed(() => {
+  return Object.values(inhouse.taxes)
+})
+
+const taxInclusive = computed(() => {
+  const value = taxSettings.value[0]?.inclusive ?? false
+  return value ? TaxOption.inclusive : TaxOption.exclusive
+})
+
+function toggleTax(enable: boolean): void {
+  if (!enable) {
+    inhouse.taxes = {}
+    return
+  }
+
+  const firstTax = taxOptions.value[0]
+  if (!firstTax) {
+    snackBar.open({
+      title: 'ttest',
+      message: 'Cannot toggle tax setting, no available tax',
+      type: 'error'
+    })
+    return
+  }
+
+  const [systemCode, taxCode] = firstTax.value.split('/')
+  inhouse.taxes = {
+    [firstTax.value]: {
+      inclusive: true,
+      systemCode: systemCode,
+      taxCode: taxCode
+    }
+  }
+}
+
+function updateTax(taxes: FdoProductTaxSetting[]): void {
+  inhouse.taxes = taxes.reduce<{ [key: string]: FdoDeliveryTaxSetting }>((pv, tax) => {
+    pv[tax.systemCode] = {
+      systemCode: tax.systemCode,
+      taxCode: tax.taxCode,
+      inclusive: taxInclusive.value === TaxOption.inclusive
+    }
+    return pv
+  }, {})
+}
+
+function updateTaxInclusive(taxOption: TaxOption): void {
+  const inclusive = taxOption === TaxOption.inclusive
+  inhouse.taxes = Object.entries(inhouse.taxes).reduce<{ [key: string]: FdoDeliveryTaxSetting }>(
+    (pv, [key, tax]) => {
+      pv[key] = {
+        ...tax,
+        inclusive: !!inclusive
+      }
+      return pv
+    },
+    {}
+  )
+}
+
 const emits = defineEmits<{
   (event: 'update:model-value', v: FdoRestaurantInHouseDelivery): void
 }>()
@@ -83,6 +190,10 @@ function updateTerm(value: string) {
   emitUpdatedValue()
 }
 
+function updatePaymentTypes(v: F_ORDER_PAYMENT_TYPE[]) {
+  inhouse.paymentTypes = v
+}
+
 watch(
   inhouse,
   (newValue) => {
@@ -117,32 +228,100 @@ const actualDeliveryTime = computed({
 </script>
 
 <template>
-  <FmSwitch :model-value="inhouse.enable" label="Activate In house Delivery" label-placement="right"
-    sublabel="Accept In house Delivery with POS" @update:model-value="updateEnable" />
+  <FmSwitch
+    :model-value="inhouse.enable"
+    label="Activate In house Delivery"
+    label-placement="right"
+    sublabel="Accept In house Delivery with POS"
+    @update:model-value="updateEnable"
+  />
   <div v-if="inhouse.enable">
     <FmCard variant="outlined" class="p-5 mt-10">
       <div class="flex-grow fm-typo-en-title-sm-600 mb-3">General setting</div>
 
       <div class="mb-5">
-        <FmSwitch :model-value="inhouse.ignoreStock || false" value="ignoreStock" label="Ignore stock"
-          sublabel="Customer can order even product out of stocks" label-placement="right"
-          @update:model-value="updateIgnoreStock" />
+        <FmSwitch
+          :model-value="inhouse.ignoreStock || false"
+          value="ignoreStock"
+          label="Ignore stock"
+          sublabel="Customer can order even product out of stocks"
+          label-placement="right"
+          @update:model-value="updateIgnoreStock"
+        />
       </div>
 
       <div class="mb-5">
-        <FmSelect :model-value="inhouse.catalogId" label="Catalog" :items="menuStore.catalogOptions"
-          @update:model-value="updateCatalogId" />
+        <FmSelect
+          :model-value="inhouse.catalogId"
+          label="Catalog"
+          :items="menuStore.catalogOptions"
+          @update:model-value="updateCatalogId"
+        />
       </div>
 
       <div class="mb-5">
-        <FmTextarea :model-value="inhouse.term" label="Delivery term" @update:model-value="updateTerm" />
+        <FmTextarea
+          :model-value="inhouse.term"
+          label="Delivery term"
+          @update:model-value="updateTerm"
+        />
+      </div>
+    </FmCard>
+
+    <FmCard variant="outlined" class="p-5 mt-10">
+      <div class="flex-grow fm-typo-en-title-sm-600 mb-3">
+        Tax settings
+        <span
+          class="text-fm-color-secondary-salmon fm-typo-en-body-sm-600"
+          v-if="validatePosVersion"
+        >
+          (Tax setting only applicable for POS after {{ minVersionForTax }})</span
+        >
+      </div>
+      <div class="mb-5">
+        <FmSwitch
+          :model-value="hasInhouseDeliveryTax"
+          :disabled="!!validatePosVersion.length"
+          label="Delivery fee charge tax"
+          label-placement="right"
+          sublabel="Accept In house Delivery with POS"
+          @update:model-value="toggleTax"
+        />
+      </div>
+      <div v-if="hasInhouseDeliveryTax">
+        <div class="mb-5">
+          <TaxInput
+            :model-value="taxSettings"
+            :tax-options="taxOptions"
+            :title="`${tax.systemCode} (applicable if restaurant profile SST is set)`"
+            @update:model-value="(ev) => updateTax(ev)"
+          />
+        </div>
+        <div class="mb-5">
+          <FmRadioGroup
+            :model-value="taxInclusive"
+            label-mark="required"
+            inline
+            label="Tax calculation"
+            @update:model-value="(ev) => updateTaxInclusive(ev as unknown as number)"
+          >
+            <div v-for="option in taxInclusiveOptions" :key="option.value">
+              <FmRadio :value="option.value" :label="option.label" />
+            </div>
+          </FmRadioGroup>
+        </div>
       </div>
     </FmCard>
 
     <FmCard variant="outlined" class="p-5 mt-10">
-      <PaymentSidesheet :paymentTypes="inhouse.paymentTypes" :offlinePaymentTypes="inhouse.offlinePaymentTypes"
-        @update:payment-types="(v: F_ORDER_PAYMENT_TYPE[]) => (inhouse.paymentTypes = v)" @update:offline-payment-types="(v: FdoOfflinePaymentMethod[] | undefined | null) => (inhouse.offlinePaymentTypes = v)
-          " />
+      <PaymentSidesheet
+        :paymentTypes="inhouse.paymentTypes"
+        :offlinePaymentTypes="inhouse.offlinePaymentTypes"
+        @update:payment-types="(v: F_ORDER_PAYMENT_TYPE[]) => updatePaymentTypes(v)"
+        @update:offline-payment-types="
+          (v: FdoOfflinePaymentMethod[] | undefined | null) => (inhouse.offlinePaymentTypes = v)
+        "
+      />
     </FmCard>
 
     <FmCard variant="outlined" class="p-5 mt-10">

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

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { clone } from '@/helpers/object'
 import { useMenuStore } from '@/stores/menu/menu'
-import { useRestaurantStore } from '@/stores/restaurant'
 import { Pos } from '@feedmepos/core'
 import {
   F_FEATURE,
@@ -44,7 +43,6 @@ const data = reactive<FdoRestaurantFeedme>(
 const { sessionUser } = useCoreStore()
 const canActivateFeedmeExpress = computed(() => sessionUser.value?.isInternal)
 const { currentRestaurant } = useCoreStore()
-const restaurantStore = useRestaurantStore()
 const validatePosVersion = computed<ValidateFeedmeResult>(() => {
   const posVersion = currentRestaurant?.value?.posVersion
   const res = Pos.canUse({

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

@@ -5,7 +5,6 @@ import type { FdoLinkedDelivery } from '@feedmepos/core/entity'
 import { FdoGrabfoodSettings } from '@entity'
 import type { DeliveryCompany } from '../delivery'
 import type { IntegratedDeliverySettingData } from './IntegratedDelivery.vue'
-import { useRestaurantStore } from '@/stores/restaurant'
 import { useLoading } from '@/composables/loading'
 import { remoteOrderApi } from '@/api/remoteOrder'
 import IntegratedDelivery from './IntegratedDelivery.vue'
@@ -51,7 +50,7 @@ const modelValue = computed<IntegratedDeliverySettingData>(() => {
   }
 })
 
-const restaurantStore = useRestaurantStore()
+const { currentRestaurant } = useCoreStore()
 
 
 function updateData({ manual, auto }: IntegratedDeliverySettingData) {
@@ -60,7 +59,6 @@ function updateData({ manual, auto }: IntegratedDeliverySettingData) {
     ...auto,
     merchantID: auto.integrationId,
     commissionRate: auto.commissionRate,
-    partnerMerchantID: restaurantStore.currentRestaurantId
   }
   return { manual: data.manual, integrated: data.integrated };
 }
@@ -90,8 +88,6 @@ async function syncMenu() {
   })
 }
 
-const { currentRestaurant } = useCoreStore()
-
 import { useSnackbarFunctions } from '@/components/snackbar'
 const { showSuccess } = useSnackbarFunctions();
 

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

@@ -6,7 +6,6 @@ import type { DeliveryCompany } from "../delivery";
 import type { IntegratedDeliverySettingData } from "./IntegratedDelivery.vue";
 import { useLoading } from "@/composables/loading";
 import { remoteOrderApi } from "@/api/remoteOrder";
-import { useRestaurantStore } from "@/stores/restaurant";
 import IntegratedDelivery from "./IntegratedDelivery.vue";
 import { clone } from "@/helpers/object";
 import { useCoreStore } from "@feedmepos/mf-common";

package/src/views/order-settings/dinein/DineInSetting.vue

@@ -82,7 +82,7 @@ async function updateDineInSetting() {
     const id = currentRestaurant.value?._id ?? ''
     const orderSetting = dineInSetting.value
     if (orderSetting) {
-      await restaurantStore.updateDineInSetting(id, orderSetting)
+      await restaurantStore.updateDineInSetting(orderSetting)
       if (currentRestaurant.value) {
         currentRestaurant.value.dineIn = orderSetting
       }

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

@@ -111,8 +111,8 @@ const handleParentUpdate = (ev: boolean) => {
   if (nestedVal.value.includes('offline')) {
     updatedPaymentTypes.push(F_ORDER_PAYMENT_TYPE.enum.cash)
   }
-
-  emits('update:payments', { paymentTypes: updatedPaymentTypes, offlinePaymentTypes: updatedOfflinePaymentTypes })
+  emits('update:paymentTypes', updatedPaymentTypes)
+  emits('update:offlinePaymentTypes', updatedOfflinePaymentTypes)
 }
 
 const handleChildUpdate = (ev: string[]) => {
@@ -128,7 +128,8 @@ const handleChildUpdate = (ev: string[]) => {
   if (ev.includes('offline')) {
     updatedPaymentTypes.push(F_ORDER_PAYMENT_TYPE.enum.cash)
   }
-  emits('update:payments', { paymentTypes: updatedPaymentTypes, offlinePaymentTypes: updatedOfflinePaymentTypes })
+  emits('update:paymentTypes', updatedPaymentTypes)
+  emits('update:offlinePaymentTypes', updatedOfflinePaymentTypes)
 }
 
 const localOfflinePaymentTypes = ref<FdoRestaurantPickup['offlinePaymentTypes']>(

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

@@ -58,7 +58,7 @@ function updatePickupSetting(value: FdoRestaurantPickup) {
 async function onSave() {
   await startAsyncCallWithErr(async () => {
     const id = currentRestaurant.value?._id ?? ''
-    await restaurantStore.updatePickupSetting(id, pickupSetting.value)
+    await restaurantStore.updatePickupSetting(pickupSetting.value)
     if (currentRestaurant.value) {
       currentRestaurant.value.pickup = pickupSetting.value
     }

package/dist/KioskSettingView-DqpBqjGG.js

@@ -1,4 +0,0 @@
-import { _ as f } from "./app-Bd8YKqAx.js";
-export {
-  f as default
-};