@pisell/private-materials 3.3.19 → 3.3.21

package/es/components/appointmentBooking/hooks.js

@@ -47,7 +47,9 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
   var pisellOS = usePisellOS();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    setCurrentStep = _useAppointmentBookin.setCurrentStep;
+    setCurrentStep = _useAppointmentBookin.setCurrentStep,
+    policyIdsRef = _useAppointmentBookin.policyIdsRef,
+    openPolicy = _useAppointmentBookin.openPolicy;
   var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.step) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.stepList) || [];
 
   // 判断是否是最后一步
@@ -117,12 +119,46 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
       isSkip: (step === null || step === void 0 ? void 0 : step.isSkip) || false
     });
   };
+
+  // 下一步
+  var nextStep = function nextStep() {
+    var _appointmentBooking$s2;
+    var currentStep = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.getCurrentStep();
+    var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.step) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.store) === null || _appointmentBooking$s2 === void 0 ? void 0 : _appointmentBooking$s2.stepList) || [];
+
+    // 倒数第二步
+    if ((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2 === (stepList === null || stepList === void 0 ? void 0 : stepList.length)) {
+      var _policyIdsRef$current;
+      // 如果没有同意资源上挂接的协议，则打开协议弹窗
+      if (policyIdsRef !== null && policyIdsRef !== void 0 && (_policyIdsRef$current = policyIdsRef.current) !== null && _policyIdsRef$current !== void 0 && _policyIdsRef$current.length) {
+        // 依次弹出所有协议
+        var idx = 0;
+        var showNextPolicy = function showNextPolicy() {
+          if (idx < policyIdsRef.current.length) {
+            openPolicy({
+              id: policyIdsRef.current[idx]
+            }, function () {
+              idx++;
+              showNextPolicy();
+            });
+          } else {
+            // 全部同意后，进入下一步
+            appointmentBooking.next();
+          }
+        };
+        showNextPolicy();
+        return;
+      }
+    }
+    appointmentBooking.next();
+  };
   return {
     getStepIndex: getStepIndex,
     stepList: stepList,
     removeStep: removeStep,
     addStep: addStep,
-    updateStep: updateStep
+    updateStep: updateStep,
+    nextStep: nextStep
   };
 };
 
@@ -575,23 +611,26 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
  * @Date: 2025-04-21 11:47
  */
 export var useIsSkipResourceStep = function useIsSkipResourceStep() {
-  var _appointmentBooking$s2;
+  var _appointmentBooking$s3;
   var _useAppointmentBookin5 = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin5.currentStep,
-    setCarts = _useAppointmentBookin5.setCarts;
+    setCarts = _useAppointmentBookin5.setCarts,
+    setPolicyIds = _useAppointmentBookin5.setPolicyIds;
   var _useAppointmentBookin6 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin6.getResourceList,
     autoSelectAllProductResources = _useAppointmentBookin6.autoSelectAllProductResources;
   var _useAppointmentBookin7 = useAppointmentBookingSetting(),
     isFormSubject = _useAppointmentBookin7.isFormSubject;
   var appointmentBooking = useAppointmentBooking();
-  var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.step) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.store) === null || _appointmentBooking$s2 === void 0 ? void 0 : _appointmentBooking$s2.stepList) || [];
+  var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s3 = appointmentBooking.store) === null || _appointmentBooking$s3 === void 0 || (_appointmentBooking$s3 = _appointmentBooking$s3.step) === null || _appointmentBooking$s3 === void 0 || (_appointmentBooking$s3 = _appointmentBooking$s3.store) === null || _appointmentBooking$s3 === void 0 ? void 0 : _appointmentBooking$s3.stepList) || [];
   var _useAppointmentBookin8 = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin8.isLogin,
     openLoginModal = _useAppointmentBookin8.openLoginModal;
   var _useAppointmentBookin9 = useAppointmentBookingAccount(),
     getHolders = _useAppointmentBookin9.getHolders,
     checkAccount = _useAppointmentBookin9.checkAccount;
+  var _useAppointmentBookin10 = useAppointmentBookingStep(),
+    nextStep = _useAppointmentBookin10.nextStep;
   var utils = contextUtils();
   var checkSkipResourceStep = /*#__PURE__*/function () {
     var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(isSkipUpdateFormStep) {
@@ -622,8 +661,9 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
               break;
             }
             if (!isSkipUpdateFormStep) {
-              resultCarts = formatCartsResources(carts, resources); // 如果当前资源有表单，则添加表单步骤，否则删除表单步骤
+              resultCarts = formatCartsResources(carts, resources, setPolicyIds); // 如果当前资源有表单，则添加表单步骤，否则删除表单步骤
               checkHasFormStep({
+                nextStep: nextStep,
                 isSkip: true,
                 openLoginModal: openLoginModal,
                 utils: utils,
@@ -683,8 +723,8 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
 export var useAppointmentBookingSetting = function useAppointmentBookingSetting() {
   var _appointmentBooking$o3;
   var utils = contextUtils();
-  var _useAppointmentBookin10 = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin10.appointmentBooking;
+  var _useAppointmentBookin11 = useAppointmentBookingContext(),
+    appointmentBooking = _useAppointmentBookin11.appointmentBooking;
   var _ref21 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o3 = appointmentBooking.otherParams) === null || _appointmentBooking$o3 === void 0 ? void 0 : _appointmentBooking$o3.productModuleParams) || {},
     bookingProcess = _ref21.bookingProcess,
     bookingSubject = _ref21.bookingSubject,

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

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

package/es/components/appointmentBooking/locales.js

@@ -120,6 +120,8 @@ export 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',
@@ -251,6 +253,8 @@ export 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': '商品兑换券',
@@ -382,6 +386,8 @@ export 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/es/components/appointmentBooking/utils.js

@@ -57,8 +57,9 @@ export var formatGuest = function formatGuest(data, products) {
  * @Author: WangHan
  * @Date: 2025-05-06 22:22
  */
-export var formatCartsResources = function formatCartsResources(carts, resources) {
+export var formatCartsResources = function formatCartsResources(carts, resources, setPolicyIds) {
   try {
+    var policyIds = [];
     var newCarts = carts === null || carts === void 0 ? void 0 : carts.map(function (d) {
       var _currentResource$reso;
       var currentResource = resources === null || resources === void 0 ? void 0 : resources.find(function (r) {
@@ -77,9 +78,13 @@ export var formatCartsResources = function formatCartsResources(carts, resources
         return _objectSpread(_objectSpread({}, d), {}, {
           resource_form_id: foundResource === null || foundResource === void 0 ? void 0 : foundResource.resource_form_id
         });
+      } else if (foundResource !== null && foundResource !== void 0 && foundResource.policy_id && !policyIds.includes(foundResource === null || foundResource === void 0 ? void 0 : foundResource.policy_id)) {
+        // 资源上没有挂接表单，但是有协议，则在触发按钮的时候需要同意协议才能继续
+        policyIds.push(foundResource === null || foundResource === void 0 ? void 0 : foundResource.policy_id);
       }
       return false;
     }).filter(Boolean);
+    setPolicyIds(policyIds);
     return newCarts || [];
   } catch (error) {
     console.log(error, 'formatCarts');
@@ -371,7 +376,8 @@ export var Toast = function Toast(text) {
  */
 export var checkHasFormStep = function checkHasFormStep(_ref2) {
   var _appointmentBooking$s;
-  var isSkip = _ref2.isSkip,
+  var nextStep = _ref2.nextStep,
+    isSkip = _ref2.isSkip,
     checkHolder = _ref2.checkHolder,
     checkAccount = _ref2.checkAccount,
     carts = _ref2.carts,
@@ -453,14 +459,14 @@ export var checkHasFormStep = function checkHasFormStep(_ref2) {
       isNext = true;
     }
     if (isNext && !_checkHolder()) {
-      appointmentBooking.next();
+      nextStep();
     } else {
       return true;
     }
   } else {
     // 如果只有一个资源执行跳过
     if (isSkip) {
-      appointmentBooking.next();
+      nextStep();
     }
   }
 };

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

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

package/es/components/booking/components/footer/utils.js

@@ -165,7 +165,7 @@ var checkResourcesFormat = function checkResourcesFormat(resources, service, isC
       children: (_resource$children = resource.children) !== null && _resource$children !== void 0 && _resource$children.length ? checkResourcesFormat(resource.children, service, true) : undefined,
       form_id: resource.form_id,
       relation_type: resource.relation_type || 'form',
-      relation_id: resource.relation_id || resource.id || 0,
+      relation_id: resource.relation_id || 0,
       capacity: resource.capacity,
       like_status: resource.like_status || 'common',
       metadata: resource.metadata || {}

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

@@ -97,7 +97,7 @@ var Deposit = function Deposit(props) {
   }, [globalState]);
   var depositList = useMemo(function () {
     if (!bookingId) return [];
-    if (Number(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.deposit_amount) === 0) return [];
+    if ((bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.is_deposit) === 0) return [];
     return [{
       customer: bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.customer,
       status: bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.deposit_payment_status,

package/es/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/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -95,6 +95,7 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
         }
       }
     } catch (error) {
+      (0, import_utils2.Toast)((error == null ? void 0 : error.message) || "");
       setTimeout(() => {
         setLoading(false);
       }, 50);

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

@@ -58,15 +58,15 @@ var Layout = () => {
     resourceOtherParams,
     setIsAgreeDepositPolicy,
     appointmentBooking,
-    setLoading
+    setLoading,
+    policyParams,
+    closePolicy
   } = (0, import_context.useAppointmentBookingContext)();
   const { getLoadAllSchedule, isDateSelectedFirst, isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
   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)({});
@@ -172,9 +172,6 @@ var Layout = () => {
     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",
     {
@@ -190,13 +187,16 @@ 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(
+  ) : null, (policyParams == null ? void 0 : policyParams.open) ? /* @__PURE__ */ import_react.default.createElement(
     import_PolicyModal.default,
     {
-      open: showAgreement,
-      onCancel: handleAgreementOk,
-      item: agreementContent,
-      onChange: () => setLoading(false)
+      key: policyParams == null ? void 0 : policyParams._ts,
+      open: policyParams == null ? void 0 : policyParams.open,
+      onCancel: () => closePolicy(false),
+      onConfirm: () => closePolicy(true),
+      item: policyParams == null ? void 0 : policyParams.content,
+      onChange: () => setLoading(false),
+      isHideCheckout: false
     }
   ) : null);
 };

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

@@ -41,25 +41,37 @@ var import_utils = require("@pisell/utils");
 var import_icons = require("@ant-design/icons");
 var import_context = require("../../context");
 var import_utils2 = require("../../utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_hooks = require("../../hooks");
+var import_state = require("./state");
 var import_index = require("./index.less");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 var Date = (0, import_react.forwardRef)((props, ref) => {
+  var _a, _b, _c;
   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)();
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const { isDateSelectedFirst, customPageId, getLoadAllSchedule, channel } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const context = (0, import_useEngineContext.default)();
   (0, import_react.useImperativeHandle)(ref, () => ({
-    next: async () => {
-      const data = await appointmentBooking.getDateRange();
-      if (!(data == null ? void 0 : data.length)) {
-        return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unselect.date"));
+    next: handleNext
+  }));
+  const handleNext = async () => {
+    const data = await appointmentBooking.getDateRange();
+    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"));
       }
-      appointmentBooking.next();
     }
-  }));
+    nextStep();
+  };
   const weekListText = [
     import_utils.locales.getText("pisell2.appointment.sunday"),
     import_utils.locales.getText("pisell2.appointment.monday"),
@@ -76,12 +88,17 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
   );
   (0, import_react.useEffect)(() => {
     const getCurrentMonthData = async () => {
-      var _a;
+      var _a2;
       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)());
+      setCurrentMonth((0, import_dayjs.default)((_a2 = data == null ? void 0 : data[0]) == null ? void 0 : _a2.date) || (0, import_dayjs.default)());
     };
     getCurrentMonthData();
   }, []);
+  const locale = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    const currentLocale = (_b2 = (_a2 = context == null ? void 0 : context.engine) == null ? void 0 : _a2.props) == null ? void 0 : _b2.locale;
+    return import_state.localeTypes[currentLocale] || "en";
+  }, [(_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale]);
   const getMonthData = (date) => {
     const firstDay = (0, import_dayjs.default)(`${date}-01`);
     const startDay = firstDay.day();
@@ -119,7 +136,7 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
     return await appointmentBooking.getAvailableDate(params);
   };
   const getDates = async (date) => {
-    var _a;
+    var _a2;
     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");
@@ -131,7 +148,7 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
       const selected = await appointmentBooking.getDateRange();
       console.log(data, selected, customPageId, "getDates");
       if ((selected == null ? void 0 : selected.length) > 0) {
-        setCurrentDate((_a = selected == null ? void 0 : selected[0]) == null ? void 0 : _a.date);
+        setCurrentDate((_a2 = selected == null ? void 0 : selected[0]) == null ? void 0 : _a2.date);
       } else if (!isDateSelectedFirst) {
         if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM")) {
           const firstAvailableDate = (data || []).find(
@@ -183,7 +200,7 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
     setCurrentDate(date);
     appointmentBooking.setDateRange([day]);
     if (isDateSelectedFirst) {
-      appointmentBooking.next();
+      handleNext();
     }
   };
   return /* @__PURE__ */ import_react.default.createElement(
@@ -203,7 +220,7 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
         }
       },
       /* @__PURE__ */ import_react.default.createElement(import_icons.CaretLeftOutlined, null)
-    ), /* @__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) => {
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "calendar-current-month" }, (_c = (0, import_dayjs.default)(currentMonth).locale(locale)) == null ? void 0 : _c.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,

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

@@ -33,6 +33,7 @@ __export(state_exports, {
   getCallToBookStatus: () => getCallToBookStatus,
   getNextSevenDaysList: () => getNextSevenDaysList,
   getStatus: () => getStatus,
+  localeTypes: () => localeTypes,
   statusColor: () => statusColor,
   weekListText: () => weekListText
 });
@@ -184,12 +185,18 @@ var getCallToBookStatus = (currentDate, dateLimitData, cutTime) => {
   }
   return isShowCallToBook;
 };
+var localeTypes = {
+  "en-US": "en",
+  "zh-CN": "zh-cn",
+  "zh-TW": "zh-tw"
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ShowDayOnly,
   getCallToBookStatus,
   getNextSevenDaysList,
   getStatus,
+  localeTypes,
   statusColor,
   weekListText
 });

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

@@ -50,6 +50,7 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
   const { carts, appointmentBooking, setLoading } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { setOtherData, getOtherData } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
       var _a, _b;
@@ -90,7 +91,7 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
         setLoading(false);
       }
     } else {
-      appointmentBooking.next();
+      nextStep();
     }
   };
   const updateFormStatus = (status) => {
@@ -166,9 +167,11 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     import_PolicyModal.default,
     {
       open: showAgreement,
-      onCancel: handleAgreementOk,
+      onCancel: () => setShowAgreement(false),
+      onConfirm: () => handleAgreementOk(),
       item: agreementContent,
-      onChange: () => setLoading(false)
+      onChange: () => setLoading(false),
+      isHideCheckout: false
     }
   ) : null);
 });

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

@@ -46,9 +46,10 @@ var Guest = (0, import_react.forwardRef)((props, ref) => {
   const [holderItem, setHolderItem] = (0, import_react.useState)(null);
   const { carts, appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
+  const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
-      appointmentBooking.next();
+      nextStep();
     }
   }));
   const lists = (0, import_react.useMemo)(() => {

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.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 = {