@pisell/private-materials 3.3.19 → 3.3.20

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

@@ -53,7 +53,8 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
     setCarts,
     currentStep,
     setResourceOtherParams,
-    setIsErrorHolder
+    setIsErrorHolder,
+    setPolicyIds
   } = (0, import_context.useAppointmentBookingContext)();
   const {
     getResourceList,
@@ -61,7 +62,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
     getResourceTimeSlot
   } = (0, import_hooks.useAppointmentBookingResource)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
-  const { updateStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const { updateStep, nextStep } = (0, import_hooks.useAppointmentBookingStep)();
   const { openLoginModal, isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
   const { getHolders, checkAccount } = (0, import_hooks.useAppointmentBookingAccount)();
   const { isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
@@ -78,10 +79,11 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
         (0, import_utils3.scrollToFirstErrorCard)();
         return;
       }
-      const resultCarts = (0, import_utils.formatCartsResources)(carts, resources);
+      const resultCarts = (0, import_utils.formatCartsResources)(carts, resources, setPolicyIds);
       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 accountLists = await appointmentBooking.getAccounts();
       const checkResult = (0, import_utils.checkHasFormStep)({
+        nextStep,
         hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0,
         currentStep,
         stepList,
@@ -104,7 +106,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
         errorList: null
       });
       getResourceTimeSlot();
-      appointmentBooking.next();
+      nextStep();
     }
   }));
   const resources = (0, import_react.useMemo)(() => {

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

@@ -47,13 +47,13 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const { isDateSelectedFirst } = (0, import_hooks.useAppointmentBookingSetting)();
   const { getProducts, checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
-  const { removeStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const { removeStep, nextStep } = (0, import_hooks.useAppointmentBookingStep)();
   const { currentStep } = (0, import_context.useAppointmentBookingContext)();
   const [products, setProducts] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
-      appointmentBooking.next();
+      nextStep();
     }
   }));
   (0, import_react.useEffect)(() => {

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

@@ -49,6 +49,7 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
     carts
   } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceTimeSlot, getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
+  const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
       const isUnSelectedTimes = appointmentBooking.checkCartItems("date");
@@ -56,7 +57,7 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
         (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unselect.time"));
         return;
       }
-      appointmentBooking.next();
+      nextStep();
     }
   }));
   (0, import_react.useEffect)(() => {

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

@@ -24,10 +24,12 @@ interface AppointmentBookingContextType {
     tasksManager: TasksManager;
     policyParams: any;
     setPolicyParams: (val: any) => void;
+    openPolicy: (content: any, callback?: any) => void;
+    closePolicy: (val?: boolean) => void;
     [key: string]: any;
 }
 export declare const AppointmentBookingProvider: ({ children, }: {
     children: ReactNode;
 }) => JSX.Element;
-export declare const useAppointmentBookingContext: () => AppointmentBookingContextType;
+export declare const useAppointmentBookingContext: () => AppointmentBookingContextType | undefined;
 export {};

package/lib/components/appointmentBooking/context.js

@@ -42,6 +42,7 @@ var AppointmentBookingProvider = ({
   children
 }) => {
   var _a, _b, _c, _d, _e;
+  const policyIdsRef = (0, import_react.useRef)([]);
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const [summary, setSummary] = (0, import_react.useState)({});
   const [times, setTimes] = (0, import_react.useState)([]);
@@ -62,6 +63,18 @@ var AppointmentBookingProvider = ({
     const currentStep2 = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
     setCurrentStep(currentStep2);
   }, []);
+  const setPolicyIds = (ids) => {
+    policyIdsRef.current = ids;
+  };
+  const openPolicy = (content, callback) => {
+    setPolicyParams({ open: true, content, callback, _ts: Date.now() });
+  };
+  const closePolicy = (isCallback) => {
+    setPolicyParams({ open: false, content: {}, callback: null });
+    if ((policyParams == null ? void 0 : policyParams.callback) && isCallback) {
+      policyParams.callback();
+    }
+  };
   const isLastStep = (0, import_react.useMemo)(() => {
     var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
@@ -99,18 +112,26 @@ var AppointmentBookingProvider = ({
     isLastStep,
     tasksManager,
     policyParams,
-    setPolicyParams
+    setPolicyParams,
+    policyIdsRef,
+    setPolicyIds,
+    openPolicy,
+    closePolicy
   };
   return /* @__PURE__ */ import_react.default.createElement(AppointmentBookingContext.Provider, { value }, children);
 };
 var useAppointmentBookingContext = () => {
-  const context = (0, import_react.useContext)(AppointmentBookingContext);
-  if (context === void 0) {
-    throw new Error(
-      "useAppointmentBookingContext must be used within a AppointmentBookingProvider"
-    );
+  try {
+    const context = (0, import_react.useContext)(AppointmentBookingContext);
+    if (context === void 0) {
+      throw new Error(
+        "useAppointmentBookingContext must be used within a AppointmentBookingProvider"
+      );
+    }
+    return context;
+  } catch (error) {
+    console.log(error, "useAppointmentBookingContext");
   }
-  return context;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -39,19 +39,31 @@ var import_utils = require("@pisell/utils");
 var import_context = require("../../../context");
 var import_index = require("./index.less");
 var DepositModal = (props) => {
-  const { open, onCancel, item, onChange } = props;
+  const {
+    open,
+    onCancel,
+    item,
+    onChange,
+    onConfirm,
+    isHideCheckout = true
+  } = props;
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const [policy, setPolicy] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
+  const [disabled, setDisabled] = (0, import_react.useState)(false);
+  (0, import_react.useEffect)(() => {
+    setDisabled(!isHideCheckout);
+  }, [isHideCheckout]);
   const getPolicy = async (id) => {
     setLoading(true);
     try {
       const { data } = await appointmentBooking.getProtocol(id);
       setPolicy(data);
-      onChange(data);
+      onChange && onChange(data);
     } catch (error) {
       console.log(error);
-      onChange(error);
+      onChange && onChange(error);
+      debugger;
     } finally {
       setLoading(false);
     }
@@ -74,7 +86,30 @@ var DepositModal = (props) => {
       className: "policy-modal-wrap",
       cancelVisible: false,
       okText: import_utils.locales.getText("pisell2.appointment.deposit.close"),
-      onOk: onCancel
+      footer: [
+        /* @__PURE__ */ import_react.default.createElement("div", { className: "policy-modal-footer" }, !isHideCheckout ? /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Checkbox,
+          {
+            className: "policy-modal-checkbox",
+            onChange: (e) => {
+              var _a;
+              return setDisabled(!((_a = e.target) == null ? void 0 : _a.checked));
+            }
+          },
+          import_utils.locales.getText("pisell2.appointment.policy")
+        ) : null, /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Button,
+          {
+            type: "primary",
+            size: "large",
+            onClick: isHideCheckout ? onCancel : onConfirm,
+            disabled
+          },
+          import_utils.locales.getText(
+            isHideCheckout ? "pisell2.appointment.deposit.close" : "pisell2.appointment.policy.confirm"
+          )
+        ))
+      ]
     },
     /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { style: { minHeight: "200px" }, spinning: loading }, (policy == null ? void 0 : policy.content) ? /* @__PURE__ */ import_react.default.createElement(
       "div",

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.less

@@ -6,4 +6,13 @@
   .ant-empty-image {
     height: auto !important;
   }
+
+  .policy-modal-footer {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    .policy-modal-checkbox {
+      margin-bottom: 20px;
+    }
+  }
 }

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

@@ -14,6 +14,7 @@ export declare const useAppointmentBookingStep: () => {
     removeStep: (key: string) => any;
     addStep: (props: any, stepKey?: string) => any;
     updateStep: (key: string, step: any) => void;
+    nextStep: () => void;
 };
 /**
  * @title: 获取商品数据

package/lib/components/appointmentBooking/hooks.js

@@ -66,7 +66,7 @@ var contextUtils = () => {
 var useAppointmentBookingStep = () => {
   var _a, _b, _c;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
-  const { appointmentBooking, setCurrentStep } = (0, import_context.useAppointmentBookingContext)();
+  const { appointmentBooking, setCurrentStep, policyIdsRef, openPolicy } = (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();
@@ -113,7 +113,30 @@ var useAppointmentBookingStep = () => {
       isSkip: (step == null ? void 0 : step.isSkip) || false
     });
   };
-  return { getStepIndex, stepList, removeStep, addStep, updateStep };
+  const nextStep = () => {
+    var _a2, _b2, _c2, _d;
+    const currentStep = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
+    const stepList2 = ((_c2 = (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.step) == null ? void 0 : _b2.store) == null ? void 0 : _c2.stepList) || [];
+    if ((currentStep == null ? void 0 : currentStep.index) + 2 === (stepList2 == null ? void 0 : stepList2.length)) {
+      if ((_d = policyIdsRef == null ? void 0 : policyIdsRef.current) == null ? void 0 : _d.length) {
+        let idx = 0;
+        const showNextPolicy = () => {
+          if (idx < policyIdsRef.current.length) {
+            openPolicy({ id: policyIdsRef.current[idx] }, () => {
+              idx++;
+              showNextPolicy();
+            });
+          } else {
+            appointmentBooking.next();
+          }
+        };
+        showNextPolicy();
+        return;
+      }
+    }
+    appointmentBooking.next();
+  };
+  return { getStepIndex, stepList, removeStep, addStep, updateStep, nextStep };
 };
 var useAppointmentBookingProduct = () => {
   const { appointmentBooking, carts } = (0, import_context.useAppointmentBookingContext)();
@@ -284,13 +307,14 @@ var useAppointmentBookingResource = () => {
 };
 var useIsSkipResourceStep = () => {
   var _a, _b, _c;
-  const { currentStep, setCarts } = (0, import_context.useAppointmentBookingContext)();
+  const { currentStep, setCarts, setPolicyIds } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList, autoSelectAllProductResources } = useAppointmentBookingResource();
   const { isFormSubject } = useAppointmentBookingSetting();
   const appointmentBooking = useAppointmentBooking();
   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 { isLogin, openLoginModal } = useAppointmentBookingLogin();
   const { getHolders, checkAccount } = useAppointmentBookingAccount();
+  const { nextStep } = useAppointmentBookingStep();
   const utils = contextUtils();
   const checkSkipResourceStep = async (isSkipUpdateFormStep) => {
     var _a2, _b2, _c2, _d, _e;
@@ -302,8 +326,8 @@ var useIsSkipResourceStep = () => {
         const { resources } = getResourceList();
         if (!((_a2 = res == null ? void 0 : res.errorList) == null ? void 0 : _a2.length) && ((_e = (_d = (_c2 = (_b2 = resources == null ? void 0 : resources[0]) == null ? void 0 : _b2.resources) == null ? void 0 : _c2[0]) == null ? void 0 : _d.renderList) == null ? void 0 : _e.length) === 1) {
           if (!isSkipUpdateFormStep) {
-            const resultCarts = (0, import_utils2.formatCartsResources)(carts, resources);
-            (0, import_utils2.checkHasFormStep)({ isSkip: true, openLoginModal, utils, accountLists, getHolders, checkHolder: import_utils3.checkHolder, setCarts, checkAccount, carts, isFormSubject, hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0, currentStep, stepList, appointmentBooking, locales: import_utils.locales, isLogin });
+            const resultCarts = (0, import_utils2.formatCartsResources)(carts, resources, setPolicyIds);
+            (0, import_utils2.checkHasFormStep)({ nextStep, isSkip: true, openLoginModal, utils, accountLists, getHolders, checkHolder: import_utils3.checkHolder, setCarts, checkAccount, carts, isFormSubject, hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0, currentStep, stepList, appointmentBooking, locales: import_utils.locales, isLogin });
           }
           return true;
         } else {

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

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

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

@@ -104,6 +104,8 @@ declare const _default: {
         'pisell2.appointment.unselect.date': string;
         'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
+        'pisell2.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -219,6 +221,8 @@ declare const _default: {
         'pisell2.appointment.unselect.date': string;
         'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
+        'pisell2.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -334,6 +338,8 @@ declare const _default: {
         'pisell2.appointment.unselect.date': string;
         'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
+        'pisell2.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;

package/lib/components/appointmentBooking/locales.js

@@ -128,6 +128,8 @@ var locales_default = {
     "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.appointment.policy": "You have read and agreed to this policy",
+    "pisell2.appointment.policy.confirm": "Confirm",
     "pisell2.text.apply": "Apply",
     "pisell2.text.goodpass": "GoodPass",
     "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
@@ -243,6 +245,8 @@ var locales_default = {
     "pisell2.appointment.unselect.date": "请选择日期",
     "pisell2.appointment.unuse.date": "此日期不可用，请更换日期。",
     "pisell2.appointment.add-guests": "添加预约人",
+    "pisell2.appointment.policy": "您已仔细阅读并同意此协议",
+    "pisell2.appointment.policy.confirm": "确定",
     "pisell2.text.apply": "应用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兑换券",
@@ -358,6 +362,8 @@ var locales_default = {
     "pisell2.appointment.unselect.date": "請選擇日期",
     "pisell2.appointment.unuse.date": "此日期不可用，請更換日期。",
     "pisell2.appointment.add-guests": "添加預約人",
+    "pisell2.appointment.policy": "您已仔細閱讀並同意此協議",
+    "pisell2.appointment.policy.confirm": "確定",
     "pisell2.text.apply": "應用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兌換券",

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

@@ -17,7 +17,7 @@ export declare const formatGuest: (data: any[], products: any) => any[];
  * @Author: WangHan
  * @Date: 2025-05-06 22:22
  */
-export declare const formatCartsResources: (carts: any[], resources: any[]) => any[];
+export declare const formatCartsResources: (carts: any[], resources: any[], setPolicyIds: any) => any[];
 /**
  * @title: 格式化购物车数据
  * @description:
@@ -111,4 +111,4 @@ export declare const Toast: (text: string) => void;
  * @Author: WangHan
  * @Date: 2025-05-06 21:51
  */
-export declare const checkHasFormStep: ({ isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => true | undefined;
+export declare const checkHasFormStep: ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => true | undefined;

package/lib/components/appointmentBooking/utils.js

@@ -76,8 +76,9 @@ var formatGuest = (data, products) => {
     };
   });
 };
-var formatCartsResources = (carts, resources) => {
+var formatCartsResources = (carts, resources, setPolicyIds) => {
   try {
+    let policyIds = [];
     let newCarts = carts == null ? void 0 : carts.map((d) => {
       var _a, _b;
       const currentResource = resources == null ? void 0 : resources.find((r) => (d == null ? void 0 : d._id) === (r == null ? void 0 : r._id));
@@ -89,9 +90,12 @@ var formatCartsResources = (carts, resources) => {
           ...d,
           resource_form_id: foundResource == null ? void 0 : foundResource.resource_form_id
         };
+      } else if ((foundResource == null ? void 0 : foundResource.policy_id) && !policyIds.includes(foundResource == null ? void 0 : foundResource.policy_id)) {
+        policyIds.push(foundResource == null ? void 0 : foundResource.policy_id);
       }
       return false;
     }).filter(Boolean);
+    setPolicyIds(policyIds);
     return newCarts || [];
   } catch (error) {
     console.log(error, "formatCarts");
@@ -278,7 +282,7 @@ var Toast = (text) => {
     window == null ? void 0 : window.alert(text);
   }
 };
-var checkHasFormStep = ({ isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId: hasResourceFormId2, currentStep, stepList, appointmentBooking, locales: locales2, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }) => {
+var checkHasFormStep = ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId: hasResourceFormId2, currentStep, stepList, appointmentBooking, locales: locales2, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }) => {
   var _a, _b, _c;
   let isNext = false;
   if (hasResourceFormId2) {
@@ -329,13 +333,13 @@ var checkHasFormStep = ({ isSkip, checkHolder, checkAccount, carts, setCarts, ha
       isNext = true;
     }
     if (isNext && !_checkHolder()) {
-      appointmentBooking.next();
+      nextStep();
     } else {
       return true;
     }
   } else {
     if (isSkip) {
-      appointmentBooking.next();
+      nextStep();
     }
   }
 };

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

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

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

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

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

@@ -106,7 +106,7 @@ var Deposit = (props) => {
   }, [globalState]);
   const depositList = (0, import_react.useMemo)(() => {
     if (!bookingId) return [];
-    if (Number(bookingDetail == null ? void 0 : bookingDetail.deposit_amount) === 0) return [];
+    if ((bookingDetail == null ? void 0 : bookingDetail.is_deposit) === 0) return [];
     return [
       {
         customer: bookingDetail == null ? void 0 : bookingDetail.customer,

package/lib/components/ticketBooking/components/ticketBooking/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.19",
+  "version": "3.3.20",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.42",
-    "@pisell/date-picker": "3.0.2",
+    "@pisell/icon": "0.0.11",
     "@pisell/materials": "3.3.7",
-    "@pisell/icon": "0.0.11"
+    "@pisell/date-picker": "3.0.2",
+    "@pisell/utils": "1.0.42"
   },
   "peerDependencies": {
     "react": "^18.0.0",