@pisell/private-materials 6.9.2 → 6.9.4

package/lib/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const SelectDate: (props: any) => JSX.Element | null;
+export default SelectDate;

package/lib/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.js

@@ -0,0 +1,89 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.tsx
+var SelectDateOS_exports = {};
+__export(SelectDateOS_exports, {
+  default: () => SelectDateOS_default
+});
+module.exports = __toCommonJS(SelectDateOS_exports);
+var import_react = __toESM(require("react"));
+var import_hooks = require("../../../hooks");
+var import_context = require("../../../context");
+var import_useComponents = __toESM(require("../../../../../hooks/useComponents"));
+var import_utils = require("../../../utils");
+var import_hooks2 = require("../../../hooks");
+var import_utils2 = require("../../../utils");
+var SelectDate = (props) => {
+  const { onDateChange, times, currentDate } = props;
+  const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
+  const { currentSelectedResources, setTimes } = (0, import_context.useAppointmentBookingContext)();
+  const utils = (0, import_hooks2.contextUtils)();
+  const [SelectDateOS] = (0, import_useComponents.default)({
+    components: ["SelectDateOS"]
+  });
+  const resourceCode = (0, import_react.useMemo)(() => {
+    const { resourceSort } = (appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || {};
+    const resources = appointmentBooking.getResourcesList();
+    const { resourceCodes } = (0, import_utils.processResourceList)(resources, resourceSort);
+    return (resourceCodes == null ? void 0 : resourceCodes[0]) || "";
+  }, []);
+  const currentResourceName = (0, import_react.useMemo)(() => {
+    var _a;
+    const currentResource = (_a = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _a.currentSelectedResource;
+    const resourceItem = (currentResource == null ? void 0 : currentResource.resourceItem) || {};
+    const name = (0, import_utils.getResourceTitle)(
+      appointmentBooking,
+      resourceItem == null ? void 0 : resourceItem.code,
+      utils,
+      resourceItem
+    );
+    return name;
+  }, [currentSelectedResources]);
+  const onStepChange = () => {
+    (0, import_utils2.clearDataByStepKey)("select-service", appointmentBooking, setTimes);
+    const stepLists = appointmentBooking.getStepList();
+    const serviceIndex = stepLists.findIndex(
+      (item) => (item == null ? void 0 : item.key) === "select-service"
+    );
+    appointmentBooking.gotoStep(serviceIndex);
+  };
+  return SelectDateOS ? /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
+    SelectDateOS,
+    {
+      isTimeSlicing: true,
+      currentDate,
+      resourceCode,
+      resourceName: currentResourceName,
+      onDateChange,
+      onStepChange,
+      times
+    }
+  )) : null;
+};
+var SelectDateOS_default = SelectDate;

package/lib/components/appointmentBooking/components/TimeSlicing/index.js

@@ -39,6 +39,7 @@ var import_context = require("../../context");
 var import_utils2 = require("../Resource/utils");
 var import_hooks = require("../../hooks");
 var import_utils3 = require("../../utils");
+var import_SelectDateOS = __toESM(require("./components/SelectDateOS"));
 var import_index = require("./index.less");
 var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)("");
@@ -51,6 +52,7 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceTimeSlot, getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const [currentDate, setCurrentDate] = (0, import_react.useState)(void 0);
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
       const isUnSelectedTimes = appointmentBooking.checkCartItems("date");
@@ -85,7 +87,30 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
     setSelectedResource(e == null ? void 0 : e.start_time);
     getAutoSelect(e);
   };
-  return (times == null ? void 0 : times.length) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-time-slicing-wrap" }, times.map((item, index) => {
+  (0, import_react.useEffect)(() => {
+    const getCurrentDate = async () => {
+      var _a;
+      const res = await appointmentBooking.getDateRange();
+      const date = (_a = res == null ? void 0 : res[0]) == null ? void 0 : _a.date;
+      setCurrentDate(date);
+    };
+    getCurrentDate();
+  }, []);
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+    import_SelectDateOS.default,
+    {
+      onDateChange: (currentData) => {
+        if ((times == null ? void 0 : times.length) > 0) {
+          appointmentBooking.deleteCartItemInfo("time");
+        }
+        setCurrentDate(currentData == null ? void 0 : currentData.date);
+        appointmentBooking.setDateRange([currentData]);
+        getResourceTimeSlot();
+      },
+      times,
+      currentDate
+    }
+  ), (times == null ? void 0 : times.length) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-time-slicing-wrap" }, times.map((item, index) => {
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -96,11 +121,6 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
       /* @__PURE__ */ import_react.default.createElement("span", null, item == null ? void 0 : item.start_time),
       /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-chevron-right", className: `icon` })
     );
-  })) : /* @__PURE__ */ import_react.default.createElement(
-    import_materials.PisellEmpty,
-    {
-      description: import_utils.locales.getText("pisell2.appointment.unselect.time")
-    }
-  );
+  })) : null);
 });
 var TimeSlicing_default = TimeSlicing;

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -43,6 +43,8 @@ var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
+var import_ahooks = require("ahooks");
+var import_context = require("../../context");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -66,11 +68,17 @@ var VoucherCard = (props) => {
   const productRef = (0, import_react.useRef)(products);
   const { openLoginModal } = (0, import_hooks.useAppointmentBookingLogin)();
   const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
+  const { summary } = (0, import_context.useAppointmentBookingContext)();
+  const { originTotal, total } = summary;
   const cart = (_b = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _b.cart;
   const isUserLoggedIn = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return !!((_b2 = (_a2 = utils == null ? void 0 : utils.token) == null ? void 0 : _a2.get) == null ? void 0 : _b2.call(_a2)) || false;
   }, [store]);
+  (0, import_react.useEffect)(() => {
+    const shopDiscount2 = pisellos.getModule("shopDiscount");
+    shopDiscount2.setOriginTotalAmount(originTotal);
+  }, [originTotal]);
   const availableData = (0, import_react.useMemo)(() => {
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
@@ -89,6 +97,12 @@ var VoucherCard = (props) => {
   (0, import_react.useEffect)(() => {
     shopDiscount.setProductList(products);
   }, [products]);
+  const { run: onCartChange } = (0, import_ahooks.useDebounceFn)(
+    () => {
+      onCartChangeFn();
+    },
+    { wait: 300 }
+  );
   const batchUpdateCart = (productList) => {
     var _a2;
     const items = productList.map((item) => {
@@ -106,13 +120,16 @@ var VoucherCard = (props) => {
     });
     (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.batchUpdateCart) == null ? void 0 : _a2.call(appointmentBooking, items);
   };
-  const onCartChange = () => {
-    var _a2, _b2, _c;
+  const onCartChangeFn = () => {
+    var _a2, _b2, _c, _d;
     const products2 = cart == null ? void 0 : cart.getItems();
     (_c = shopDiscount == null ? void 0 : shopDiscount.setBookingSubject) == null ? void 0 : _c.call(
       shopDiscount,
       (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a2.bookingSetting) == null ? void 0 : _b2.bookingSubject
     );
+    if (Array.isArray((_d = shopDiscount == null ? void 0 : shopDiscount.getDiscountList) == null ? void 0 : _d.call(shopDiscount)) && !(shopDiscount == null ? void 0 : shopDiscount.getDiscountList().length)) {
+      return;
+    }
     const val = shopDiscount.calcDiscount(products2);
     batchUpdateCart(val.productList);
   };
@@ -138,9 +155,18 @@ var VoucherCard = (props) => {
       }
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
-    pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
-    pisellos.effects.on("appointmentBooking_cart:onUpdateBookingDate", onCartChange);
-    pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
+    pisellos.effects.on(
+      "appointmentBooking_cart:onUpdateQuotationPrice",
+      onCartChange
+    );
+    pisellos.effects.on(
+      "appointmentBooking_cart:onUpdateBookingDate",
+      onCartChange
+    );
+    pisellos.effects.on(
+      "appointmentBooking_cart:onUpdateCartItemNums",
+      onCartChange
+    );
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(
       ShopDiscountHooks.onDiscountListChange,
@@ -157,8 +183,13 @@ var VoucherCard = (props) => {
       batchUpdateCart(val.productList);
       setCode("");
     } else {
+      const content = {
+        time_limit: import_utils.locales.getText(
+          "pisell2.text.goodpass.code-invalid-expired"
+        )
+      };
       (0, import_materials.PisellToast)({
-        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
+        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : content[val == null ? void 0 : val.unavailableReason] || import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
       });
     }
   };

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

package/lib/components/appointmentBooking/hooks.d.ts

@@ -72,7 +72,7 @@ export declare const useAppointmentBookingAccount: () => {
 export declare const useAppointmentBookingResource: () => {
     getResourceTimeSlot: (index?: number) => Promise<void>;
     getResourceList: () => {
-        resources: any;
+        resources: any[];
         resourceCodes: any;
     };
 };

package/lib/components/appointmentBooking/hooks.js

@@ -489,18 +489,13 @@ var useAppointmentBookingResource = () => {
   const { appointmentBooking, setResources, setTimes } = (0, import_context.useAppointmentBookingContext)();
   const { resourceSort } = (appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || {};
   const getResourceList = () => {
-    var _a;
     let resources = appointmentBooking.getResourcesList();
-    resources = resources.map((item) => {
-      return {
-        ...item,
-        resources: (0, import_utils2.sortResources)((item == null ? void 0 : item.resources) || [], resourceSort)
-      };
-    });
-    const _resources = ((_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.resources) || [];
-    const resourceCodes = _resources.map((item) => item.code);
-    setResources(resources || []);
-    return { resources, resourceCodes };
+    const { resources: processedResources, resourceCodes } = (0, import_utils2.processResourceList)(
+      resources,
+      resourceSort
+    );
+    setResources(processedResources || []);
+    return { resources: processedResources, resourceCodes };
   };
   const getResourceTimeSlot = async (index) => {
     const { resourceCodes } = getResourceList();

package/lib/components/appointmentBooking/locales.d.ts

@@ -115,6 +115,7 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
         'pisell2.text.contact-info.title': string;
@@ -235,6 +236,7 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
         'pisell2.text.contact-info.title': string;
@@ -355,6 +357,7 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
         'pisell2.text.contact-info.title': string;

package/lib/components/appointmentBooking/locales.js

@@ -139,6 +139,7 @@ var locales_default = {
     "pisell2.text.goodpass.enter-code": "Enter Code",
     "pisell2.text.goodpass.code-invalid": "Current code is invalid",
     "pisell2.text.goodpass.code-invalid-cart": "No eligible items in the cart",
+    "pisell2.text.goodpass.code-invalid-expired": "Current coupon is not valid in use",
     "pisell2.text.goodpass.login": "Login",
     "pisell2.text.goodpass.login-tip": " for member benefit Or use account credit",
     "pisell2.text.contact-info.title": "Contact info"
@@ -259,6 +260,7 @@ var locales_default = {
     "pisell2.text.goodpass.enter-code": "请输入券码",
     "pisell2.text.goodpass.code-invalid": "当前券码不可用",
     "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
+    "pisell2.text.goodpass.code-invalid-expired": "当前优惠券不在使用期限内",
     "pisell2.text.goodpass.login": "登录",
     "pisell2.text.goodpass.login-tip": "以获取会员福利或使用账户积分",
     "pisell2.text.contact-info.title": "联系信息"
@@ -379,6 +381,7 @@ var locales_default = {
     "pisell2.text.goodpass.enter-code": "請輸入券碼",
     "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
     "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
+    "pisell2.text.goodpass.code-invalid-expired": "當前優惠券不在使用期限內",
     "pisell2.text.goodpass.login": "登錄",
     "pisell2.text.goodpass.login-tip": "以獲取會員福利或使用賬戶積分",
     "pisell2.text.contact-info.title": "聯繫信息"

package/lib/components/appointmentBooking/utils.d.ts

@@ -39,6 +39,19 @@ export declare const formatCarts: (data: any[], resources: any[], utils: any, ac
  * @Date: 2025-04-14 11:16
  */
 export declare const sortResources: (resources: any[], resourceSort: any[]) => any[] | undefined;
+/**
+ * @title: 处理资源列表并提取资源代码
+ * @description: 对资源列表进行排序，并提取 resourceCodes
+ * @param {any[]} resources - 原始资源列表
+ * @param {any[]} resourceSort - 资源排序配置
+ * @return {*} 返回处理后的资源列表和资源代码数组
+ * @Author: WangHan
+ * @Date: 2025-11-21 15:33
+ */
+export declare const processResourceList: (resources: any[], resourceSort: any[]) => {
+    resources: any[];
+    resourceCodes: any;
+};
 export declare const getMeAccount: (val: any[]) => any;
 export declare const getCustomer: (utils: any) => any;
 export declare const formatCustomer: (val: any) => {
@@ -201,3 +214,13 @@ export declare const currentRenderLists: (resources: any[], code: any) => any;
  * @Date: 2025-05-25 23:17
  */
 export declare const updateCartResources: (item: any, value?: any, currentSelectedResources?: any) => any;
+/**
+ * @title: 根据步骤key清空数据
+ * @param {string} key - 当前步骤的key
+ * @param {any} appointmentBooking - 预约预订实例
+ * @param {(times: any[]) => void} setTimes - 设置时间列表的回调函数
+ * @return {string[]} 返回需要清空的数据类型数组
+ * @Author: WangHan
+ * @Date: 2025-11-21 15:40
+ */
+export declare const clearDataByStepKey: (key: string, appointmentBooking: any, setTimes?: ((times: any[]) => void) | undefined) => string[] | undefined;

package/lib/components/appointmentBooking/utils.js

@@ -23,6 +23,7 @@ __export(utils_exports, {
   checkAndGoNext: () => checkAndGoNext,
   checkAndMarkCartRenderError: () => checkAndMarkCartRenderError,
   checkHasFormStep: () => checkHasFormStep,
+  clearDataByStepKey: () => clearDataByStepKey,
   currentAppointmentBoard: () => currentAppointmentBoard,
   currentRenderLists: () => currentRenderLists,
   formatCarts: () => formatCarts,
@@ -42,6 +43,7 @@ __export(utils_exports, {
   getResourceTitle: () => getResourceTitle,
   hasResourceFormId: () => hasResourceFormId,
   openForm: () => openForm,
+  processResourceList: () => processResourceList,
   sortResources: () => sortResources,
   updateBookingFormStorage: () => updateBookingFormStorage,
   updateCartResources: () => updateCartResources,
@@ -165,6 +167,18 @@ var sortResources = (resources, resourceSort) => {
     console.log(error, "wh2222");
   }
 };
+var processResourceList = (resources, resourceSort) => {
+  var _a;
+  const processedResources = resources.map((item) => {
+    return {
+      ...item,
+      resources: sortResources((item == null ? void 0 : item.resources) || [], resourceSort)
+    };
+  });
+  const _resources = ((_a = processedResources == null ? void 0 : processedResources[0]) == null ? void 0 : _a.resources) || [];
+  const resourceCodes = _resources.map((item) => item.code);
+  return { resources: processedResources, resourceCodes };
+};
 var getMeAccount = (val) => {
   return val == null ? void 0 : val.find((d) => !(d == null ? void 0 : d.isGuest));
 };
@@ -487,12 +501,100 @@ var updateCartResources = (item, value, currentSelectedResources) => {
   }
   return newResource || [];
 };
+var STEP_CLEAR_CONFIG = {
+  "select-time": ["time"],
+  "fill-form": ["time", "form"],
+  "select-resource": ["time", "form", "resource"],
+  "select-date": ["time", "form", "resource", "date"],
+  "select-service": ["time", "form", "resource", "date"]
+};
+var getMatchedStepKey = (key) => {
+  if (STEP_CLEAR_CONFIG[key]) {
+    return key;
+  }
+  const matchedKey = Object.keys(STEP_CLEAR_CONFIG).find(
+    (stepKey) => key.startsWith(stepKey)
+  );
+  return matchedKey || null;
+};
+var createClearActions = (appointmentBooking, setTimes) => {
+  return {
+    time: () => {
+      appointmentBooking.deleteCartItemInfo("time");
+      setTimes == null ? void 0 : setTimes([]);
+    },
+    resource: () => {
+      appointmentBooking.deleteCartItemInfo("resource");
+    },
+    form: () => {
+      appointmentBooking.deleteCartItemInfo("relationForms");
+      appointmentBooking.removeStep("fill-form");
+    },
+    date: () => {
+      var _a;
+      const { bookingProcess } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
+      if (bookingProcess !== "date_first") {
+        appointmentBooking.clearDateRange();
+      }
+    }
+  };
+};
+var clearServiceRelatedSteps = (appointmentBooking) => {
+  const stepList = (appointmentBooking == null ? void 0 : appointmentBooking.getStepList()) || [];
+  const stepKeysToRemove = ["select-resource_", "fill-form_"];
+  stepList.forEach((item) => {
+    if (item == null ? void 0 : item.isSkip) {
+      appointmentBooking.updateStep(item.key, {
+        key: item.key,
+        isSkip: false
+      });
+    }
+    const shouldRemove = stepKeysToRemove.some(
+      (prefix) => {
+        var _a;
+        return (_a = item.key) == null ? void 0 : _a.startsWith(prefix);
+      }
+    );
+    if (shouldRemove) {
+      appointmentBooking.removeStep(item.key);
+    }
+  });
+};
+var executeClearActions = (dataTypes, clearActions) => {
+  const uniqueTypes = Array.from(new Set(dataTypes));
+  uniqueTypes.forEach((type) => {
+    const action = clearActions[type];
+    if (action) {
+      action();
+    }
+  });
+};
+var clearDataByStepKey = (key, appointmentBooking, setTimes) => {
+  if (!key || !appointmentBooking) {
+    return;
+  }
+  if (key === "select-service") {
+    clearServiceRelatedSteps(appointmentBooking);
+  }
+  const stepKey = getMatchedStepKey(key);
+  if (!stepKey) {
+    return;
+  }
+  const clearDataTypes = STEP_CLEAR_CONFIG[stepKey] || [];
+  if (clearDataTypes.length === 0) {
+    return clearDataTypes;
+  }
+  const clearActions = createClearActions(appointmentBooking, setTimes);
+  executeClearActions(clearDataTypes, clearActions);
+  return clearDataTypes;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Toast,
   checkAndGoNext,
   checkAndMarkCartRenderError,
   checkHasFormStep,
+  clearDataByStepKey,
   currentAppointmentBoard,
   currentRenderLists,
   formatCarts,
@@ -512,6 +614,7 @@ var updateCartResources = (item, value, currentSelectedResources) => {
   getResourceTitle,
   hasResourceFormId,
   openForm,
+  processResourceList,
   sortResources,
   updateBookingFormStorage,
   updateCartResources,

package/lib/components/booking/addons/index.js

@@ -68,14 +68,15 @@ var formatProducts = (values) => {
       discountway: "num",
       discount_type: "discount",
       bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
       "product_option_item": (0, import_utils.formatProductOption)((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
       "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
       "source_product_price": (0, import_utils.getSourceProductPrice)(item),
       "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
       "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
       "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
-      "tax_fee": item._extend.tax_fee
+      "tax_fee": item._extend.tax_fee,
+      is_price_include_tax: item.is_price_include_tax
     };
   });
   return arr;

package/lib/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/actionButtons/index.js

@@ -49,6 +49,7 @@ var import_useScanManager = __toESM(require("../../../ticketBooking/hooks/pisell
 var import_priceKeyboard = require("../../../../pro/priceKeyboard");
 var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
+var import_useLogger = __toESM(require("../../../../hooks/useLogger"));
 var createToastContent = (text) => /* @__PURE__ */ import_react.default.createElement("div", { className: "action-buttons-toast-content" }, text);
 var ActionButtons = ({
   state,
@@ -69,6 +70,7 @@ var ActionButtons = ({
   const bookingTicket = (0, import_pisellos.useBookingTicket)();
   const { ScheduleModule } = pisellosAllModule;
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
+  const logger = (0, import_useLogger.default)();
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   (0, import_react.useEffect)(() => {
     if (!bookingTicket) return;
@@ -187,6 +189,10 @@ var ActionButtons = ({
     setShowClearModal(true);
   };
   const handleClearItemsOnly = () => {
+    logger.addLog({
+      title: "ActionButtons: handleClearItemsOnly 调用",
+      metadata: {}
+    });
     clearAllScanListenersTaskQueue();
     if (!hasCartItems) {
       Toast == null ? void 0 : Toast.info(
@@ -229,6 +235,10 @@ var ActionButtons = ({
   };
   const handleClearAllAndReset = () => {
     var _a2, _b2;
+    logger.addLog({
+      title: "ActionButtons: handleClearAllAndReset 调用",
+      metadata: {}
+    });
     clearAllScanListenersTaskQueue();
     (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
     setShowClearModal(false);

package/lib/components/booking/components/customiseItemModal/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
-var import_pisellNumberSelector = __toESM(require("../../../../pro/pisellNumberSelector"));
+var import_NumericStepper = __toESM(require("../../../../pro/NumericStepper"));
 var import_pisellPriceKeyboardModal = __toESM(require("../../../../pro/pisellPriceKeyboardModal"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
@@ -244,8 +244,9 @@ var CustomiseItemModal = ({
       },
       import_utils.locales.getText("pisell2.customise-item.save")
     )))), /* @__PURE__ */ import_react.default.createElement("div", { className: "customise-item-quantity-selector-fixed" }, /* @__PURE__ */ import_react.default.createElement(
-      import_pisellNumberSelector.default,
+      import_NumericStepper.default,
       {
+        variant: "capsule",
         value: quantity,
         min: 1,
         max: 999,
@@ -257,9 +258,7 @@ var CustomiseItemModal = ({
           } else {
             setQuantity(value);
           }
-        },
-        size: "middle",
-        enablePriceAdjust: true
+        }
       }
     ))),
     /* @__PURE__ */ import_react.default.createElement(

package/lib/components/booking/components/footer/amount.d.ts

@@ -1,4 +1,5 @@
 export declare const getRelationDetailsTotal: (relation_details: any) => number;
+export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
 export declare const getIsPriceIncludeTax: (state: any) => any;
 /**
  * 总金额