@feedmepos/mf-order-setting 0.0.75-prod → 0.0.76

package/dist/{index-DQA37h5T.js → index-Bid9lO2x.js}

@@ -1,9 +1,9 @@
 import { defineComponent as Q, ref as O, resolveComponent as F, openBlock as g, createElementBlock as E, createElementVNode as h, toDisplayString as C, createVNode as D, unref as $, createBlock as j, computed as N, watch as ne, onMounted as ae, withCtx as M, createTextVNode as re, createCommentVNode as x, Fragment as oe, renderList as se, renderSlot as ue } from "vue";
-import { e as w } from "./app-DzO7wZsC.js";
+import { e as w } from "./app-BDlPjU4y.js";
 import { useDialog as le, useSnackbar as ie } from "@feedmepos/ui-library";
 import { useI18n as G, useCoreStore as te } from "@feedmepos/mf-common";
 import { defineStore as de } from "pinia";
-import { r as R, g as n, x as V, w as z, e as q } from "./lineman-settings.dto-BMG_DnTF.js";
+import { r as R, g as n, x as V, w as z, e as q } from "./lineman-settings.dto-Cny_fF4n.js";
 const ce = /* @__PURE__ */ Q({
   __name: "OfflinePaymentTypeDialogContent",
   props: {

package/dist/index-gGOpbnY3.js

@@ -0,0 +1,23 @@
+import { g as n, v as a, w as r, r as e } from "./lineman-settings.dto-Cny_fF4n.js";
+async function i() {
+  const t = await e().get("/order-settings");
+  return n(t);
+}
+async function c(t) {
+  const s = await e().put("/order-settings", t);
+  return n(s);
+}
+const u = {
+  getOrderSetting: i,
+  updateOrderSetting: c
+};
+async function o() {
+  return n(await a().get(`balance/${r.getBusinessId()}`));
+}
+const d = {
+  read: o
+};
+export {
+  u as O,
+  d as s
+};

package/dist/{lineman-settings.dto-BMG_DnTF.js → lineman-settings.dto-Cny_fF4n.js}

@@ -1,7 +1,7 @@
 var G5 = Object.defineProperty;
 var q5 = (i, u, s) => u in i ? G5(i, u, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[u] = s;
 var YS = (i, u, s) => q5(i, typeof u != "symbol" ? u + "" : u, s);
-import { e as x, l, c as ge, i as re, j as Y5, z as ut } from "./app-DzO7wZsC.js";
+import { e as x, l, c as ge, i as re, j as Y5, z as ut } from "./app-BDlPjU4y.js";
 import { useCoreStore as _u } from "@feedmepos/mf-common";
 function fO(i, u) {
   return function() {

package/package.json

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

package/src/locales/en-US.json

@@ -284,6 +284,7 @@
         "offlinePayment": "Offline Payment",
         "offlinePaymentName": "Offline Payment Name",
         "online": "Online",
+        "onlineFromPos": "Adjust from POS",
         "operatingHour": "Operating hour",
         "operatingSystem": "Operating System",
         "orderFrom": "Order from",

package/src/locales/ja-JP.json

@@ -204,6 +204,7 @@
     "offlinePayment": "オフライン支払い",
     "offlinePaymentName": "オフライン支払い名",
     "online": "オンライン",
+    "onlineFromPos": "POSで調整",
     "operatingHour": "営業時間",
     "orderFrom": "注文元",
     "orderNumberSettings": "番号設定",

package/src/locales/th-TH.json

@@ -207,6 +207,7 @@
     "offlinePayment": "การชำระเงินแบบออฟไลน์",
     "offlinePaymentName": "ชื่อการชำระเงินแบบออฟไลน์",
     "online": "ออนไลน์",
+    "onlineFromPos": "ปรับจาก POS",
     "operatingHour": "เวลาทำการ",
     "orderFrom": "คำสั่งซื้อจาก",
     "orderNumberSettings": "การตั้งค่าการออกหมายเลข",

package/src/locales/zh-CN.json

@@ -211,6 +211,7 @@
     "offlinePayment": "线下支付",
     "offlinePaymentName": "付款名称",
     "online": "在线",
+    "onlineFromPos": "在 POS 调整",
     "operatingHour": "营业时间",
     "orderFrom": "预订从",
     "orderNumberSettings": "编号设置",

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

@@ -1,226 +1,155 @@
 <template>
-  <div v-if="isLoading" class="column">
-    <FmCircularProgress size="xxl" />
+  <div class="flex justify-between items-center">
+    <RestaurantSelector />
   </div>
-  <div v-else class="block m-3">
-    <div class="flex justify-end items-center mb-3">
-      <FmSearch v-model="searchKey" :placeholder="t('order.search')" />
+  <div v-if="isReady">
+    <div class="p-[1.5rem] flex flex-col m-5 w-2/3 max-w-4xl">
+      <PickUpSettingDialogContent
+        :pickup="pickupSetting"
+        :order-pickup-settings="orderPickupSettings"
+        :accept-pickup="acceptPickup"
+        @update-pickup="updatePickupSetting"
+        @update-order-settings="updateOrderPickupSettings"
+      />
+      <div class="fm-corner-radius-lg flex flex-col gap-5 mt-5">
+        <FmButton
+          variant="primary"
+          :label="t('order.saveSetting')"
+          class="mr-auto"
+          @click="onSave"
+        />
+      </div>
     </div>
-    <PickupList
-      :pickupSettingData="pickupSettingData"
-      @toggleSideSheet="toggleSideSheet"
-      class="mt-5 md:hidden lg:hidden xl:hidden"
-    />
-    <FmTable
-      class="h-[500px] xs:hidden sm:hidden"
-      :row-data="pickupSettingData"
-      :hideFooter="true"
-      :column-defs="columns"
-      :loading="isLoading"
-      @row-click="toggleSideSheet"
-      :pageSize="pickupSettingData.length"
-    >
-    </FmTable>
-    <PickUpSettingDialog :showPickupDialog="sideSheet" @closeSideSheet="closeSideSheet" />
   </div>
+  <div v-else-if="!currentRestaurant?._id" class="p-[1.5rem] m-5">
+    {{ t('order.noRestaurantSelected') }}
+  </div>
+  <div v-else-if="loadError" class="p-[1.5rem] m-5">
+    <FmButton variant="secondary" :label="t('order.retry')" @click="loadSetting" />
+  </div>
+  <FmCircularProgress size="xxl" v-else />
 </template>
 
 <script setup lang="ts">
-import { computed, h, onMounted, ref, watch } from 'vue'
-import type { ColumnDef } from '@feedmepos/ui-library'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useCoreStore, useI18n } from '@feedmepos/mf-common'
-import type { FdoRestaurant, FdoRestaurantPickup } from '@feedmepos/core/entity'
+import { utils } from '@feedmepos/core'
+import { F_ORDER_PAYMENT_TYPE, FdoRestaurantPickup } from '@feedmepos/core/entity'
+import type { OrderPickupSettingsDto, OrderSettingsDto } from '@entity'
+import RestaurantSelector from '../components/RestaurantSelector.vue'
+import PickUpSettingDialogContent from './PickUpSettingDialogContent.vue'
+import { MAX_PREORDER_DAYS } from './Preorder.vue'
 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'
-
-interface FmpRestaurant extends FdoRestaurant {
-  managable: boolean
-}
+import { useSnackbarFunctions } from '@/components/snackbar'
+import { OrderSettingApi } from '@/api/order-setting'
 
 const { t } = useI18n()
-const { searchKey, filter } = useSearch()
-const { restaurants, changeRestaurant, currentRestaurant } = useCoreStore()
+const { currentRestaurant } = useCoreStore()
 const restaurantStore = useRestaurantStore()
-const sideSheet = ref<boolean>(false)
 const { isLoading, startAsyncCallWithErr } = useLoading()
-const currentRestaurants = ref<FmpRestaurant[]>([])
-
-const pickupSetting = computed<RestaurantPickup[]>(() => {
-  return currentRestaurants.value.map((r: FmpRestaurant) => {
-    const restaurantSetting = restaurantStore.state.restaurantSettings[r._id]
-
-    return {
-      enable: restaurantSetting?.acceptPickup,
-      restaurant: {
-        id: r._id,
-        name: r.profile.name
-      },
-      ...(restaurantSetting?.pickup || r.pickup)
-    }
-  })
-})
+const { showSuccess, showError } = useSnackbarFunctions()
+
+const pickupSetting = ref<FdoRestaurantPickup>(initDefaultPickupSetting())
+const acceptPickup = ref<boolean>(false)
+// The form (and its Save) must only render once BOTH fetches completed for the
+// restaurant that is still selected — otherwise a failed or raced load exposes
+// an editable default form whose Save would overwrite the real config.
+const loadedForId = ref<string | null>(null)
+const loadError = ref(false)
+const isReady = computed(
+  () => !isLoading.value && loadedForId.value === currentRestaurant.value?._id
+)
+// `orderSetting.pickupSettings` (bill auto-close / receipt-print) is a separate doc
+// from the restaurant-level pickup setting; loaded/saved alongside it here.
+const orderSetting = ref<OrderSettingsDto | undefined>(undefined)
+const orderPickupSettings = ref<OrderPickupSettingsDto>({})
+
+function initDefaultPickupSetting(): FdoRestaurantPickup {
+  return {
+    offlinePaymentTypes: [],
+    paymentTypes: [F_ORDER_PAYMENT_TYPE.enum.cash]
+  }
+}
 
-async function fetchRestaurants() {
-  await startAsyncCallWithErr(async () => {
-    if (!!restaurants.value) {
-      currentRestaurants.value = [...restaurants.value]
+async function loadSetting() {
+  const restaurant = currentRestaurant.value
+  if (!restaurant?._id) return
+  // Reset before any await so a partial failure can never leave the previous
+  // restaurant's docs live under this restaurant's selector (a later save would
+  // write them to the wrong restaurant).
+  loadedForId.value = null
+  loadError.value = false
+  pickupSetting.value = initDefaultPickupSetting()
+  acceptPickup.value = false
+  orderSetting.value = undefined
+  orderPickupSettings.value = {}
+  try {
+    await startAsyncCallWithErr(async () => {
+      const restaurantSetting = await restaurantStore.readRestaurantSetting(restaurant._id)
+      // The selector stays clickable while requests are in flight — a late response
+      // for a restaurant the user already switched away from must not land.
+      if (currentRestaurant.value?._id !== restaurant._id) return
+      acceptPickup.value = !!restaurantSetting?.acceptPickup
+      // Clone: the form's in-place edits must never mutate the store-cached
+      // setting doc or the core-store restaurant object.
+      pickupSetting.value = utils.clone(
+        restaurantSetting?.pickup ?? restaurant.pickup ?? initDefaultPickupSetting()
+      )
+      const setting = await OrderSettingApi.getOrderSetting()
+      if (currentRestaurant.value?._id !== restaurant._id) return
+      orderSetting.value = setting
+      orderPickupSettings.value = setting.pickupSettings ?? {}
+      loadedForId.value = restaurant._id
+    })
+  } catch {
+    // startAsyncCallWithErr already surfaced the error snackbar; keep the form
+    // behind the retry state so Save can never persist the reset defaults.
+    if (currentRestaurant.value?._id === restaurant._id) {
+      loadError.value = true
     }
-    await Promise.all(
-      currentRestaurants.value.map(async (r: FmpRestaurant) => {
-        await restaurantStore.readRestaurantSetting(r._id)
-      })
-    )
-  })
+  }
 }
 
-onMounted(async () => {
-  await fetchRestaurants()
-})
+onMounted(loadSetting)
 
 watch(
-  () => restaurants.value,
-  async () => {
-    await fetchRestaurants()
-  }
+  () => currentRestaurant.value?._id,
+  () => loadSetting()
 )
 
-async function onUpdate() {
-  await fetchRestaurants()
+function updatePickupSetting(value: FdoRestaurantPickup) {
+  pickupSetting.value = value
 }
 
-let originalRestaurant: any
-
-async function toggleSideSheet(rowData: any) {
-  const v = rowData?.original?.restaurantId ?? rowData?.restaurantId
-  originalRestaurant = currentRestaurant.value
-
-  const restaurant: FmpRestaurant | undefined = currentRestaurants.value.find(
-    (r: FmpRestaurant) => r._id === v
-  )
-  if (restaurant) {
-    await changeRestaurant(restaurant as any)
-  }
-  sideSheet.value = true
+function updateOrderPickupSettings(value: OrderPickupSettingsDto) {
+  orderPickupSettings.value = value
 }
 
-async function closeSideSheet(refresh = false) {
-  sideSheet.value = false
-  if (originalRestaurant) {
-    await changeRestaurant(originalRestaurant)
-  }
-  if (refresh) {
-    await onUpdate()
+async function onSave() {
+  const restaurant = currentRestaurant.value
+  if (!restaurant?._id) return
+  const pickupTime = pickupSetting.value.pickupTime
+  if (pickupTime?.day) {
+    const { min, max } = pickupTime.day
+    if (max <= min || max - min > MAX_PREORDER_DAYS) {
+      showError(t('order.preOrderMaxDaysError', { days: MAX_PREORDER_DAYS }))
+      return
+    }
   }
-}
-
-const filteredPickupSettings = computed<RestaurantPickup[]>(() => {
-  return pickupSetting.value.filter(({ restaurant, paymentTypes, offlinePaymentTypes }) =>
-    filter([
-      restaurant.name,
-      paymentTypes?.join('') || '',
-      offlinePaymentTypes?.map((p) => p.name).join('') || ''
-    ])
-  )
-})
-
-const pickupSettingData = computed<PickupSettingData[]>(() => {
-  return filteredPickupSettings.value.map((item) => {
-    const hasCustomOfflinePayment = !!item.offlinePaymentTypes?.length
-    const canOfflinePayment = (item.paymentTypes || []).includes('cash')
-    const paymentMethod = !hasCustomOfflinePayment
-      ? (item.paymentTypes || []).map((p) => sentenceCase(p)).join(', ')
-      : [
-          (item.paymentTypes || [])
-            .filter((p) => p !== 'cash')
-            .map((p) => sentenceCase(p))
-            .join(', '),
-          canOfflinePayment
-            ? (item.offlinePaymentTypes || []).map((p) => sentenceCase(p.name)).join(', ')
-            : ''
-        ]
-          .filter((v) => !!v)
-          .join(', ')
-
-    const onlineStatus = item.enable ? t('order.activated') : t('order.inactive')
-
-    const preorderRange = item.pickupTime
-      ? `${item.pickupTime.day.min} ${t('order.to')} ${item.pickupTime.day.max - 1} ${t('order.day')}`
-      : '-'
-    const pickupPointCount = item.pickupPointConfig?.points.length || 0
-
-    return {
-      restaurantId: item.restaurant.id,
-      restaurant: item.restaurant.name,
-      paymentmethod: paymentMethod,
-      online: onlineStatus,
-      enable: item.enable,
-      preorder: preorderRange,
-      pickuppoint: `${pickupPointCount} ${t('order.pickupPoint')}`
+  await startAsyncCallWithErr(async () => {
+    await restaurantStore.updatePickupSetting(pickupSetting.value)
+    restaurant.pickup = utils.clone(pickupSetting.value)
+    // The order-settings client resolves the CURRENT restaurant at call time —
+    // if the user switched away while the pickup PUT was in flight, this would
+    // write this restaurant's doc onto the newly selected one. Skip instead.
+    if (orderSetting.value && currentRestaurant.value?._id === restaurant._id) {
+      orderSetting.value = await OrderSettingApi.updateOrderSetting({
+        ...orderSetting.value,
+        pickupSettings: orderPickupSettings.value
+      })
     }
+    showSuccess('Pickup setting updated.')
   })
-})
-
-export interface PickupSettingData {
-  restaurantId: string
-  restaurant: string
-  paymentmethod: string
-  online: string
-  enable: boolean
-  preorder: string
-  pickuppoint: string
-}
-
-export interface RestaurantPickup extends FdoRestaurantPickup {
-  enable: boolean
-  restaurant: {
-    id: string
-    name: string
-  }
 }
-
-const getClassForOnline = (enabled: boolean) => {
-  return enabled
-    ? 'bg-fm-color-system-success-100  text-fm-color-system-success-400 fm-typo-en-body-md-600 border fm-corner-radius-lg w-max gap-8 p-4'
-    : ' bg-fm-color-neutral-gray-100 fm-typo-en-body-md-600 border fm-corner-radius-lg w-max gap-8 p-4'
-}
-
-const columns: ColumnDef<any>[] = [
-  {
-    accessorKey: 'restaurant',
-    header: () => t('order.restaurant'),
-    meta: {
-      maxWidth: '150px'
-    },
-    enableSorting: false
-  },
-  {
-    accessorKey: 'paymentmethod',
-    header: () => t('order.paymentMethod'),
-    enableSorting: false
-  },
-  {
-    accessorKey: 'online',
-    header: () => t('order.online'),
-    cell: (info: any) => {
-      const enabled = info.row.original.enable
-      const onlineStatus = info.getValue()
-      return h('div', { class: getClassForOnline(enabled) }, onlineStatus)
-    },
-    enableSorting: false
-  },
-  {
-    accessorKey: 'preorder',
-    header: () => t('order.preOrder'),
-    enableSorting: false
-  },
-  {
-    accessorKey: 'pickuppoint',
-    header: () => t('order.pickupPoint'),
-    enableSorting: false
-  }
-]
 </script>

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

@@ -1,5 +1,16 @@
 <template>
-  <div class="flex-grow fm-typo-en-title-sm-600 mb-3 mt-3">{{ t('order.generalSetting') }}</div>
+  <div class="flex-grow fm-typo-en-title-sm-600 mb-5">{{ t('order.generalSetting') }}</div>
+  <div class="flex flex-col mb-5">
+    <div class="flex items-center gap-3">
+      <span class="fm-typo-en-body-md-600">{{ t('order.online') }}</span>
+      <div :class="getClassForOnline(acceptPickup)">
+        {{ acceptPickup ? t('order.activated') : t('order.inactive') }}
+      </div>
+    </div>
+    <span class="fm-typo-en-body-sm-400 text-fm-color-typo-secondary">
+      {{ t('order.onlineFromPos') }}
+    </span>
+  </div>
   <FmSwitch
     :model-value="pickupSetting.ignoreStock ?? false"
     value="ignoreStock"
@@ -107,9 +118,21 @@ const props = defineProps({
   orderPickupSettings: {
     type: Object as PropType<OrderPickupSettingsDto>,
     default: () => ({})
+  },
+  // Read-only pickup online status (restaurant-level `acceptPickup`); shown as a
+  // labeled row at the top of this section, not editable here.
+  acceptPickup: {
+    type: Boolean,
+    default: false
   }
 })
 
+const getClassForOnline = (enabled: boolean) => {
+  return enabled
+    ? 'bg-fm-color-system-success-100 text-fm-color-system-success-400 fm-typo-en-body-md-600 border fm-corner-radius-lg w-max p-4'
+    : 'bg-fm-color-neutral-gray-100 text-fm-color-typo-neutral fm-typo-en-body-md-600 border fm-corner-radius-lg w-max p-4'
+}
+
 function updateAutoCloseBill(autoCloseBill: boolean) {
   emits('update-order-settings', { ...props.orderPickupSettings, autoCloseBill })
 }