@pisell/private-materials 3.4.84 → 3.4.86

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/es/components/eftposPay/component/fail/failCustom.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
 /* eslint-disable no-nested-ternary */
 import { locales } from '@pisell/utils';
 import { useMount } from 'ahooks';
@@ -23,7 +29,8 @@ export default (function (_ref) {
     order_id = _useContextData.order_id,
     number = _useContextData.number,
     device = _useContextData.device,
-    client = _useContextData.client;
+    client = _useContextData.client,
+    originalParams = _useContextData.originalParams;
   var failCustom = custom === null || custom === void 0 ? void 0 : custom.failCustom;
   var dispatch = useDispatch();
 
@@ -34,20 +41,18 @@ export default (function (_ref) {
    */
   var onRetry = function onRetry() {
     onChange('page', 'pay');
-    dispatch(updateState(getInitState(eftpos, mode === ModeEnum.Query ? {
+    var params = _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
       name: name,
       symbol: symbol,
       amount: amount,
       order_id: order_id
-    } : {
-      mode: mode,
-      name: name,
-      symbol: symbol,
-      amount: amount,
-      order_id: order_id,
-      number: ''
-    })));
+    });
+    // 非查询模式，清空支付流水号
+    if (mode !== ModeEnum.Query) {
+      params.number = '';
+    }
+    dispatch(updateState(getInitState(eftpos, params)));
   };
 
   /**
@@ -56,14 +61,14 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:30
    */
   var onModify = function onModify() {
-    dispatch(updateState(getInitState(eftpos, {
+    dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
       name: name,
       symbol: symbol,
       amount: amount,
       order_id: order_id,
       number: ''
-    })));
+    }))));
     onChange('page', 'amount');
   };
 

package/es/components/eftposPay/component/fail/index.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
 /* eslint-disable no-nested-ternary */
 import { locales } from '@pisell/utils';
 import { Button } from 'antd';
@@ -25,7 +31,8 @@ export default (function (_ref) {
     order_id = _useContextData.order_id,
     number = _useContextData.number,
     device = _useContextData.device,
-    client = _useContextData.client;
+    client = _useContextData.client,
+    originalParams = _useContextData.originalParams;
   var isPosNetworkError = ((_steps$step = steps[step]) === null || _steps$step === void 0 || (_steps$step = _steps$step.custom) === null || _steps$step === void 0 ? void 0 : _steps$step.isPosNetworkError) || false;
   var dispatch = useDispatch();
 
@@ -36,14 +43,14 @@ export default (function (_ref) {
    */
   var onRetry = function onRetry() {
     onChange('page', 'pay');
-    dispatch(updateState(getInitState(eftpos, {
+    dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
       name: name,
       symbol: symbol,
       amount: amount,
       order_id: order_id,
       number: ''
-    })));
+    }))));
   };
 
   /**
@@ -52,14 +59,14 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:30
    */
   var onModify = function onModify() {
-    dispatch(updateState(getInitState(eftpos, {
+    dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
       name: name,
       symbol: symbol,
       amount: amount,
       order_id: order_id,
       number: ''
-    })));
+    }))));
     onChange('page', 'amount');
   };
 

package/es/components/eftposPay/const.d.ts

@@ -154,6 +154,8 @@ export declare enum PayStatus {
     'Unknown' = "701000",
     /** 交易请求超时 */
     'Timeout' = "701001",
+    /** 支付失败 */
+    'PaymentFailed' = "701002",
     /** 繁忙 EFTPOS终端暂时不可用，因为EFTPOS正在处理另一个请求。 */
     'PayOtherEftposFailed' = "701003",
     /** 购物者没有出示卡片/卡片金额不足/在线拒绝/卡已过期/卡被锁定 */

package/es/components/eftposPay/const.js

@@ -68,6 +68,7 @@ export var PayStatus = /*#__PURE__*/function (PayStatus) {
   PayStatus["PairingFailure"] = "606020";
   PayStatus["Unknown"] = "701000";
   PayStatus["Timeout"] = "701001";
+  PayStatus["PaymentFailed"] = "701002";
   PayStatus["PayOtherEftposFailed"] = "701003";
   PayStatus["PayCardErrorFailed"] = "701004";
   PayStatus["NoNetWork"] = "701005";

package/es/components/eftposPay/hooks.d.ts

@@ -32,4 +32,5 @@ export declare const useStoreRef: <T extends {
  */
 export declare const useFail: (index: number) => (res: {
     code?: `${PayStatus}`;
+    message?: string;
 }, isMark?: boolean) => void;

package/es/components/eftposPay/hooks.js

@@ -314,6 +314,18 @@ export var useFail = function useFail(index) {
       }));
       return;
     }
+    if (code === PayStatus.PaymentFailed) {
+      // 前往错误页  不可标记状态
+      steps[index].title = locales.getText('page.eftpos-pay.text.transaction.fail');
+      steps[index].fail = (res === null || res === void 0 ? void 0 : res.message) || locales.getText('page.eftpos-pay.text.failed')(modeRef.current);
+      steps[index].status = 'fail';
+      dispatch(updateSteps(steps));
+      dispatch(updateComponent('Fail'));
+      dispatch(updateCustom({
+        errorStatus: 'know' // unknow know
+      }));
+      return;
+    }
 
     // 其他场景前往未知错误页
     steps[index].title = locales.getText('page.eftpos-pay.text.failed')(modeRef.current);

package/es/components/eftposPay/index.js

@@ -114,7 +114,7 @@ export default (function (props) {
     if (props.source === RestoreEumn.Restore) {
       return props.params;
     }
-    return getInitState(props.type, props.params ? _objectSpread(_objectSpread({
+    var initState = getInitState(props.type, props.params ? _objectSpread(_objectSpread({
       mode: mode
     }, props.params), {}, {
       symbol: current
@@ -122,6 +122,10 @@ export default (function (props) {
       mode: mode,
       symbol: current
     });
+    // 手动将 originalParams 添加到 State 根级别
+    return _objectSpread(_objectSpread({}, initState || {}), {}, {
+      originalParams: props.params || {}
+    });
   }, [mode, props.params, props.type, symbol]);
   var stateRef = useRef(state);
   useEffect(function () {

package/es/components/eftposPay/linkly/const.js

@@ -54,7 +54,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
     warn: '',
     custom: other || {}
   }, typeof net !== 'undefined' ? {

package/es/components/eftposPay/payo/config.js

@@ -188,6 +188,7 @@ export var POS = function POS(_ref) {
       card_reader_type: eftposRef.current,
       card_reader_id: (_deviceRef$current3 = deviceRef.current) === null || _deviceRef$current3 === void 0 ? void 0 : _deviceRef$current3.id,
       number: numRef.current,
+      original_payment_number: custom === null || custom === void 0 ? void 0 : custom.original_payment_number,
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))

package/es/components/eftposPay/payo/const.js

@@ -68,7 +68,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
     custom: other || {}
   }, typeof net !== 'undefined' ? {
     net: net

package/es/components/eftposPay/store/index.d.ts

@@ -91,6 +91,8 @@ export declare type State = {
     };
     backup?: Omit<State, 'backup'>;
     client: ClientEnum;
+    /** 支付原始参数 */
+    originalParams?: Record<string, any>;
 };
 export declare type Action = {
     type: EActionTypes;
@@ -344,6 +346,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
         client?: ClientEnum | undefined;
+        originalParams?: Record<string, any> | undefined;
     };
 };
 export declare function reducers(state: State, action: Action): State;

package/es/components/eftposPay/tyro/const.js

@@ -45,7 +45,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: [],
     render: true,
-    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
     custom: other || {}
   }, typeof net !== 'undefined' ? {
     net: net

package/es/components/eftposPay/windcave/const.js

@@ -46,7 +46,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: [],
     render: true,
-    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
     custom: other ? _objectSpread(_objectSpread({}, other), {}, {
       list: [],
       step: StepStatusEnum.Free

package/es/components/eventBooking/components/ErrorTip/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/es/components/pay/toC/PaymentMethods/MWCreditCard/List/index.js

@@ -15,6 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useImperativeHandle, forwardRef, useMemo, useContext } from 'react';
 import { Button } from 'antd';
 import { locales } from '@pisell/utils';
+import { useDebounceFn } from 'ahooks';
 import { PisellModal, Iconfont, PisellCheckboxGroup, PisellRow, getBankCardTypeImg, PisellLoading, PisellText } from '@pisell/materials';
 import classNames from 'classnames';
 import { Context } from "../../../model";
@@ -126,12 +127,15 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
             // 关闭管理卡模式
             setManage(false);
 
+            // 重置确认按钮loading状态
+            setOkLoading(false);
+
             // 选中第一个卡
             setCurrentCard(0);
 
             // 异步 获取信用卡列表
             _getCreditCardList();
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -266,21 +270,32 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-16 11:11
    */
-  var onOk = function onOk() {
-    var _props$onChange;
-    // 管理卡模式下, 则执行删除卡操作
-    if (manage) {
-      setManage(false);
-      handleBatchDeleteCards();
-      return;
-    }
+  // 确认按钮loading状态
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    okLoading = _useState14[0],
+    setOkLoading = _useState14[1];
+  var _useDebounceFn = useDebounceFn(function () {
+      var _props$onChange;
+      // 管理卡模式下, 则执行删除卡操作
+      if (manage) {
+        setManage(false);
+        handleBatchDeleteCards();
+        return;
+      }
 
-    // 否则回调到外部
-    var cur = creditCardList.find(function (d) {
-      return d.id === currentCard;
-    });
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, cur);
-  };
+      // 展示loading, 防止重复点击
+      setOkLoading(true);
+
+      // 否则回调到外部
+      var cur = creditCardList.find(function (d) {
+        return d.id === currentCard;
+      });
+      (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, cur);
+    }, {
+      wait: 300
+    }),
+    onOk = _useDebounceFn.run;
 
   // 渲染列表
   var renderList = useMemo(function () {
@@ -330,7 +345,8 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
     okText: manage ? locales.getText('tocPay.text.done') : okText,
     onOk: onOk,
     okButtonProps: {
-      disabled: !currentCard
+      disabled: !currentCard,
+      loading: okLoading
     },
     bodyStyle: {
       padding: 24

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

@@ -367,15 +367,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           timer = null; // 返回promise
           return _context3.abrupt("return", new Promise(function (res, rej) {
             var _threeDSMethodData$pa7;
-            // 10秒内没有成功则走N逻辑
-            timer = setTimeout(function () {
-              res(defaultReturnParams);
-              log({
-                msg: '第三步: 10秒超时则走N逻辑',
-                data: threeDSMethodData
-              });
-            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
-            window.addEventListener('message', function (event) {
+            var handleMessage = function handleMessage(event) {
               // 判断域名
               if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
                 // 返回 threeDSServerTransID 则 res
@@ -388,6 +380,8 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   if (timer) {
                     clearTimeout(timer);
                   }
+                  // 移除监听器，防止重复触发
+                  window.removeEventListener('message', handleMessage);
                   // 10秒内成功则走Y逻辑
                   res({
                     threeDSServerTransID: event.data.threeDSServerTransID,
@@ -395,7 +389,19 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   });
                 }
               }
-            }, false);
+            };
+
+            // 10秒内没有成功则走N逻辑
+            timer = setTimeout(function () {
+              // 超时也要移除监听器
+              window.removeEventListener('message', handleMessage);
+              res(defaultReturnParams);
+              log({
+                msg: '第三步: 10秒超时则走N逻辑',
+                data: threeDSMethodData
+              });
+            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
+            window.addEventListener('message', handleMessage, false);
           }));
         case 28:
         case "end":

package/es/components/shoppingCart/components/Empty/index.d.ts

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