@pisell/private-materials 6.3.66 → 6.3.67

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

@@ -90,11 +90,11 @@ var PaymentList = (props, ref) => {
     var _a2, _b2;
     return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2);
   }, []);
-  const init = (list) => {
+  const init = (list, amount) => {
     var _a2, _b2;
     setLoading(true);
     const platform = ((_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform) || "h5";
-    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform, isApp);
+    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform, isApp, amount);
     if (paymentList2.length > 0) {
       let first = paymentList2[0];
       setPaymentList(paymentList2);
@@ -147,6 +147,24 @@ var PaymentList = (props, ref) => {
       }
     ));
   };
+  const renderCreditCardToast = (_item) => {
+    var _a2;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-wrap surcharge-modal-wrap-credit-card" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-lists" }, (_a2 = _item == null ? void 0 : _item.surcharge_config_result) == null ? void 0 : _a2.map((d) => {
+      var _a3, _b2;
+      return /* @__PURE__ */ import_react.default.createElement("div", { key: d.name, className: "surcharge-modal-list-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-list-item-header" }, (_a3 = d == null ? void 0 : d.icons) == null ? void 0 : _a3.map((icon) => {
+        return /* @__PURE__ */ import_react.default.createElement(
+          import_materials.Image,
+          {
+            src: icon,
+            className: "header-icon",
+            isPreview: false
+          }
+        );
+      }), /* @__PURE__ */ import_react.default.createElement("span", null, d.name)), /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-list-item-content" }, (_b2 = d == null ? void 0 : d.lists) == null ? void 0 : _b2.map((item) => {
+        return /* @__PURE__ */ import_react.default.createElement("div", { key: item.name, className: "content-item" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils2.locales.getText(item.area_text)), /* @__PURE__ */ import_react.default.createElement("span", { className: "item-fee" }, item.surcharge_fee), /* @__PURE__ */ import_react.default.createElement("span", null, item.surcharge_text));
+      })));
+    })));
+  };
   const content = (0, import_react.useMemo)(() => {
     if (loading) {
       return null;
@@ -172,8 +190,9 @@ var PaymentList = (props, ref) => {
         onChange: paymentTypeChange,
         optionClassName: "payment-item",
         renderOption: (d, active) => {
-          var _a2, _b2;
+          var _a2, _b2, _c2;
           const showIcon = d.surcharge && d.service !== "pisell.other.cashmanual" && d.service !== "pisell.custom_payment" || ((_a2 = d == null ? void 0 : d.params) == null ? void 0 : _a2.description) && (d.service === "pisell.other.cashmanual" || d.service === "pisell.custom_payment");
+          const showCreditCardToast = (d == null ? void 0 : d.service) === "mw.credit_card" && ((_b2 = d == null ? void 0 : d.surcharge_config_result) == null ? void 0 : _b2.length) > 0;
           return /* @__PURE__ */ import_react.default.createElement(
             import_materials.PisellRow,
             {
@@ -199,12 +218,24 @@ var PaymentList = (props, ref) => {
                   d.title,
                   " "
                 ),
-                /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, (((_b2 = d == null ? void 0 : d.params) == null ? void 0 : _b2.description) || d.surcharge) && d.service !== "pisell.offline_payment" ? /* @__PURE__ */ import_react.default.createElement(
+                /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, (((_c2 = d == null ? void 0 : d.params) == null ? void 0 : _c2.description) || d.surcharge) && d.service !== "pisell.offline_payment" ? /* @__PURE__ */ import_react.default.createElement(
                   import_materials.PisellTooltip,
                   {
-                    title: renderToast(d),
+                    title: showCreditCardToast ? renderCreditCardToast(d) : renderToast(d),
                     onClick: (e) => {
                       e.stopPropagation();
+                    },
+                    overlayClassName: showCreditCardToast ? "surcharge-tooltip-overlay-wrap" : "",
+                    getPopupContainer: (triggerNode) => {
+                      var _a3;
+                      if (showCreditCardToast) {
+                        const modalContainer = (_a3 = triggerNode == null ? void 0 : triggerNode.closest) == null ? void 0 : _a3.call(
+                          triggerNode,
+                          ".toc-pay-modal-content .pisell-lowcode-modal"
+                        );
+                        return modalContainer || document.body;
+                      }
+                      return document.body;
                     }
                   },
                   /* @__PURE__ */ import_react.default.createElement(

package/lib/components/pay/toC/PaymentList/index.less

@@ -109,4 +109,61 @@
     font-style: normal;
     font-weight: 500;
   }
-}
+}
+
+.surcharge-tooltip-overlay-wrap{
+  max-width: 92% !important;
+  width: 92%;
+  left: 4% !important;
+  .pisell-lowcode-tooltip-inner{
+    background: #F2F4F7 !important;
+  }
+}
+
+.surcharge-modal-wrap-credit-card {
+  .surcharge-modal-lists {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    .surcharge-modal-list-item {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      .surcharge-modal-list-item-header {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        color: #101828;
+        font-size: 14px;
+        font-weight: 600;
+        line-height: 20px;
+        .header-icon{
+          width: 58px;
+        }
+      }
+      .surcharge-modal-list-item-content {
+        display: flex;
+        gap: 12px;
+        .content-item {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          padding: 8px 12px;
+          border-radius: 8px;
+          box-shadow: 0px 2px 4px -2px rgba(16, 24, 40, 0.06);
+          background: white;
+          color: #475467;
+          font-size: 12px;
+          font-weight: 400;
+          line-height: 18px;
+          .item-fee {
+            color: black;
+            font-size: 24px;
+            font-weight: 700;
+            line-height: 32px;
+          }
+        }
+      }
+    }
+  }
+}

package/lib/components/pay/toC/PaymentList/serve.d.ts

@@ -20,7 +20,7 @@ export declare const getPaymentList: (values: any) => Promise<{
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:57
  */
-export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean) => {
+export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean, amount?: number) => {
     message: string;
     status: string;
     paymentList: any[];

package/lib/components/pay/toC/PaymentList/serve.js

@@ -27,6 +27,7 @@ var import_utils = require("../../../../utils");
 var import_status = require("./status");
 var import_utils2 = require("@pisell/utils");
 var import_status2 = require("./status");
+var import_utils3 = require("./utils");
 var getPaymentList = async (values) => {
   let { data = [] } = await import_utils.request.getRequest().get("/h5/pay/order/payments", values);
   return filterPaymentList(data);
@@ -43,7 +44,7 @@ var sortArr = [
   "pisell.other.cashmanual",
   "pisell.custom_payment"
 ];
-var filterPaymentList = (list, platform = "h5", isApp) => {
+var filterPaymentList = (list, platform = "h5", isApp, amount) => {
   let paymentList = [...list];
   let _paymentKeys = [...import_status.paymentKeys];
   const walletPass = paymentList.find((d) => d.service === "pisell.wallet_pass");
@@ -82,6 +83,9 @@ var filterPaymentList = (list, platform = "h5", isApp) => {
     if ((0, import_status2.isCustomPayment)(d.service)) {
       service = service + "|" + d.params.custom_payment_id;
     }
+    if (service === "mw.credit_card") {
+      d.surcharge_config_result = (0, import_utils3.formatCreditCardSurchargeList)(d, amount);
+    }
     return {
       ...d,
       service,

package/lib/components/pay/toC/PaymentList/utils.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @description: visa/master手续费是否一致
+ * @param {any} creditCardConfig
+ * @return {*}
+ */
+export declare const isCreditCardSurchargeSame: (creditCardConfig: any[]) => boolean;
+/**
+ * @description: 格式化visa/master手续费
+ * @param {any} item 支付列表项
+ * @param {number} amount 订单金额
+ * @param {boolean} isSame 手续费是否一致
+ * @return {*}
+ */
+export declare const formatCreditCardSurcharge: (item: any, amount: number, isSame: boolean) => any;
+/**
+ * @description: 格式化visa/master手续费列表
+ * @param {any} item
+ * @param {number} amount
+ * @return {*}
+ */
+export declare const formatCreditCardSurchargeList: (item: any, amount: number) => any;
+/**
+ * @title: 计算支付列表的手续费
+ * @description:
+ * @param {any} paymentList
+ * @param {number} amount
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-18 09:30
+ */
+export declare const calculateSurcharge: (paymentList: any[], amount: number) => any[];

package/lib/components/pay/toC/PaymentList/utils.js

@@ -1,6 +1,8 @@
+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)
@@ -14,14 +16,128 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/pay/toC/PaymentList/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  calculateSurcharge: () => calculateSurcharge
+  calculateSurcharge: () => calculateSurcharge,
+  formatCreditCardSurcharge: () => formatCreditCardSurcharge,
+  formatCreditCardSurchargeList: () => formatCreditCardSurchargeList,
+  isCreditCardSurchargeSame: () => isCreditCardSurchargeSame
 });
 module.exports = __toCommonJS(utils_exports);
+var import_visa = __toESM(require("./payment/visa.png"));
+var import_credit_card = __toESM(require("./payment/credit_card.png"));
+var isCreditCardSurchargeSame = (creditCardConfig) => {
+  try {
+    const configMap = {};
+    creditCardConfig.forEach((config) => {
+      const key = `${(config == null ? void 0 : config.credit_card_type) || "-"}_${(config == null ? void 0 : config.area) || "-"}`;
+      configMap[key] = config;
+    });
+    const visaDomestic = configMap["visa_domestic"];
+    const visaWorld = configMap["visa_world"];
+    const masterDomestic = configMap["master_domestic"];
+    const masterWorld = configMap["master_world"];
+    const formatFee = (config) => {
+      if (!config) return null;
+      const percent = parseFloat(config.percent ?? config.percentage ?? "0");
+      const amount = parseFloat(config.amount ?? "0");
+      return {
+        percentStr: percent,
+        amountStr: amount
+      };
+    };
+    const visaDomesticFee = formatFee(visaDomestic);
+    const visaWorldFee = formatFee(visaWorld);
+    const masterDomesticFee = formatFee(masterDomestic);
+    const masterWorldFee = formatFee(masterWorld);
+    const isFeeSame = (fee1, fee2) => {
+      if (!fee1 || !fee2) return false;
+      return fee1.percentStr === fee2.percentStr && fee1.amountStr === fee2.amountStr;
+    };
+    const isDomesticSame = isFeeSame(visaDomesticFee, masterDomesticFee);
+    const isWorldSame = isFeeSame(visaWorldFee, masterWorldFee);
+    const isAllSame = isDomesticSame && isWorldSame;
+    return isAllSame;
+  } catch (error) {
+    return false;
+  }
+};
+var totalFee = (config, amount) => {
+  const percentageFee = parseFloat(config.percent ?? config.percentage) * Number(amount);
+  const totalFee2 = percentageFee + parseFloat(config.amount);
+  return totalFee2;
+};
+var formatCreditCardSurcharge = (item, amount, isSame) => {
+  try {
+    const { surcharge_config, currency_symbol } = item;
+    const formatSurchargeList = (list) => {
+      return list == null ? void 0 : list.map((config) => {
+        const percentageFee = parseFloat(
+          (config == null ? void 0 : config.percent) ?? (config == null ? void 0 : config.percentage) ?? 0
+        );
+        const percent = (percentageFee * 100).toFixed(2);
+        const amountFee = parseFloat(config == null ? void 0 : config.amount).toFixed(2);
+        const _totalFee = totalFee(config, amount).toFixed(2);
+        const areaText = (config == null ? void 0 : config.area) === "world" ? "tocPay.text.rest-of-world" : "tocPay.text.domestic";
+        return {
+          ...config,
+          area_text: areaText,
+          surcharge_text: `${percent}% + ${currency_symbol}${amountFee}`,
+          surcharge_fee: `${currency_symbol}${_totalFee}`
+        };
+      });
+    };
+    if (isSame) {
+      const visaResult = surcharge_config.filter((config) => {
+        return config.credit_card_type === "visa";
+      });
+      return [
+        {
+          icons: [import_visa.default, import_credit_card.default],
+          name: "Visa / Mastercard",
+          lists: formatSurchargeList(visaResult)
+        }
+      ];
+    } else {
+      const visaResult = surcharge_config.filter((config) => {
+        return config.credit_card_type === "visa";
+      });
+      const masterResult = surcharge_config.filter((config) => {
+        return config.credit_card_type === "master";
+      });
+      return [
+        {
+          icons: [import_visa.default],
+          name: "Visa",
+          lists: formatSurchargeList(visaResult)
+        },
+        {
+          icons: [import_credit_card.default],
+          name: "Mastercard",
+          lists: formatSurchargeList(masterResult)
+        }
+      ];
+    }
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+};
+var formatCreditCardSurchargeList = (item, amount) => {
+  const isSame = isCreditCardSurchargeSame((item == null ? void 0 : item.surcharge_config) || []);
+  return formatCreditCardSurcharge(item || {}, amount, isSame);
+};
 var calculateSurcharge = (paymentList, amount) => {
   return paymentList.map((payment) => {
     const { surcharge_config, currency_symbol, surcharge_text } = payment;
@@ -30,9 +146,7 @@ var calculateSurcharge = (paymentList, amount) => {
       return payment;
     }
     const fees = surcharge_config.map((config) => {
-      const percentageFee = parseFloat(config.percent ?? config.percentage) * Number(amount);
-      const totalFee = percentageFee + parseFloat(config.amount);
-      return totalFee;
+      return totalFee(config, amount);
     });
     const minFee = Math.min(...fees);
     const maxFee = Math.max(...fees);
@@ -41,12 +155,26 @@ var calculateSurcharge = (paymentList, amount) => {
     } else if (minFee === maxFee) {
       payment.surcharge = `${surcharge_text}${currency_symbol}${minFee.toFixed(2)}`;
     } else {
-      payment.surcharge = `${surcharge_text}${currency_symbol}${minFee.toFixed(2)} ~ ${currency_symbol}${maxFee.toFixed(2)}`;
+      payment.surcharge = `${surcharge_text}${currency_symbol}${minFee.toFixed(
+        2
+      )} ~ ${currency_symbol}${maxFee.toFixed(2)}`;
+    }
+    if (payment.service === "mw.credit_card") {
+      const percentList = surcharge_config.map((config) => {
+        return parseFloat(config.percent ?? config.percentage ?? "0") * 100;
+      });
+      const minPercent = Math.min(...percentList);
+      const maxPercent = Math.max(...percentList);
+      payment.surcharge = `${surcharge_text}${minPercent}% ~ ${maxPercent}%`;
+      payment.surcharge_config_result = formatCreditCardSurchargeList(payment, amount);
     }
     return payment;
   });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  calculateSurcharge
+  calculateSurcharge,
+  formatCreditCardSurcharge,
+  formatCreditCardSurchargeList,
+  isCreditCardSurchargeSame
 });

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

@@ -0,0 +1,6 @@
+import React from 'react';
+declare type PaymentStatusProps = {
+    onChange: (status: 'succeeded' | 'processing' | 'requires_payment_method' | 'error') => void;
+};
+declare const PaymentStatus: React.FC<PaymentStatusProps>;
+export default PaymentStatus;

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

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

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

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

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

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

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

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

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

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

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

@@ -206,7 +206,7 @@ var ToCPay = (props, ref) => {
           wait_amount: remain_amount
         }
       });
-      await ((_b2 = paymentListRef.current) == null ? void 0 : _b2.init(payment_list));
+      await ((_b2 = paymentListRef.current) == null ? void 0 : _b2.init(payment_list, remain_amount || 0));
       setTimeout(() => {
         setLoading(false);
       }, 100);
@@ -515,6 +515,7 @@ var ToCPay = (props, ref) => {
         open,
         cancelVisible: false,
         okText,
+        wrapClassName: "toc-pay-modal-content",
         bodyStyle: {
           padding: 24
         },