@pisell/private-materials 6.9.1 → 6.9.3

package/es/components/checkout/components/PaymentOptionsModule/PaymentMethodItem.d.ts

@@ -10,6 +10,7 @@ export interface ExtendedPaymentMethod {
     fixed?: number;
     percentage?: number;
     totalAmount?: string;
+    channel_application?: string[];
 }
 export interface PaymentMethodItemProps {
     /** 支付方式数据 */

package/es/components/checkout/components/PaymentOptionsModule/index.js

@@ -10,7 +10,7 @@ import checkoutLocales from "../../locales";
 
 // 扩展 PaymentOptionsModule Props 接口
 
-export var SHOW_METHODS_CODE = ['EFTPOS_LINKLY', 'EFTPOS', 'EFTPOS_TYRO', 'EFTPOS_WINDCAVE', 'EFTPOS_PAYO'];
+export var SHOW_METHODS_CODE = ['EFTPOS_LINKLY', 'EFTPOS', 'EFTPOS_TYRO', 'EFTPOS_WINDCAVE', 'EFTPOS_PAYO', 'EFTPOS_HUIFU'];
 function PaymentOptionsModule(_ref) {
   var _context$appHelper, _context$appHelper$ge, _context$appHelper$ge2, _context$appHelper$ut;
   var amountSymbol = _ref.amountSymbol,
@@ -45,7 +45,8 @@ function PaymentOptionsModule(_ref) {
   // 获取标题，优先使用props中的title，如果没有则使用国际化的默认值
   var displayTitle = typeof title === 'string' ? title : title ? String(title) : getText('cards.and.digitals', 'Cards & Digitals');
   var filteredPaymentMethods = paymentMethods.filter(function (item) {
-    return !(item.type === 'app' && item.code === 'EFTPOS_LINKLY') && (['custom'].includes(item.type) || SHOW_METHODS_CODE.includes(item.code));
+    var _item$channel_applica;
+    return !(item.type === 'app' && item.code === 'EFTPOS_LINKLY') && ((_item$channel_applica = item.channel_application) === null || _item$channel_applica === void 0 ? void 0 : _item$channel_applica.includes('pos')) && (['custom'].includes(item.type) || SHOW_METHODS_CODE.includes(item.code));
   });
 
   // 防抖处理支付方式点击

package/es/components/checkout/components/PaymentResultToast/PaymentResultToastProvider.js

@@ -337,7 +337,6 @@ var GlobalToastManager = /*#__PURE__*/function () {
       if (config.mask) {
         container.setAttribute('data-mask', 'true');
       }
-      debugger;
       // 计算动态的bottom位置
       var dynamicBottomOffset = this.calculateAndCacheBottomOffset();
       // const centerOffset = this.calculateAndCacheCenterOffset();

package/es/components/checkout/components/PaymentResultToast/index.js

@@ -158,9 +158,11 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
       }
     };
     document.addEventListener('mousedown', handleClickOutside);
+    document.addEventListener('pointerup', handleClickOutside);
     // 清理函数
     return function () {
       document.removeEventListener('mousedown', handleClickOutside);
+      document.removeEventListener('pointerup', handleClickOutside);
     };
   }, [clickOutsideToClose, visible, clearCountdown]);
 

package/es/components/checkout/components/WalletPassModule/index.js

@@ -25,6 +25,7 @@ var WalletPassModule = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useWalletPass = useWalletPass({
       onSelectChange: onSelectChange,
       customAmount: customAmount,
+      totalAmount: Number(orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalAmount) || 0,
       clientId: clientId
     }),
     handleSelectWallet = _useWalletPass.handleSelectWallet,

package/es/components/checkout/components/WalletPassModule/utils.d.ts

@@ -1,6 +1,7 @@
 declare type WalletPassDataType = Record<string, any>;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => any;
 export declare const voucherTime: (data: WalletPassDataType, key?: string) => any;
+export declare const getVoucherAvailableStatus: (item: any) => boolean;
 export declare const formatMachineCodeServer2CardList: (data: WalletPassDataType[], selectId?: number[], otherProps?: Record<string, any>) => any;
 export declare const formatDiscountWalletData: (data: any, selectId?: number[]) => any;
 export interface WalletPassUsageUnit {

package/es/components/checkout/components/WalletPassModule/utils.js

@@ -11,12 +11,15 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
-import { formatDate, locales } from '@pisell/utils';
+import { formatDate, isNumber, locales } from '@pisell/utils';
 import { globalConfig, PisellText } from "@pisell/materials";
 import Decimal from 'decimal.js';
 var Amount = PisellText.Amount;
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (isNumber(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 export var voucherTime = function voucherTime(data) {
@@ -27,11 +30,22 @@ export var voucherTime = function voucherTime(data) {
   }
   return locales.getText('pisell2.text.walletPassPermanent');
 };
+export var getVoucherAvailableStatus = function getVoucherAvailableStatus(item) {
+  return item.unified_available_status === 1 && (isNumber(item._unified_available_status) ? !!item._unified_available_status : true);
+};
 export var formatMachineCodeServer2CardList = function formatMachineCodeServer2CardList(data) {
   var selectId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var otherProps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return (data || []).map(function (item) {
     var _item$unified_message, _item$product;
+    var disabled = false;
+    if (item.unified_available_status === 0) {
+      disabled = true;
+    } else {
+      if (isNumber(item._unified_available_status)) {
+        disabled = !item._unified_available_status;
+      }
+    }
     return _objectSpread({
       id: item.id,
       name: item.product_name,
@@ -48,8 +62,8 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       showQrCode: false,
       showStatus: true,
       code: item.code,
-      disabled: !item.unified_available_status,
-      disabledReason: (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
+      disabled: disabled,
+      disabledReason: isNumber(item._unified_available_status) && item._unified_available_status !== 1 ? item.reason : (_item$unified_message = item.unified_messages) === null || _item$unified_message === void 0 ? void 0 : _item$unified_message.title,
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -9,6 +9,7 @@ export declare const useWalletPass: (props: {
     }[]) => void) | undefined;
     customAmount?: string | undefined;
     clientId?: number | undefined;
+    totalAmount?: number | undefined;
 }) => {
     walletRecommendList: any[];
     userIdentificationCodes: any[];
@@ -29,7 +30,6 @@ export declare const useWalletPass: (props: {
     selectedDiscountList: any;
     handleSelectDiscount: (value: number[], option: any) => void;
     customerName: any;
-    fetchWalletRecommendList: (params: any) => Promise<any>;
     fetchUserIdentificationCodes: (params: any) => Promise<any>;
     getCachedWalletRecommendList: () => any;
     getCachedUserIdentificationCodes: () => any;