@pisell/private-materials 3.2.39 → 3.3.0

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

@@ -40,16 +40,16 @@ var import_classnames = __toESM(require("classnames"));
 var import_utils = require("@pisell/utils");
 var import_icons = require("@ant-design/icons");
 var import_context = require("../../context");
+var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 var CalendarDate = (props) => {
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [currentDate, setCurrentDate] = (0, import_react.useState)();
   const [dateMonthList, setDateMonthList] = (0, import_react.useState)([]);
-  const [currentMonth, setCurrentMonth] = (0, import_react.useState)(() => {
-    return (0, import_dayjs.default)();
-  });
+  const [currentMonth, setCurrentMonth] = (0, import_react.useState)();
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
+  const { isDateSelectedFirst, customPageId, getLoadAllSchedule } = (0, import_hooks.useAppointmentBookingSetting)();
   const weekListText = [
     import_utils.locales.getText("pisell2.appointment.sunday"),
     import_utils.locales.getText("pisell2.appointment.monday"),
@@ -64,6 +64,14 @@ var CalendarDate = (props) => {
     { length: 7 },
     (_, index) => (index + 7 - startingColumn) % 7
   );
+  (0, import_react.useEffect)(() => {
+    const getCurrentMonthData = async () => {
+      var _a;
+      const data = await appointmentBooking.getDateRange();
+      setCurrentMonth((0, import_dayjs.default)((_a = data == null ? void 0 : data[0]) == null ? void 0 : _a.date) || (0, import_dayjs.default)());
+    };
+    getCurrentMonthData();
+  }, []);
   const getMonthData = (date) => {
     const firstDay = (0, import_dayjs.default)(`${date}-01`);
     const startDay = firstDay.day();
@@ -85,11 +93,22 @@ var CalendarDate = (props) => {
     return monthData;
   };
   const lastMonthDisable = () => {
-    let newCurrentMonth = currentMonth.format("YYYY-MM");
+    let newCurrentMonth = currentMonth == null ? void 0 : currentMonth.format("YYYY-MM");
     let lastDate = (0, import_dayjs.default)(newCurrentMonth).subtract(1, "month");
     return lastDate.isBefore((0, import_dayjs.default)(), "month");
   };
+  const getDateData = async (params) => {
+    console.log(isDateSelectedFirst, customPageId, "wh7868");
+    if (isDateSelectedFirst) {
+      return appointmentBooking.loadScheduleAvailableDate({
+        ...params,
+        custom_page_id: customPageId
+      });
+    }
+    return await appointmentBooking.getAvailableDate(params);
+  };
   const getDates = async (date) => {
+    var _a;
     try {
       const startDate = (0, import_dayjs.default)(date).startOf("month").format("YYYY-MM-DD");
       const endDate = (0, import_dayjs.default)(date).endOf("month").format("YYYY-MM-DD");
@@ -97,17 +116,18 @@ var CalendarDate = (props) => {
         startDate,
         endDate
       };
-      const data = await appointmentBooking.getAvailableDate(params);
+      const data = await getDateData(params);
       const selected = await appointmentBooking.getDateRange();
+      console.log(data, selected, customPageId, "getDates");
       if ((selected == null ? void 0 : selected.length) > 0) {
-        setCurrentDate(selected[0].date);
-      } else {
+        setCurrentDate((_a = selected == null ? void 0 : selected[0]) == null ? void 0 : _a.date);
+      } else if (!isDateSelectedFirst) {
         if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM")) {
-          const firstAvailableDate = data.find(
+          const firstAvailableDate = (data || []).find(
             (d) => d.status === "available"
           );
           if (firstAvailableDate) {
-            setCurrentDate(firstAvailableDate == null ? void 0 : firstAvailableDate.date);
+            setCurrentDate(firstAvailableDate.date);
             appointmentBooking.setDateRange([firstAvailableDate]);
           }
         }
@@ -128,29 +148,39 @@ var CalendarDate = (props) => {
       setDateMonthList(updatedDates);
     } catch (error) {
       setLoading(false);
+      setDateMonthList([]);
       console.log(error, "wh978968234234");
     }
   };
   (0, import_react.useEffect)(() => {
+    if (!currentMonth) return;
     getDates(currentMonth);
   }, [currentMonth]);
   const lastMonth = () => {
-    let currentLastText = currentMonth.format("YYYY-MM");
+    let currentLastText = currentMonth == null ? void 0 : currentMonth.format("YYYY-MM");
     let newLastMonth = (0, import_dayjs.default)(currentLastText).subtract(1, "month");
     setCurrentMonth(newLastMonth);
   };
   const nextMonth = () => {
-    let currentMonthText = currentMonth.format("YYYY-MM");
+    let currentMonthText = currentMonth == null ? void 0 : currentMonth.format("YYYY-MM");
     let newNextMonth = (0, import_dayjs.default)(currentMonthText).add(1, "month");
     setCurrentMonth(newNextMonth);
     setLoading(true);
   };
+  const handleClick = (day, date) => {
+    if (day == null ? void 0 : day.disabled) return;
+    setCurrentDate(date);
+    appointmentBooking.setDateRange([day]);
+    if (isDateSelectedFirst) {
+      appointmentBooking.next();
+    }
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: `calendar-date-box ${(0, import_utils.isMobile)() ? "calendar-date-mobile-box" : ""}`
     },
-    !dateMonthList.length ? /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, style: { paddingTop: "16px" } }) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-header" }, /* @__PURE__ */ import_react.default.createElement(
+    !dateMonthList.length || !currentMonth ? /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, style: { paddingTop: "16px" } }) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-header" }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: (0, import_classnames.default)("calendar-last-month", {
@@ -162,7 +192,7 @@ var CalendarDate = (props) => {
         }
       },
       /* @__PURE__ */ import_react.default.createElement(import_icons.CaretLeftOutlined, null)
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-current-month" }, currentMonth.format("MMMM YYYY")), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-next-month", onClick: nextMonth }, /* @__PURE__ */ import_react.default.createElement(import_icons.CaretRightOutlined, null))), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-weeks" }, columns.map((col) => /* @__PURE__ */ import_react.default.createElement("div", { key: col, className: "calendar-weeks-items" }, weekListText[Number(col)]))), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-days" }, dateMonthList.map((day, index) => {
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-current-month" }, currentMonth == null ? void 0 : currentMonth.format("MMMM YYYY")), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-next-month", onClick: nextMonth }, /* @__PURE__ */ import_react.default.createElement(import_icons.CaretRightOutlined, null))), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-weeks" }, columns.map((col) => /* @__PURE__ */ import_react.default.createElement("div", { key: col, className: "calendar-weeks-items" }, weekListText[Number(col)]))), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-days" }, dateMonthList.map((day, index) => {
       const date = (0, import_dayjs.default)(day.date).format("YYYY-MM-DD");
       const isCurrentMonth = (0, import_dayjs.default)(day.date).isSame(
         currentMonth,
@@ -178,11 +208,7 @@ var CalendarDate = (props) => {
             ["other-month-days"]: !isCurrentMonth,
             ["loading-item"]: loading
           }),
-          onClick: () => {
-            if (day == null ? void 0 : day.disabled) return;
-            setCurrentDate(date);
-            appointmentBooking.setDateRange([day]);
-          }
+          onClick: () => handleClick(day, date)
         },
         isCurrentMonth && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("day-text") }, (0, import_dayjs.default)(day.date).format("D"))
       );

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

@@ -121,7 +121,7 @@
   }
 
   &.selectDate {
-    border: 2px solid #7f56d9;
+    border: 2px solid var(--theme-color, #7f56d9);
   }
 
   &.other-month-days {

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

@@ -0,0 +1,3 @@
+import './index.less';
+declare const Deposit: () => JSX.Element;
+export default Deposit;

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

@@ -0,0 +1,61 @@
+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/Deposit/index.tsx
+var Deposit_exports = {};
+__export(Deposit_exports, {
+  default: () => Deposit_default
+});
+module.exports = __toCommonJS(Deposit_exports);
+var import_react = __toESM(require("react"));
+var import_materials = require("@pisell/materials");
+var import_deposit = __toESM(require("../../deposit"));
+var import_context = require("../../context");
+var import_utils = require("@pisell/utils");
+var import_index = require("./index.less");
+var Deposit = () => {
+  const { setIsAgreeDepositPolicy, isAgreeDepositPolicy, summary } = (0, import_context.useAppointmentBookingContext)();
+  const { deposit } = summary;
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-top" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.appointment.deposit")), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellText.Amount,
+    {
+      value: deposit == null ? void 0 : deposit.total,
+      showCurrencySymbol: true,
+      className: "amount"
+    }
+  )), /* @__PURE__ */ import_react.default.createElement(
+    import_deposit.default,
+    {
+      total: deposit == null ? void 0 : deposit.total,
+      protocols: deposit == null ? void 0 : deposit.protocols,
+      isAgreePolicy: isAgreeDepositPolicy,
+      onChange: (value) => setIsAgreeDepositPolicy(value)
+    }
+  ));
+};
+var Deposit_default = Deposit;

package/lib/components/appointmentBooking/components/Deposit/index.less

@@ -0,0 +1,17 @@
+.appointment-deposit-wrap {
+  .appointment-deposit-top {
+    color: var(--Text-Text_1, #1b1b1b);
+    font-size: 20px;
+    font-weight: 600;
+    line-height: 28px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 14px;
+    justify-content: space-between;
+
+    .amount {
+      color: var(--theme-color, #7f56d9);
+    }
+  }
+}

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

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Footer: () => JSX.Element;
+declare const Footer: ({ onContinue }: any) => JSX.Element;
 export default Footer;

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

@@ -41,7 +41,7 @@ var import_context = require("../../context");
 var import_Cart = __toESM(require("../Cart"));
 var import_Total = __toESM(require("../Cart/Item/Total"));
 var import_index = require("./index.less");
-var Footer = () => {
+var Footer = ({ onContinue }) => {
   var _a;
   const { carts, currentStep } = (0, import_context.useAppointmentBookingContext)();
   const [open, setOpen] = (0, import_react2.useState)(false);
@@ -61,7 +61,13 @@ var Footer = () => {
           className: "section-footer-btn"
         },
         /* @__PURE__ */ import_react.default.createElement(import_materials.Image, { src: import_shopping_cart.default, preview: false })
-      )), /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
+      )), /* @__PURE__ */ import_react.default.createElement(
+        import_ContinueButton.default,
+        {
+          onContinue,
+          onIsErrorResource: (val) => setOpen(val || false)
+        }
+      ))
     }
   ), /* @__PURE__ */ import_react.default.createElement(import_Cart.default, { open, onCancel: () => setOpen(false) }));
 };

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const Form: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default Form;

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

@@ -0,0 +1,157 @@
+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/Form/index.tsx
+var Form_exports = {};
+__export(Form_exports, {
+  default: () => Form_default
+});
+module.exports = __toCommonJS(Form_exports);
+var import_react = __toESM(require("react"));
+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_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 { carts, appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
+  const { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
+  const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
+  const key = "booking_form";
+  const resources = (0, import_react.useMemo)(() => {
+    const _resource = getResourceList();
+    return (_resource == null ? void 0 : _resource.resources) || [];
+  }, []);
+  const formStorage = (0, import_react.useMemo)(() => {
+    return getOtherData(key);
+  }, []);
+  const newCarts = (0, import_utils.formatCarts)(carts, resources);
+  const forms = (0, import_react.useMemo)(() => {
+    if (!(newCarts == null ? void 0 : newCarts.length) || !(resources == null ? void 0 : resources.length)) return [];
+    return (0, import_utils.formatForms)(newCarts);
+  }, [newCarts, resources]);
+  const currentForm = (0, import_react.useMemo)(() => {
+    return forms == null ? void 0 : forms[currentFormIndex];
+  }, [forms, currentFormIndex]);
+  const [FormCard] = (0, import_useComponents.default)({
+    components: ["FormCard"]
+  });
+  const goToNextForm = () => {
+    var _a, _b, _c;
+    const nextIndex = currentFormIndex + 1;
+    if (nextIndex < forms.length) {
+      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)) {
+        setAgreementContent({ id: (_c = forms == null ? void 0 : forms[nextIndex]) == null ? void 0 : _c.policy_id });
+        setShowAgreement(true);
+      }
+    } else {
+      appointmentBooking.next();
+    }
+  };
+  const updateFormStatus = (status) => {
+    const newFormStatus = (0, import_utils.updateLists)(formStatus, "id", currentForm == null ? void 0 : currentForm.form_id, {
+      status
+    });
+    setFormStatus(newFormStatus);
+  };
+  const setFormStorage = (values) => {
+    const oldData = getOtherData(key);
+    const newData = (0, import_utils.updateBookingFormStorage)(oldData, currentForm == null ? void 0 : currentForm.id, values);
+    setOtherData(key, { ...newData });
+    appointmentBooking.updateCart({
+      _id: currentForm == null ? void 0 : currentForm.cart_id,
+      relationForms: [
+        {
+          form_id: currentForm == null ? void 0 : currentForm.form_id,
+          form_record_ids: [currentForm == null ? void 0 : currentForm.id]
+        }
+      ]
+    });
+  };
+  const handleFormFinish = (status, values) => {
+    updateFormStatus(status);
+    if (status === "success") {
+      setFormStorage(values);
+      if (currentForm == null ? void 0 : currentForm.policy_id) {
+        setAgreementContent({ id: currentForm.policy_id });
+        setShowAgreement(true);
+      } else {
+        goToNextForm();
+      }
+    }
+  };
+  const handleAgreementOk = () => {
+    setShowAgreement(false);
+    goToNextForm();
+  };
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    submit: () => {
+      var _a, _b;
+      (_b = (_a = manualRef.current) == null ? void 0 : _a.submit) == null ? void 0 : _b.call(_a);
+    }
+  }));
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (currentForm == null ? void 0 : currentForm.form_id) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-form-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+    FormCard,
+    {
+      id: currentForm == null ? void 0 : currentForm.form_id,
+      ref: manualRef,
+      isGetLastData: false,
+      setting: { isHidden: 1 },
+      formWrapStyle: { padding: "16px" },
+      isV2API: true,
+      isShowSkeleton: true,
+      onSubmit: (status, values) => {
+        handleFormFinish(status, values);
+      },
+      onFinishFailed: (e) => {
+        console.log(e, "updateFormStatus");
+        updateFormStatus("error");
+      },
+      onFormValueChange: (values) => {
+        console.log(values, "onFormValueChange");
+      },
+      defaultValues: formStorage == null ? void 0 : formStorage[currentForm == null ? void 0 : currentForm.id],
+      isClearData: false
+    }
+  )) : null, showAgreement ? /* @__PURE__ */ import_react.default.createElement(
+    import_PolicyModal.default,
+    {
+      open: showAgreement,
+      onCancel: handleAgreementOk,
+      item: agreementContent
+    }
+  ) : null);
+});
+var Form_default = Form;

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

@@ -0,0 +1,3 @@
+.appointment-form-wrap {
+  padding: 16px 0;
+}

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

@@ -115,7 +115,7 @@ var Guest = () => {
       username: `Guest${accountLists.length + 1}`,
       isGuest: true
     };
-    appointmentBooking.addAccount([guest]);
+    appointmentBooking.addAccounts([guest]);
     appointmentBooking.setActiveAccount(guest.id);
     appointmentBooking.back();
   };

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

@@ -40,27 +40,30 @@ var import_hooks = require("../../hooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var Header = () => {
-  var _a, _b;
-  const { currentStep, appointmentBooking, resources, setTimes } = (0, import_context.useAppointmentBookingContext)();
+  var _a;
+  const { currentStep, appointmentBooking, resources, setTimes, carts } = (0, import_context.useAppointmentBookingContext)();
   const shopDiscount = (0, import_hooks.useShopDiscount)();
   const context = (0, import_useEngineContext.default)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { getStepIndex } = (0, import_hooks.useAppointmentBookingStep)();
+  const { getStepIndex, stepList } = (0, import_hooks.useAppointmentBookingStep)();
+  const { setOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
   const stepName = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c, _d, _e;
+    var _a2, _b, _c, _d, _e;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (key === "select-resource") {
-      const name = ((_d = (_c = (_b2 = resources == null ? void 0 : resources[0]) == null ? void 0 : _b2.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.title) || "";
+      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) || "";
       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]);
   const handleBack = async () => {
-    var _a2;
+    var _a2, _b;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     const types = {
       "select-time": "time",
-      "select-resource": "resource"
+      "select-resource": "resource",
+      "fill-form": "relationForms"
     };
     if (types[key]) {
       appointmentBooking.deleteCartItemInfo(types[key]);
@@ -68,29 +71,44 @@ var Header = () => {
     if (key === "select-date") {
       appointmentBooking.clearDateRange();
     }
+    if (key === "select-service") {
+      appointmentBooking.clearCart();
+      const type = await checkProductType((_b = carts == null ? void 0 : carts[0]) == null ? void 0 : _b.id);
+      if (type === "duration") {
+        appointmentBooking.deleteCartItemInfo("time");
+      }
+    }
     if (key === "select-time") {
       setTimes([]);
+    }
+    if (key === "fill-form") {
+      setOtherData("booking_form", {});
+    }
+    const isHasForm = stepList == null ? void 0 : stepList.some((item) => item.key === "fill-form");
+    const shouldCheckSkip = isHasForm && key === "fill-form" || key === "select-time";
+    if (shouldCheckSkip) {
       const skipResourceStep = await checkSkipResourceStep();
       if (skipResourceStep) {
         appointmentBooking.deleteCartItemInfo("resource");
-        const index = getStepIndex("prev", 2);
-        appointmentBooking.gotoStep(index);
-        return;
+        const targetIndex = getStepIndex("prev", 2);
+        return appointmentBooking.gotoStep(targetIndex);
       }
     }
     appointmentBooking.back();
   };
   const handleClose = () => {
-    var _a2, _b2;
+    var _a2, _b;
     appointmentBooking.destroy();
     (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
     const utils = context.appHelper.utils || {};
-    (_b2 = utils == null ? void 0 : utils.history) == null ? void 0 : _b2.replace("/");
+    (_b = utils == null ? void 0 : utils.history) == null ? void 0 : _b.replace("/");
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_progressBar.default,
     {
-      title: (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.title,
+      title: `${import_utils.locales.getText("pisell2.appointment.step")(
+        (currentStep == null ? void 0 : currentStep.index) + 1
+      )}`,
       description: stepName,
       showBack: (currentStep == null ? void 0 : currentStep.index) > 0,
       onBack: () => handleBack(),

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

@@ -39,31 +39,53 @@ var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_context = require("../../context");
 var import_guests = __toESM(require("../../assets/guests.svg"));
-var import_utils = require("@pisell/utils");
+var import_utils = require("../../utils");
+var import_utils2 = require("@pisell/utils");
 var import_index = require("./index.less");
 var Resource = () => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)(0);
-  const { appointmentBooking, resources, carts, resourceOtherParams } = (0, import_context.useAppointmentBookingContext)();
+  const {
+    appointmentBooking,
+    resources,
+    carts,
+    resourceOtherParams,
+    currentStep
+  } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList, autoSelectAllProductResources } = (0, import_hooks.useAppointmentBookingResource)();
+  const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
+  const { addStep, removeStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const newCarts = (0, import_utils.formatCarts)(carts, resources);
   (0, import_react.useEffect)(() => {
-    const _resources = getResourceList();
-    autoSelectAllProductResources();
-    getResourceList();
+    const checkAndSkipResourceStep = async () => {
+      const skipResourceStep = await checkSkipResourceStep();
+      const _resources = getResourceList();
+      autoSelectAllProductResources();
+      getResourceList();
+      console.log(skipResourceStep, "skipResourceStep");
+      if (skipResourceStep) {
+        const index = (currentStep == null ? void 0 : currentStep.index) + 1;
+        if ((0, import_utils.hasResourceFormId)(newCarts)) {
+          const description = import_utils2.locales.getText("pisell2.appointment.fill-form");
+          addStep({ index, key: "fill-form", description });
+        } else {
+          removeStep("fill-form");
+        }
+        appointmentBooking.next();
+        return true;
+      }
+      return false;
+    };
+    checkAndSkipResourceStep();
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a;
-    if (((_a = resourceOtherParams == null ? void 0 : resourceOtherParams.errorList) == null ? void 0 : _a.length) > 0) {
-      return (0, import_materials.PisellToast)({
-        content: import_utils.locales.getText("pisell2.appointment.no.available.time")
-      });
-    }
+    console.log(resourceOtherParams, "resourceOtherParams");
   }, [resourceOtherParams == null ? void 0 : resourceOtherParams.errorList]);
   const anyResource = [
     {
       id: 0,
       image: import_guests.default,
-      title: import_utils.locales.getText("pisell2.appointment.any.professional"),
-      subtitle: import_utils.locales.getText("pisell2.appointment.for.maximum.availability")
+      title: import_utils2.locales.getText("pisell2.appointment.any.professional"),
+      subtitle: import_utils2.locales.getText("pisell2.appointment.for.maximum.availability")
     }
   ];
   const currentResource = (0, import_react.useMemo)(() => {
@@ -110,7 +132,7 @@ var Resource = () => {
           }
         );
       },
-      columns: (0, import_utils.isMobile)() ? 2 : 3,
+      columns: (0, import_utils2.isMobile)() ? 2 : 3,
       horizontalGap: 16,
       verticalGap: 16,
       onClick: (e) => onClick && onClick(e)