@pisell/private-materials 6.3.113 → 6.3.114

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

@@ -29,14 +29,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pay/toC/PaymentMethods/MWCreditCard/tds2.tsx
 var tds2_exports = {};
 __export(tds2_exports, {
-  cancelCurrentPayment: () => cancelCurrentPayment,
   checkEnrollment: () => checkEnrollment,
   checkPARes: () => checkPARes,
   checkTDSAuth: () => checkTDSAuth,
   createChallengeIframe: () => createChallengeIframe,
   createThreeDSMethodIframe: () => createThreeDSMethodIframe,
   paymentEnd: () => paymentEnd,
-  preCheckEnrollment: () => preCheckEnrollment,
   startPayment: () => startPayment
 });
 module.exports = __toCommonJS(tds2_exports);
@@ -45,7 +43,6 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_payGroup = require("../../payGroup");
-var import_utils3 = require("../../utils");
 var { REACT_APP_API_ENV } = process.env;
 var paymentInfo = {
   transactionInfo: {
@@ -64,11 +61,6 @@ var paymentInfo = {
 };
 var paymentData = {};
 var postmessageUrl = "merchantwarrior";
-var activeCleanup = null;
-var cancelCurrentPayment = () => {
-  activeCleanup == null ? void 0 : activeCleanup();
-  activeCleanup = null;
-};
 var log = (data) => {
   let _template = {
     module,
@@ -92,8 +84,7 @@ var setHistoryLog = (log2) => {
 var getCurrentTime = () => {
   return (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
 };
-var startPayment = async ({ orderId, cardInfo, payData }, options) => {
-  const { callback, isCancelled } = options || {};
+var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
   let paymentInfo2 = {
     amount: 0,
     order_id: 0
@@ -110,11 +101,7 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
       payDataOrderId: payData == null ? void 0 : payData.order_id,
       payDataPayNumber: payData == null ? void 0 : payData.pay_number
     });
-    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, { callback, isCancelled });
-    if (isCancelled == null ? void 0 : isCancelled()) {
-      closeIframe();
-      return;
-    }
+    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, callback);
     setHistoryLog({
       msg: "步骤2完成: 提交卡信息到后端",
       time: getCurrentTime(),
@@ -132,10 +119,6 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
       time: getCurrentTime()
     });
     let step3 = await createThreeDSMethodIframe(step2, callback);
-    if (isCancelled == null ? void 0 : isCancelled()) {
-      closeIframe();
-      return;
-    }
     paymentData.step3 = step3;
     setHistoryLog({
       msg: "步骤3完成: iframe监听结束",
@@ -151,11 +134,7 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
       order_id: step2 == null ? void 0 : step2.order_id,
       pay_number: step2 == null ? void 0 : step2.pay_number
     });
-    const step4 = await checkTDSAuth(step2, step3, { callback, isCancelled });
-    if (isCancelled == null ? void 0 : isCancelled()) {
-      closeIframe();
-      return;
-    }
+    const step4 = await checkTDSAuth(step2, step3, callback);
     setHistoryLog({
       msg: "步骤4完成: checkTDSAuth 返回",
       time: getCurrentTime(),
@@ -171,10 +150,6 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
         time: getCurrentTime()
       });
       const step5 = await createChallengeIframe(step4, callback);
-      if (isCancelled == null ? void 0 : isCancelled()) {
-        closeIframe();
-        return;
-      }
       paymentData.step5 = step5;
       setHistoryLog({
         msg: "步骤5完成: challenge iframe结束",
@@ -185,20 +160,12 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
         time: getCurrentTime()
       });
       await checkPARes(step2, step4, step5);
-      if (isCancelled == null ? void 0 : isCancelled()) {
-        closeIframe();
-        return;
-      }
       setHistoryLog({
         msg: "步骤6完成: check_pares接口返回",
         time: getCurrentTime()
       });
     }
-    if (isCancelled == null ? void 0 : isCancelled()) {
-      closeIframe();
-      return;
-    }
-    callback == null ? void 0 : callback({ key: "hideModal" });
+    callback({ key: "hideModal" });
     setHistoryLog({
       msg: "支付成功",
       time: getCurrentTime()
@@ -216,17 +183,11 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
     setHistoryLog({
       msg: "支付异常",
       time: getCurrentTime(),
-      error: err,
-      errorCode: err == null ? void 0 : err.code
+      error: err
     });
+    callback({ key: "hideModal" });
     closeIframe();
-    if (isCancelled == null ? void 0 : isCancelled()) return;
-    callback == null ? void 0 : callback({ key: "hideModal" });
     if (err === 0) return;
-    if ((err == null ? void 0 : err.code) === 700500) {
-      callback == null ? void 0 : callback({ key: "bankVerifyFailed" });
-      return false;
-    }
     paymentData.error = err;
     paymentEnd(
       {
@@ -238,34 +199,11 @@ var startPayment = async ({ orderId, cardInfo, payData }, options) => {
     return false;
   }
 };
-var preCheckEnrollment = async (orderId, cardInfo) => {
-  try {
-    const { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
-      ...cardInfo
-    });
-    (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
-    if (!(data == null ? void 0 : data.pay_info)) {
-      throw new Error("Card does not support 3DS verification");
-    }
-    return data;
-  } catch (err) {
-    log({
-      msg: err,
-      data: {
-        orderId,
-        cardInfo
-      }
-    });
-    throw err;
-  }
-};
-var checkEnrollment = async (orderId, cardInfo, options) => {
-  const { callback, isCancelled } = options || {};
+var checkEnrollment = async (orderId, cardInfo, callback) => {
   try {
     let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
       ...cardInfo
     });
-    if (isCancelled == null ? void 0 : isCancelled()) return 0;
     (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
     if (!(data == null ? void 0 : data.pay_info)) {
       return null;
@@ -279,8 +217,7 @@ var checkEnrollment = async (orderId, cardInfo, options) => {
         cardInfo
       }
     });
-    if (isCancelled == null ? void 0 : isCancelled()) return 0;
-    callback == null ? void 0 : callback({ key: "hideModal" });
+    callback({ key: "hideModal" });
     closeIframe();
     (0, import_materials.PisellToast)({
       content: (err == null ? void 0 : err.message) || "",
@@ -326,43 +263,38 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
   let timer = null;
   return new Promise((res, rej) => {
     var _a2;
-    const handleMessage = (event) => {
-      if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
-        if (typeof event.data.threeDSServerTransID == "string") {
-          setHistoryLog({
-            msg: "第三步: message 返回 threeDSServerTransID",
-            time: getCurrentTime(),
-            threeDSServerTransID: event.data.threeDSServerTransID
-          });
-          if (timer) {
-            clearTimeout(timer);
-          }
-          window.removeEventListener("message", handleMessage);
-          res({
-            threeDSServerTransID: event.data.threeDSServerTransID,
-            threeDSCompInd: "Y"
-          });
-        }
-      }
-    };
     timer = setTimeout(() => {
-      window.removeEventListener("message", handleMessage);
       res(defaultReturnParams);
       log({
         msg: "第三步: 10秒超时则走N逻辑",
         data: threeDSMethodData
       });
     }, ((_a2 = threeDSMethodData == null ? void 0 : threeDSMethodData.pay_info) == null ? void 0 : _a2.tdsMethodTimeoutMS) || 1e4);
-    window.addEventListener("message", handleMessage, false);
-    activeCleanup = () => {
-      window.removeEventListener("message", handleMessage);
-      if (timer) clearTimeout(timer);
-      rej(0);
-    };
+    window.addEventListener(
+      "message",
+      (event) => {
+        if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
+          if (typeof event.data.threeDSServerTransID == "string") {
+            setHistoryLog({
+              msg: "第三步: message 返回 threeDSServerTransID",
+              time: getCurrentTime(),
+              threeDSServerTransID: event.data.threeDSServerTransID
+            });
+            if (timer) {
+              clearTimeout(timer);
+            }
+            res({
+              threeDSServerTransID: event.data.threeDSServerTransID,
+              threeDSCompInd: "Y"
+            });
+          }
+        }
+      },
+      false
+    );
   });
 };
-var checkTDSAuth = async (step2, step3, options) => {
-  const { callback, isCancelled } = options || {};
+var checkTDSAuth = async (step2, step3, callback) => {
   try {
     const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
     const { threeDSServerTransID, threeDSCompInd } = step3;
@@ -371,18 +303,15 @@ var checkTDSAuth = async (step2, step3, options) => {
     if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
       isPre = true;
     }
-    const request_unique_idempotency_token = (0, import_utils3.getUniqueIdempotencyToken)();
     setHistoryLog({
       msg: "步骤4开始: 调用tds_auth_pay接口",
       time: getCurrentTime(),
       order_id,
-      pay_number,
-      request_unique_idempotency_token
+      pay_number
     });
     let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
       order_id,
       pay_number,
-      request_unique_idempotency_token,
       mw_data: {
         accessToken: pay_info.check_tds_auth.access_token,
         method: "checkTDSAuth",
@@ -410,7 +339,7 @@ var checkTDSAuth = async (step2, step3, options) => {
         billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
         billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
         billAddrState: paymentInfo.billingAddress.billAddrState,
-        threeDSCompInd: isPre ? "" : threeDSCompInd || "N",
+        threeDSCompInd: isPre ? "" : threeDSCompInd,
         threeDSServerTransID: isPre ? "" : threeDSServerTransID,
         threeDSRequestorAuthenticationInd: "01",
         threeDSRequestorURL: window.location.href,
@@ -429,23 +358,20 @@ var checkTDSAuth = async (step2, step3, options) => {
   } catch (err) {
     setHistoryLog({
       msg: "步骤4异常",
-      time: getCurrentTime(),
-      errorCode: err == null ? void 0 : err.code
+      time: getCurrentTime()
     });
     log({
       msg: err,
       data: paymentData
     });
-    if (isCancelled == null ? void 0 : isCancelled()) return 0;
-    if ((err == null ? void 0 : err.code) === 700500) {
-      throw err;
-    }
     (0, import_materials.PisellToast)({
       content: (err == null ? void 0 : err.message) || "",
-      duration: 1e3 * 2
+      duration: 1e3 * 200,
+      onClose() {
+        callback({ key: "hideModal" });
+        closeIframe();
+      }
     });
-    callback == null ? void 0 : callback({ key: "hideModal" });
-    closeIframe();
     return 0;
   }
 };
@@ -481,7 +407,6 @@ var createChallengeIframe = (challengeData, callback) => {
           if (timer) {
             clearTimeout(timer);
           }
-          window.removeEventListener("message", handleMessage);
           res(event.data.cres);
           closeIframe();
         }
@@ -500,11 +425,6 @@ var createChallengeIframe = (challengeData, callback) => {
       handleMessage,
       false
     );
-    activeCleanup = () => {
-      window.removeEventListener("message", handleMessage);
-      if (timer) clearTimeout(timer);
-      rej(0);
-    };
   });
 };
 var checkPARes = async (step2, step4, step5) => {
@@ -545,13 +465,11 @@ var closeIframe = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  cancelCurrentPayment,
   checkEnrollment,
   checkPARes,
   checkTDSAuth,
   createChallengeIframe,
   createThreeDSMethodIframe,
   paymentEnd,
-  preCheckEnrollment,
   startPayment
 });

package/lib/components/pay/toC/PaymentMethods/WalletPass/List/index.d.ts

@@ -13,7 +13,6 @@ export interface WalletPassListProps {
     onChangeDebounce?: boolean;
     loading?: boolean;
     onLoadingChange?: (loading: boolean) => void;
-    customer_id?: number;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;

package/lib/components/pay/toC/PaymentMethods/WalletPass/List/index.js

@@ -41,7 +41,7 @@ var import_utils2 = require("../utils");
 var import_index = require("./index.less");
 var WalletPassList = (0, import_react.forwardRef)(
   (props, ref) => {
-    const { title, onChange, data: propsData, value, walletSetting, onLoadingChange, loading: propsLoading, onChangeDebounce, customer_id } = props;
+    const { title, onChange, data: propsData, value, walletSetting, onLoadingChange, loading: propsLoading, onChangeDebounce } = props;
     const [data, setData] = (0, import_react.useState)(
       propsData || []
     );
@@ -58,12 +58,6 @@ var WalletPassList = (0, import_react.forwardRef)(
       setLoading(true);
       try {
         let list = await (0, import_serve.getMachineCodeList)(params) || [];
-        list = list.map((item) => {
-          return {
-            ...item,
-            customer_id: customer_id || item.customer_id
-          };
-        });
         if ((0, import_utils.isFunction)(formatList)) {
           list = formatList(list);
         }

package/lib/components/pay/toC/PaymentMethods/WalletPass/index.d.ts

@@ -15,16 +15,11 @@ export interface WalletPassProps {
     walletPass: {
         cards: WalletPassDataType[];
         amount: number;
-        recommended?: WalletPassDataType[];
-        transformList?: WalletPassDataType[];
-        noApplicableVoucher?: WalletPassDataType[];
     };
     walletSetting: {
         name: string;
         popup_status: 0 | 1;
     };
-    orderDetail: any;
-    total_amount: number;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;