@feedmepos/mf-order-setting 0.0.18 → 0.0.19-alpha.1

package/dist/{index-B0G4vTU2.js → index-C11cYT__.js}

@@ -1,4 +1,4 @@
-import { g as i, s as _, S as C, r as g } from "./dayjs.min-7bYz19Mt.js";
+import { g as i, s as _, S as C, r as g } from "./dayjs.min-BRln33N4.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.18",
+  "version": "0.0.19-alpha.1",
   "type": "module",
   "module": "./dist/app.js",
   "license": "UNLICENSED",

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

@@ -28,15 +28,14 @@
 <script setup lang="ts">
 import { computed, h, onMounted, ref, watch } from 'vue'
 import type { ColumnDef } from '@feedmepos/ui-library'
-import { useCoreStore } from '@feedmepos/mf-common'
-import type { FdoPickupPoint, FdoRestaurantPickup } from '@feedmepos/core/entity'
+import { useCoreStore, useI18n } from '@feedmepos/mf-common'
+import type { 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()
@@ -44,9 +43,12 @@ 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[]>(() => {
-  return restaurants.value.map((r) => {
+  console.log('computed')
+  console.log(`computed - !!${currentRestaurant.value}`)
+  return currentRestaurants.value.map((r: any) => {
     const restaurantSetting = restaurantStore.restaurantSettings[r._id]
 
     return {
@@ -60,25 +62,38 @@ const pickupSetting = computed<RestaurantPickup[]>(() => {
   })
 })
 
-onMounted(async () => {
+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(
-      restaurants.value.map(async (r) => {
+      currentRestaurants.value.map(async (r: any) => {
         await restaurantStore.readRestaurantSetting(r._id)
       })
     )
   })
+}
+
+onMounted(async () => {
+  console.log('onMounted')
+  await fetchRestaurants()
 })
 
+watch(
+  () => restaurants.value,
+  async () => {
+    console.log('watch')
+    await fetchRestaurants()
+  }
+)
+
 async function onUpdate() {
-  await startAsyncCallWithErr(async () => {
-    await Promise.all(
-      restaurants.value.map(async (r) => {
-        await changeRestaurant(r)
-        await restaurantStore.readRestaurantSetting(r._id)
-      })
-    )
-  })
+  await fetchRestaurants()
 }
 
 let originalRestaurant: any
@@ -87,7 +102,7 @@ async function toggleSideSheet(rowData: any) {
   const v = rowData?.original?.restaurantId ?? rowData?.restaurantId
   originalRestaurant = currentRestaurant.value
 
-  const restaurant = restaurants.value.find((r) => r._id === v)
+  const restaurant = currentRestaurants.value.find((r: any) => r._id === v)
   if (restaurant) {
     await changeRestaurant(restaurant)
   }