@feedmepos/mf-order-setting 0.0.61-prod → 0.0.63-prod

package/dist/{index-v1JWPl0T.js → index-D5Ao4tWD.js}

@@ -1,9 +1,9 @@
 import { defineComponent as Yu, ref as hu, resolveComponent as fu, createElementBlock as Je, openBlock as De, createElementVNode as ze, createVNode as Fe, toDisplayString as cu, unref as du, createBlock as et, computed as qu, watch as rt, onMounted as at, createCommentVNode as wu, withCtx as Eu, createTextVNode as nt, Fragment as it, renderList as st, renderSlot as ot } from "vue";
-import { e as Ie, c as Ue } from "./app-BajIwvwC.js";
+import { e as Ie, c as Ue } from "./app-BMblFPtQ.js";
 import { useDialog as lt, useSnackbar as ct } from "@feedmepos/ui-library";
 import { useI18n as Au, useCoreStore as ut } from "@feedmepos/mf-common";
 import { defineStore as ft } from "pinia";
-import { r as bu, g as ne, l as $u, j as Uu, S as Wu } from "./menu.dto-As7AyKo1.js";
+import { r as bu, g as ne, w as $u, j as Uu, S as Wu } from "./menu.dto-BdFq_BB_.js";
 const dt = /* @__PURE__ */ Yu({
   __name: "OfflinePaymentTypeDialogContent",
   props: {

package/dist/{index-BUuyLjBw.js → index-FP2iiNEg.js}

@@ -1,4 +1,4 @@
-import { g as i, w as _, S as C, r as g } from "./menu.dto-As7AyKo1.js";
+import { g as i, v as _, S as C, r as g } from "./menu.dto-BdFq_BB_.js";
 async function R() {
   const r = await g().get("/order-settings");
   return i(r);
@@ -16,10 +16,10 @@ async function p() {
 }
 const y = {
   read: p
-}, w = new RegExp("([\\p{Ll}\\d])(\\p{Lu})", "gu"), A = new RegExp("(\\p{Lu})([\\p{Lu}][\\p{Ll}])", "gu"), m = new RegExp("(\\d)\\p{Ll}|(\\p{L})\\d", "u"), I = /[^\p{L}\d]+/giu, f = "$1\0$2", d = "";
+}, A = new RegExp("([\\p{Ll}\\d])(\\p{Lu})", "gu"), w = new RegExp("(\\p{Lu})([\\p{Lu}][\\p{Ll}])", "gu"), m = new RegExp("(\\d)\\p{Ll}|(\\p{L})\\d", "u"), I = /[^\p{L}\d]+/giu, f = "$1\0$2", d = "";
 function o(r) {
   let e = r.trim();
-  e = e.replace(w, f).replace(A, f), e = e.replace(I, "\0");
+  e = e.replace(A, f).replace(w, f), e = e.replace(I, "\0");
   let t = 0, c = e.length;
   for (; e.charAt(t) === "\0"; )
     t++;

package/dist/{menu.dto-As7AyKo1.js → menu.dto-BdFq_BB_.js}

@@ -1,4 +1,4 @@
-import { e as GE, n as VE, c as ae } from "./app-BajIwvwC.js";
+import { e as GE, n as VE, c as ae } from "./app-BMblFPtQ.js";
 import { useCoreStore as Yo } from "@feedmepos/mf-common";
 function HE(o, c) {
   return function() {
@@ -96909,16 +96909,16 @@ export {
   Ve as i,
   Di as j,
   hG as k,
-  vb as l,
+  US as l,
   $W as m,
-  US as n,
-  qs as o,
-  lV as p,
-  dV as q,
+  qs as n,
+  lV as o,
+  dV as p,
+  cV as q,
   yW as r,
-  cV as s,
-  KM as t,
-  CW as u,
-  kW as v,
-  vW as w
+  KM as s,
+  CW as t,
+  kW as u,
+  vW as v,
+  vb as w
 };

package/package.json

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

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

@@ -444,7 +444,7 @@ async function updateExternalDelivery({ key, setting }: IntegratedDeliveryRow) {
   }
 }
 
-const { startAsyncCallWithErr, isLoading } = useLoading()
+const { startAsyncCallWithErr, isLoading, startLoading } = useLoading()
 const columns: ColumnDef<any>[] = [
   {
     accessorKey: 'name',
@@ -1076,6 +1076,7 @@ watch(
   () => currentRestaurant.value,
   async (newRestaurant) => {
     if (newRestaurant) {
+      startLoading()
       await readData()
       // Check if FeedMe Express deprecation notice should be shown
       checkAndShowDeprecationNotice()

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

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { type PropType, computed, ref } from 'vue'
-import { Dinero } from '@feedmepos/core'
-import { FdoDinero } from '@feedmepos/core/entity'
-import { useAppStore } from '@/stores/app'
+import { Country, Dinero } from '@feedmepos/core'
+import { F_COUNTRY, type FCurrency, type FdoCountry, FdoDinero } from '@feedmepos/core/entity'
+import { useCoreStore } from '@feedmepos/mf-common'
 
 
 const props = defineProps({
@@ -29,8 +29,9 @@ const value = computed<number | null>(() => {
 function input(v: any) {
   let value = parseFloat((v || '').toString())
   value = Number.isNaN(value) ? 0 : value
-  const currencyCode = useAppStore().country.currency.code
-  emits('update:model-value', { ...Dinero.fromNumber({ number: value }).toObject(), currency: currencyCode } as FdoDinero)
+  const countryCode = (useCoreStore().currentCountry.value || F_COUNTRY.enum.MY) as F_COUNTRY
+  const currencyCode = (Country.getCountry(countryCode) as FdoCountry).currency.code as FCurrency
+  emits('update:model-value', { ...Dinero.fromNumber({ number: value }).toObject(), currency: currencyCode })
 }
 </script>
 

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

@@ -3,10 +3,10 @@ import GoogleMap from '@/components/GoogleMap.vue'
 import type { InputModel, MapCoordinate, MapPolygon } from '@/components/type'
 import { arrayToCoordinate, coordinates, coordinateToArray, generateAreaPaths, getDefaultCoordinates } from '@/helpers/map'
 import { clone } from '@/helpers/object'
-import { Dinero } from '@feedmepos/core'
-import type { FdoDeliveryArea, FdoDinero } from '@feedmepos/core/entity'
-import { useAppStore } from '@/stores/app'
+import { Country, Dinero } from '@feedmepos/core'
+import { F_COUNTRY, type FCurrency, type FdoCountry, type FdoDeliveryArea, type FdoDinero } from '@feedmepos/core/entity'
 import { ref, reactive, type PropType, computed, onMounted, watch } from 'vue'
+import { useCoreStore } from '@feedmepos/mf-common'
 import CurrencyInput from './CurrencyInput.vue'
 import { useI18n } from '@feedmepos/mf-common'
 
@@ -16,7 +16,11 @@ const emits = defineEmits<{
   (e: 'update:model-value', value: FdoDeliveryArea): void
 }>()
 
-const zeroDineroObject = computed(() => ({ ...Dinero.zero().toObject(), currency: useAppStore().country.currency.code }) as FdoDinero)
+const zeroDineroObject = computed(() => {
+  const countryCode = (useCoreStore().currentCountry.value || F_COUNTRY.enum.MY) as F_COUNTRY
+  const country = Country.getCountry(countryCode) as FdoCountry
+  return { ...Dinero.zero().toObject(), currency: country.currency.code as FCurrency }
+})
 
 const props = defineProps({
   initialValue: {

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

@@ -231,7 +231,7 @@ async function orderSettingInit() {
 }
 
 const { showSuccess, showError } = useSnackbarFunctions()
-const { startAsyncCallWithErr, isLoading } = useLoading()
+const { startAsyncCallWithErr, isLoading, startLoading } = useLoading()
 async function updateDineInSetting() {
   if (!isDineInsettingValid.value) {
     showError(errors.value)
@@ -265,6 +265,7 @@ async function readOrderSetting(): Promise<OrderSettingsDto> {
 watch(
   () => currentRestaurant.value,
   async (newRestaurant) => {
+    startLoading()
     if (newRestaurant?.dineIn) {
       dineInSetting.value = utils.clone(newRestaurant.dineIn)
     }

package/src/views/order-settings/general/GeneralSetting.vue

@@ -104,7 +104,7 @@ function getSequenceSettingRules(digit?: number | null) {
 
 const { showSuccess, showError } = useSnackbarFunctions()
 const { currentRestaurant } = useCoreStore()
-const { startAsyncCallWithErr, isLoading } = useLoading()
+const { startAsyncCallWithErr, isLoading, startLoading } = useLoading()
 
 const orderSetting = ref<OrderSettingsDto | undefined>(undefined)
 const v3Settings = ref<OrderV3Settings | undefined>(undefined)
@@ -241,6 +241,7 @@ onMounted(() => init())
 watch(
   () => currentRestaurant.value,
   () => {
+    startLoading()
     init()
   },
   { immediate: true }

package/src/views/order-settings/queue/QueueSetting.vue

@@ -19,7 +19,7 @@ import PresetRemarksSheet from './PresetRemarksSheet.vue'
 const { t } = useI18n()
 const { showSuccess } = useSnackbarFunctions()
 const { currentRestaurant } = useCoreStore()
-const { isLoading, startAsyncCallWithErr } = useLoading()
+const { isLoading, startAsyncCallWithErr, startLoading } = useLoading()
 
 const orderSettingDefault = ref<FdoOrderSettings | undefined>(undefined)
 const queueSettings = ref<FdoOrderQueueSettings>({ ...defaultQueueSetting })
@@ -35,6 +35,7 @@ onMounted(() => {
 watch(
   () => currentRestaurant.value,
   () => {
+    startLoading()
     init()
   },
   { immediate: true }

package/src/views/order-settings/sms/SmsSetting.vue

@@ -22,7 +22,7 @@ import { SMS } from '@common'
 
 const { showSuccess, showError } = useSnackbarFunctions()
 const { currentRestaurant } = useCoreStore()
-const { isLoading, startAsyncCallWithErr } = useLoading()
+const { isLoading, startAsyncCallWithErr, startLoading } = useLoading()
 
 const orderSettingDefault = ref<OrderSettingsDto | undefined>(undefined)
 
@@ -38,6 +38,7 @@ onMounted(() => {
 watch(
   () => currentRestaurant.value,
   () => {
+    startLoading()
     init()
   },
   { immediate: true }