@pisell/private-materials 6.3.126 → 6.3.127

package/lib/components/appointmentBooking/hooks.js

@@ -49,6 +49,7 @@ var import_useEngineContext2 = __toESM(require("../../hooks/useEngineContext"));
 var import_utils2 = require("./utils");
 var import_context = require("./context");
 var import_utils3 = require("./components/Resource/utils");
+var import_utils4 = require("./utils");
 var useAppointmentBooking = () => {
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
   return pisellOS.getModule("appointmentBooking");
@@ -127,13 +128,19 @@ var useAppointmentBookingStep = () => {
       isSkip: (step == null ? void 0 : step.isSkip) || false
     });
   };
-  const nextStep = () => {
+  const nextStep = (isLog = false) => {
     var _a2, _b2, _c2, _d, _e, _f, _g;
     let stepList2 = appointmentBooking.getStepList() || [];
     const currentKey = currentStepParams == null ? void 0 : currentStepParams.key;
     const currentSelectedResources = appointmentBooking.getOtherData(
       "current_selected_resources"
     );
+    if (isLog) {
+      (0, import_utils4.nextStepLog)(utils, "开始执行下一步方法", [
+        { key: "步骤列表", value: JSON.stringify(stepList2) },
+        { key: "当前步骤参数", value: JSON.stringify(currentStepParams) }
+      ]);
+    }
     if (!isRetailTemplate && currentKey === "select-service") {
       const { bookingProcess } = ((_a2 = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a2.productModuleParams) || {};
       const isDateSelectedFirst = bookingProcess === "date_first";
@@ -270,55 +277,96 @@ var useAppointmentBookingStep = () => {
     if (((_f = nextStep2 == null ? void 0 : nextStep2.key) == null ? void 0 : _f.startsWith("select-resource_")) || (nextStep2 == null ? void 0 : nextStep2.key) === "confirm-information") {
       const selectedResource = ((_g = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _g.currentSelectedResource) || {};
       const renderItem = (selectedResource == null ? void 0 : selectedResource.renderItem) || {};
+      if (isLog) {
+        (0, import_utils4.nextStepLog)(utils, "开始检测是否登录和打开协议弹窗", [
+          { key: "下一步步骤", value: JSON.stringify(nextStep2) },
+          { key: "渲染项", value: JSON.stringify(renderItem) }
+        ]);
+      }
+      const logNextStepAsyncError = (error) => {
+        const msg = (error == null ? void 0 : error.message) || "未知错误";
+        (0, import_utils4.nextStepLog)(utils, "登录检测登录异常", [
+          { key: "错误信息", value: msg }
+        ]);
+      };
       const checkHolder = async () => {
-        setLoading(false);
-        if (isRetailTemplate || (appointmentBooking == null ? void 0 : appointmentBooking.isCartAllNormalProducts())) {
-          return appointmentBooking.next();
-        }
-        let cartLists = carts || [];
-        if (!(carts == null ? void 0 : carts.length)) {
-          const newCarts = await appointmentBooking.getCart();
-          cartLists = newCarts || [];
-        } else {
-          cartLists = carts || [];
-        }
-        const appoimentCarts = cartLists.filter(
-          (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
-        );
-        const { hasError } = (0, import_utils2.checkAndGoNext)(
-          isFormSubject,
-          checkAccount,
-          appoimentCarts
-        );
-        setIsErrorHolder(hasError);
-        if (hasError) {
-          return;
-        }
-        if (!!(renderItem == null ? void 0 : renderItem.policy_id)) {
-          openPolicy({ id: renderItem == null ? void 0 : renderItem.policy_id }, () => {
+        try {
+          setLoading(false);
+          if (isRetailTemplate || (appointmentBooking == null ? void 0 : appointmentBooking.isCartAllNormalProducts())) {
             return appointmentBooking.next();
-          });
-        } else {
-          return appointmentBooking.next();
+          }
+          let cartLists = carts || [];
+          if (!(carts == null ? void 0 : carts.length)) {
+            const newCarts = await appointmentBooking.getCart();
+            cartLists = newCarts || [];
+          } else {
+            cartLists = carts || [];
+          }
+          const appoimentCarts = cartLists.filter(
+            (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
+          );
+          const { hasError } = (0, import_utils2.checkAndGoNext)(
+            isFormSubject,
+            checkAccount,
+            appoimentCarts
+          );
+          setIsErrorHolder(hasError);
+          if (isLog) {
+            (0, import_utils4.nextStepLog)(utils, "开始检测holder数据", [
+              { key: "是否有错误", value: hasError },
+              { key: "协议id", value: renderItem == null ? void 0 : renderItem.policy_id }
+            ]);
+          }
+          if (hasError) {
+            return;
+          }
+          if (!!(renderItem == null ? void 0 : renderItem.policy_id)) {
+            openPolicy({ id: renderItem == null ? void 0 : renderItem.policy_id }, () => {
+              return appointmentBooking.next();
+            });
+          } else {
+            return appointmentBooking.next();
+          }
+        } catch (error) {
+          setLoading(false);
+          logNextStepAsyncError(error);
         }
       };
       const checkLogin = async () => {
-        if (!isLogin) {
-          const { pubsub } = utils;
-          pubsub.once("pisell1.login.success", (res) => {
-            if (res === "success") {
-              checkHolder();
-            }
-            if (res === "close") {
-              setLoading(false);
-            }
-          });
-          return openLoginModal({
-            callback: (status) => {
+        try {
+          if (isLog) {
+            (0, import_utils4.nextStepLog)(utils, "开始检测是否登录", [
+              { key: "是否登录", value: isLogin }
+            ]);
+          }
+          if (!isLogin) {
+            const { pubsub } = utils;
+            if (isLog) {
+              (0, import_utils4.nextStepLog)(utils, "进入打开登录弹窗");
             }
-          });
-        } else {
-          return checkHolder();
+            pubsub.once("pisell1.login.success", (res) => {
+              if (isLog) {
+                (0, import_utils4.nextStepLog)(utils, "登录弹窗回调", [
+                  { key: "登录状态", value: res }
+                ]);
+              }
+              if (res === "success") {
+                checkHolder();
+              }
+              if (res === "close") {
+                setLoading(false);
+              }
+            });
+            return openLoginModal({
+              callback: (status) => {
+              }
+            });
+          } else {
+            return checkHolder();
+          }
+        } catch (error) {
+          setLoading(false);
+          logNextStepAsyncError(error);
         }
       };
       if ((nextStep2 == null ? void 0 : nextStep2.key) !== "confirm-information") {

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

@@ -362,5 +362,245 @@ declare const _default: {
         'pisell2.text.goodpass.login-tip': string;
         'pisell2.text.contact-info.title': string;
     };
+    ja: {
+        'pisell2.event.calendar.limit.unavailable': string;
+        'pisell2.event.calendar.limit.sold.out': string;
+        'pisell2.event.calendar.limit.call.to.book': string;
+        'pisell2.event.calendar.limit.filling.up.fast': string;
+        'pisell2.event.calendar.limit.lots.of.space': string;
+        'pisell2.event.calendar.booking-closed': string;
+        'pisell2.event.calendar.call-to-book': string;
+        'pisell2.event.calendar.email-to-book': string;
+        'pisell2.event.close.title': string;
+        'pisell2.event.close.tip': string;
+        'pisell2.event.close.continue': string;
+        'pisell2.event.close.exit': string;
+        'pisell2.appointment.step': (step: number) => string;
+        'pisell2.event.select.category': (val: string) => string;
+        'pisell2.event.select.campus': (val: string) => string;
+        'pisell2.event.select.event': string;
+        'pisell2.event.cart': string;
+        'pisell2.event.total': string;
+        'pisell2.event.total.gst': (val: string, amount: any) => string;
+        'pisell2.event.continue': string;
+        'pisell2.event.details': string;
+        'pisell2.event.introduction': string;
+        'pisell2.event.schedule': string;
+        'pisell2.event.teacher': string;
+        'pisell2.event.campus': string;
+        'pisell2.event.resource': string;
+        'pisell2.event.booking.options': string;
+        'pisell2.event.add.to.cart': string;
+        'pisell2.event.description': string;
+        'pisell2.event.view.more': string;
+        'pisell2.event.view.less': string;
+        'pisell2.event.holder.modal.title': string;
+        'pisell2.event.confirm': string;
+        'pisell2.event.confirm.information': string;
+        'pisell2.event.confirm.information.tip': string;
+        'pisell2.event.confirm.information.other': string;
+        'pisell2.event.add.others': string;
+        'pisell2.event.checkout': string;
+        'pisell2.event.edit.event': string;
+        'pisell2.event.remove': string;
+        'pisell2.event.option': string;
+        'pisell2.event.order.items.error.title': string;
+        'pisell2.event.order.items.error.tip': (val: number) => string;
+        'pisell2.event.order.items.error.proceed': string;
+        'pisell2.event.order.items.error.return': string;
+        'pisell2.event.order.items.error.back': string;
+        'pisell2.event.order.items.error.continue': string;
+        'pisell2.event.order.items.error.all.tip': string;
+        'pisell2.event.remove.title': string;
+        'pisell2.event.remove.tip': string;
+        'pisell2.event.remove.cancel': string;
+        'pisell2.event.create': string;
+        'pisell2.event.search': string;
+        'pisell2.event.empty.service': string;
+        'pisell2.event.title': (val: number) => string;
+        'pisell2.event.create.form': string;
+        'pisell2.event.empty.event': string;
+        'pisell2.event.error.holder': string;
+        'pisell2.event.price.from': string;
+        'pisell2.event.empty.holder.title': string;
+        'pisell2.event.empty.holder.tip': string;
+        'pisell2.event.empty.holder.continue.tip': string;
+        'pisell2.event.empty.holder.go.back': string;
+        'pisell2.event.empty.holder.continue.anyway': string;
+        'pisell2.event.event.full.title': string;
+        'pisell2.event.event.full.tip': string;
+        'pisell2.event.event.full.ok': string;
+        'pisell2.event.capacity.limit.reached.title': string;
+        'pisell2.event.capacity.limit.reached.tip': string;
+        'pisell2.appointment.booking.empty.service': string;
+        'pisell2.appointment.booking.empty.data': string;
+        'pisell2.appointment.booking.empty.time': string;
+        'pisell2.appointment.service.title': (val: number) => string;
+        'pisell2.appointment.add.guest': string;
+        'pisell2.appointment.edit.service': string;
+        'pisell2.appointment.remove.guest': string;
+        'pisell2.appointment.no.available.service': string;
+        'pisell2.appointment.max.guest': string;
+        'pisell2.appointment.no.available.time': string;
+        'pisell2.appointment.monday': string;
+        'pisell2.appointment.tuesday': string;
+        'pisell2.appointment.wednesday': string;
+        'pisell2.appointment.thursday': string;
+        'pisell2.appointment.friday': string;
+        'pisell2.appointment.saturday': string;
+        'pisell2.appointment.sunday': string;
+        'pisell2.appointment.any.professional': string;
+        'pisell2.appointment.for.maximum.availability': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.tips': string;
+        'pisell2.appointment.tips.content': string;
+        'pisell2.appointment.fill-form': string;
+        'pisell2.appointment.select.holder': (val: string) => string;
+        '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.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
+        'pisell2.appointment.resource.tip': (val: string) => string;
+        'pisell2.text.apply': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.login': string;
+        'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
+    };
+    pt: {
+        'pisell2.event.calendar.limit.unavailable': string;
+        'pisell2.event.calendar.limit.sold.out': string;
+        'pisell2.event.calendar.limit.call.to.book': string;
+        'pisell2.event.calendar.limit.filling.up.fast': string;
+        'pisell2.event.calendar.limit.lots.of.space': string;
+        'pisell2.event.calendar.booking-closed': string;
+        'pisell2.event.calendar.call-to-book': string;
+        'pisell2.event.calendar.email-to-book': string;
+        'pisell2.event.close.title': string;
+        'pisell2.event.close.tip': string;
+        'pisell2.event.close.continue': string;
+        'pisell2.event.close.exit': string;
+        'pisell2.appointment.step': (step: number) => string;
+        'pisell2.event.select.category': (val: string) => string;
+        'pisell2.event.select.campus': (val: string) => string;
+        'pisell2.event.select.event': string;
+        'pisell2.event.cart': string;
+        'pisell2.event.total': string;
+        'pisell2.event.total.gst': (val: string, amount: any) => string;
+        'pisell2.event.continue': string;
+        'pisell2.event.details': string;
+        'pisell2.event.introduction': string;
+        'pisell2.event.schedule': string;
+        'pisell2.event.teacher': string;
+        'pisell2.event.campus': string;
+        'pisell2.event.resource': string;
+        'pisell2.event.booking.options': string;
+        'pisell2.event.add.to.cart': string;
+        'pisell2.event.description': string;
+        'pisell2.event.view.more': string;
+        'pisell2.event.view.less': string;
+        'pisell2.event.holder.modal.title': string;
+        'pisell2.event.confirm': string;
+        'pisell2.event.confirm.information': string;
+        'pisell2.event.confirm.information.tip': string;
+        'pisell2.event.confirm.information.other': string;
+        'pisell2.event.add.others': string;
+        'pisell2.event.checkout': string;
+        'pisell2.event.edit.event': string;
+        'pisell2.event.remove': string;
+        'pisell2.event.option': string;
+        'pisell2.event.order.items.error.title': string;
+        'pisell2.event.order.items.error.tip': (val: number) => string;
+        'pisell2.event.order.items.error.proceed': string;
+        'pisell2.event.order.items.error.return': string;
+        'pisell2.event.order.items.error.back': string;
+        'pisell2.event.order.items.error.continue': string;
+        'pisell2.event.order.items.error.all.tip': string;
+        'pisell2.event.remove.title': string;
+        'pisell2.event.remove.tip': string;
+        'pisell2.event.remove.cancel': string;
+        'pisell2.event.create': string;
+        'pisell2.event.search': string;
+        'pisell2.event.empty.service': string;
+        'pisell2.event.title': (val: number) => string;
+        'pisell2.event.create.form': string;
+        'pisell2.event.empty.event': string;
+        'pisell2.event.error.holder': string;
+        'pisell2.event.price.from': string;
+        'pisell2.event.empty.holder.title': string;
+        'pisell2.event.empty.holder.tip': string;
+        'pisell2.event.empty.holder.continue.tip': string;
+        'pisell2.event.empty.holder.go.back': string;
+        'pisell2.event.empty.holder.continue.anyway': string;
+        'pisell2.event.event.full.title': string;
+        'pisell2.event.event.full.tip': string;
+        'pisell2.event.event.full.ok': string;
+        'pisell2.event.capacity.limit.reached.title': string;
+        'pisell2.event.capacity.limit.reached.tip': string;
+        'pisell2.appointment.booking.empty.service': string;
+        'pisell2.appointment.booking.empty.data': string;
+        'pisell2.appointment.booking.empty.time': string;
+        'pisell2.appointment.service.title': (val: number) => string;
+        'pisell2.appointment.add.guest': string;
+        'pisell2.appointment.edit.service': string;
+        'pisell2.appointment.remove.guest': string;
+        'pisell2.appointment.no.available.service': string;
+        'pisell2.appointment.max.guest': string;
+        'pisell2.appointment.no.available.time': string;
+        'pisell2.appointment.monday': string;
+        'pisell2.appointment.tuesday': string;
+        'pisell2.appointment.wednesday': string;
+        'pisell2.appointment.thursday': string;
+        'pisell2.appointment.friday': string;
+        'pisell2.appointment.saturday': string;
+        'pisell2.appointment.sunday': string;
+        'pisell2.appointment.any.professional': string;
+        'pisell2.appointment.for.maximum.availability': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.tips': string;
+        'pisell2.appointment.tips.content': string;
+        'pisell2.appointment.fill-form': string;
+        'pisell2.appointment.select.holder': (val: string) => string;
+        '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.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
+        'pisell2.appointment.resource.tip': (val: string) => string;
+        'pisell2.text.apply': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.login': string;
+        'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
+    };
 };
 export default _default;