@feedmepos/mf-order-setting 0.0.19 → 0.0.20

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

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

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

@@ -28,15 +28,18 @@
 <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 { FdoRestaurant, 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'
+
+interface FmpRestaurant extends FdoRestaurant {
+  managable: boolean
+}
 
 const { t } = useI18n()
 const { searchKey, filter } = useSearch()
@@ -44,9 +47,10 @@ const { restaurants, changeRestaurant, currentRestaurant } = useCoreStore()
 const restaurantStore = useRestaurantStore()
 const sideSheet = ref<boolean>(false)
 const { isLoading, startAsyncCallWithErr } = useLoading()
+const currentRestaurants = ref<FmpRestaurant[]>([])
 
 const pickupSetting = computed<RestaurantPickup[]>(() => {
-  return restaurants.value.map((r) => {
+  return currentRestaurants.value.map((r: FmpRestaurant) => {
     const restaurantSetting = restaurantStore.restaurantSettings[r._id]
 
     return {
@@ -62,8 +66,11 @@ const pickupSetting = computed<RestaurantPickup[]>(() => {
 
 async function fetchRestaurants() {
   await startAsyncCallWithErr(async () => {
+    if (!!restaurants.value) {
+      currentRestaurants.value = [...restaurants.value]
+    }
     await Promise.all(
-      restaurants.value.map(async (r) => {
+      currentRestaurants.value.map(async (r: FmpRestaurant) => {
         await restaurantStore.readRestaurantSetting(r._id)
       })
     )
@@ -82,14 +89,7 @@ watch(
 )
 
 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
@@ -98,7 +98,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: FmpRestaurant) => r._id === v)
   if (restaurant) {
     await changeRestaurant(restaurant)
   }

package/tsconfig.json

@@ -7,13 +7,5 @@
     {
       "path": "./tsconfig.app.json"
     }
-  ],
-  "include": [
-    "src/index.d.ts",
-    "src/*",
-    "../../package/entity/*",
-    "../../package/entity/index.ts",
-    "../../common/*",
-    "src/**/*.json"
   ]
 }