@feedmepos/mf-order-setting 0.0.14 → 0.0.15-alpha

package/package.json

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

package/src/app.ts

@@ -1,7 +1,15 @@
 import type { App } from 'vue'
+import enUS from "./locales/en-US.json"
+import zhCN from "./locales/zh-CN.json"
+
 export { default as FmApp } from './App.vue'
 export { routes as routers } from '../src/router/routes'
 
+export const i18nMessages = {
+    "en-US": enUS,
+    "zh-CN": zhCN
+}
+
 export function initOrderSettingApp(app: App) {
 
 }

package/src/main.ts

@@ -11,13 +11,7 @@ import { getAuth, signInWithCustomToken } from 'firebase/auth'
 import { initializeApp } from 'firebase/app'
 import { useIframeStore } from './stores/iframe'
 import { createFeedMeI18n, type I18n, detectLocale } from "@feedmepos/mf-common"
-import enUS from "./locales/en-US.json"
-import zhCN from "./locales/zh-CN.json"
-
-export const i18nMessages = {
-    "en-US": enUS,
-    "zh-CN": zhCN
-}
+import { i18nMessages } from './app'
 
 function initI18n(): I18n {
     const i18n = createFeedMeI18n({
@@ -30,16 +24,15 @@ function initI18n(): I18n {
 
 const app = createApp(Entry)
 
-app.use(initI18n())
-app.use(createPinia())
-app.use(router)
-
-
-
 app.use(FeedMeUI, {
     locale: detectLocale(),
 })
 
+app.use(initI18n())
+
+app.use(createPinia())
+app.use(router)
+
 const CoreStore = useCoreStore();
 const iframeMode = computed(() => {
     return new URLSearchParams(window.location.search).get('iframe') === 'true';

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

@@ -54,7 +54,7 @@ onMounted(async () => {
   await startAsyncCallWithErr(async () => {
     await Promise.all(
       restaurants.value.map(async (r) => {
-        changeRestaurant(r)
+        await changeRestaurant(r)
         await restaurantStore.readRestaurantSetting(r._id)
       })
     )

package/src/views/order-settings/servicecharge/ServiceChargeSetting.vue

@@ -5,22 +5,40 @@
   <div v-if="!isLoading">
     <div class="p-[1.5rem] flex flex-col gap-5">
       <FmCard variant="outlined" class="p-5 sm:w-2/3 md:w-2/3 lg:w-1/3 xl:w-1/3">
-        <div class="flex-grow fm-typo-en-title-sm-600 mb-3">{{ t('order.enableServiceCharge') }}</div>
-        <FmSwitch v-model="data.active" value="first"
+        <div class="flex-grow fm-typo-en-title-sm-600 mb-3">
+          {{ t('order.enableServiceCharge') }}
+        </div>
+        <FmSwitch
+          v-model="data.active"
+          value="first"
           :sublabel="t('order.serviceChargeSublabel')"
-          :label="t('order.serviceCharge')" label-placement="right" :disabled="!canUseServiceCharge" />
-        <div v-if="!canUseServiceCharge" class="fm-typo-en-body-md-400 text-fm-color-typo-error ml-14">
+          :label="t('order.serviceCharge')"
+          label-placement="right"
+          :disabled="!canUseServiceCharge"
+        />
+        <div
+          v-if="!canUseServiceCharge"
+          class="fm-typo-en-body-md-400 text-fm-color-typo-error ml-14"
+        >
           {{ t('order.serviceChargeRule') }}
         </div>
 
         <div class="flex flex-col gap-5 m-5" v-if="data.active">
-          <FmRadioGroup :model-value="chargeTime" :label="t('order.chargeWhen')" @update:model-value="updateChargeWhen">
+          <FmRadioGroup
+            :model-value="chargeTime"
+            :label="t('order.chargeWhen')"
+            @update:model-value="updateChargeWhen"
+          >
             <FmRadio value="beforeDiscount" :label="t('order.beforeBillDiscount')" />
             <FmRadio value="afterDiscount" :label="t('order.afterBillDiscount')" />
           </FmRadioGroup>
           <RateInput :model-value="data.rate" @update:model-value="handleUpdateRate" />
 
-          <FmRadioGroup :model-value="chargeValue" :label="t('order.selectServiceChargeType')" @update:model-value="updateInclusive">
+          <FmRadioGroup
+            :model-value="chargeValue"
+            :label="t('order.selectServiceChargeType')"
+            @update:model-value="updateInclusive"
+          >
             <FmRadio value="exclusive" :label="t('order.exclusive')" />
             <FmRadio value="inclusive" :label="t('order.inclusive')" />
           </FmRadioGroup>
@@ -29,24 +47,40 @@
     </div>
     <div v-if="data.active">
       <div class="flex flex-col gap-5 m-5">
-        <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-3">{{ t('order.customServiceCharge') }}</div>
+        <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-3">
+          {{ t('order.customServiceCharge') }}
+        </div>
         <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-5">
           <div v-for="(rule, index) in data.rules" :key="index" class="h-full">
             <FmCard variant="outlined">
               <FmCardSection>
-                <ServiceChargeRule :model-value="rule" :inclusive="data.inclusive"
-                  :charge-before-discount="isBeforeDiscountBoolean" :items="menuStore.categorizedItems"
-                  :tables="tableSettingStore.tables" :is-loading-menu="isLoadingMenu"
-                  :is-loading-table="isLoadingTables" @delete="deleteRule(index)"
-                  @update:model-value="(v: FdoServiceChargeRule) => updateRule(index, v)" />
+                <ServiceChargeRule
+                  :model-value="rule"
+                  :inclusive="data.inclusive"
+                  :charge-before-discount="isBeforeDiscountBoolean"
+                  :items="menuStore.categorizedItems"
+                  :tables="tableSettingStore.tables"
+                  :is-loading-menu="isLoadingMenu"
+                  :is-loading-table="isLoadingTables"
+                  @delete="deleteRule(index)"
+                  @update:model-value="(v: FdoServiceChargeRule) => updateRule(index, v)"
+                />
               </FmCardSection>
             </FmCard>
           </div>
           <div>
-            <FmCard variant="outlined" class="flex items-center justify-center w-full h-full border-dashed">
+            <FmCard
+              variant="outlined"
+              class="flex items-center justify-center w-full h-full border-dashed"
+            >
               <FmCardSection class="flex items-center justify-center w-full">
-                <FmButton variant="plain" :label="t('order.addServiceCharge')" icon="add" @click="createRule"
-                  class="border fm-corner-radius-lg border-fm-color-primary" />
+                <FmButton
+                  variant="plain"
+                  :label="t('order.addServiceCharge')"
+                  icon="add"
+                  @click="createRule"
+                  class="border fm-corner-radius-lg border-fm-color-primary"
+                />
               </FmCardSection>
             </FmCard>
           </div>
@@ -54,7 +88,12 @@
       </div>
     </div>
     <div class="fm-corner-radius-lg flex flex-col gap-5 m-5">
-      <FmButton variant="primary" :label="t('order.saveSetting')" class="mr-auto" @click="updateServiceChargeSetting" />
+      <FmButton
+        variant="primary"
+        :label="t('order.saveSetting')"
+        class="mr-auto"
+        @click="updateServiceChargeSetting"
+      />
     </div>
   </div>
   <FmCircularProgress size="xxl" v-else />
@@ -145,11 +184,14 @@ function updateInclusive(inclusiveValue: string) {
 }
 
 function createRule() {
-  data.value.rules.push({
-    rate: data.value.rate,
-    inclusive: data.value.inclusive,
-    condition: {}
-  })
+  data.value.rules = [
+    ...data.value.rules,
+    {
+      rate: data.value.rate,
+      inclusive: data.value.inclusive,
+      condition: {}
+    }
+  ]
 }
 
 function updateRule(index: number, rule: FdoServiceChargeRule) {
@@ -157,7 +199,7 @@ function updateRule(index: number, rule: FdoServiceChargeRule) {
 }
 
 function deleteRule(index: number) {
-  data.value.rules.splice(index, 1)
+  data.value.rules = data.value.rules.filter((_, id) => id !== index)
 }
 
 import { useSnackbarFunctions } from '@/components/snackbar'
@@ -170,7 +212,9 @@ async function updateServiceChargeSetting() {
     await restaurantStore.updateServiceCharge(data.value)
     showSuccess('Service charge setting updated. ')
   })
-  const restaurantSetting = await restaurantStore.readRestaurantSetting(currentRestaurant.value?._id || '')
+  const restaurantSetting = await restaurantStore.readRestaurantSetting(
+    currentRestaurant.value?._id || ''
+  )
   initialize(restaurantSetting)
 }
 

package/dist/KioskSettingView-BYv2A8Xy.js

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