@pisell/private-materials 3.3.43 → 3.3.45

package/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -46,18 +46,20 @@ var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
 var CartItem = ({ onNext }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
     carts,
     currentStep,
-    resources,
     setResourceOtherParams,
     resourceOtherParams,
     summary,
-    isLastStep
+    isLastStep,
+    currentSelectedResources,
+    currentStepParams,
+    isErrorHolder
   } = (0, import_context.useAppointmentBookingContext)();
-  const { accountLists, getHolders, form_id, addAccount } = (0, import_hooks2.useAppointmentBookingAccount)();
+  const { accountLists, getHolders, addAccount } = (0, import_hooks2.useAppointmentBookingAccount)();
   const { getResourceList } = (0, import_hooks2.useAppointmentBookingResource)();
   const { isFormSubject, bookingSubject, isRetailTemplate } = (0, import_hooks2.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks2.useAppointmentBookingLogin)();
@@ -95,14 +97,10 @@ var CartItem = ({ onNext }) => {
         ...resourceOtherParams,
         errorList: null
       });
-      if (!val) {
-        appointmentBooking.deleteCartItemInfo("resource", e == null ? void 0 : e._id);
-      } else {
-        appointmentBooking.updateCart({
-          _id: e == null ? void 0 : e._id,
-          resources: val ? [val] : []
-        });
-      }
+      appointmentBooking.updateCart({
+        _id: e == null ? void 0 : e._id,
+        resources: (0, import_utils2.updateCartResources)(e, val, currentSelectedResources)
+      });
       getResourceList();
       return;
     }
@@ -150,8 +148,29 @@ var CartItem = ({ onNext }) => {
     }
   };
   const products = (0, import_react.useMemo)(() => {
-    return (0, import_utils2.formatCarts)(carts, resources, utils, accountLists);
-  }, [carts, resources, accountLists]);
+    if (!(carts == null ? void 0 : carts.length)) return [];
+    if ((currentSelectedResources == null ? void 0 : currentSelectedResources.length) > 0) {
+      const newCarts = carts.map((item) => {
+        const currentResourceData = currentSelectedResources.find(
+          (resource) => (resource == null ? void 0 : resource._id) === (item == null ? void 0 : item._id)
+        );
+        const multiResources = (0, import_utils2.getMultiResources)(
+          item,
+          currentResourceData == null ? void 0 : currentResourceData.currentSelectedResource,
+          currentStepParams == null ? void 0 : currentStepParams.key
+        );
+        return {
+          ...item,
+          isMultipleResource: true,
+          multiResources,
+          isErrorHolder: isErrorHolder || false
+        };
+      });
+      return newCarts;
+    } else {
+      return carts;
+    }
+  }, [carts, currentSelectedResources, currentStepParams == null ? void 0 : currentStepParams.key, isErrorHolder]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -165,8 +184,8 @@ var CartItem = ({ onNext }) => {
           hideAddBtn: false,
           holders,
           disabledEdit: isLastStep,
-          isShowChangeResource: ((_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) === "select-resource",
-          isShowDelete: ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) === "select-service",
+          isShowChangeResource: (_c = (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) == null ? void 0 : _c.startsWith("select-resource"),
+          isShowDelete: ((_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key) === "select-service",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
           isShowHolder: isFormSubject,

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

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

@@ -51,7 +51,6 @@ var import_index = require("./index.less");
 var Layout = () => {
   var _a, _b, _c, _d, _e;
   const stepRef = (0, import_react.useRef)();
-  const formRef = (0, import_react.useRef)();
   const {
     currentStep,
     setResourceOtherParams,
@@ -60,17 +59,20 @@ var Layout = () => {
     appointmentBooking,
     setLoading,
     policyParams,
-    closePolicy
+    closePolicy,
+    currentStepParams,
+    setIsErrorHolder
   } = (0, import_context.useAppointmentBookingContext)();
   const { isDateSelectedFirst, isFormSubject, isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
   const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
-  const { removeStep, stepList } = (0, import_hooks.useAppointmentBookingStep)();
+  const { removeStep } = (0, import_hooks.useAppointmentBookingStep)();
   const { shopDiscount } = (0, import_hooks.useShopDiscount)();
   (0, import_hooks.useAppointmentBookingCart)();
   (0, import_hooks.useAppointmentBookingStep)();
   const [params, setParams] = (0, import_react.useState)({});
   (0, import_react.useEffect)(() => {
+    appointmentBooking.removeStep("fill-form");
     return () => {
       var _a2;
       setIsAgreeDepositPolicy(false);
@@ -78,6 +80,16 @@ var Layout = () => {
       (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
     };
   }, []);
+  (0, import_react.useEffect)(() => {
+    var _a2;
+    if ((currentStepParams == null ? void 0 : currentStepParams.index) < 0) return;
+    const resourceStepIndex = (_a2 = currentStepParams == null ? void 0 : currentStepParams.stepLists) == null ? void 0 : _a2.findIndex(
+      (item) => item.key === "select-resource"
+    );
+    if ((currentStepParams == null ? void 0 : currentStepParams.index) < resourceStepIndex) {
+      appointmentBooking.setOtherData("current_selected_resources", null);
+    }
+  }, [currentStepParams]);
   (0, import_react.useEffect)(() => {
     try {
       if (!(appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || isRetailTemplate) return;
@@ -107,34 +119,38 @@ var Layout = () => {
       ...resourceOtherParams,
       errorList: null
     });
+    setIsErrorHolder(false);
     window.scrollTo({
       top: 0,
       behavior: "smooth"
     });
   }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key]);
+  const components = {
+    // 选择服务
+    "select-service": import_Services.default,
+    // 添加客户
+    "select-guest": import_Guest.default,
+    // 选择时间
+    "select-date": import_Date.default,
+    // 时间切片
+    "select-time": import_TimeSlicing.default,
+    // 确认信息
+    "confirm-information": import_ConfirmInformation.default
+  };
   const Com = (0, import_react.useMemo)(() => {
     var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (!key) return null;
-    const components = {
-      // 选择服务
-      "select-service": import_Services.default,
-      // 添加客户
-      "select-guest": import_Guest.default,
-      // 选择时间
-      "select-date": import_Date.default,
-      // 选择资源
-      "select-resource": import_Resource.default,
-      // 时间切片
-      "select-time": import_TimeSlicing.default,
-      // 填写表单
-      "fill-form": import_Form.default,
-      // 确认信息
-      "confirm-information": import_ConfirmInformation.default
-    };
-    let Com2 = components[key];
+    let Com2;
+    if (key.startsWith("select-resource")) {
+      Com2 = import_Resource.default;
+    } else if (key.startsWith("fill-form")) {
+      Com2 = import_Form.default;
+    } else {
+      Com2 = components[key];
+    }
     return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
-  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key, stepRef]);
+  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2;
     if ((0, import_utils.isMobile)()) {

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

@@ -64,12 +64,6 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
     if (!(data == null ? void 0 : data.length)) {
       return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unselect.date"));
     }
-    if (!isDateSelectedFirst) {
-      const result = appointmentBooking.checkResourceListForDate();
-      if (!result) {
-        return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.date"));
-      }
-    }
     nextStep();
   };
   const weekListText = [

package/lib/components/appointmentBooking/components/Deposit/index.d.ts

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

package/lib/components/appointmentBooking/components/Footer/index.d.ts

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

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

@@ -37,143 +37,91 @@ var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
 var import_utils = require("../../utils");
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
-var import_PolicyModal = __toESM(require("../../deposit/components/PolicyModal"));
+var import_utils2 = require("./utils");
 var import_index = require("./index.less");
 var Form = (0, import_react.forwardRef)((props, ref) => {
   const manualRef = (0, import_react.useRef)();
-  const [currentFormIndex, setCurrentFormIndex] = (0, import_react.useState)(0);
-  const [showAgreement, setShowAgreement] = (0, import_react.useState)(false);
-  const [agreementContent, setAgreementContent] = (0, import_react.useState)({});
-  const [formStatus, setFormStatus] = (0, import_react.useState)([]);
-  const [isClearData, setIsClearData] = (0, import_react.useState)(false);
-  const [formId, setFormId] = (0, import_react.useState)(0);
-  const { carts, appointmentBooking, setLoading } = (0, import_context.useAppointmentBookingContext)();
+  const { appointmentBooking, setLoading, currentStepParams, carts } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
-  const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { setOtherData, getOtherData, isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
   const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const utils = (0, import_hooks.contextUtils)();
+  const { isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
+  const { checkAccount } = (0, import_hooks.useAppointmentBookingAccount)();
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
-      var _a, _b;
+      var _a, _b, _c;
+      const stepLists = (currentStepParams == null ? void 0 : currentStepParams.stepLists) || [];
+      const nextStepKey = (_a = stepLists[(currentStepParams == null ? void 0 : currentStepParams.index) + 1]) == null ? void 0 : _a.key;
       setLoading(true);
-      (_b = (_a = manualRef.current) == null ? void 0 : _a.submit) == null ? void 0 : _b.call(_a);
+      (_c = (_b = manualRef.current) == null ? void 0 : _b.submit) == null ? void 0 : _c.call(_b);
     }
   }));
-  const key = "booking_form";
-  const formStorage = getOtherData("booking_form") || {};
-  const resources = (0, import_react.useMemo)(() => {
-    const _resource = getResourceList();
-    return (_resource == null ? void 0 : _resource.resources) || [];
-  }, []);
-  const forms = (0, import_react.useMemo)(() => {
-    const newCarts = (0, import_utils.formatCarts)(carts, resources, utils);
-    if (!(newCarts == null ? void 0 : newCarts.length) || !(resources == null ? void 0 : resources.length)) return [];
-    return (0, import_utils.formatForms)(newCarts) || [];
-  }, [carts, resources]);
-  (0, import_react.useEffect)(() => {
-    var _a;
-    if (!(forms == null ? void 0 : forms.length)) return;
-    setFormId(((_a = forms == null ? void 0 : forms[currentFormIndex]) == null ? void 0 : _a.form_id) || 0);
-  }, [forms, currentFormIndex]);
   const [FormCard] = (0, import_useComponents.default)({
     components: ["FormCard"]
   });
-  const goToNextForm = () => {
-    var _a, _b, _c;
-    const nextIndex = currentFormIndex + 1;
-    if (nextIndex < forms.length) {
-      setIsClearData(true);
-      setCurrentFormIndex(nextIndex);
-      if (!((_a = forms == null ? void 0 : forms[nextIndex]) == null ? void 0 : _a.form_id) && ((_b = forms == null ? void 0 : forms[nextIndex]) == null ? void 0 : _b.policy_id)) {
-        setLoading(true);
-        setAgreementContent({ id: (_c = forms == null ? void 0 : forms[nextIndex]) == null ? void 0 : _c.policy_id });
-        setShowAgreement(true);
-      } else {
-        setLoading(false);
-      }
-    } else {
-      nextStep();
-    }
-  };
+  const key = "booking_form";
+  const formStorage = getOtherData("booking_form") || {};
+  const appointmentBoard = (0, import_react.useMemo)(() => {
+    const { resources } = getResourceList();
+    return (0, import_utils.currentAppointmentBoard)(
+      currentStepParams.key,
+      resources,
+      appointmentBooking
+    );
+  }, [currentStepParams.key]);
+  const formId = (0, import_react.useMemo)(() => {
+    return (appointmentBoard == null ? void 0 : appointmentBoard.resource_form_id) || 0;
+  }, [appointmentBoard == null ? void 0 : appointmentBoard.resource_form_id]);
   const updateFormStatus = (status) => {
     if (status === "error") {
       setLoading(false);
     }
-    const newFormStatus = (0, import_utils.updateLists)(formStatus, "id", formId, {
-      status
-    });
-    setFormStatus(newFormStatus);
   };
   const setFormStorage = (values) => {
-    var _a;
-    const cart_id = (_a = forms == null ? void 0 : forms[currentFormIndex]) == null ? void 0 : _a.cart_id;
     const oldData = getOtherData(key);
-    const newData = (0, import_utils.updateBookingFormStorage)(oldData, cart_id, values);
+    const newData = (0, import_utils.updateBookingFormStorage)(
+      oldData,
+      currentStepParams == null ? void 0 : currentStepParams.key,
+      values
+    );
     setOtherData(key, { ...newData });
     appointmentBooking.updateCart({
-      _id: cart_id,
-      relationForms: [
-        {
-          form_id: formId,
-          form_record_ids: [values == null ? void 0 : values.form_record_id]
-        }
-      ]
+      _id: appointmentBoard == null ? void 0 : appointmentBoard.cart_id,
+      relationForms: (0, import_utils2.updateRelationForms)(carts, appointmentBoard, values)
     });
   };
   const handleFormFinish = (status, values) => {
-    var _a, _b;
-    setIsClearData(false);
-    updateFormStatus(status);
-    if (status === "success") {
-      setFormStorage(values);
-      if ((_a = forms == null ? void 0 : forms[currentFormIndex]) == null ? void 0 : _a.policy_id) {
-        setAgreementContent({ id: (_b = forms == null ? void 0 : forms[currentFormIndex]) == null ? void 0 : _b.policy_id });
-        setShowAgreement(true);
-      } else {
-        goToNextForm();
+    try {
+      updateFormStatus(status);
+      if (status === "success") {
+        setFormStorage(values);
+        nextStep();
       }
+    } catch (error) {
+      setLoading(false);
     }
   };
-  const handleAgreementOk = () => {
-    setShowAgreement(false);
-    goToNextForm();
-  };
-  const formCom = (0, import_react.useMemo)(() => {
-    var _a;
-    if (!formId) return;
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-form-wrap" }, /* @__PURE__ */ import_react.default.createElement(
-      FormCard,
-      {
-        id: formId,
-        ref: manualRef,
-        isGetLastData: false,
-        setting: { isHidden: 1 },
-        formWrapStyle: { padding: "16px" },
-        isV2API: true,
-        isShowSkeleton: true,
-        onSubmit: (status, values) => {
-          handleFormFinish(status, values);
-        },
-        onFinishFailed: (e) => {
-          updateFormStatus("error");
-        },
-        onFormValueChange: (values) => {
-        },
-        defaultValues: (formStorage == null ? void 0 : formStorage[(_a = forms == null ? void 0 : forms[currentFormIndex]) == null ? void 0 : _a.cart_id]) || {},
-        isClearData: false
-      }
-    ));
-  }, [currentFormIndex, formId]);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, formCom, showAgreement ? /* @__PURE__ */ import_react.default.createElement(
-    import_PolicyModal.default,
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-form-wrap", key: currentStepParams == null ? void 0 : currentStepParams.key }, /* @__PURE__ */ import_react.default.createElement(
+    FormCard,
     {
-      open: showAgreement,
-      onCancel: () => setShowAgreement(false),
-      onConfirm: () => handleAgreementOk(),
-      item: agreementContent,
-      onChange: () => setLoading(false),
-      isHideCheckout: false
+      id: formId,
+      ref: manualRef,
+      isGetLastData: false,
+      setting: { isHidden: 1 },
+      formWrapStyle: { padding: "16px" },
+      isV2API: true,
+      isShowSkeleton: true,
+      onSubmit: (status, values) => {
+        handleFormFinish(status, values);
+      },
+      onFinishFailed: (e) => {
+        updateFormStatus("error");
+      },
+      onFormValueChange: (values) => {
+      },
+      defaultValues: (formStorage == null ? void 0 : formStorage[currentStepParams == null ? void 0 : currentStepParams.key]) || {},
+      isClearData: false
     }
-  ) : null);
+  )));
 });
 var Form_default = Form;

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

@@ -0,0 +1,8 @@
+/**
+ * @title: 更新表单数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-05-26 16:58
+ */
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;

package/lib/components/appointmentBooking/components/Form/utils.js

@@ -0,0 +1,49 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/appointmentBooking/components/Form/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  updateRelationForms: () => updateRelationForms
+});
+module.exports = __toCommonJS(utils_exports);
+var updateRelationForms = (carts, currentCart, values) => {
+  var _a, _b;
+  if (!(currentCart == null ? void 0 : currentCart.cart_id)) return [];
+  const cartItem = carts == null ? void 0 : carts.find(
+    (item) => (item == null ? void 0 : item._id) === (currentCart == null ? void 0 : currentCart.cart_id)
+  );
+  let oldLists = ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.relation_forms) || [];
+  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_id: values == null ? void 0 : values.form_record_id };
+  const exist = oldLists.find((item) => item.form_id === (newData == null ? void 0 : newData.form_id));
+  if (exist) {
+    if (!((_b = exist == null ? void 0 : exist.form_record_ids) == null ? void 0 : _b.includes(newData.form_record_id))) {
+      exist.form_record_ids.push(newData.form_record_id);
+    }
+  } else {
+    oldLists.push({
+      form_id: newData.form_id,
+      form_record_ids: [newData.form_record_id]
+    });
+  }
+  return oldLists;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  updateRelationForms
+});

package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

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

@@ -38,26 +38,41 @@ var import_progressBar = __toESM(require("../../../eventBooking/components/progr
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var Header = () => {
   var _a;
-  const { currentStep, appointmentBooking, resources, setTimes, carts } = (0, import_context.useAppointmentBookingContext)();
+  const {
+    currentStep,
+    appointmentBooking,
+    setTimes,
+    carts,
+    currentStepParams,
+    currentSelectedResources
+  } = (0, import_context.useAppointmentBookingContext)();
   const shopDiscount = (0, import_hooks.useShopDiscount)();
   const context = (0, import_useEngineContext.default)();
-  const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { getStepIndex, stepList, updateStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const { setOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { stepList, updateStep, removeStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
   const { checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
+  const utils = (0, import_hooks.contextUtils)();
   const stepName = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b, _c;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (!key) return "";
-    if (key === "select-resource") {
-      const name = ((_d = (_c = (_b = resources == null ? void 0 : resources[0]) == null ? void 0 : _b.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.title) || "";
+    if (key.startsWith("select-resource")) {
+      const currentResource = (_b = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _b.currentSelectedResource;
+      const resourceItem = (currentResource == null ? void 0 : currentResource.resourceItem) || {};
+      const name = (0, import_utils2.getResourceTitle)(
+        appointmentBooking,
+        resourceItem == null ? void 0 : resourceItem.code,
+        utils,
+        resourceItem
+      );
       return import_utils.locales.getText("pisell2.event.select.category")(name);
     }
-    return ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.description) || "";
-  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, resources]);
+    return ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.description) || "";
+  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, currentSelectedResources]);
   const handleBack = async () => {
     var _a2, _b;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
@@ -82,29 +97,44 @@ var Header = () => {
     if (key === "select-time") {
       setTimes([]);
     }
-    if (key === "fill-form") {
-      setOtherData("booking_form", {});
-    }
-    const resourceStep = stepList[(currentStep == null ? void 0 : currentStep.index) - 1];
-    if ((resourceStep == null ? void 0 : resourceStep.isSkip) && (resourceStep == null ? void 0 : resourceStep.key) === "select-resource") {
-      appointmentBooking.deleteCartItemInfo("resource");
+    if (key.startsWith("fill-form")) {
+      const form_key = "booking_form";
+      let booking_form = getOtherData(form_key);
+      setOtherData(form_key, { ...booking_form, [key]: {} });
     }
     appointmentBooking.back();
-    const prevStepData = stepList[(currentStep == null ? void 0 : currentStep.index) - 1];
-    const currentStepData = stepList[currentStep == null ? void 0 : currentStep.index];
+    const prevStepData = stepList[(currentStepParams == null ? void 0 : currentStepParams.index) - 1];
+    const currentStepData = stepList[currentStepParams == null ? void 0 : currentStepParams.index];
     if ((currentStepData == null ? void 0 : currentStepData.isSkip) || (prevStepData == null ? void 0 : prevStepData.isSkip)) {
       const key2 = (currentStepData == null ? void 0 : currentStepData.isSkip) ? currentStepData == null ? void 0 : currentStepData.key : prevStepData == null ? void 0 : prevStepData.key;
+      if (key2 === "select-resource") {
+        appointmentBooking.deleteCartItemInfo("resource");
+      }
       updateStep(key2, {
         isSkip: false
       });
     }
+    if ((prevStepData == null ? void 0 : prevStepData.key) === "select-service") {
+      stepList.forEach((item) => {
+        if (item.key.startsWith("select-resource_") || item.key.startsWith("fill-form_")) {
+          removeStep(item.key);
+        }
+      });
+    }
+    if ((currentStepData == null ? void 0 : currentStepData.key) === "select-resource") {
+      stepList.forEach((item) => {
+        if (item.key.startsWith("fill-form_")) {
+          removeStep(item.key);
+        }
+      });
+    }
   };
   const handleClose = () => {
     var _a2, _b;
     appointmentBooking.destroy();
     (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
-    const utils = context.appHelper.utils || {};
-    (_b = utils == null ? void 0 : utils.history) == null ? void 0 : _b.replace("/");
+    const utils2 = context.appHelper.utils || {};
+    (_b = utils2 == null ? void 0 : utils2.history) == null ? void 0 : _b.replace("/");
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_progressBar.default,