@pisell/private-materials 3.3.16 → 3.3.18

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

@@ -45,6 +45,7 @@ var import_Guest = __toESM(require("../Guest"));
 var import_Form = __toESM(require("../Form"));
 var import_ConfirmInformation = __toESM(require("../ConfirmInformation"));
 var import_context = require("../../context");
+var import_PolicyModal = __toESM(require("../../deposit/components/PolicyModal"));
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
 var Layout = () => {
@@ -63,12 +64,18 @@ var Layout = () => {
   const { isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
   const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
   const { removeStep, stepList } = (0, import_hooks.useAppointmentBookingStep)();
+  const { shopDiscount } = (0, import_hooks.useShopDiscount)();
+  const [showAgreement, setShowAgreement] = (0, import_react.useState)(false);
+  const [agreementContent, setAgreementContent] = (0, import_react.useState)({});
   (0, import_hooks.useAppointmentBookingCart)();
   (0, import_hooks.useAppointmentBookingStep)();
   const [params, setParams] = (0, import_react.useState)({});
   (0, import_react.useEffect)(() => {
     return () => {
+      var _a2;
       setIsAgreeDepositPolicy(false);
+      appointmentBooking.destroy();
+      (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
     };
   }, []);
   (0, import_react.useEffect)(() => {
@@ -158,6 +165,16 @@ var Layout = () => {
       return (_b2 = (_a3 = stepRef == null ? void 0 : stepRef.current) == null ? void 0 : _a3.next) == null ? void 0 : _b2.call(_a3);
     } }));
   }, [isDateSelectedFirst, (_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
+  const isFooter = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (!(0, import_utils.isMobile)()) return false;
+    const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
+    if (isDateSelectedFirst && key === "select-date") return false;
+    return key !== "confirm-information";
+  }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
+  const handleAgreementOk = () => {
+    setShowAgreement(false);
+  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Header.default, null), /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -165,7 +182,7 @@ var Layout = () => {
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "parallel-content-left" }, Com),
     isShowCartCom
-  ), (0, import_utils.isMobile)() && ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key) !== "confirm-information" ? /* @__PURE__ */ import_react.default.createElement(
+  ), isFooter ? /* @__PURE__ */ import_react.default.createElement(
     import_Footer.default,
     {
       onNext: () => {
@@ -173,6 +190,14 @@ var Layout = () => {
         return (_b2 = (_a2 = stepRef == null ? void 0 : stepRef.current) == null ? void 0 : _a2.next) == null ? void 0 : _b2.call(_a2);
       }
     }
+  ) : null, showAgreement ? /* @__PURE__ */ import_react.default.createElement(
+    import_PolicyModal.default,
+    {
+      open: showAgreement,
+      onCancel: handleAgreementOk,
+      item: agreementContent,
+      onChange: () => setLoading(false)
+    }
   ) : null);
 };
 var Content_default = Layout;

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

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

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

@@ -1,3 +1,4 @@
+/// <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

@@ -45,6 +45,8 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
   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 { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
@@ -56,20 +58,20 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     }
   }));
   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 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];
+  (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"]
@@ -78,11 +80,14 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     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 {
       appointmentBooking.next();
@@ -92,31 +97,35 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     if (status === "error") {
       setLoading(false);
     }
-    const newFormStatus = (0, import_utils.updateLists)(formStatus, "id", currentForm == null ? void 0 : currentForm.form_id, {
+    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, currentForm == null ? void 0 : currentForm.id, values);
+    const newData = (0, import_utils.updateBookingFormStorage)(oldData, cart_id, values);
     setOtherData(key, { ...newData });
     appointmentBooking.updateCart({
-      _id: currentForm == null ? void 0 : currentForm.cart_id,
+      _id: cart_id,
       relationForms: [
         {
-          form_id: currentForm == null ? void 0 : currentForm.form_id,
-          form_record_ids: [currentForm == null ? void 0 : currentForm.id]
+          form_id: formId,
+          form_record_ids: [values == null ? void 0 : values.form_record_id]
         }
       ]
     });
   };
   const handleFormFinish = (status, values) => {
+    var _a, _b;
+    setIsClearData(false);
     updateFormStatus(status);
     if (status === "success") {
       setFormStorage(values);
-      if (currentForm == null ? void 0 : currentForm.policy_id) {
-        setAgreementContent({ id: currentForm.policy_id });
+      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();
@@ -127,30 +136,33 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     setShowAgreement(false);
     goToNextForm();
   };
-  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: !(formStorage == null ? void 0 : formStorage[currentForm == null ? void 0 : currentForm.id])
-    }
-  )) : null, showAgreement ? /* @__PURE__ */ import_react.default.createElement(
+  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,
     {
       open: showAgreement,

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

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

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

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

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

@@ -51,11 +51,12 @@ var Header = () => {
   const stepName = (0, import_react.useMemo)(() => {
     var _a2, _b, _c, _d, _e;
     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) || "";
       return import_utils.locales.getText("pisell2.event.select.category")(name);
     }
-    return (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.description;
+    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, _b;
@@ -89,7 +90,7 @@ var Header = () => {
       appointmentBooking.deleteCartItemInfo("resource");
     }
     appointmentBooking.back();
-    if ((resourceStep == null ? void 0 : resourceStep.isSkip) && (resourceStep == null ? void 0 : resourceStep.key) === "select-resource") {
+    if ((resourceStep == null ? void 0 : resourceStep.isSkip) && ((resourceStep == null ? void 0 : resourceStep.key) === "select-resource" || (resourceStep == null ? void 0 : resourceStep.key) === "select-service")) {
       updateStep(resourceStep == null ? void 0 : resourceStep.key, {
         index: currentStep == null ? void 0 : currentStep.index,
         isSkip: false
@@ -106,9 +107,9 @@ var Header = () => {
   return /* @__PURE__ */ import_react.default.createElement(
     import_progressBar.default,
     {
-      title: `${import_utils.locales.getText("pisell2.appointment.step")(
+      title: currentStep ? `${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/Services/index.js

@@ -35,12 +35,12 @@ module.exports = __toCommonJS(Services_exports);
 var import_react = __toESM(require("react"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
-var import_materials = require("@pisell/materials");
 var import_productSelect = __toESM(require("../../../productSelect"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
+var import_utils2 = require("../../utils");
 var Services = (0, import_react.forwardRef)((props, ref) => {
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
@@ -103,11 +103,9 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
           const resources = ((_b = (_a = data == null ? void 0 : data.origin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [];
           const activeStatus = resources.find((item2) => item2.status === 1);
           if (!activeStatus) {
-            return (0, import_materials.PisellToast)({
-              content: import_utils.locales.getText(
-                "pisell2.appointment.no.available.service"
-              )
-            });
+            return (0, import_utils2.Toast)(
+              import_utils.locales.getText("pisell2.appointment.no.available.service")
+            );
           }
           appointmentBooking.storeProduct(product);
           if (type === "duration") {

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

@@ -59,7 +59,7 @@ var VoucherCard = (props) => {
   const context = (0, import_useEngineContext.default)();
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const shopDiscount = (0, import_hooks.useShopDiscount)();
-  const [showDetail, setShowDetail] = (0, import_react.useState)(true);
+  const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const { pisellos, action, token, store } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const { utils } = context.appHelper || {};
   const [code, setCode] = (0, import_react.useState)("");
@@ -204,9 +204,7 @@ var VoucherCard = (props) => {
               discountId: val.id,
               isSelected: val.isSelected
             });
-            batchUpdateCart(
-              detail.productList
-            );
+            batchUpdateCart(detail.productList);
           }
         }
       ) : null,

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

@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+import { TasksManager } from '../../utils/tasks';
 interface AppointmentBookingContextType {
     appointmentBooking: any;
     times: any[];
@@ -19,7 +20,10 @@ interface AppointmentBookingContextType {
     setSelectedTime: (val: any) => void;
     isAgreeDepositPolicy: boolean;
     setIsAgreeDepositPolicy: (val: boolean) => void;
-    setStepParams: (val: any) => void;
+    isLastStep: boolean;
+    tasksManager: TasksManager;
+    policyParams: any;
+    setPolicyParams: (val: any) => void;
     [key: string]: any;
 }
 export declare const AppointmentBookingProvider: ({ children, }: {

package/lib/components/appointmentBooking/context.js

@@ -36,11 +36,12 @@ module.exports = __toCommonJS(context_exports);
 var import_react = __toESM(require("react"));
 var import_hooks = require("./hooks");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
+var import_tasks = require("../../utils/tasks");
 var AppointmentBookingContext = (0, import_react.createContext)(void 0);
 var AppointmentBookingProvider = ({
   children
 }) => {
-  var _a;
+  var _a, _b, _c, _d, _e;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const [summary, setSummary] = (0, import_react.useState)({});
   const [times, setTimes] = (0, import_react.useState)([]);
@@ -51,15 +52,24 @@ var AppointmentBookingProvider = ({
   const [selectedTime, setSelectedTime] = (0, import_react.useState)(null);
   const [isAgreeDepositPolicy, setIsAgreeDepositPolicy] = (0, import_react.useState)(false);
   const [currentResource, setCurrentResource] = (0, import_react.useState)(null);
-  const [stepParams, setStepParams] = (0, import_react.useState)({});
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [isErrorHolder, setIsErrorHolder] = (0, import_react.useState)(false);
+  const [tasksManager] = (0, import_react.useState)(() => new import_tasks.TasksManager());
+  const [policyParams, setPolicyParams] = (0, import_react.useState)(null);
   const { appHelper } = (0, import_useEngineContext.default)();
   const symbolic = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getSymbolic();
   (0, import_react.useEffect)(() => {
     const currentStep2 = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
     setCurrentStep(currentStep2);
   }, []);
+  const isLastStep = (0, import_react.useMemo)(() => {
+    var _a2;
+    const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
+    return key === "confirm-information";
+  }, [
+    (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key,
+    (_e = (_d = (_c = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _c.step) == null ? void 0 : _d.store) == null ? void 0 : _e.stepList
+  ]);
   const value = {
     appointmentBooking,
     times,
@@ -82,12 +92,14 @@ var AppointmentBookingProvider = ({
     setIsAgreeDepositPolicy,
     currentResource,
     setCurrentResource,
-    setStepParams,
-    stepParams,
     loading,
     setLoading,
     isErrorHolder,
-    setIsErrorHolder
+    setIsErrorHolder,
+    isLastStep,
+    tasksManager,
+    policyParams,
+    setPolicyParams
   };
   return /* @__PURE__ */ import_react.default.createElement(AppointmentBookingContext.Provider, { value }, children);
 };

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/deposit/index.d.ts

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

package/lib/components/appointmentBooking/hooks.js

@@ -66,17 +66,11 @@ var contextUtils = () => {
 var useAppointmentBookingStep = () => {
   var _a, _b, _c;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
-  const { appointmentBooking, setCurrentStep, setStepParams, stepParams } = (0, import_context.useAppointmentBookingContext)();
+  const { appointmentBooking, setCurrentStep } = (0, import_context.useAppointmentBookingContext)();
   const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
   const getCurrentAndLastStep = () => {
     const currentStep = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
-    console.log("appointmentBooking_step:changed", currentStep);
     setCurrentStep(currentStep);
-    setStepParams({
-      ...stepParams,
-      isLastStep: (currentStep == null ? void 0 : currentStep.index) === stepList.length - 1,
-      isTwoLastStep: (currentStep == null ? void 0 : currentStep.index) === stepList.length - 2
-    });
   };
   (0, import_react.useEffect)(() => {
     getCurrentAndLastStep();
@@ -84,7 +78,6 @@ var useAppointmentBookingStep = () => {
       "appointmentBooking_step:changed",
       async (res) => {
         if (res.path === "currentStep") {
-          console.log("appointmentBooking_step:changed", res);
           getCurrentAndLastStep();
         }
       }
@@ -158,7 +151,6 @@ var useAppointmentBookingCart = () => {
   const { bookingSubject } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
   const getCartAndSummary = async () => {
     const carts = await appointmentBooking.getCart();
-    console.log(carts, appointmentBooking, utils, "3khhsdjf");
     const newCarts = carts == null ? void 0 : carts.map((item) => {
       return {
         ...item,
@@ -171,7 +163,6 @@ var useAppointmentBookingCart = () => {
     if (!carts.length) {
       setIsAgreeDepositPolicy(false);
     }
-    console.log(carts, summary, "appointmentBooking_cart:changed");
   };
   (0, import_react.useEffect)(() => {
     getCartAndSummary();
@@ -187,7 +178,6 @@ var useAppointmentBookingLogin = () => {
   var _a, _b;
   const utils = contextUtils();
   const isLogin = !!((_b = (_a = utils == null ? void 0 : utils.token) == null ? void 0 : _a.get) == null ? void 0 : _b.call(_a));
-  console.log(isLogin, "isLogin");
   const openLoginModal = (params) => {
     const { callback } = params || {};
     utils.action({
@@ -270,7 +260,6 @@ var useAppointmentBookingResource = () => {
     const _resources = ((_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.resources) || [];
     const resourceCodes = _resources.map((item) => item.code);
     setResources(resources || []);
-    console.log(resourceCodes, resources, "getResourceList");
     return { resources, resourceCodes };
   };
   const getResourceTimeSlot = async (index) => {

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

@@ -102,6 +102,7 @@ declare const _default: {
         'pisell2.appointment.select.time': string;
         'pisell2.appointment.unselect.time': string;
         'pisell2.appointment.unselect.date': string;
+        'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
@@ -216,6 +217,7 @@ declare const _default: {
         'pisell2.appointment.select.time': string;
         'pisell2.appointment.unselect.time': string;
         'pisell2.appointment.unselect.date': string;
+        'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
@@ -330,6 +332,7 @@ declare const _default: {
         'pisell2.appointment.select.time': string;
         'pisell2.appointment.unselect.time': string;
         'pisell2.appointment.unselect.date': string;
+        'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;

package/lib/components/appointmentBooking/locales.js

@@ -23,7 +23,7 @@ __export(locales_exports, {
 });
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
-  "en": {
+  en: {
     "pisell2.event.calendar.limit.unavailable": "Unavailable",
     "pisell2.event.calendar.limit.sold.out": "Sold out",
     "pisell2.event.calendar.limit.call.to.book": "Call to book",
@@ -126,6 +126,7 @@ var locales_default = {
     "pisell2.appointment.select.time": "Select time",
     "pisell2.appointment.unselect.time": "No times available. Go back",
     "pisell2.appointment.unselect.date": "Please select date",
+    "pisell2.appointment.unuse.date": "This date is not available, please change the date.",
     "pisell2.appointment.add-guests": "Add guests",
     "pisell2.text.apply": "Apply",
     "pisell2.text.goodpass": "GoodPass",
@@ -240,6 +241,7 @@ var locales_default = {
     "pisell2.appointment.select.time": "选择时间",
     "pisell2.appointment.unselect.time": "无可用时间，请返回",
     "pisell2.appointment.unselect.date": "请选择日期",
+    "pisell2.appointment.unuse.date": "此日期不可用，请更换日期。",
     "pisell2.appointment.add-guests": "添加预约人",
     "pisell2.text.apply": "应用",
     "pisell2.text.goodpass": "商品券",
@@ -354,6 +356,7 @@ var locales_default = {
     "pisell2.appointment.select.time": "選擇時間",
     "pisell2.appointment.unselect.time": "無可用時間，請返回",
     "pisell2.appointment.unselect.date": "請選擇日期",
+    "pisell2.appointment.unuse.date": "此日期不可用，請更換日期。",
     "pisell2.appointment.add-guests": "添加預約人",
     "pisell2.text.apply": "應用",
     "pisell2.text.goodpass": "商品券",

package/lib/components/appointmentBooking/utils.js

@@ -279,7 +279,8 @@ var Toast = (text) => {
   }
 };
 var checkHasFormStep = ({ isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId: hasResourceFormId2, currentStep, stepList, appointmentBooking, locales: locales2, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c;
+  let isNext = false;
   if (hasResourceFormId2) {
     const index = (currentStep == null ? void 0 : currentStep.index) + 1;
     const description = locales2.getText("pisell2.appointment.fill-form");
@@ -290,6 +291,17 @@ var checkHasFormStep = ({ isSkip, checkHolder, checkAccount, carts, setCarts, ha
   }
   const stepLists = (_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList;
   if ((currentStep == null ? void 0 : currentStep.index) + 2 === (stepLists == null ? void 0 : stepLists.length)) {
+    const _checkHolder = () => {
+      const result = checkHolder({
+        isFormSubject,
+        checkAccount,
+        carts
+      });
+      if (result) {
+        setCarts(result);
+      }
+      if (!!result) return true;
+    };
     if (!isLogin) {
       utils.action({
         type: "pisell1.login",
@@ -308,30 +320,24 @@ var checkHasFormStep = ({ isSkip, checkHolder, checkAccount, carts, setCarts, ha
               getHolders();
             }
             if (isSkip) {
-              appointmentBooking.next();
+              isNext = true;
             }
           }
         }
       });
-      return true;
     } else {
-      appointmentBooking.next();
+      isNext = true;
     }
-    const result = checkHolder({
-      isFormSubject,
-      checkAccount,
-      carts
-    });
-    if (result) {
-      setCarts(result);
+    if (isNext && !_checkHolder()) {
+      appointmentBooking.next();
+    } else {
+      return true;
     }
-    if (!!result) return true;
   } else {
     if (isSkip) {
       appointmentBooking.next();
     }
   }
-  console.log(appointmentBooking, (_f = (_e = (_d = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _d.step) == null ? void 0 : _e.store) == null ? void 0 : _f.stepList, currentStep, "appointmentBooking444");
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -326,6 +326,7 @@ var CustomSelect = (props, ref) => {
               }
             ),
             onClick: () => {
+              if ((item == null ? void 0 : item.status) === "expired") return;
               handleSelectItem(item);
             },
             id: item[rowKey]
@@ -342,6 +343,7 @@ var CustomSelect = (props, ref) => {
           ) : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__custom-select-card-list-item-content" }, mode === "multiple" && /* @__PURE__ */ import_react.default.createElement(
             import_antd.Checkbox,
             {
+              disabled: (item == null ? void 0 : item.status) === "expired",
               className: "custom-select-checkbox",
               checked: (0, import_utils.getItemByArray)(_value, item, rowKey)
             }

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -274,6 +274,9 @@ var Footer = (props) => {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
     }
+    if ((0, import_utils2.getIsSubjectRequire)(state) && (0, import_utils4.checkHolderIsError)(state)) {
+      return;
+    }
     let _setLoading = type === "checkout" ? setCheckoutLoading : setLoading;
     _setLoading(true);
     const { createBooking, editBooking } = getApis();
@@ -300,7 +303,6 @@ var Footer = (props) => {
           );
         }
       }
-      debugger;
       state == null ? void 0 : state.callback(callbackData);
       _setLoading(false);
       return callbackData || values;

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

@@ -28,3 +28,4 @@ export interface ResourceItem {
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
 export declare const formatValues: (state: any) => any;
+export declare const checkHolderIsError: (state: any) => any;