@pisell/private-materials 6.0.25 → 6.2.1

package/es/components/eftposPay/pay.js

@@ -10,7 +10,7 @@ import { getPayParams } from "./helper";
 import Manual from "./component/manual";
 import Signature from "./component/signature";
 import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
-import { Payo, Windcave, Tyro } from "./manufacturer";
+import { Payo, Windcave, Tyro, Linkly } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
 
@@ -150,7 +150,7 @@ var Pay = function Pay(_ref) {
       }
     };
   }, []);
-  // console.log("pay2222 = ",'pay 222' , data.render,data.type)
+  console.log('data =>>>>>> ', data);
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.render ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-box ".concat(className),
     style: data.type === 'step' ? {} : {
@@ -178,6 +178,10 @@ var Pay = function Pay(_ref) {
     onChange: onChange,
     key: data.key,
     formatAmount: formatAmount
+  }) : null, data.eftpos === 'linkly' ? /*#__PURE__*/React.createElement(Linkly, {
+    key: data.key,
+    api: api,
+    onChange: onChange
   }) : null) : null, data.type === PayRouteEnum.Unset && Comm ? /*#__PURE__*/React.createElement(Comm, {
     onChange: onChange,
     api: api,

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

@@ -20,7 +20,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 /* eslint-disable @typescript-eslint/naming-convention */
 import { locales } from '@pisell/utils';
 import { Button } from 'antd';
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import Step from "../component/step";
 import { PayStatus, StatusEnum, ModeEnum, ClientEnum } from "../const";
 import { getUuid, getPayParams } from "../helper";
@@ -33,7 +33,8 @@ export var POS = function POS(_ref) {
   var api = _ref.api,
     onChange = _ref.onChange;
   var _useContextData = useContextData(),
-    steps = _useContextData.steps;
+    steps = _useContextData.steps,
+    custom = _useContextData.custom;
   var _useStoreRef = useStoreRef(),
     deviceRef = _useStoreRef.deviceRef,
     payRef = _useStoreRef.payRef,
@@ -150,7 +151,17 @@ export var POS = function POS(_ref) {
     }));
     controllerRef.current = new AbortController();
     // 支付 or 退款
-    var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay({
+    var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay(_objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
+      "operator_id": custom.operator_id,
+      "operator_type": custom.operator_type,
+      "platform": custom.platform,
+      "custom_payment_id": custom.custom_payment_id,
+      "service_charge": {
+        "amount": payRef.current.surMoney,
+        "percentage": payRef.current.surPercentRate
+      },
+      "original_amount": payRef.current.amount
+    } : {}), {}, {
       order_id: orderIdRef.current,
       amount: payRef.current.total,
       card_reader_type: eftposRef.current,
@@ -159,7 +170,7 @@ export var POS = function POS(_ref) {
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))
-    }, {
+    }), {
       signal: controllerRef.current.signal
     }) : api.refund({
       order_id: orderIdRef.current,
@@ -213,7 +224,22 @@ export var Action = function Action(_ref2) {
   var dispatch = useDispatch();
   var _useContextData2 = useContextData(),
     mode = _useContextData2.mode,
-    client = _useContextData2.client;
+    client = _useContextData2.client,
+    order_id = _useContextData2.order_id,
+    number = _useContextData2.number,
+    device = _useContextData2.device;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isShowCancel = _useState2[0],
+    setIsShowCancel = _useState2[1];
+  useEffect(function () {
+    var timer = setTimeout(function () {
+      setIsShowCancel(true);
+    }, 30 * 1000);
+    return function () {
+      clearTimeout(timer);
+    };
+  }, []);
 
   /**
    * @title: 前往手动标记页
@@ -229,9 +255,21 @@ export var Action = function Action(_ref2) {
     }));
     dispatch(updateComponent('Manual', true));
   };
+  var onCancel = function onCancel() {
+    onChange('fail', {
+      number: number,
+      uniquePaymentNumber: number,
+      device: device,
+      order_id: order_id
+    });
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item-btns"
-  }, client === ClientEnum.Merchant ? /*#__PURE__*/React.createElement(Button, {
+  }, client !== ClientEnum.Merchant && isShowCancel && /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    onClick: onCancel
+  }, locales.getText('page.eftpos-pay.text.cancel')), client === ClientEnum.Merchant ? /*#__PURE__*/React.createElement(Button, {
     block: true,
     className: "pisell-lowcode__eft-pay-step-item-btn",
     onClick: onManually

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

@@ -12,6 +12,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useCallback, useEffect, useRef } from 'react';
 import { PayStatus } from "../const";
 import { sleep } from "../helper";
+import { sendWarningLog } from '@pisell/utils';
 
 /**
  * @title: 循环查询 接口状态
@@ -111,14 +112,24 @@ export var useValidate = function useValidate(timeout) {
     (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
   }, []);
   var run = function run() {
+    for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+      params[_key] = arguments[_key];
+    }
     isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     // 开启计时
     TimeoutRef.current = setTimeout(function () {
       isTimeoutCloseRef.current = true;
+      sendWarningLog({
+        title: '支付状态查询超时',
+        content: [{
+          key: 'params',
+          value: JSON.stringify(params)
+        }]
+      });
       close();
     }, timeout);
-    return checkApi.apply(void 0, arguments);
+    return checkApi.apply(void 0, params);
   };
   useEffect(function () {
     return function () {

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

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/es/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

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

@@ -173,7 +173,17 @@ export default (function (_ref) {
     var _params = {};
     if (isPay) {
       var _deviceRef$current2;
-      _params = {
+      _params = _objectSpread(_objectSpread({}, custom !== null && custom !== void 0 && custom.platform ? {
+        "operator_id": custom.operator_id,
+        "operator_type": custom.operator_type,
+        "platform": custom.platform,
+        "custom_payment_id": custom.custom_payment_id,
+        "service_charge": {
+          "amount": payRef.current.surMoney,
+          "percentage": payRef.current.surPercentRate
+        },
+        "original_amount": payRef.current.amount
+      } : {}), {}, {
         order_id: orderIdRef.current,
         amount: payRef.current.total,
         card_reader_type: eftposRef.current,
@@ -182,7 +192,7 @@ export default (function (_ref) {
         pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
           number: numRef.current
         })))))
-      };
+      });
     } else {
       var _deviceRef$current3;
       _params = {