@pisell/private-materials 3.0.209 → 3.0.210

package/es/components/eventBooking/components/progressBar/index.js

@@ -6,6 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import { PisellHeaderProgressBar, PisellModal } from '@pisell/materials';
+import { useSales } from "../../../Sales";
 import { locales } from '@pisell/utils';
 import "./index.less";
 var ProgressBar = function ProgressBar(_ref) {
@@ -26,6 +27,8 @@ var ProgressBar = function ProgressBar(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var _useSales = useSales(),
+    removeSessionStorage = _useSales.removeSessionStorage;
 
   /**
    * @title: 点击关闭
@@ -42,6 +45,20 @@ var ProgressBar = function ProgressBar(_ref) {
       onClose === null || onClose === void 0 ? void 0 : onClose();
     }
   };
+
+  /**
+   * @title: 点击退出
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-02-10 17:46
+   */
+  var handleOk = function handleOk() {
+    onClose === null || onClose === void 0 ? void 0 : onClose();
+    setOpen(false);
+    // 清空数据
+    removeSessionStorage();
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellHeaderProgressBar, {
     className: "event-progress-bar",
     style: style,
@@ -69,8 +86,7 @@ var ProgressBar = function ProgressBar(_ref) {
       setOpen(false);
     },
     onOk: function onOk() {
-      onClose === null || onClose === void 0 ? void 0 : onClose();
-      setOpen(false);
+      return handleOk();
     }
   }));
 };

package/es/components/eventBooking/components/scheduleCalendar/calendarItem.js

@@ -3,13 +3,20 @@ import dayjs from 'dayjs';
 import React, { useMemo } from 'react';
 import { Iconfont } from '@pisell/materials';
 import { formatBackgroundColors, formatMonthDisplay } from "../../utils";
+import useEngineContext from "../../../../hooks/useEngineContext";
+import zhCN from 'antd/es/date-picker/locale/zh_CN';
+import enUS from 'antd/es/date-picker/locale/en_US';
 var CalendarItem = function CalendarItem(props) {
+  var _utils$storage, _utils$storage$get;
   var month = props.month,
     schedulesData = props.schedulesData,
     selectDate = props.selectDate,
     onSelect = props.onSelect,
     isEdit = props.isEdit,
     onChange = props.onChange;
+  var context = useEngineContext();
+  var utils = context.appHelper.utils || {};
+  var locale = utils !== null && utils !== void 0 && (_utils$storage = utils.storage) !== null && _utils$storage !== void 0 && (_utils$storage$get = _utils$storage.get('umi_locale')) !== null && _utils$storage$get !== void 0 && _utils$storage$get.includes('zh') ? zhCN : enUS;
   var scheduleMap = useMemo(function () {
     return new Map(schedulesData.map(function (schedule) {
       return [schedule.date, schedule];
@@ -54,6 +61,7 @@ var CalendarItem = function CalendarItem(props) {
   }, /*#__PURE__*/React.createElement(Iconfont, {
     type: "pisell2-chevron-right"
   }))), /*#__PURE__*/React.createElement(Calendar, {
+    locale: locale,
     headerRender: function headerRender() {
       return null;
     },

package/es/components/eventBooking/index.js

@@ -4,7 +4,7 @@ import Footer from "./components/Provider/Footer";
 import EventContent from "./components/Provider/Content";
 import { isMobile, locales } from '@pisell/utils';
 import useEngineContext from "../../hooks/useEngineContext";
-import SalesPage, { useInit, useStep, useResource, useCustomer, useSales } from "../Sales";
+import SalesPage, { useInit, useStep, useResource, useSales } from "../Sales";
 import "./index.less";
 import localeTexts from "./locales";
 var Content = function Content() {
@@ -20,27 +20,13 @@ var Content = function Content() {
     currentStepData = _useStep.currentStepData;
   var _useResource = useResource(),
     getResourceList = _useResource.getResourceList;
-  var _useCustomer = useCustomer(),
-    openLoginModal = _useCustomer.openLoginModal,
-    isLogin = _useCustomer.isLogin;
-  var _useSales2 = useSales(),
-    removeSessionStorage = _useSales2.removeSessionStorage;
   var _ref = data.initData || {},
     form_id = _ref.form_id,
     shop_id = _ref.shop_id;
   useEffect(function () {
-    // 没有登录则打开登录弹窗
-    if (!isLogin()) {
-      openLoginModal({});
-    }
     getBoardSetting.run({
       item_type: 'event_booking_v2'
     });
-
-    // 清空数据
-    return function () {
-      removeSessionStorage();
-    };
   }, []);
 
   /**

package/es/components/eventBooking/locales.d.ts

@@ -14,7 +14,7 @@ declare const _default: {
         'pisell2.event.close.exit': string;
         'pisell2.event.step': (step: number) => string;
         'pisell2.event.select.category': string;
-        'pisell2.event.select.campus': string;
+        'pisell2.event.select.campus': (val: string) => string;
         'pisell2.event.select.event': string;
         'pisell2.event.cart': string;
         'pisell2.event.total': string;
@@ -58,6 +58,16 @@ declare const _default: {
         'pisell2.event.empty.event': string;
         'pisell2.event.error.holder': string;
         'pisell2.event.price.from': string;
+        'pisell2.event.empty.holder.title': string;
+        'pisell2.event.empty.holder.tip': string;
+        'pisell2.event.empty.holder.continue.tip': string;
+        'pisell2.event.empty.holder.go.back': string;
+        'pisell2.event.empty.holder.continue.anyway': string;
+        'pisell2.event.event.full.title': string;
+        'pisell2.event.event.full.tip': string;
+        'pisell2.event.event.full.ok': string;
+        'pisell2.event.capacity.limit.reached.title': string;
+        'pisell2.event.capacity.limit.reached.tip': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -75,7 +85,7 @@ declare const _default: {
         'pisell2.event.step': (step: number) => string;
         'pisell2.event.select.category': string;
         'pisell2.event.select.event': string;
-        'pisell2.event.select.campus': string;
+        'pisell2.event.select.campus': (val: string) => string;
         'pisell2.event.cart': string;
         'pisell2.event.total': string;
         'pisell2.event.continue': string;
@@ -118,6 +128,16 @@ declare const _default: {
         'pisell2.event.empty.event': string;
         'pisell2.event.error.holder': string;
         'pisell2.event.price.from': string;
+        'pisell2.event.empty.holder.title': string;
+        'pisell2.event.empty.holder.tip': string;
+        'pisell2.event.empty.holder.continue.tip': string;
+        'pisell2.event.empty.holder.go.back': string;
+        'pisell2.event.empty.holder.continue.anyway': string;
+        'pisell2.event.event.full.title': string;
+        'pisell2.event.event.full.tip': string;
+        'pisell2.event.event.full.ok': string;
+        'pisell2.event.capacity.limit.reached.title': string;
+        'pisell2.event.capacity.limit.reached.tip': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -135,7 +155,7 @@ declare const _default: {
         'pisell2.event.step': (step: number) => string;
         'pisell2.event.select.category': string;
         'pisell2.event.select.event': string;
-        'pisell2.event.select.campus': string;
+        'pisell2.event.select.campus': (val: string) => string;
         'pisell2.event.cart': string;
         'pisell2.event.total': string;
         'pisell2.event.continue': string;
@@ -178,6 +198,16 @@ declare const _default: {
         'pisell2.event.empty.event': string;
         'pisell2.event.error.holder': string;
         'pisell2.event.price.from': string;
+        'pisell2.event.empty.holder.title': string;
+        'pisell2.event.empty.holder.tip': string;
+        'pisell2.event.empty.holder.continue.tip': string;
+        'pisell2.event.empty.holder.go.back': string;
+        'pisell2.event.empty.holder.continue.anyway': string;
+        'pisell2.event.event.full.title': string;
+        'pisell2.event.event.full.tip': string;
+        'pisell2.event.event.full.ok': string;
+        'pisell2.event.capacity.limit.reached.title': string;
+        'pisell2.event.capacity.limit.reached.tip': string;
     };
 };
 export default _default;

package/es/components/eventBooking/locales.js

@@ -16,7 +16,9 @@ export default {
       return "Step ".concat(step);
     },
     'pisell2.event.select.category': "Select category",
-    'pisell2.event.select.campus': "Please choose campus",
+    'pisell2.event.select.campus': function pisell2EventSelectCampus(val) {
+      return "Please choose ".concat(val || 'resource');
+    },
     'pisell2.event.select.event': "Select event",
     'pisell2.event.cart': "Cart",
     'pisell2.event.total': "Total",
@@ -63,7 +65,17 @@ export default {
     'pisell2.event.create.form': "Create form",
     'pisell2.event.empty.event': "No event",
     'pisell2.event.error.holder': "You need to create a holder first",
-    'pisell2.event.price.from': 'From '
+    'pisell2.event.price.from': 'From ',
+    'pisell2.event.empty.holder.title': 'Empty holders found',
+    'pisell2.event.empty.holder.tip': 'The following holders have no services added:',
+    'pisell2.event.empty.holder.continue.tip': 'You can still proceed, but please check if you want to add any services.',
+    'pisell2.event.empty.holder.go.back': 'Go back',
+    'pisell2.event.empty.holder.continue.anyway': 'Continue anyway',
+    'pisell2.event.event.full.title': 'Event full',
+    'pisell2.event.event.full.tip': 'Sorry, this event has reached its maximum capacity. Please select another event.',
+    'pisell2.event.event.full.ok': 'Ok',
+    'pisell2.event.capacity.limit.reached.title': 'Capacity limit reached',
+    'pisell2.event.capacity.limit.reached.tip': 'One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.'
   },
   'zh-CN': {
     'pisell2.event.calendar.limit.unavailable': "不可预约",
@@ -83,7 +95,9 @@ export default {
     },
     'pisell2.event.select.category': "选择分类",
     'pisell2.event.select.event': "选择活动",
-    'pisell2.event.select.campus': "请选择校区",
+    'pisell2.event.select.campus': function pisell2EventSelectCampus(val) {
+      return "\u8BF7\u9009\u62E9".concat(val || '资源');
+    },
     'pisell2.event.cart': "购物车",
     'pisell2.event.total': "总计",
     'pisell2.event.continue': "继续",
@@ -129,7 +143,17 @@ export default {
     'pisell2.event.create.form': "创建表单",
     'pisell2.event.empty.event': "暂无活动",
     'pisell2.event.error.holder': "您需要先创建一个持有人",
-    'pisell2.event.price.from': ' 起'
+    'pisell2.event.price.from': ' 起',
+    'pisell2.event.empty.holder.title': '发现空预约位',
+    'pisell2.event.empty.holder.tip': '以下预约位未添加任何服务：',
+    'pisell2.event.empty.holder.continue.tip': '您可以继续操作，但请确认是否需要添加服务。',
+    'pisell2.event.empty.holder.go.back': '返回修改',
+    'pisell2.event.empty.holder.continue.anyway': '继续操作',
+    'pisell2.event.event.full.title': '活动已满',
+    'pisell2.event.event.full.tip': '抱歉，当前活动名额已满。请选择其他活动。',
+    'pisell2.event.event.full.ok': '好的',
+    'pisell2.event.capacity.limit.reached.title': '活动名额已满',
+    'pisell2.event.capacity.limit.reached.tip': '购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。'
   },
   'zh-HK': {
     'pisell2.event.calendar.limit.unavailable': "不可預約",
@@ -149,7 +173,9 @@ export default {
     },
     'pisell2.event.select.category': "選擇分類",
     'pisell2.event.select.event': "選擇活動",
-    'pisell2.event.select.campus': "請選擇校區",
+    'pisell2.event.select.campus': function pisell2EventSelectCampus(val) {
+      return "\u8ACB\u9078\u64C7".concat(val || '資源');
+    },
     'pisell2.event.cart': "購物車",
     'pisell2.event.total': "總計",
     'pisell2.event.continue': "繼續",
@@ -195,6 +221,16 @@ export default {
     'pisell2.event.create.form': "創建表單",
     'pisell2.event.empty.event': "暫無活動",
     'pisell2.event.error.holder': "您需要先創建一個持有人",
-    'pisell2.event.price.from': ' 起'
+    'pisell2.event.price.from': ' 起',
+    'pisell2.event.empty.holder.title': '發現空預約位',
+    'pisell2.event.empty.holder.tip': '以下預約位未添加任何服務：',
+    'pisell2.event.empty.holder.continue.tip': '您可以繼續操作，但請確認是否需要添加服務。',
+    'pisell2.event.empty.holder.go.back': '返回修改',
+    'pisell2.event.empty.holder.continue.anyway': '繼續操作',
+    'pisell2.event.event.full.title': '活動已滿',
+    'pisell2.event.event.full.tip': '抱歉，當前活動名額已滿。請選擇其他活動。',
+    'pisell2.event.event.full.ok': '好的',
+    'pisell2.event.capacity.limit.reached.title': '活動名額已滿',
+    'pisell2.event.capacity.limit.reached.tip': '購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。'
   }
 };

package/es/components/shoppingCart/components/Cart/Product.js

@@ -30,7 +30,7 @@ var Product = function Product(props) {
    * @Date: 2024-11-28 22:02
    */
   var handleChange = function handleChange(item, type, other) {
-    if (disabledEdit) return;
+    if (disabledEdit && !(other !== null && other !== void 0 && other.disabled)) return;
     onChange(item, type, other);
   };
   var productParams = useMemo(function () {
@@ -50,7 +50,7 @@ var Product = function Product(props) {
         return _onAction === null || _onAction === void 0 ? void 0 : _onAction(e);
       },
       onDelete: function onDelete(e) {
-        return handleChange(e, 'delete');
+        return handleChange(e, 'delete', item);
       },
       onNote: function onNote(e) {
         return handleChange(e, 'note', {

package/lib/components/Sales/Cart/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { TUpdateDisabledCartItem } from './types';
 interface CartItem {
     _id: string;
     [key: string]: any;
@@ -27,11 +28,13 @@ interface CartContextType {
     addHolderToCartItem: (holderItem: any) => void;
     cartDataHolderList: any;
     addNoteToCartItem: (cartItem: CartItem) => void;
-    updateDisabledCartItem: (params: Array<{
-        relation_id: number;
-        product_id: number;
-        type: string;
-    }>) => void;
+    updateDisabledCartItem: TUpdateDisabledCartItem;
+    getWithoutCartItemsHolderNames: () => Array<string>;
+    checkBeforeAddToCartResquest: any;
+    checkBeforeAddToCart: () => Promise<{
+        result: boolean;
+        num: number;
+    }>;
 }
 interface CartProviderProps {
     children: React.ReactNode;

package/lib/components/Sales/Cart/index.js

@@ -39,7 +39,10 @@ var import_react = __toESM(require("react"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_SalesModel = require("../../../businessModel/SalesModel");
+var import_serve = require("./serve");
 var import_Customer = require("../Customer");
+var import_ahooks = require("ahooks");
+var import_utils2 = require("../Checkout/utils");
 var defaultState = {
   cartItems: [],
   currentCartItem: null
@@ -51,7 +54,7 @@ var CartProvider = ({ children }) => {
   const { appUtils, getUserInfo } = (0, import_Customer.useCustomer)();
   const { data, setData, hooks, getCurrentData } = (0, import_SalesModel.useSales)();
   const [openCart, setOpen] = (0, import_react.useState)(false);
-  const {} = hooks;
+  const checkRef = (0, import_react.useRef)(null);
   const cartData = (0, import_react.useMemo)(() => {
     return data.cartData || defaultState;
   }, [data]);
@@ -178,23 +181,66 @@ var CartProvider = ({ children }) => {
     setCurrentCartItem(cartItem);
     return cartItem;
   };
-  const addToCart = () => {
+  const checkBeforeAddToCartResquest = (0, import_ahooks.useRequest)(import_serve.checkBeforeAddToCartApi, {
+    manual: true,
+    onSuccess: (res) => {
+      var _a, _b;
+      if ((_a = res.data) == null ? void 0 : _a.length) {
+        const isUnavailable = checkCartItemIsUnavailable(
+          res.data,
+          checkRef.current.cartItem
+        );
+        checkRef.current.callback({
+          result: isUnavailable ? false : true,
+          num: isUnavailable ? (_b = res.data) == null ? void 0 : _b.length : 0
+        });
+      } else {
+        checkRef.current.callback({ result: true });
+      }
+    }
+  });
+  const checkBeforeAddToCart = () => {
+    return new Promise((resolve) => {
+      const _cartData = getCurrentData().cartData;
+      const newCartItem = createCartItemData() || {};
+      const params = (0, import_utils2.formatValues)({
+        cartData: {
+          cartItems: [..._cartData.cartItems || [], newCartItem]
+        }
+      });
+      checkRef.current = {
+        callback: (res) => {
+          resolve(res);
+          checkRef.current = null;
+        },
+        cartItem: newCartItem
+      };
+      checkBeforeAddToCartResquest.runAsync(params);
+    });
+  };
+  const createCartItemData = () => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     const _cartData = getCurrentData().cartData;
-    const { _id, eventItem = {}, holderItem = {} } = _cartData.currentCartItem;
     if (_cartData.currentCartItem) {
+      const {
+        _id,
+        eventItem = {},
+        holderItem = {}
+      } = _cartData.currentCartItem || {};
       const bookingOptionData = (_b = (_a = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _a.bookingOptionItem) == null ? void 0 : _b._originData;
       const startDateInfo = (_d = (_c = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _c.selectDate) == null ? void 0 : _d.startDateInfo;
       const startTime = (_f = (_e = startDateInfo == null ? void 0 : startDateInfo.times) == null ? void 0 : _e[0]) == null ? void 0 : _f.start_at;
       const endDateInfo = (_h = (_g = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _g.selectDate) == null ? void 0 : _h.endDateInfo;
       const endTime = (_k = (_j = (_i = endDateInfo == null ? void 0 : endDateInfo.times) == null ? void 0 : _i.slice(-1)) == null ? void 0 : _j[0]) == null ? void 0 : _k.end_at;
+      const originTotal = Number((bookingOptionData == null ? void 0 : bookingOptionData.original_price) || "");
       const newCartItem = {
         _id,
         id: eventItem.id,
         name: eventItem.title,
         price: bookingOptionData == null ? void 0 : bookingOptionData.price,
         total: bookingOptionData == null ? void 0 : bookingOptionData.price,
-        origin_total: bookingOptionData == null ? void 0 : bookingOptionData.original_price,
+        // 排除原始价格为0的场景
+        origin_total: isNaN(originTotal) || originTotal === 0 ? void 0 : bookingOptionData == null ? void 0 : bookingOptionData.original_price,
         num: 1,
         image: eventItem.image,
         isShowNote: true,
@@ -228,7 +274,9 @@ var CartProvider = ({ children }) => {
           metadata: {
             end_date_text: (endDateInfo == null ? void 0 : endDateInfo.date) || null,
             end_time_text: endTime ? (0, import_dayjs.default)(endTime || "").format("HH:mm") : null
-          }
+          },
+          event_unique_identifier: _id
+          // 传递给接口用于商品可用性检测的比对
         }
       };
       if (holderItem == null ? void 0 : holderItem._originData) {
@@ -238,8 +286,16 @@ var CartProvider = ({ children }) => {
           form_record: ((_n = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _n.form_record_id) ? [(_o = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _o.form_record_id] : null
         };
       }
+      return newCartItem;
+    }
+    return null;
+  };
+  const addToCart = () => {
+    const _cartData = getCurrentData().cartData;
+    const newCartItem = createCartItemData();
+    if (_cartData.currentCartItem && newCartItem) {
       setCartData({
-        cartItems: [..._cartData.cartItems, newCartItem],
+        cartItems: [..._cartData.cartItems || [], newCartItem],
         currentCartItem: null
       });
     }
@@ -353,16 +409,30 @@ var CartProvider = ({ children }) => {
     }
     return null;
   };
+  const checkCartItemIsUnavailable = (list, item) => {
+    var _a, _b, _c, _d;
+    const productId = (_b = (_a = item._originData) == null ? void 0 : _a.product) == null ? void 0 : _b.product_id;
+    const relationId = (_c = item._originData) == null ? void 0 : _c.relation_id;
+    const eventUniqueIdentifier = (_d = item._originData) == null ? void 0 : _d.event_unique_identifier;
+    return list.find((res) => {
+      var _a2;
+      const checkType = ["available_capacity"];
+      const isTypeIncludes = ((_a2 = res.details) == null ? void 0 : _a2.find((v) => {
+        var _a3;
+        return (_a3 = checkType.includes) == null ? void 0 : _a3.call(checkType, v.type || "");
+      })) !== void 0;
+      if (isTypeIncludes) {
+        return res.product_id === productId && res.relation_id === relationId && res.event_unique_identifier === eventUniqueIdentifier;
+      }
+      return false;
+    }) !== void 0;
+  };
   const updateDisabledCartItem = (list) => {
     const currentCartItems = getCurrentData().cartData.cartItems || [];
     if ((list == null ? void 0 : list.length) && currentCartItems.length) {
       const newCartItems = currentCartItems.map((item) => {
-        var _a, _b, _c;
-        const productId = (_b = (_a = item._originData) == null ? void 0 : _a.product) == null ? void 0 : _b.product_id;
-        const relationId = (_c = item._originData) == null ? void 0 : _c.relation_id;
-        if (list.find(
-          (v) => v.product_id === productId && v.relation_id === relationId
-        ) !== void 0) {
+        const isUnavailable = checkCartItemIsUnavailable(list, item);
+        if (isUnavailable) {
           item.disabled = true;
         } else {
           item.disabled = false;
@@ -372,6 +442,17 @@ var CartProvider = ({ children }) => {
       setCartData({ cartItems: newCartItems });
     }
   };
+  const getWithoutCartItemsHolderNames = () => {
+    var _a;
+    const list = [];
+    (_a = cartDataHolderList == null ? void 0 : cartDataHolderList.forEach) == null ? void 0 : _a.call(cartDataHolderList, (v) => {
+      var _a2;
+      if (!((_a2 = v == null ? void 0 : v.children) == null ? void 0 : _a2.length)) {
+        list.push((v == null ? void 0 : v.name) || "");
+      }
+    });
+    return list;
+  };
   const contextValue = {
     createCartItem,
     createCartItemFromEvent,
@@ -392,7 +473,10 @@ var CartProvider = ({ children }) => {
     addHolderToCartItem,
     cartDataHolderList,
     addNoteToCartItem,
-    updateDisabledCartItem
+    updateDisabledCartItem,
+    getWithoutCartItemsHolderNames,
+    checkBeforeAddToCartResquest,
+    checkBeforeAddToCart
   };
   return /* @__PURE__ */ import_react.default.createElement(CartContext.Provider, { value: contextValue }, children);
 };

package/lib/components/Sales/Cart/serve.d.ts

@@ -1 +1,2 @@
 export declare const getResourceListApi: () => Promise<any>;
+export declare const checkBeforeAddToCartApi: (data: any) => Promise<any>;

package/lib/components/Sales/Cart/serve.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/Sales/Cart/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
+  checkBeforeAddToCartApi: () => checkBeforeAddToCartApi,
   getResourceListApi: () => getResourceListApi
 });
 module.exports = __toCommonJS(serve_exports);
@@ -26,7 +27,11 @@ var import_utils = require("../../../utils");
 var getResourceListApi = () => {
   return import_utils.request.getRequest().get("/api/resource/list", {});
 };
+var checkBeforeAddToCartApi = (data) => {
+  return import_utils.request.getRequest().post("/h5/eventbookingv2/order/check-config", data);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkBeforeAddToCartApi,
   getResourceListApi
 });

package/lib/components/Sales/Cart/types.d.ts

@@ -0,0 +1,19 @@
+/**
+ * available_capacity(容量)、deadline_day(截止日期)、future_day(预定天数)
+ */
+export declare type TCartItemUnavailableType = 'available_capacity' | 'deadline_day' | 'future_day';
+/**
+ * 商品不可用原因
+ */
+export interface IUnavailableResult {
+    event_unique_identifier: number;
+    relation_id: number;
+    product_id: number;
+    details?: Array<{
+        type: TCartItemUnavailableType;
+    }>;
+}
+/**
+ * 更新失效的购物车商品
+ */
+export declare type TUpdateDisabledCartItem = (list: Array<IUnavailableResult>) => void;

package/lib/components/Sales/Cart/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/Sales/Cart/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/lib/components/Sales/Checkout/index.js

@@ -70,6 +70,7 @@ var CheckoutProvider = ({
     manual: true,
     onSuccess: (res) => {
       onPay(res.data);
+      checkoutCallback.current({ success: true });
     }
   });
   const onCheckBeforeBooking = (data2) => {

package/lib/components/booking/info/pet/index.js

@@ -75,7 +75,7 @@ var Pet = (props) => {
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
   }, [(_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject]);
   const petForm = (0, import_react.useMemo)(() => {
-    var _a2;
+    var _a2, _b2, _c2;
     let _holder = (_a2 = state.bookingConfig) == null ? void 0 : _a2.holder;
     if (!_holder) {
       return null;
@@ -84,8 +84,8 @@ var Pet = (props) => {
       ..._holder,
       ..._holder == null ? void 0 : _holder.form,
       options: [],
-      form_id: _holder.form.id,
-      field: _holder.form.form_field,
+      form_id: (_b2 = _holder == null ? void 0 : _holder.form) == null ? void 0 : _b2.id,
+      field: (_c2 = _holder == null ? void 0 : _holder.form) == null ? void 0 : _c2.form_field,
       relation_type: "appointment_booking",
       form_record: []
     };

package/lib/components/booking/info/service2/utils.d.ts

@@ -237,4 +237,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/lib/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/app.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PosProps, RouteType } from './const';
-declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;

package/lib/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */