@pisell/private-materials 6.8.75 → 6.8.76

package/es/components/kioskSkuDetail/locales.d.ts

@@ -3,19 +3,25 @@ declare const _default: {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
         'pisell2.text.kiosk.sku.detail.item.total': string;
         'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
     };
     'zh-CN': {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
         'pisell2.text.kiosk.sku.detail.item.total': string;
         'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
     };
     'zh-TW': {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
         'pisell2.text.kiosk.sku.detail.item.total': string;
         'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
     };
 };
 export default _default;

package/es/components/kioskSkuDetail/locales.js

@@ -3,18 +3,24 @@ export default {
     'pisell2.text.kiosk.sku.detail.btn.back': 'Back',
     'pisell2.text.kiosk.sku.detail.item.total': 'Item total',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': 'Add to cart',
-    'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…'
+    'pisell2.text.kiosk.sku.detail.btn.update': 'Update',
+    'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': 'Please select a top-up option'
   },
   'zh-CN': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
     'pisell2.text.kiosk.sku.detail.item.total': '小计',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入购物车',
-    'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…'
+    'pisell2.text.kiosk.sku.detail.btn.update': '更新',
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': '请选择充值选项'
   },
   'zh-TW': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
     'pisell2.text.kiosk.sku.detail.item.total': '小計',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入購物車',
-    'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…'
+    'pisell2.text.kiosk.sku.detail.btn.update': '更新',
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': '請選擇充值選項'
   }
 };

package/es/components/login/index.d.ts

@@ -1,8 +1,9 @@
+import React from "react";
 import "./index.less";
 export interface LoginProps {
     title: string;
     style: any;
     onLogin: (values: any, callback: (status: any) => void) => void;
 }
-declare const Login: (props: LoginProps) => JSX.Element;
+declare const Login: (props: LoginProps) => React.JSX.Element;
 export default Login;

package/es/components/pay/toB/components/Cache/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 declare const ToBPayCache: (props: {
     open: boolean;
@@ -6,5 +7,5 @@ declare const ToBPayCache: (props: {
     expect_amount: string;
     onCancel: () => void;
     onOk: (amount: string) => void;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ToBPayCache;

package/es/components/pay/toB/components/Card/index.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import { PayMethod } from '../../types';
 import './index.less';
 declare const ToBPayCard: ({ data, onChange, }: {
     data: PayMethod;
     onChange: (item: PayMethod, type: 'fullPay' | 'pay') => void;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ToBPayCard;

package/es/components/pay/toB/components/CardGroup/index.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 import { PayMethod, PayMethodGroup } from '../../types';
 import './index.less';
 declare const ToBPayCardGroup: (props: {
     data: PayMethodGroup;
     onChange: (item: PayMethod, type: 'fullPay' | 'pay') => void;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ToBPayCardGroup;

package/es/components/pay/toB/components/ConfirmedPayment/index.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 import { Payment } from '../../types';
 import './index.less';
 declare const ConfirmedPayment: (props: {
     data: Payment[];
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ConfirmedPayment;

package/es/components/pay/toB/components/Content/Footer.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 declare const ToBPayFooter: (props: {
     loading: boolean;
     submitDisabled: boolean;
     onCancel: () => void;
     onSubmit: () => void;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ToBPayFooter;

package/es/components/pay/toB/components/Content/Header.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 declare const ToBPayTitle: (props: {
     amount: number | string;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ToBPayTitle;

package/es/components/pay/toB/components/EFTPOS/index.js

@@ -127,7 +127,14 @@ var EFTPOS = function EFTPOS(props, ref) {
                 name: payMethod.name,
                 symbol: params.symbol,
                 amount: params.amount,
-                device_number: device_number
+                device_number: device_number,
+                custom_payment_id: payMethod === null || payMethod === void 0 ? void 0 : payMethod.id,
+                custom_payment_code: payMethod === null || payMethod === void 0 ? void 0 : payMethod.code,
+                custom_payment_name: payMethod === null || payMethod === void 0 ? void 0 : payMethod.name,
+                custom_payment_type: payMethod === null || payMethod === void 0 ? void 0 : payMethod.type,
+                operator_type: params === null || params === void 0 ? void 0 : params.operator_type,
+                operator_id: params === null || params === void 0 ? void 0 : params.operator_id,
+                platform: params === null || params === void 0 ? void 0 : params.platform
               },
               mode: mode
             };

package/es/components/pay/toB/store/provider.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare const ToBPayProvider: ({ children }: {
     children: React.ReactNode;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/es/components/pay/toB/types/index.d.ts

@@ -14,6 +14,7 @@ export interface ToBPayParams {
             symbol?: string;
             amount: string;
             surcharge?: string;
+            [key: string]: any;
         };
         mode: 'pay' | 'refund';
     };

package/es/components/pay/toC/PaymentList/index.d.ts

@@ -12,7 +12,7 @@ export interface PaymentListProps {
     renderTitle?: () => React.ReactNode;
 }
 export interface PaymentListRef {
-    init: (props: any) => {};
+    init: (props: any, amount?: number) => {};
     calculateSurcharge: (amount: number) => any;
 }
 declare const _default: React.ForwardRefExoticComponent<PaymentListProps & React.RefAttributes<unknown>>;

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

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useMemo, useImperativeHandle, forwardRef } from 'react';
 import { filterPaymentList, getPaymentList } from "./serve";
-import { PisellCheckboxGroup, PisellRow, PisellTooltip, Iconfont, PisellEmpty } from '@pisell/materials';
+import { PisellCheckboxGroup, PisellRow, PisellTooltip, Iconfont, PisellEmpty, Image } from '@pisell/materials';
 import { calculateSurcharge } from "./utils";
 import classNames from 'classnames';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -154,14 +154,14 @@ var PaymentList = function PaymentList(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-16 10:53
    */
-  var init = function init(list) {
+  var init = function init(list, amount) {
     var _context$appHelper2;
     // 打开loading
     setLoading(true);
     var platform = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.constants) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.platform) || 'h5';
 
     // 过滤数据
-    var _filterPaymentList = filterPaymentList(list, platform, isApp),
+    var _filterPaymentList = filterPaymentList(list, platform, isApp, amount),
       paymentList = _filterPaymentList.paymentList,
       walletPass = _filterPaymentList.walletPass;
 
@@ -262,6 +262,43 @@ var PaymentList = function PaymentList(props, ref) {
     }));
   };
 
+  /**
+   * @description: 渲染信用卡手续费弹窗
+   * @param {any} _item
+   * @return {*}
+   */
+  var renderCreditCardToast = function renderCreditCardToast(_item) {
+    var _item$surcharge_confi;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "surcharge-modal-wrap surcharge-modal-wrap-credit-card"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "surcharge-modal-lists"
+    }, _item === null || _item === void 0 || (_item$surcharge_confi = _item.surcharge_config_result) === null || _item$surcharge_confi === void 0 ? void 0 : _item$surcharge_confi.map(function (d) {
+      var _d$icons, _d$lists;
+      return /*#__PURE__*/React.createElement("div", {
+        key: d.name,
+        className: "surcharge-modal-list-item"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "surcharge-modal-list-item-header"
+      }, d === null || d === void 0 || (_d$icons = d.icons) === null || _d$icons === void 0 ? void 0 : _d$icons.map(function (icon) {
+        return /*#__PURE__*/React.createElement(Image, {
+          src: icon,
+          className: "header-icon",
+          isPreview: false
+        });
+      }), /*#__PURE__*/React.createElement("span", null, d.name)), /*#__PURE__*/React.createElement("div", {
+        className: "surcharge-modal-list-item-content"
+      }, d === null || d === void 0 || (_d$lists = d.lists) === null || _d$lists === void 0 ? void 0 : _d$lists.map(function (item) {
+        return /*#__PURE__*/React.createElement("div", {
+          key: item.name,
+          className: "content-item"
+        }, /*#__PURE__*/React.createElement("span", null, locales.getText(item.area_text)), /*#__PURE__*/React.createElement("span", {
+          className: "item-fee"
+        }, item.surcharge_fee), /*#__PURE__*/React.createElement("span", null, item.surcharge_text));
+      })));
+    })));
+  };
+
   /**
    * @title: 列表
    * @description:
@@ -293,9 +330,12 @@ var PaymentList = function PaymentList(props, ref) {
       onChange: paymentTypeChange,
       optionClassName: 'payment-item',
       renderOption: function renderOption(d, active) {
-        var _d$params, _d$params2;
+        var _d$params, _d$surcharge_config_r, _d$params2;
         // 是否展示手续费icon
         var showIcon = d.surcharge && d.service !== 'pisell.other.cashmanual' && d.service !== 'pisell.custom_payment' || (d === null || d === void 0 || (_d$params = d.params) === null || _d$params === void 0 ? void 0 : _d$params.description) && (d.service === 'pisell.other.cashmanual' || d.service === 'pisell.custom_payment');
+
+        // 是否显示单独的信用卡手续费弹窗
+        var showCreditCardToast = (d === null || d === void 0 ? void 0 : d.service) === 'mw.credit_card' && (d === null || d === void 0 || (_d$surcharge_config_r = d.surcharge_config_result) === null || _d$surcharge_config_r === void 0 ? void 0 : _d$surcharge_config_r.length) > 0;
         return /*#__PURE__*/React.createElement(PisellRow, {
           platform: "h5",
           key: d.service,
@@ -316,9 +356,18 @@ var PaymentList = function PaymentList(props, ref) {
           }, d.title, ' '), /*#__PURE__*/React.createElement("div", {
             className: ""
           }, (d !== null && d !== void 0 && (_d$params2 = d.params) !== null && _d$params2 !== void 0 && _d$params2.description || d.surcharge) && d.service !== 'pisell.offline_payment' ? /*#__PURE__*/React.createElement(PisellTooltip, {
-            title: renderToast(d),
+            title: showCreditCardToast ? renderCreditCardToast(d) : renderToast(d),
             onClick: function onClick(e) {
               e.stopPropagation();
+            },
+            overlayClassName: showCreditCardToast ? 'surcharge-tooltip-overlay-wrap' : '',
+            getPopupContainer: function getPopupContainer(triggerNode) {
+              if (showCreditCardToast) {
+                var _triggerNode$closest;
+                var modalContainer = triggerNode === null || triggerNode === void 0 || (_triggerNode$closest = triggerNode.closest) === null || _triggerNode$closest === void 0 ? void 0 : _triggerNode$closest.call(triggerNode, '.toc-pay-modal-content .pisell-lowcode-modal');
+                return modalContainer || document.body;
+              }
+              return document.body;
             }
           }, /*#__PURE__*/React.createElement("span", {
             className: classNames('surcharge-wrap', {

package/es/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/es/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/es/components/pay/toC/PaymentList/serve.js

@@ -17,6 +17,7 @@ import { request } from "../../../../utils";
 import { paymentKeys } from "./status";
 import { isWx, isIOS } from '@pisell/utils';
 import { paymentTypes, isCustomPayment } from "./status";
+import { formatCreditCardSurchargeList, formatCreditCardSurchargeText } from "./utils";
 
 /**
  * @title: 获取支付列表
@@ -49,6 +50,17 @@ export var getPaymentList = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+// 修改当前的支付方式默认排序
+// Apple Pay / Google Pay（按设备自动显示）
+// Visa / Master（信用卡）
+// Online Payment（stripe）
+// Bank Deposit（银行转账）
+// Alipay
+// WeChat Pay
+// Offline Payment（线下支付）
+// Cash（现金）
+// Custom Payment（自定义支付）
+var sortArr = ['mw.google', 'mw.apple', 'mw.credit_card', 'stripe', 'pisell.bank_deposit', 'superpay.alipay.h5', 'superpay.wechat.h5', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_payment'];
 
 /**
  * @title: 过滤支付列表
@@ -61,6 +73,7 @@ export var getPaymentList = /*#__PURE__*/function () {
 export var filterPaymentList = function filterPaymentList(list) {
   var platform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'h5';
   var isApp = arguments.length > 2 ? arguments[2] : undefined;
+  var amount = arguments.length > 3 ? arguments[3] : undefined;
   var paymentList = _toConsumableArray(list);
   var _paymentKeys = _toConsumableArray(paymentKeys);
 
@@ -122,6 +135,9 @@ export var filterPaymentList = function filterPaymentList(list) {
       walletPass: walletPass
     };
   }
+  paymentList = paymentList.sort(function (a, b) {
+    return sortArr.indexOf(a.service) - sortArr.indexOf(b.service);
+  });
 
   // 将自定义支付方式的service加上custom_payment_id, 保证唯一性
   paymentList = paymentList.map(function (d) {
@@ -132,6 +148,12 @@ export var filterPaymentList = function filterPaymentList(list) {
     if (isCustomPayment(d.service)) {
       service = service + '|' + d.params.custom_payment_id;
     }
+
+    // visa/master手续费特殊处理
+    if (service === 'mw.credit_card') {
+      d.surcharge = formatCreditCardSurchargeText(d === null || d === void 0 ? void 0 : d.surcharge_config, d === null || d === void 0 ? void 0 : d.surcharge_text);
+      d.surcharge_config_result = formatCreditCardSurchargeList(d, amount !== null && amount !== void 0 ? amount : 0);
+    }
     return _objectSpread(_objectSpread({}, d), {}, {
       service: service,
       title: d.name,

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

@@ -1,3 +1,29 @@
+/**
+ * @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;
+/**
+ * @description: 格式化visa/master手续费文案，只显示百分比区间
+ * @return {*}
+ */
+export declare const formatCreditCardSurchargeText: (surcharge_config: any[], surcharge_text: string) => string;
 /**
  * @title: 计算支付列表的手续费
  * @description: