@pisell/private-materials 3.4.91 → 3.4.93

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

@@ -14,6 +14,7 @@ import { getInitState } from "../../manufacturer";
 import XClose from '@pisell/icon/es/XClose';
 import { useDispatch, useContextData, updateState, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 export default (function (_ref) {
   var _ref$className = _ref.className,
     className = _ref$className === void 0 ? '' : _ref$className,
@@ -40,13 +41,15 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:30
    */
   var onRetry = function onRetry() {
+    payLog.log('自定义失败页：重试');
     onChange('page', 'pay');
     var params = _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
       name: name,
       symbol: symbol,
       amount: amount,
-      order_id: order_id
+      order_id: order_id,
+      client: client
     });
     // 非查询模式，清空支付流水号
     if (mode !== ModeEnum.Query) {
@@ -67,7 +70,8 @@ export default (function (_ref) {
       symbol: symbol,
       amount: amount,
       order_id: order_id,
-      number: ''
+      number: '',
+      client: client
     }))));
     onChange('page', 'amount');
   };
@@ -80,6 +84,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:31
    */
   var onManually = function onManually() {
+    payLog.log('自定义失败页：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.unknown.title')(mode),
@@ -89,6 +94,7 @@ export default (function (_ref) {
     dispatch(updateComponent('Manual'));
   };
   var onNotin = function onNotin() {
+    payLog.log('自定义失败页：点击打印小票');
     onChange('print', [], 'print_on_timeout');
   };
 
@@ -99,6 +105,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:32
    */
   var onClose = function onClose() {
+    payLog.log('自定义失败页：关闭');
     onChange('fail', {
       number: number,
       uniquePaymentNumber: number,
@@ -106,9 +113,10 @@ export default (function (_ref) {
       order_id: order_id
     });
   };
-
-  // 错误页 通知外界 开发关闭按钮
   useMount(function () {
+    payLog.log('自定义失败页展示', {
+      status: failCustom === null || failCustom === void 0 ? void 0 : failCustom.status
+    });
     if ((failCustom === null || failCustom === void 0 ? void 0 : failCustom.status) === 'fail') {
       onChange('page', 'fail');
     }

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ActionProps } from '../../const';
-declare const _default: ({ onChange, className, isMobile }: ActionProps) => React.JSX.Element;
+declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

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

@@ -14,6 +14,7 @@ import { ClientEnum } from "../../const";
 import { getInitState } from "../../manufacturer";
 import { useDispatch, useContextData, updateState, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 export default (function (_ref) {
   var _steps$step;
   var onChange = _ref.onChange,
@@ -42,6 +43,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:30
    */
   var onRetry = function onRetry() {
+    payLog.log('失败页：点击重试');
     onChange('page', 'pay');
     dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
@@ -49,7 +51,8 @@ export default (function (_ref) {
       symbol: symbol,
       amount: amount,
       order_id: order_id,
-      number: ''
+      number: '',
+      client: client
     }))));
   };
 
@@ -65,7 +68,8 @@ export default (function (_ref) {
       symbol: symbol,
       amount: amount,
       order_id: order_id,
-      number: ''
+      number: '',
+      client: client
     }))));
     onChange('page', 'amount');
   };
@@ -78,6 +82,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:31
    */
   var onManually = function onManually() {
+    payLog.log('失败页：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.unknown.title')(mode),
@@ -87,6 +92,7 @@ export default (function (_ref) {
     dispatch(updateComponent('Manual'));
   };
   var onNotin = function onNotin() {
+    payLog.log('失败页：点击打印小票');
     onChange('print', [], 'print_on_timeout');
   };
 
@@ -97,7 +103,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:32
    */
   var onClose = function onClose() {
-    // 支付失败页
+    payLog.log('失败页：点击关闭');
     onChange('fail', {
       number: number,
       uniquePaymentNumber: number,
@@ -105,9 +111,10 @@ export default (function (_ref) {
       order_id: order_id
     });
   };
-
-  // 错误页 通知外界 开发关闭按钮
   useMount(function () {
+    payLog.log('失败页展示', {
+      status: steps[step].status
+    });
     if (steps[step].status === 'fail') {
       onChange('page', 'fail');
     }

package/es/components/eftposPay/component/fail/network.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页
  * @Author: hongbing.wang
  * @Date: 2024-08-20 11:40
  */
-declare const _default: ({ className }: ActionProps) => React.JSX.Element;
+declare const _default: ({ className }: ActionProps) => JSX.Element;
 export default _default;

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

@@ -8,6 +8,7 @@ import { locales } from '@pisell/utils';
 import React, { useEffect, useState } from 'react';
 import { Button, message } from 'antd';
 import Header from "../header";
+import payLog from "../../utils/payLog";
 
 /**
  * @title: 断网(客户端)提示页
@@ -22,6 +23,7 @@ export default (function (_ref) {
     hasBtn = _useState2[0],
     setBtn = _useState2[1];
   useEffect(function () {
+    payLog.log('断网提示页展示');
     var clear = setTimeout(function () {
       setBtn(true);
     }, 1000);
@@ -37,6 +39,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:41
    */
   var onReconnect = function onReconnect() {
+    payLog.log('断网提示页：点击重新连接');
     message.open({
       key: 'net-warning',
       type: 'loading',

package/es/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面
@@ -6,5 +5,5 @@ import { ActionProps } from '../../const';
  * @Author: hongbing.wang
  * @Date: 2024-08-20 11:42
  */
-declare const _default: ({ onChange, className }: ActionProps) => React.JSX.Element;
+declare const _default: ({ onChange, className }: ActionProps) => JSX.Element;
 export default _default;

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

@@ -2,9 +2,11 @@
 import { locales } from '@pisell/utils';
 import { Button } from 'antd';
 import React, { useEffect } from 'react';
+import { useMount } from 'ahooks';
 import { ClientEnum } from "../../const";
 import { useDispatch, useContextData, updateState, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 
 /**
  * @title: 支付状态未知页面
@@ -21,6 +23,9 @@ export default (function (_ref) {
     mode = _useContextData.mode,
     client = _useContextData.client;
   var dispatch = useDispatch();
+  useMount(function () {
+    payLog.log('未知状态处理页展示');
+  });
 
   /**
    * @title: 手动标记
@@ -29,6 +34,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:31
    */
   var onManually = function onManually() {
+    payLog.log('未知状态处理页：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.unknown.title')(mode),
@@ -38,11 +44,13 @@ export default (function (_ref) {
     dispatch(updateComponent('Manual'));
   };
   var onNotin = function onNotin() {
+    payLog.log('未知状态处理页：点击打印小票');
     onChange('print', [], 'print_on_timeout');
   };
   useEffect(function () {
     // 如果 网络终端 恢复至此页面 则需要 回归 步骤流程
     if (form === 'Network' || form === 'restore') {
+      payLog.log('未知状态处理页：网络终端');
       dispatch(updateComponent(''));
     }
   }, [form]);

package/es/components/eftposPay/component/header/index.d.ts

@@ -6,5 +6,5 @@ declare const _default: ({ status, title, subTitle, children }: {
     title?: string | undefined;
     subTitle?: string | undefined;
     children?: React.ReactNode;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",
@@ -9,5 +8,5 @@ declare const _default: ({ type, children, onBack, onClose, }: {
     children: string;
     onBack?: (() => void) | undefined;
     onClose?: (() => void) | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ActionProps } from '../../const';
 import './index.less';
 /**
@@ -6,5 +5,5 @@ import './index.less';
  * @Author: hongbing.wang
  * @Date: 2024-08-20 11:46
  */
-declare const _default: ({ onChange, className, formatAmount }: ActionProps) => React.JSX.Element;
+declare const _default: ({ onChange, className, formatAmount }: ActionProps) => JSX.Element;
 export default _default;

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

@@ -13,11 +13,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { locales } from '@pisell/utils';
 import { Decimal } from 'decimal.js';
 import { Button, InputNumber } from 'antd';
-import React, { useMemo, useState } from 'react';
+import React, { useMemo, useEffect, useState } from 'react';
 import usePrefix from "../../../../hooks/usePrefix";
 import { ModeEnum } from "../../const";
 import { useContextData, useDispatch, updateState } from "../../store";
 import { limitDecimals } from "../../helper";
+import payLog from "../../utils/payLog";
 import "./index.less";
 
 /**
@@ -40,6 +41,9 @@ export default (function (_ref) {
     number = _useContextData.number,
     pay = _useContextData.pay,
     amount = _useContextData.amount;
+  useEffect(function () {
+    payLog.log('手动标记页展示');
+  }, []);
   var start = useMemo(function () {
     if (typeof (manual === null || manual === void 0 ? void 0 : manual.money) === 'number' || typeof (manual === null || manual === void 0 ? void 0 : manual.money) === 'string') {
       return Number(manual === null || manual === void 0 ? void 0 : manual.money);
@@ -70,6 +74,7 @@ export default (function (_ref) {
    */
   var onSuccess = function onSuccess() {
     if (disabled) {
+      payLog.log('手动标记：点击成功被拦截');
       return;
     }
     // if (mode === ModeEnum.Pay) {
@@ -84,6 +89,7 @@ export default (function (_ref) {
     //   return;
     // }
     if (mode === ModeEnum.Refund) {
+      payLog.log('手动标记(退款)：点击标记为成功');
       setDisabled(true);
       onChange('success', {
         amount: amount,
@@ -95,6 +101,7 @@ export default (function (_ref) {
       });
       return;
     }
+    payLog.log('手动标记：点击标记为成功');
     updateAmountStatus(true);
     dispatch(updateState({
       manual: _objectSpread(_objectSpread({}, manual), {}, {
@@ -112,6 +119,7 @@ export default (function (_ref) {
     if (disabled) {
       return;
     }
+    payLog.log('手动标记：点击标记为失败');
     setDisabled(true);
     onChange('fail', {
       number: number,
@@ -124,6 +132,9 @@ export default (function (_ref) {
     if (disabled) {
       return;
     }
+    payLog.log('手动标记-确认金额：点击确认', {
+      money: money
+    });
     setDisabled(true);
     if (mode === ModeEnum.Refund || mode === ModeEnum.Query) {
       return;
@@ -160,6 +171,7 @@ export default (function (_ref) {
     return;
   };
   var onCancel = function onCancel() {
+    payLog.log('手动标记-确认金额：点击取消');
     updateAmountStatus(false);
     setMoney(pay === null || pay === void 0 ? void 0 : pay.total);
     dispatch(updateState({

package/es/components/eftposPay/component/signature/index.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页
  * @Author: hongbing.wang
  * @Date: 2024-08-20 11:49
  */
-declare const _default: ({ api, className }: ActionProps) => React.JSX.Element;
+declare const _default: ({ api, className }: ActionProps) => JSX.Element;
 export default _default;

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

@@ -9,6 +9,7 @@ import { Button } from 'antd';
 import React, { useState } from 'react';
 import { useContextData, useDispatch, updateNextStep, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 
 /**
  * @title: 取消签名确认页
@@ -34,6 +35,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:51
    */
   var onBack = function onBack() {
+    payLog.log('取消签名确认页：点击返回');
     dispatch(updateComponent(''));
   };
 
@@ -43,6 +45,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:51
    */
   var onConfirm = function onConfirm() {
+    payLog.log('取消签名确认页：点击确认');
     setDisabled(true);
     api.update({
       type: 'NO',

package/es/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;
@@ -8,5 +7,5 @@ declare const _default: (props: {
     loading?: string;
     success?: string;
     fail?: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 declare const _default: (props: {
     status: string;
     pedding?: string;
     resolve?: string;
     reject?: string;
     className?: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**
@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;
@@ -20,5 +20,5 @@ declare const _default: ({ api, onChange, onClose, className, device_number, isM
     net: boolean;
     client: string;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/es/components/eftposPay/device.js

@@ -25,7 +25,7 @@ import { useDispatch, useContextData, updateDevice, updateState } from "./store"
 import { getAmonunt } from "./manufacturer";
 import "./device.less";
 import useEngineContext from "../../hooks/useEngineContext";
-import { sendWarningLog } from '@pisell/utils';
+import payLog from "./utils/payLog";
 
 /**
  * @title: 设备选择页
@@ -80,6 +80,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 13:02
    */
   var onClick = function onClick(event) {
+    var _list$index;
     if (!net) {
       message.open({
         key: 'net-warning',
@@ -90,6 +91,10 @@ export default (function (_ref) {
     }
     var _ref3 = [Number(event.currentTarget.dataset.index)],
       index = _ref3[0];
+    payLog.log('手动选择设备', {
+      deviceId: (_list$index = list[index]) === null || _list$index === void 0 ? void 0 : _list$index.id,
+      index: index
+    });
     setDevice(list[index]);
   };
 
@@ -144,8 +149,8 @@ export default (function (_ref) {
    * @Date: 2024-08-20 13:02
    */
   useMount(function () {
+    payLog.log('设备选择页展示');
     setLoading(true);
-    // Terminal环境，进入设备列表页面初始化默认关闭原生弹窗的loading，5s后如果还是没有调用成功再放开
     closeFirstWithDelayShow();
     api.getDeviceList({
       type: eftpos,
@@ -154,6 +159,10 @@ export default (function (_ref) {
       clearTimer();
       setLoading(false);
       if (res && Array.isArray(res.list) && res.list.length > 0) {
+        payLog.log('设备列表加载成功', {
+          count: res.list.length,
+          hasDeviceNumber: !!device_number
+        });
         if (device_number) {
           var hostDeviceList = res.list.filter(function (item) {
             var _item$setting;
@@ -165,6 +174,9 @@ export default (function (_ref) {
             setDataStaus(true);
             setList(setDeviceList(hostDeviceList));
             if (hostDeviceList.length === 1) {
+              payLog.log('自动选择设备（device_number匹配）', {
+                device: hostDeviceList[0]
+              });
               setDevice(hostDeviceList[0]);
             }
             return;
@@ -173,7 +185,9 @@ export default (function (_ref) {
         setDataStaus(true);
         setList(setDeviceList(res.list));
         if (res.list.length === 1) {
-          // 只存在一个设备时，直接选中进行支付
+          payLog.log('自动选择设备（单设备）', {
+            device: res.list[0]
+          });
           setDevice(res.list[0]);
         } else {
           // 存在多个设备时，等待用户选择，Terminal环境需要显示关闭按钮
@@ -181,12 +195,12 @@ export default (function (_ref) {
         }
         return;
       }
-      // 列表为空，显示关闭按钮
+      payLog.log('设备列表为空');
       triggerCloseButton(true);
       setDataStaus(false);
     }, function () {
       clearTimer();
-      // 加载失败，显示关闭按钮
+      payLog.log('设备列表加载失败');
       triggerCloseButton(true);
       setDataStaus(false);
       setLoading(false);
@@ -259,6 +273,9 @@ export default (function (_ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            payLog.setContext({
+              deviceId: device === null || device === void 0 ? void 0 : device.id
+            });
             dispatch(updateDevice({
               device: device
             }));
@@ -266,36 +283,30 @@ export default (function (_ref) {
               api.selectDevice(device);
             }
             if (!(typeof onChange === 'function')) {
-              _context2.next = 13;
+              _context2.next = 14;
               break;
             }
             if (!(mode === ModeEnum.Pay)) {
-              _context2.next = 12;
+              _context2.next = 13;
               break;
             }
             // Terminal环境，进入支付页面之前需要先隐藏关闭按钮
             triggerCloseButton(false);
             // 由于js和原生通信存在延时，需要检查当前页面是否处于活跃状态，如果不在活跃状态，则不进行支付
-            _context2.next = 7;
+            _context2.next = 8;
             return checkIsActiveWithDelay(100);
-          case 7:
+          case 8:
             isActive = _context2.sent;
             if (isActive) {
-              _context2.next = 11;
+              _context2.next = 12;
               break;
             }
-            sendWarningLog({
-              title: '支付-当前页面非活跃状态，无法进行支付',
-              content: [{
-                key: 'activeStatus',
-                value: JSON.stringify({
-                  order_id: order_id,
-                  isActive: isActive
-                })
-              }]
+            payLog.log('页面非活跃状态，阻断支付', {
+              order_id: order_id,
+              isActive: isActive
             });
             return _context2.abrupt("return");
-          case 11:
+          case 12:
             if (device.pay) {
               dispatch(updateState({
                 pay: device.pay
@@ -311,9 +322,9 @@ export default (function (_ref) {
                 pay: pay
               }));
             }
-          case 12:
-            onChange('page', mode === ModeEnum.FullPay ? 'amount' : 'pay');
           case 13:
+            onChange('page', mode === ModeEnum.FullPay ? 'amount' : 'pay');
+          case 14:
           case "end":
             return _context2.stop();
         }

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -1,5 +1,5 @@
-import React from 'react';
+/// <reference types="react" />
 import { PosProps } from './const';
 import './index.less';
-declare const _default: (props: PosProps) => React.JSX.Element | null;
+declare const _default: (props: PosProps) => JSX.Element | null;
 export default _default;