@feedmepos/mf-order-setting 0.0.19-alpha.2 → 0.0.19

package/dist/{index-Bh8lg9Uc.js → index-SQG-c9lu.js}

@@ -1,4 +1,4 @@
-import { g as i, s as _, S as C, r as g } from "./dayjs.min-Sszw1zIA.js";
+import { g as i, s as _, S as C, r as g } from "./dayjs.min-WEimBwWx.js";
 async function R() {
   const r = await g().get("/order-settings");
   return i(r);

package/package.json

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

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

@@ -28,14 +28,15 @@
 <script setup lang="ts">
 import { computed, h, onMounted, ref, watch } from 'vue'
 import type { ColumnDef } from '@feedmepos/ui-library'
-import { useCoreStore, useI18n } from '@feedmepos/mf-common'
-import type { FdoRestaurantPickup } from '@feedmepos/core/entity'
+import { useCoreStore } from '@feedmepos/mf-common'
+import type { FdoPickupPoint, FdoRestaurantPickup } from '@feedmepos/core/entity'
 import { useRestaurantStore } from '@/stores/restaurant'
 import useSearch from '@/composables/search'
 import { sentenceCase } from 'change-case'
 import PickUpSettingDialog from './PickUpSettingDialog.vue'
 import { useLoading } from '@/composables/loading'
 import PickupList from './PickupList.vue'
+import { useI18n } from '@feedmepos/mf-common'
 
 const { t } = useI18n()
 const { searchKey, filter } = useSearch()
@@ -43,12 +44,9 @@ const { restaurants, changeRestaurant, currentRestaurant } = useCoreStore()
 const restaurantStore = useRestaurantStore()
 const sideSheet = ref<boolean>(false)
 const { isLoading, startAsyncCallWithErr } = useLoading()
-const currentRestaurants = ref<any[]>([])
 
 const pickupSetting = computed<RestaurantPickup[]>(() => {
-  console.log('computed')
-  console.log(`computed - !!${currentRestaurant.value}`)
-  return currentRestaurants.value.map((r: any) => {
+  return restaurants.value.map((r) => {
     const restaurantSetting = restaurantStore.restaurantSettings[r._id]
 
     return {
@@ -64,15 +62,8 @@ const pickupSetting = computed<RestaurantPickup[]>(() => {
 
 async function fetchRestaurants() {
   await startAsyncCallWithErr(async () => {
-    console.log(`restaurants.value - ${!!restaurants.value}`)
-    console.log(`fetchRestaurants - !!${currentRestaurant.value}`)
-    if (!!restaurants.value) {
-      currentRestaurants.value = [...restaurants.value]
-    }
-    console.log(`fetchRestaurants - !!${currentRestaurant.value}`)
-
     await Promise.all(
-      currentRestaurants.value.map(async (r: any) => {
+      restaurants.value.map(async (r) => {
         await restaurantStore.readRestaurantSetting(r._id)
       })
     )
@@ -80,20 +71,25 @@ async function fetchRestaurants() {
 }
 
 onMounted(async () => {
-  console.log('onMounted')
   await fetchRestaurants()
 })
 
 watch(
   () => restaurants.value,
   async () => {
-    console.log('watch')
     await fetchRestaurants()
   }
 )
 
 async function onUpdate() {
-  await fetchRestaurants()
+  await startAsyncCallWithErr(async () => {
+    await Promise.all(
+      restaurants.value.map(async (r) => {
+        await changeRestaurant(r)
+        await restaurantStore.readRestaurantSetting(r._id)
+      })
+    )
+  })
 }
 
 let originalRestaurant: any
@@ -102,7 +98,7 @@ async function toggleSideSheet(rowData: any) {
   const v = rowData?.original?.restaurantId ?? rowData?.restaurantId
   originalRestaurant = currentRestaurant.value
 
-  const restaurant = currentRestaurants.value.find((r: any) => r._id === v)
+  const restaurant = restaurants.value.find((r) => r._id === v)
   if (restaurant) {
     await changeRestaurant(restaurant)
   }