@pisell/private-materials 6.1.7 → 6.1.9

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/StripePay/Stripe/Finish/index.d.ts

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

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

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

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts

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

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
 export default SetupForm;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

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

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
       }
     ))
   );

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

@@ -86,6 +86,15 @@ var PaymentMethods = (props, ref) => {
     var _a2, _b2;
     const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
     const cards = (_b2 = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b2.length;
+    (0, import_utils2.sendWarningLog)({
+      title: "支付初始化",
+      content: [
+        { key: "type", value: type },
+        { key: "payGroup", value: JSON.stringify(payGroup) },
+        { key: "waitAmount", value: waitAmount },
+        { key: "cards", value: cards }
+      ]
+    });
     if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
       try {
         await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
@@ -98,6 +107,14 @@ var PaymentMethods = (props, ref) => {
           }
         });
       } catch (err) {
+        (0, import_utils2.sendWarningLog)({
+          title: "钱包支付失败 catch",
+          content: [
+            { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+            { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+            { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+          ]
+        });
         return props.payCallback({
           key: "fail",
           data: {
@@ -109,8 +126,19 @@ var PaymentMethods = (props, ref) => {
       }
     }
     if (waitAmount <= 0) {
-      (0, import_payGroup.removePayGroupFromStorage)(payGroup.order_id);
-      props.payCallback({ key: "success" });
+      try {
+        (0, import_payGroup.removePayGroupFromStorage)(payGroup.order_id);
+        props.payCallback({ key: "success" });
+      } catch (err) {
+        (0, import_utils2.sendWarningLog)({
+          title: "跳转成功页面 catch",
+          content: [
+            { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+            { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+            { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+          ]
+        });
+      }
       return;
     }
     await onPayByType({ type, payGroup });

package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

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

@@ -208,6 +208,14 @@ var ToCPay = (props, ref) => {
         payment_priority: data.payment_priority
       };
     } catch (err) {
+      (0, import_utils.sendWarningLog)({
+        title: "创建交易组失败 paymentInit catch",
+        content: [
+          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+        ]
+      });
       setSubmitLoading(false);
       payCallback({
         key: "fail",
@@ -243,16 +251,28 @@ var ToCPay = (props, ref) => {
   };
   const onSubmit = async (newOrderId) => {
     var _a2;
-    let newPayGroup = state.payGroup;
-    const result = await getIsShowDetectIncognitoConfirm(newPayGroup);
-    if (result) {
-      setShowDetectIncognitoConfirm(true);
-      return;
-    }
-    if (!((_a2 = state.payGroup) == null ? void 0 : _a2.payment_group_id)) {
-      newPayGroup = await paymentInit(newOrderId);
+    try {
+      let newPayGroup = state.payGroup;
+      const result = await getIsShowDetectIncognitoConfirm(newPayGroup);
+      if (result) {
+        setShowDetectIncognitoConfirm(true);
+        return;
+      }
+      if (!((_a2 = state.payGroup) == null ? void 0 : _a2.payment_group_id)) {
+        newPayGroup = await paymentInit(newOrderId);
+      }
+      handlePaymentByType(void 0, newPayGroup);
+    } catch (err) {
+      console.log("err", err);
+      (0, import_utils.sendWarningLog)({
+        title: "提交支付失败 onSubmit catch",
+        content: [
+          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+        ]
+      });
     }
-    handlePaymentByType(void 0, newPayGroup);
   };
   const paymentTypeChange = (payload) => {
     dispatch({

package/lib/components/pay/toC/locales.d.ts

@@ -35,6 +35,7 @@ declare const _default: {
         'tocPay.text.done': string;
         'tocPay.text.manageCard': string;
         'tocPay.text.waitingForBankVerification': string;
+        'tocPay.text.successBack': string;
         'tocPay.text.redirectingToAlipay': string;
         'tocPay.text.redirectingToPaypal': string;
         'tocPay.text.redirectingToWeChatPay': string;
@@ -130,6 +131,7 @@ declare const _default: {
         'tocPay.text.done': string;
         'tocPay.text.manageCard': string;
         'tocPay.text.waitingForBankVerification': string;
+        'tocPay.text.successBack': string;
         'tocPay.text.redirectingToAlipay': string;
         'tocPay.text.redirectingToPaypal': string;
         'tocPay.text.redirectingToWeChatPay': string;
@@ -224,6 +226,7 @@ declare const _default: {
         'tocPay.text.done': string;
         'tocPay.text.manageCard': string;
         'tocPay.text.waitingForBankVerification': string;
+        'tocPay.text.successBack': string;
         'tocPay.text.redirectingToAlipay': string;
         'tocPay.text.redirectingToPaypal': string;
         'tocPay.text.redirectingToWeChatPay': string;

package/lib/components/pay/toC/locales.js

@@ -59,6 +59,7 @@ var locales_default = {
     "tocPay.text.done": "Done",
     "tocPay.text.manageCard": "Manage card",
     "tocPay.text.waitingForBankVerification": "Waiting for bank verification, please wait for 5-10 seconds. You may be redirected to the card issuing bank’s verification page to authorize this payment.",
+    "tocPay.text.successBack": "Payment completed, return to order",
     "tocPay.text.redirectingToAlipay": "Redirecting to Alipay, please wait...",
     "tocPay.text.redirectingToPaypal": "Redirecting to Paypal, please wait...",
     "tocPay.text.redirectingToWeChatPay": "Redirecting to WeChat Pay, please wait...",
@@ -154,6 +155,7 @@ var locales_default = {
     "tocPay.text.done": "完成",
     "tocPay.text.manageCard": "管理卡片",
     "tocPay.text.waitingForBankVerification": "正在等待银行校验，请静候5-10秒左右。您可能被转入开卡行的持卡人校验页面来授权本次支付。",
+    "tocPay.text.successBack": "已支付完成返回查看订单",
     "tocPay.text.redirectingToAlipay": "正在转入支付宝支付，请稍候...",
     "tocPay.text.redirectingToPaypal": "正在转入Paypal支付，请稍候...",
     "tocPay.text.redirectingToWeChatPay": "正在转入微信支付，请稍候...",
@@ -248,6 +250,7 @@ var locales_default = {
     "tocPay.text.done": "完成",
     "tocPay.text.manageCard": "管理卡片",
     "tocPay.text.waitingForBankVerification": "正在等待銀行校驗，請靜候5-10秒左右。您可能被轉入開卡行的持卡人校驗頁面來授權本次支付。",
+    "tocPay.text.successBack": "已支付完成返回查看訂單",
     "tocPay.text.redirectingToAlipay": "正在轉入支付寶支付，請稍候...",
     "tocPay.text.redirectingToPaypal": "正在轉入Paypal支付，請稍候...",
     "tocPay.text.redirectingToWeChatPay": "正在轉入微信支付，請稍候...",

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts

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

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/PhoneField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface AddClientProps {
     onChange: (value: any) => void;

package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface CustomerListProps {
     value: any;

package/lib/components/pisellSelectCustomerModal/RightPanel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface RightPanelProps {
     value: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

package/lib/components/productExtension/fields/Actor/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Actor: ({ name }: {
     name: string;
 }) => JSX.Element;

package/lib/components/productExtension/fields/Forms/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface InfoProps {
     relation_id: any;
     action: any;

package/lib/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItemPreview;

package/lib/components/productExtension/fields/SelectProducts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface valueType {
 }

package/lib/components/productExtension/fields/SelectResourcesTable/index.d.ts

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

package/lib/components/productSelect/components/TabProduct/index.d.ts

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