@feedmepos/mf-order-setting 0.0.15-alpha.1 → 0.0.16

package/package.json

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

package/src/Entry.vue

@@ -17,7 +17,7 @@ onMounted(async () => {
     parent.postMessage({ event: 'ready' }, '*')
   }
 
-  const loader = new Loader(import.meta.env.VITE_GOOGLE_MAP_API_KEY, {
+  const loader = new Loader(appApi.googleMap, {
     libraries: ['places']
   })
 
@@ -31,7 +31,7 @@ onMounted(async () => {
     <div v-if="!state.isIframe" style="height: 64px">
       <FmNavBar />
     </div>
-    <App/>
+    <App />
   </div>
 </template>
 

package/src/stores/restaurant/index.ts

@@ -101,7 +101,7 @@ export const useRestaurantStore = defineStore('restaurant', {
       await remoteOrderApi.integratedDelivery.updateInhouse(restaurantId, dto)
     },
     async updateFeedmeDelivery(restaurantId: string, dto: FdoRestaurantFeedmeDelivery) {
-      await remoteOrderApi.integratedDelivery.updateFeedme(restaurantId, dto)
+      return await remoteOrderApi.integratedDelivery.updateFeedme(restaurantId, dto)
     },
     async updateIntegratedFoodpandaDelivery(restaurantId: string, dto: FdoFoodpandaSettings) {
       await remoteOrderApi.integratedDelivery.updateFoodpanda(restaurantId, dto)
@@ -126,7 +126,7 @@ export const useRestaurantStore = defineStore('restaurant', {
         })
 
       if (!validPosVersion)
-        return t('order.payoutPosVersion', {version: Pos.minVersionToUse(F_FEATURE.enum.qrEPayment)})
+        return t('order.payoutPosVersion', { version: Pos.minVersionToUse(F_FEATURE.enum.qrEPayment) })
       if (!payoutAccount || !payoutAccount.enable) {
         return t('order.payoutAccountIsRequired')
       }

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

@@ -746,11 +746,16 @@ async function updateIntegratedDeliverySetting() {
 
 async function updateFeedmeExpressSetting() {
   sideSheetIntegrated.value = false
-  await restaurantStore.updateFeedmeDelivery(currentRestaurant.value?._id ?? '', feedMeDoc.value)
-  const res = (await readRestaurants())?.find((res) => res._id === currentRestaurant.value?._id)
-  if (!!res) {
-    changeRestaurant(res)
-  }
+
+  await startAsyncCallWithErr(async () => {
+    const restaurant = await restaurantStore.updateFeedmeDelivery(
+      currentRestaurant.value?._id ?? '',
+      feedMeDoc.value
+    )
+    if (!!currentRestaurant.value?.feedmeDelivery) {
+      currentRestaurant.value.feedmeDelivery = restaurant.feedmeDelivery
+    }
+  })
   showSuccess('Delivery setting updated. ')
 }
 
@@ -759,7 +764,7 @@ async function updateInHouseSetting() {
   await restaurantStore.updateInhouseDelivery(currentRestaurant.value?._id ?? '', inHouseDoc.value)
   const res = (await readRestaurants())?.find((res) => res._id === currentRestaurant.value?._id)
   if (!!res) {
-    changeRestaurant(res)
+    await changeRestaurant(res)
   }
   showSuccess('Delivery setting updated. ')
 }
@@ -800,11 +805,6 @@ async function updateDelivery(
         break
     }
   }
-
-  const res = (await readRestaurants())?.find((res) => res._id === currentRestaurant.value?._id)
-  if (!!res) {
-    changeRestaurant(res)
-  }
 }
 
 const feedMeDoc = computed(() => feedMeComponentProps.value.initialValue)
@@ -876,7 +876,6 @@ function convertIntegratedCompanyName(name: companyName): string {
 
 watch(
   () => currentRestaurant.value,
-
   async (newRestaurant) => {
     if (newRestaurant) {
       await readData()

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

@@ -247,7 +247,10 @@ watch(
   () => currentRestaurant.value,
   async (newValue) => {
     if (newValue) {
-      const restaurantSetting = restaurantStore.restaurantSettings[newValue._id]
+      let restaurantSetting = restaurantStore.restaurantSettings[newValue._id]
+      if (!restaurantSetting) {
+        restaurantSetting = await restaurantStore.readRestaurantSetting(newValue._id)
+      }
       initialize(restaurantSetting)
       await startAsyncCallWithErr(tableSettingStore.readTables)
     }

package/vite.config.ts

@@ -1,11 +1,12 @@
 import { fileURLToPath, URL } from 'node:url'
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import { fmmfVitePresent } from "@feedmepos/mf-common/vite-preset";
 
 
 // https://vitejs.dev/config/
 export default defineConfig((env) => {
+  process.env = { ...process.env, ...loadEnv(env.mode, process.cwd(), "") }
   const config = {
     plugins: [vue()],
     resolve: {
@@ -18,10 +19,9 @@ export default defineConfig((env) => {
     },
     define: {
       devInfo: JSON.stringify({
-
       }),
       appApi: JSON.stringify({
-        googleMap: process.env.GOOGLE_MAP_API_KEY,
+        googleMap: process.env.VITE_GOOGLE_MAP_API_KEY,
         firebase: {
           apiKey: process.env.FIREBASE_API_KEY,
           authDomain: process.env.FIREBASE_AUTH_DOMAIN,

package/dist/KioskSettingView-ChG0eNUq.js

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