@pisell/private-materials 6.1.6 → 6.1.8

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -43,6 +43,7 @@ var import_serve = require("../../../../../Sales/Event/serve");
 var import_ahooks = require("ahooks");
 var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
+var import_utils3 = require("../../../../../appointmentBooking/utils");
 var ContinueButton = () => {
   var _a, _b;
   const { data } = (0, import_Sales.useSales)();
@@ -53,9 +54,11 @@ var ContinueButton = () => {
     onCheckout,
     createBooking,
     onCheckBeforeBooking,
-    checkBeforeBooking
+    checkBeforeBooking,
+    freePay
   } = (0, import_Sales.useCheckout)();
   const { openLoginModal, isLogin } = (0, import_Sales.useCustomer)();
+  const { deposit, isAgreeDepositPolicy } = (0, import_Sales.useSummary)();
   const [openCheckout, setOpenCheckout] = (0, import_react.useState)(false);
   const [checkedNumber, setCheckedNumber] = (0, import_react.useState)(0);
   const [openEmptyHolder, setOpenEmptyHolder] = (0, import_react.useState)(false);
@@ -68,19 +71,24 @@ var ContinueButton = () => {
       type: "pisell1.goProductForm",
       data: params,
       callback: async (e) => {
-        var _a2;
+        var _a2, _b2, _c;
         if ((e == null ? void 0 : e.type) === "close") {
           return;
         }
-        const value = (0, import_utils2.formatValues)(data, false, {
-          relation_forms: e
+        const value = (0, import_utils2.formatValues)({
+          state: data,
+          platform: (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform,
+          excludeDisabled: false,
+          extra: {
+            relation_forms: e
+          }
         });
         const result = await onCheckout(value);
         if (result == null ? void 0 : result.success) {
           removeSessionStorage();
         } else {
           (0, import_materials.PisellToast)({
-            content: ((_a2 = result == null ? void 0 : result.err) == null ? void 0 : _a2.message) || ""
+            content: ((_c = result == null ? void 0 : result.err) == null ? void 0 : _c.message) || ""
           });
         }
       }
@@ -226,8 +234,16 @@ var ContinueButton = () => {
     handleNextStep();
   };
   const handleContinue = async () => {
+    var _a2, _b2, _c;
     if (isLastStep) {
-      const value = (0, import_utils2.formatValues)(data);
+      const value = (0, import_utils2.formatValues)({
+        state: data,
+        platform: (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform
+      });
+      if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_c = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _c.length) > 0 && !isAgreeDepositPolicy) {
+        (0, import_utils3.Toast)(import_utils.locales.getText("pisell2.appointment.deposit.agree.policy"));
+        return;
+      }
       const checkRes = await onCheckBeforeBooking(value);
       if ((checkRes == null ? void 0 : checkRes.result) === false) {
         setCheckedNumber(checkRes == null ? void 0 : checkRes.num);
@@ -263,8 +279,13 @@ var ContinueButton = () => {
   }, [currentStepData == null ? void 0 : currentStepData.key]);
   const confirmLoading = (0, import_react.useMemo)(() => {
     if (!isLastStep) return false;
-    return (createBooking == null ? void 0 : createBooking.loading) || (checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading);
-  }, [isLastStep, createBooking == null ? void 0 : createBooking.loading, checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading]);
+    return (createBooking == null ? void 0 : createBooking.loading) || (checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading) || (freePay == null ? void 0 : freePay.loading);
+  }, [
+    isLastStep,
+    createBooking == null ? void 0 : createBooking.loading,
+    checkBeforeBooking == null ? void 0 : checkBeforeBooking.loading,
+    freePay == null ? void 0 : freePay.loading
+  ]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_materials.Button,
     {

package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts

@@ -0,0 +1,2 @@
+declare const Deposit: () => JSX.Element;
+export default Deposit;

package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.js

@@ -0,0 +1,55 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eventBooking/components/Provider/Cart/Deposit/index.tsx
+var Deposit_exports = {};
+__export(Deposit_exports, {
+  default: () => Deposit_default
+});
+module.exports = __toCommonJS(Deposit_exports);
+var import_react = __toESM(require("react"));
+var import_Sales = require("../../../../../Sales");
+var import_Deposit = require("../../../../../appointmentBooking/components/Deposit");
+var Deposit = () => {
+  const {
+    deposit,
+    isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy,
+    getDepositProtocol
+  } = (0, import_Sales.useSummary)();
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_Deposit.DepositContent,
+    {
+      isAgreeDepositPolicy: !!isAgreeDepositPolicy,
+      setIsAgreeDepositPolicy,
+      deposit,
+      depositProtocolRequest: getDepositProtocol
+    }
+  );
+};
+var Deposit_default = Deposit;

package/lib/components/eventBooking/components/Provider/Cart/Item/Total.js

@@ -40,8 +40,9 @@ var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngine
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var Total = ({ className, isFooter }) => {
-  var _a, _b, _c, _d, _e, _f;
-  const { taxTitle, totalTaxFee, isPriceIncludeTax, total } = (0, import_Sales.useSummary)();
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const { cartData } = (0, import_Sales.useCart)();
+  const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = (0, import_Sales.useSummary)();
   const context = (0, import_useEngineContext.default)();
   console.log(
     taxTitle,
@@ -49,8 +50,10 @@ var Total = ({ className, isFooter }) => {
     totalTaxFee,
     total,
     (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getSymbolic) == null ? void 0 : _c.call(_b),
+    deposit,
     "wh97978"
   );
+  const showDeposit = ((_d = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _d.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: `event-total-wrap ${className}` }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "gst-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", null, taxTitle, isFooter ? ": " : ""), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value: totalTaxFee, showCurrencySymbol: true })) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -58,16 +61,16 @@ var Total = ({ className, isFooter }) => {
         [["total-gst-wrap"]]: !isPriceIncludeTax && Number(totalTaxFee) > 0
       })
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, isFooter && showDeposit ? import_utils.locales.getText("pisell2.appointment.deposit") : import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellText.Amount,
       {
-        value: total,
+        value: ((_e = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _e.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? deposit == null ? void 0 : deposit.total : total,
         showCurrencySymbol: true,
         className: "event-amount"
       }
     ) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("span", { className: "gst" }, import_utils.locales.getText("pisell2.event.total.gst")(
       `${isFooter ? `${taxTitle}: ` : taxTitle}`,
-      `${(_f = (_e = (_d = context == null ? void 0 : context.appHelper) == null ? void 0 : _d.utils) == null ? void 0 : _e.getSymbolic) == null ? void 0 : _f.call(_e)}${totalTaxFee}`
+      `${(_h = (_g = (_f = context == null ? void 0 : context.appHelper) == null ? void 0 : _f.utils) == null ? void 0 : _g.getSymbolic) == null ? void 0 : _h.call(_g)}${totalTaxFee}`
     )) : null),
     !isFooter ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellText.Amount,

package/lib/components/eventBooking/components/Provider/Cart/Item/index.js

@@ -39,8 +39,10 @@ var import_Sales = require("../../../../../Sales");
 var import_SelectHolderModal = __toESM(require("../../SelectHolderModal"));
 var import_ContinueButton = __toESM(require("../ContinueButton"));
 var import_Total = __toESM(require("./Total"));
+var import_Deposit = __toESM(require("../Deposit"));
 var import_index = require("./index.less");
 var CartItem = () => {
+  var _a;
   const { open, holderData, selectedHolderIds } = (0, import_Sales.useHolder)();
   const {
     deleteCartItem,
@@ -48,7 +50,7 @@ var CartItem = () => {
     cartData,
     addNoteToCartItem
   } = (0, import_Sales.useCart)();
-  const { subtotal } = (0, import_Sales.useSummary)();
+  const { deposit } = (0, import_Sales.useSummary)();
   const { isLastStep } = (0, import_Sales.useStep)();
   const handleClickCard = (e, type, key) => {
     if (type === "note") {
@@ -86,7 +88,7 @@ var CartItem = () => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "event-footer" }, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "event-footer" }, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), ((_a = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _a.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
   ), /* @__PURE__ */ import_react.default.createElement(import_SelectHolderModal.default, { open }));
 };
 var Item_default = CartItem;

package/lib/components/eventBooking/components/bookingDetailModal/index.js

@@ -55,7 +55,8 @@ var BookingDetailModal = (props) => {
     onCloseEventDetail,
     onSelectEventDetail,
     selectEventDetailProductDetail,
-    checkBeforeSelectEventDetail
+    checkBeforeSelectEventDetail,
+    getProductDetailRequest
   } = (0, import_Sales.useEventDetail)();
   const { addToCart, checkBeforeAddToCart, checkBeforeAddToCartResquest } = (0, import_Sales.useCart)();
   const { initData } = (0, import_Sales.useInit)();
@@ -239,7 +240,7 @@ var BookingDetailModal = (props) => {
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
       data: {
-        detail: { ...(bookingOption == null ? void 0 : bookingOption._originData) || {} },
+        detail: { ...(bookingOption == null ? void 0 : bookingOption._originData) || {}, open_deposit: 1 },
         isOS: false
       },
       callback: (data) => {
@@ -294,7 +295,7 @@ var BookingDetailModal = (props) => {
       onOk: handleOk,
       width: (0, import_utils.isMobile)() ? "100%" : 600,
       okButtonProps: {
-        loading: checkBeforeAddToCartResquest == null ? void 0 : checkBeforeAddToCartResquest.loading
+        loading: (getProductDetailRequest == null ? void 0 : getProductDetailRequest.loading) || (checkBeforeAddToCartResquest == null ? void 0 : checkBeforeAddToCartResquest.loading)
       }
     },
     content()

package/lib/components/eventBooking/index.js

@@ -66,6 +66,17 @@ var Content = () => {
     }
     getResourceList.run(params);
   }, []);
+  (0, import_react.useEffect)(() => {
+    const setRealVH = () => {
+      const vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty("--vh", `${vh}px`);
+    };
+    setRealVH();
+    window.addEventListener("resize", setRealVH);
+    return () => {
+      window.removeEventListener("resize", setRealVH);
+    };
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/eventBooking/index.less

@@ -15,7 +15,7 @@
 
 .event-booking-mobile-wrap {
   background: #ffffff;
-  min-height: 100vh;
+  min-height: calc(var(--vh, 1vh) * 100);
   .pisell-section-headers-content {
     width: 100%;
   }

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

@@ -71,6 +71,14 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': 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.booking.empty.data': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -144,6 +152,14 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': 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.booking.empty.data': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -217,6 +233,14 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': 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.booking.empty.data': string;
     };
 };
 export default _default;

package/lib/components/eventBooking/locales.js

@@ -94,7 +94,15 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "Capacity limit reached",
     "pisell2.event.capacity.limit.reached.tip": "One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.",
     "pisell2.event.schedule.item.expand": "See more",
-    "pisell2.event.schedule.item.collapse": "See less"
+    "pisell2.event.schedule.item.collapse": "See less",
+    "pisell2.appointment.deposit": "Deposit",
+    "pisell2.appointment.deposit.agreed": "I have read and agree to the ",
+    "pisell2.appointment.deposit.agree.policy": "You need to agree the policy to proceed",
+    "pisell2.appointment.deposit.and": " & ",
+    "pisell2.appointment.deposit.amount.tip1": " needs to be paid as deposit.",
+    "pisell2.appointment.deposit.amount.tip2": " ",
+    "pisell2.appointment.deposit.close": "Close",
+    "pisell2.appointment.booking.empty.data": "No data"
   },
   "zh-CN": {
     "pisell2.event.calendar.limit.unavailable": "不可预约",
@@ -167,7 +175,15 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活动名额已满",
     "pisell2.event.capacity.limit.reached.tip": "购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。",
     "pisell2.event.schedule.item.expand": "查看更多",
-    "pisell2.event.schedule.item.collapse": "收起"
+    "pisell2.event.schedule.item.collapse": "收起",
+    "pisell2.appointment.deposit": "定金",
+    "pisell2.appointment.deposit.agreed": "我已阅读并同意 ",
+    "pisell2.appointment.deposit.agree.policy": "您需要同意协议才能继续",
+    "pisell2.appointment.deposit.and": " 和 ",
+    "pisell2.appointment.deposit.amount.tip1": "请支付 ",
+    "pisell2.appointment.deposit.amount.tip2": " 定金。",
+    "pisell2.appointment.deposit.close": "关闭",
+    "pisell2.appointment.booking.empty.data": "暂无数据"
   },
   "zh-HK": {
     "pisell2.event.calendar.limit.unavailable": "不可預約",
@@ -240,6 +256,14 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活動名額已滿",
     "pisell2.event.capacity.limit.reached.tip": "購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。",
     "pisell2.event.schedule.item.expand": "查看更多",
-    "pisell2.event.schedule.item.collapse": "收起"
+    "pisell2.event.schedule.item.collapse": "收起",
+    "pisell2.appointment.deposit": "定金",
+    "pisell2.appointment.deposit.agreed": "我已閱讀並同意 ",
+    "pisell2.appointment.deposit.agree.policy": "您需要同意協議才能繼續",
+    "pisell2.appointment.deposit.and": " 和 ",
+    "pisell2.appointment.deposit.amount.tip1": "請支付 ",
+    "pisell2.appointment.deposit.amount.tip2": " 定金。",
+    "pisell2.appointment.deposit.close": "关闭",
+    "pisell2.appointment.booking.empty.data": "暫無數據"
   }
 };

package/lib/components/pay/toC/PaymentMethods/GlobePayAliPayH5/index.js

@@ -37,11 +37,14 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
 var import_serve = require("./serve");
+var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_index = require("./index.less");
 var GlobePayAliPayH5 = (props, ref) => {
+  const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const [showSuccessBackButton, setShowSuccessBackButton] = (0, import_react.useState)(false);
   const init = async ({ payGroup }) => {
     setOpen(true);
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
@@ -54,6 +57,7 @@ var GlobePayAliPayH5 = (props, ref) => {
       const url = data.url || (data == null ? void 0 : data.pay_url);
       if (url) {
         (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        setShowSuccessBackButton(true);
         window.location.href = url;
       } else {
         setOpen(false);
@@ -68,6 +72,12 @@ var GlobePayAliPayH5 = (props, ref) => {
       init
     })
   );
+  const handleSuccessBack = () => {
+    var _a;
+    (_a = state.payCallback) == null ? void 0 : _a.call(state, {
+      key: "success"
+    });
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -81,7 +91,9 @@ var GlobePayAliPayH5 = (props, ref) => {
     /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
-        title: import_utils.locales.getText("tocPay.text.redirectingToAlipay")
+        title: import_utils.locales.getText("tocPay.text.redirectingToAlipay"),
+        onSuccessBack: handleSuccessBack,
+        showSuccessBackButton
       }
     ))
   );

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts

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

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_useEngineContext = __toESM(require("../../../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
-var ThreedsLoading = ({ title }) => {
+var ThreedsLoading = ({ title, showSuccessBackButton, onSuccessBack }) => {
   var _a;
   const context = (0, import_useEngineContext.default)();
   const { config } = ((_a = context.appHelper) == null ? void 0 : _a.constants) || {};
@@ -47,6 +47,6 @@ var ThreedsLoading = ({ title }) => {
       src: config.static + "/static/stripe_loading.gif",
       alt: ""
     }
-  ), /* @__PURE__ */ import_react.default.createElement("div", { className: "threeds-loading-title" }, title || import_utils.locales.getText("tocPay.text.waitingForBankVerification")));
+  ), /* @__PURE__ */ import_react.default.createElement("div", { className: "threeds-loading-title" }, title || import_utils.locales.getText("tocPay.text.waitingForBankVerification")), showSuccessBackButton && /* @__PURE__ */ import_react.default.createElement("div", { onClick: onSuccessBack, className: "threeds-loading-success-back-button" }, import_utils.locales.getText("tocPay.text.successBack")));
 };
 var ThreedsLoading_default = ThreedsLoading;

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.less

@@ -21,4 +21,12 @@
     line-height: 20px;
     color: #353535;
   }
+
+  .threeds-loading-success-back-button {
+    margin-top: 20px;
+    color: #4b6b99;
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 20px;
+  }
 }

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -95,7 +95,10 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
     if (step3 === "N") {
       return;
     }
-    const step4 = await checkTDSAuth(step2, step3);
+    const step4 = await checkTDSAuth(step2, step3, callback);
+    if (step4 === 0) {
+      return;
+    }
     paymentData.step4 = step4;
     if (step4) {
       const step5 = await createChallengeIframe(step4, callback);
@@ -216,54 +219,70 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
   });
 };
 var checkTDSAuth = async (step2, step3, callback) => {
-  const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
-  const { threeDSServerTransID, threeDSCompInd } = step3;
-  var currentData = /* @__PURE__ */ new Date();
-  let isPre = false;
-  if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
-    isPre = true;
-  }
-  let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
-    order_id,
-    pay_number,
-    mw_data: {
-      accessToken: pay_info.check_tds_auth.access_token,
-      method: "checkTDSAuth",
-      cardID: pay_info.check_tds_auth.card_id,
-      // paymentCardNumber: cardInfo.paymentCardNumber,
-      paymentCardExpiry: pay_info.check_tds_auth.card_expiry,
-      paymentCardName: pay_info.check_tds_auth.card_name,
-      // paymentCardCSC: cardInfo.paymentCardCSC,
-      customerName: pay_info.check_tds_auth.card_name,
-      transactionAmount: amount,
-      transactionCurrency: paymentInfo.transactionInfo.transactionCurrency,
-      transactionProduct: pay_info.check_tds_auth.product_name,
-      browserAcceptHeader: "*/*",
-      browserColorDepth: screen.colorDepth,
-      browserJavaEnabled: navigator.javaEnabled(),
-      browserJavascriptEnabled: true,
-      browserLanguage: navigator.language,
-      browserScreenHeight: screen.height,
-      browserScreenWidth: screen.width,
-      browserTZ: currentData.getTimezoneOffset(),
-      browserUserAgent: navigator.userAgent,
-      purchaseDate: "20220420165834",
-      billAddrCity: paymentInfo.billingAddress.billAddrCity,
-      billAddrCountry: paymentInfo.billingAddress.billAddrCountry,
-      billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
-      billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
-      billAddrState: paymentInfo.billingAddress.billAddrState,
-      threeDSCompInd: isPre ? "" : threeDSCompInd,
-      threeDSServerTransID: isPre ? "" : threeDSServerTransID,
-      threeDSRequestorAuthenticationInd: "01",
-      threeDSRequestorURL: window.location.href,
-      notifyURL
+  try {
+    const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
+    const { threeDSServerTransID, threeDSCompInd } = step3;
+    var currentData = /* @__PURE__ */ new Date();
+    let isPre = false;
+    if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
+      isPre = true;
     }
-  });
-  if (!data) {
-    return null;
+    let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
+      order_id,
+      pay_number,
+      mw_data: {
+        accessToken: pay_info.check_tds_auth.access_token,
+        method: "checkTDSAuth",
+        cardID: pay_info.check_tds_auth.card_id,
+        // paymentCardNumber: cardInfo.paymentCardNumber,
+        paymentCardExpiry: pay_info.check_tds_auth.card_expiry,
+        paymentCardName: pay_info.check_tds_auth.card_name,
+        // paymentCardCSC: cardInfo.paymentCardCSC,
+        customerName: pay_info.check_tds_auth.card_name,
+        transactionAmount: amount,
+        transactionCurrency: paymentInfo.transactionInfo.transactionCurrency,
+        transactionProduct: pay_info.check_tds_auth.product_name,
+        browserAcceptHeader: "*/*",
+        browserColorDepth: screen.colorDepth,
+        browserJavaEnabled: navigator.javaEnabled(),
+        browserJavascriptEnabled: true,
+        browserLanguage: navigator.language,
+        browserScreenHeight: screen.height,
+        browserScreenWidth: screen.width,
+        browserTZ: currentData.getTimezoneOffset(),
+        browserUserAgent: navigator.userAgent,
+        purchaseDate: "20220420165834",
+        billAddrCity: paymentInfo.billingAddress.billAddrCity,
+        billAddrCountry: paymentInfo.billingAddress.billAddrCountry,
+        billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
+        billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
+        billAddrState: paymentInfo.billingAddress.billAddrState,
+        threeDSCompInd: isPre ? "" : threeDSCompInd,
+        threeDSServerTransID: isPre ? "" : threeDSServerTransID,
+        threeDSRequestorAuthenticationInd: "01",
+        threeDSRequestorURL: window.location.href,
+        notifyURL
+      }
+    });
+    if (!data) {
+      return null;
+    }
+    return data;
+  } catch (err) {
+    log({
+      msg: err,
+      data: paymentData
+    });
+    (0, import_materials.PisellToast)({
+      content: (err == null ? void 0 : err.message) || "",
+      duration: 1e3 * 200,
+      onClose() {
+        callback({ key: "hideModal" });
+        closeIframe();
+      }
+    });
+    return 0;
   }
-  return data;
 };
 var createChallengeIframe = (challengeData, callback) => {
   const displayBox = document.getElementById("threeds-container");

package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js

@@ -37,14 +37,17 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
 var import_serve = require("./serve");
+var import_model = require("../../model");
 var import_payGroup = require("../../payGroup");
 var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_utils2 = require("../../utils");
 var SuperPayAliPayH5 = (props, ref) => {
   var _a;
+  const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const [showSuccessBackButton, setShowSuccessBackButton] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ payGroup }) => {
@@ -62,6 +65,7 @@ var SuperPayAliPayH5 = (props, ref) => {
       const data = await (0, import_serve.getAliPayUrl)(payGroup.order_id, values);
       if (data == null ? void 0 : data.pay_url) {
         (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        setShowSuccessBackButton(true);
         window.location.href = data == null ? void 0 : data.pay_url;
       } else {
         setOpen(false);
@@ -76,6 +80,12 @@ var SuperPayAliPayH5 = (props, ref) => {
       init
     })
   );
+  const handleSuccessBack = () => {
+    var _a2;
+    (_a2 = state.payCallback) == null ? void 0 : _a2.call(state, {
+      key: "success"
+    });
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -89,7 +99,9 @@ var SuperPayAliPayH5 = (props, ref) => {
     /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
-        title: import_utils.locales.getText("tocPay.text.redirectingToAlipay")
+        title: import_utils.locales.getText("tocPay.text.redirectingToAlipay"),
+        onSuccessBack: handleSuccessBack,
+        showSuccessBackButton
       }
     ))
   );