@pisell/private-materials 3.0.186 → 3.0.188

package/es/components/eftposPay/index.js

@@ -19,12 +19,12 @@ import React, { useEffect, useState, useMemo, useRef, useCallback } from 'react'
 import { useNetwork } from 'ahooks';
 import useEngineContext from "../../hooks/useEngineContext";
 import Amount from "./amount";
-import { RouteEnum, ModeEnum } from "./const";
+import { RouteEnum, ModeEnum, ClientEnum } from "./const";
 import Device from "./device";
 import localeTexts from "./locales";
 import { getInitState } from "./manufacturer";
 import Pay from "./pay";
-import { Provider, useContextData, useDispatch, updateState } from "./store";
+import { Provider, useContextData, useDispatch, updateState, updateClient } from "./store";
 import "./index.less";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 var App = function App(_ref) {
@@ -50,12 +50,16 @@ var App = function App(_ref) {
       formatAmount: function formatAmount(number, precision, symbol) {
         return "".concat(symbol).concat(number);
       },
-      isTerminal: function isTerminal() {
-        return false;
+      storage: function storage() {
+        return {
+          get: function get() {
+            return '';
+          }
+        };
       }
     },
     formatAmount = _ref2.formatAmount,
-    isTerminal = _ref2.isTerminal;
+    storage = _ref2.storage;
 
   // 外部网络数据
   var network = useMemo(function () {
@@ -86,9 +90,36 @@ var App = function App(_ref) {
   useEffect(function () {
     statusRef.current = data.status;
   }, [data.status]);
-  var isIpad = useMemo(function () {
-    return isTerminal && isTerminal();
-  }, [isTerminal]);
+
+  /**
+   * terminal : terminal 内嵌
+   * android_kiosk     : kiosk 内嵌
+   */
+  var channel = useMemo(function () {
+    var _storage$get;
+    var channel = (storage === null || storage === void 0 ? void 0 : (_storage$get = storage.get) === null || _storage$get === void 0 ? void 0 : _storage$get.call(storage, 'channel')) || '';
+    if (channel === 'terminal') {
+      return 'terminal';
+    }
+    if (channel === 'android_kiosk') {
+      return 'kiosk';
+    }
+    return '';
+  }, []);
+  var client = useMemo(function () {
+    if (channel === 'kiosk') {
+      return ClientEnum.User;
+    }
+    return ClientEnum.Merchant;
+  }, [channel]);
+  useEffect(function () {
+    dispatch(updateClient(client));
+  }, [client]);
+
+  // 内嵌在 terminal 或者 kiosk 的移动端 做特定移动端(大屏)适配
+  var isMobile = useMemo(function () {
+    return Boolean(channel);
+  }, [channel]);
 
   /**
    * @title: api 接口 数据
@@ -123,7 +154,7 @@ var App = function App(_ref) {
    * @Author: hongbing.wang
    * @Date: 2024-08-20 13:10
    */
-  var onChange = useCallback(function (status, params) {
+  var onChange = useCallback(function (status, params, other) {
     if (status === 'page' && typeof params === 'string') {
       if (['amount', 'deviceList', 'pay'].includes(params)) {
         setCurrent(params);
@@ -132,8 +163,8 @@ var App = function App(_ref) {
         }));
       }
     }
-    console.log('状态切换 = ', status, params);
-    props.onChangeStatus(status, params);
+    console.log('状态切换 = ', status, params, other);
+    props.onChangeStatus(status, params, other);
   }, []);
 
   /**
@@ -153,11 +184,12 @@ var App = function App(_ref) {
       api: api,
       onChange: onChange,
       onClose: onClose,
-      isIpad: isIpad,
-      className: isIpad ? 'pisell-lowcode__eft-pay-terminal' : '',
+      isMobile: isMobile,
+      className: isMobile ? 'pisell-lowcode__eft-pay-terminal' : '',
       net: net,
       device_number: device_number,
-      formatAmount: formatAmount
+      formatAmount: formatAmount,
+      client: client
     });
   }
   if (current === RouteEnum.Amount) {
@@ -165,9 +197,10 @@ var App = function App(_ref) {
       onChange: onChange,
       onClose: onClose,
       formatAmount: formatAmount,
-      isIpad: isIpad,
-      className: isIpad ? 'pisell-lowcode__eft-pay-terminal' : '',
-      net: net
+      isMobile: isMobile,
+      className: isMobile ? 'pisell-lowcode__eft-pay-terminal' : '',
+      net: net,
+      client: client
     });
   }
   return /*#__PURE__*/React.createElement(Pay, {
@@ -175,11 +208,12 @@ var App = function App(_ref) {
     tyroUrl: tyroUrl,
     tyroVersion: tyroVersion,
     onChange: onChange,
-    className: isIpad ? 'pisell-lowcode__eft-pay-terminal' : '',
+    className: isMobile ? 'pisell-lowcode__eft-pay-terminal' : '',
     terminal: terminal,
-    isIpad: isIpad,
+    isMobile: isMobile,
     net: net,
-    formatAmount: formatAmount
+    formatAmount: formatAmount,
+    client: client
   });
 };
 export default (function (props) {
@@ -226,8 +260,8 @@ export default (function (props) {
       symbol: current
     });
   }, [mode, props.params, props.type, symbol]);
-  var onChangeStatus = useCallback(function (status, params) {
-    props.onChangeStatus(status, params);
+  var onChangeStatus = useCallback(function (status, params, other) {
+    props.onChangeStatus(status, params, other);
   }, []);
   var action = useMemo(function () {
     var act = function () {
@@ -262,7 +296,7 @@ export default (function (props) {
   }, [mode, state]);
   useEffect(function () {
     // document.body.id = 'body';
-    console.log('初始化 ........');
+    console.log('初始化 ........11221801');
   }, []);
 
   // console.log('action = ', action);

package/es/components/eftposPay/index.less

@@ -256,6 +256,7 @@
 .pisell-lowcode__eft-pay-terminal {
   width: var(--pisel-lc-pos-terminal-width, 100%) !important;
   height: var(--pisel-lc-pos-terminal-height, 100%) !important;
+  max-height: var(--pisel-lc-pos-terminal-max-height, unset) !important;
   display: flex;
   flex-direction: column;
 }

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

@@ -37,6 +37,7 @@ declare const _default: {
         'page.eftpos-pay.text.manual.diff': string;
         'page.eftpos-pay.text.manual.tip': string;
         'page.eftpos-pay.text.manual.cancel': string;
+        'page.eftpos-pay.text.manual.print_receipt': string;
         'page.eftpos-pay.text.modify.payment.info': (mode: string) => "Modify payment info" | "Modify refund information";
         'page.eftpos-pay.text.successful': (mode: string) => string;
         'page.eftpos-pay.text.failed': (mode: string) => string;
@@ -85,6 +86,7 @@ declare const _default: {
         'page.eftpos-pay.text.transaction.eftpos.fail.device': string;
         'page.eftpos-pay.text.transaction.eftpos.fail.network': string;
         'page.eftpos-pay.text.transaction.eftpos.fail.if': (mode: string) => "If you have confirmed the payment status of this order, please click on Manual marking." | "If you have confirmed the refund status of this order, please click on Manual Marking.";
+        'page.eftpos-pay.text.transaction.eftpos.fail.other': string;
         'page.eftpos-pay.text.application': string;
         'page.eftpos-pay.text.approved': string;
         'page.eftpos-pay.text.device.no.title': string;
@@ -139,6 +141,7 @@ declare const _default: {
         'page.eftpos-pay.text.manual.diff': string;
         'page.eftpos-pay.text.manual.tip': string;
         'page.eftpos-pay.text.manual.cancel': string;
+        'page.eftpos-pay.text.manual.print_receipt': string;
         'page.eftpos-pay.text.modify.payment.info': (mode: string) => "修改支付信息" | "修改退款信息";
         'page.eftpos-pay.text.successful': (mode: string) => string;
         'page.eftpos-pay.text.failed': (mode: string) => string;
@@ -187,6 +190,7 @@ declare const _default: {
         'page.eftpos-pay.text.transaction.eftpos.fail.device': string;
         'page.eftpos-pay.text.transaction.eftpos.fail.network': string;
         'page.eftpos-pay.text.transaction.eftpos.fail.if': (mode: string) => "如果您已确认此交易的付款状态，请点击手动标记" | "如果您已确认此订单的退款状态，请点击手动标记。";
+        'page.eftpos-pay.text.transaction.eftpos.fail.other': string;
         'page.eftpos-pay.text.application': string;
         'page.eftpos-pay.text.approved': string;
         'page.eftpos-pay.text.device.no.title': string;
@@ -241,6 +245,7 @@ declare const _default: {
         'page.eftpos-pay.text.manual.diff': string;
         'page.eftpos-pay.text.manual.tip': string;
         'page.eftpos-pay.text.manual.cancel': string;
+        'page.eftpos-pay.text.manual.print_receipt': string;
         'page.eftpos-pay.text.modify.payment.info': (mode: string) => "修改支付信息" | "修改退款信息";
         'page.eftpos-pay.text.successful': (mode: string) => string;
         'page.eftpos-pay.text.failed': (mode: string) => string;
@@ -289,6 +294,7 @@ declare const _default: {
         'page.eftpos-pay.text.transaction.eftpos.fail.device': string;
         'page.eftpos-pay.text.transaction.eftpos.fail.network': string;
         'page.eftpos-pay.text.transaction.eftpos.fail.if': (mode: string) => "如果您已確認此交易的付款狀態，請點擊手動標記" | "如果您已確認此訂單的退款狀態，請點擊手動標記。";
+        'page.eftpos-pay.text.transaction.eftpos.fail.other': string;
         'page.eftpos-pay.text.application': string;
         'page.eftpos-pay.text.approved': string;
         'page.eftpos-pay.text.device.no.title': string;

package/es/components/eftposPay/locales.js

@@ -59,6 +59,7 @@ export default {
     'page.eftpos-pay.text.manual.diff': "If it doesn't match, please enter the actual transaction amount in the input box below.",
     'page.eftpos-pay.text.manual.tip': "Amount tendered (incl. surcharge)",
     'page.eftpos-pay.text.manual.cancel': 'Cancel current transaction',
+    'page.eftpos-pay.text.manual.print_receipt': 'Print Receipt',
     'page.eftpos-pay.text.modify.payment.info': function pageEftposPayTextModifyPaymentInfo(mode) {
       return mode === 'pay' || mode === 'fullPay' ? 'Modify payment info' : 'Modify refund information';
     },
@@ -120,6 +121,7 @@ export default {
     'page.eftpos-pay.text.transaction.eftpos.fail.if': function pageEftposPayTextTransactionEftposFailIf(mode) {
       return mode === 'pay' || mode === 'fullPay' ? 'If you have confirmed the payment status of this order, please click on Manual marking.' : 'If you have confirmed the refund status of this order, please click on Manual Marking.';
     },
+    'page.eftpos-pay.text.transaction.eftpos.fail.other': 'Payment issue detected. Please print the receipt and contact staff for assistance.',
     'page.eftpos-pay.text.application': 'Waiting for customer to select application',
     'page.eftpos-pay.text.approved': 'Approved',
     'page.eftpos-pay.text.device.no.title': 'No devices added yet. Please add devices to proceed.',
@@ -204,6 +206,7 @@ export default {
     'page.eftpos-pay.text.manual.diff': "如不一致请在下方输入框内输入真实的交易金额。",
     'page.eftpos-pay.text.manual.tip': "实付金额（含附加费）",
     'page.eftpos-pay.text.manual.cancel': '取消当前交易',
+    'page.eftpos-pay.text.manual.print_receipt': '打印收据',
     'page.eftpos-pay.text.modify.payment.info': function pageEftposPayTextModifyPaymentInfo(mode) {
       return mode === 'pay' || mode === 'fullPay' ? '修改支付信息' : '修改退款信息';
     },
@@ -273,6 +276,7 @@ export default {
     'page.eftpos-pay.text.transaction.eftpos.fail.if': function pageEftposPayTextTransactionEftposFailIf(mode) {
       return mode === 'pay' || mode === 'fullPay' ? '如果您已确认此交易的付款状态，请点击手动标记' : '如果您已确认此订单的退款状态，请点击手动标记。';
     },
+    'page.eftpos-pay.text.transaction.eftpos.fail.other': '刷卡机支付出现问题，请打印收据后联系店员处理。',
     'page.eftpos-pay.text.application': '等待客户选择应用',
     'page.eftpos-pay.text.approved': '已接受',
     'page.eftpos-pay.text.device.no.title': '您还没有添加任何设备。请添加设备后使用',
@@ -495,6 +499,7 @@ export default {
     'page.eftpos-pay.text.manual.diff': "如不一致請在下方輸入框內輸入真實的交易金額。",
     'page.eftpos-pay.text.manual.tip': "實付金額（含附加費）",
     'page.eftpos-pay.text.manual.cancel': '取消當前交易',
+    'page.eftpos-pay.text.manual.print_receipt': '打印收據',
     'page.eftpos-pay.text.modify.payment.info': function pageEftposPayTextModifyPaymentInfo(mode) {
       return mode === 'pay' || mode === 'fullPay' ? '修改支付信息' : '修改退款信息';
     },
@@ -564,6 +569,7 @@ export default {
     'page.eftpos-pay.text.transaction.eftpos.fail.if': function pageEftposPayTextTransactionEftposFailIf(mode) {
       return mode === 'pay' || mode === 'fullPay' ? '如果您已確認此交易的付款狀態，請點擊手動標記' : '如果您已確認此訂單的退款狀態，請點擊手動標記。';
     },
+    'page.eftpos-pay.text.transaction.eftpos.fail.other': '刷卡機支付出現問題，請打印收據後聯繫店員處理。',
     'page.eftpos-pay.text.application': '等待客户選擇應用',
     'page.eftpos-pay.text.approved': '已接受',
     'page.eftpos-pay.text.device.no.title': '您還沒有添加任何設備。請添加設備後使用',

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

@@ -7,14 +7,15 @@ import './index.less';
  * @Author: hongbing.wang
  * @Date: 2024-08-20 14:59
  */
-declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isIpad, tyroUrl, tyroVersion, formatAmount, }: PayProps & {
+declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client }: PayProps & {
     terminal: {
         network: boolean;
     };
     net: boolean;
-    isIpad: boolean;
+    isMobile: boolean;
     tyroUrl?: string | undefined;
     tyroVersion?: string | undefined;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
+    client: string;
 }) => React.JSX.Element;
 export default Pay;

package/es/components/eftposPay/pay.js

@@ -9,7 +9,7 @@ import Header from "./component/header";
 import { getPayParams } from "./helper";
 import Manual from "./component/manual";
 import Signature from "./component/signature";
-import { StatusEnum, PayRouteEnum } from "./const";
+import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
 import { Payo, Windcave, Tyro } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
@@ -35,13 +35,14 @@ var Pay = function Pay(_ref) {
     className = _ref.className,
     terminal = _ref.terminal,
     net = _ref.net,
-    isIpad = _ref.isIpad,
+    isMobile = _ref.isMobile,
     tyroUrl = _ref.tyroUrl,
     tyroVersion = _ref.tyroVersion,
     _ref$formatAmount = _ref.formatAmount,
     formatAmount = _ref$formatAmount === void 0 ? function (number, precision, symbol) {
       return "".concat(symbol).concat(number);
-    } : _ref$formatAmount;
+    } : _ref$formatAmount,
+    client = _ref.client;
   var data = useContextData();
   var dataRef = useRef(data);
   // console.log("pay = ",'pay')
@@ -67,11 +68,11 @@ var Pay = function Pay(_ref) {
    * @Author: hongbing.wang
    * @Date: 2024-08-20 15:00
    */
-  var onChange = useCallback(function (status, params) {
+  var onChange = useCallback(function (status, params, other) {
     if (status === StatusEnum.Success || status === StatusEnum.Fail) {
       dispatch(updateStatus(status));
     }
-    onChangeStatus(status, params);
+    onChangeStatus(status, params, other);
   }, [dispatch, onChangeStatus]);
 
   // 主流程 已完成 的崩溃恢复
@@ -162,7 +163,7 @@ var Pay = function Pay(_ref) {
   }), data.eftpos === 'payo' ? /*#__PURE__*/React.createElement(Payo, {
     api: api,
     onChange: onChange
-  }, data.warn && data.status !== StatusEnum.Success ? /*#__PURE__*/React.createElement("div", {
+  }, data.warn && data.status !== StatusEnum.Success && client === ClientEnum.Merchant ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-warn"
   }, data.warn) : null, data.status === StatusEnum.Success ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip"
@@ -181,7 +182,7 @@ var Pay = function Pay(_ref) {
     onChange: onChange,
     api: api,
     className: className,
-    isIpad: isIpad,
+    isMobile: isMobile,
     formatAmount: formatAmount
   }) : null);
 };

package/es/components/eftposPay/payo/config.d.ts

@@ -8,4 +8,6 @@ export declare const POS: ({ api, onChange, }: {
         [keys: string]: unknown;
     } | undefined) => void;
 }) => React.JSX.Element;
-export declare const Action: () => React.JSX.Element;
+export declare const Action: ({ onChange }: {
+    onChange: any;
+}) => React.JSX.Element;

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

@@ -22,7 +22,7 @@ import { locales } from '@pisell/utils';
 import { Button } from 'antd';
 import React, { useEffect, useRef } from 'react';
 import Step from "../component/step";
-import { PayStatus, StatusEnum, ModeEnum } from "../const";
+import { PayStatus, StatusEnum, ModeEnum, ClientEnum } from "../const";
 import { getUuid, getPayParams } from "../helper";
 import { useFail, useStoreRef } from "../hooks";
 import { useContextData, useDispatch, updateNextStep, updateComponent, updateState, updateCustom } from "../store";
@@ -48,7 +48,7 @@ export var POS = function POS(_ref) {
   var _steps$ = steps[0],
     key = _steps$.key,
     props = _objectWithoutProperties(_steps$, _excluded);
-  var fail = useFail(0, true);
+  var fail = useFail(0);
   var failRef = useRef(fail);
   var controllerRef = useRef();
   var clearRef = useRef();
@@ -108,13 +108,13 @@ export var POS = function POS(_ref) {
         success(res);
         return;
       }
-      failRef.current(res);
+      failRef.current(res, true);
     }, function (res) {
       // 无网 或 已卸载 则不进行处理
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      failRef.current(res);
+      failRef.current(res, true);
     });
   };
 
@@ -180,7 +180,7 @@ export var POS = function POS(_ref) {
         checkApi();
         return;
       }
-      failRef.current(err);
+      failRef.current(err, true);
     });
   }, [api, check, dispatch, onChange]);
   useEffect(function () {
@@ -195,10 +195,12 @@ export var POS = function POS(_ref) {
   }, []);
   return /*#__PURE__*/React.createElement(Step, props);
 };
-export var Action = function Action() {
+export var Action = function Action(_ref2) {
+  var onChange = _ref2.onChange;
   var dispatch = useDispatch();
   var _useContextData2 = useContextData(),
-    mode = _useContextData2.mode;
+    mode = _useContextData2.mode,
+    client = _useContextData2.client;
 
   /**
    * @title: 前往手动标记页
@@ -216,9 +218,9 @@ export var Action = function Action() {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item-btns"
-  }, /*#__PURE__*/React.createElement(Button, {
+  }, client === ClientEnum.Merchant ? /*#__PURE__*/React.createElement(Button, {
     block: true,
     className: "pisell-lowcode__eft-pay-step-item-btn",
     onClick: onManually
-  }, locales.getText('page.eftpos-pay.text.manual.marking')));
+  }, locales.getText('page.eftpos-pay.text.manual.marking')) : null);
 };

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

@@ -1,5 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["order_id", "name", "symbol", "amount", "mode", "number", "pay", "device", "net"];
+var _excluded = ["order_id", "name", "symbol", "amount", "mode", "number", "pay", "device", "net", "client"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -8,7 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { locales } from '@pisell/utils';
-import { EftposEnum, StatusEnum, PayRouteEnum, ModeEnum } from "../const";
+import { EftposEnum, StatusEnum, PayRouteEnum, ModeEnum, ClientEnum } from "../const";
 /**
  * @title: payo 步骤信息
  * @description:
@@ -50,6 +50,7 @@ export default (function (params) {
     pay = _ref.pay,
     device = _ref.device,
     net = _ref.net,
+    client = _ref.client,
     other = _objectWithoutProperties(_ref, _excluded);
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     order_id: order_id,
@@ -67,6 +68,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
+    client: client !== 'undefined' ? client : ClientEnum.Merchant,
     custom: other || {}
   }, typeof net !== 'undefined' ? {
     net: net

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

@@ -31,5 +31,7 @@ export default (function (_ref) {
         onChange: onChange
       });
     }
-  }), children), data.status !== StatusEnum.Success ? /*#__PURE__*/React.createElement(Action, null) : null);
+  }), children), data.status !== StatusEnum.Success ? /*#__PURE__*/React.createElement(Action, {
+    onChange: onChange
+  }) : null);
 });

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

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { DeviceStatusType, StatusType, ModeType, RouteType } from '../const';
+import { DeviceStatusType, StatusType, ModeType, RouteType, ClientEnum } from '../const';
 import { ThunkDispatch } from './useThunkReducer';
 export declare enum EActionTypes {
     UPDATE_INIT = "UPDATE_INIT",
@@ -16,7 +16,8 @@ export declare enum EActionTypes {
     UPDATE_STEP_CURRENT_ITEM_CUSTOM = "UPDATE_STEP_CURRENT_ITEM_CUSTOM",
     UPDATE_STEP_ITEM = "UPDATE_STEP_ITEM",
     BACKUP_PRODUCTION = "BACKUP_PRODUCTION",
-    BACKUP_FREE = "BACKUP_FREE"
+    BACKUP_FREE = "BACKUP_FREE",
+    UPDATE_CLIENT = "UPDATE_CLIENT"
 }
 export declare type State = {
     /** 支付名称 */
@@ -89,6 +90,7 @@ export declare type State = {
         money?: number;
     };
     backup?: Omit<State, 'backup'>;
+    client: ClientEnum;
 };
 export declare type Action = {
     type: EActionTypes;
@@ -258,6 +260,18 @@ export declare const updateCurrentStemItem: (payload: any) => {
     type: EActionTypes;
     payload: any;
 };
+/**
+ * @title: 更新当前步骤信息
+ * @description: 更新当前步骤信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:09
+ */
+export declare const updateClient: (payload: ClientEnum) => {
+    type: EActionTypes;
+    payload: {
+        client: ClientEnum;
+    };
+};
 /**
  * @title: 更新备份信息
  * @description: 更新备份信息
@@ -329,6 +343,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
             money?: number | undefined;
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
+        client?: ClientEnum | undefined;
     };
 };
 export declare function reducers(state: State, action: Action): State;

package/es/components/eftposPay/store/index.js

@@ -37,6 +37,7 @@ export var EActionTypes;
   EActionTypes["UPDATE_STEP_ITEM"] = "UPDATE_STEP_ITEM";
   EActionTypes["BACKUP_PRODUCTION"] = "BACKUP_PRODUCTION";
   EActionTypes["BACKUP_FREE"] = "BACKUP_FREE";
+  EActionTypes["UPDATE_CLIENT"] = "UPDATE_CLIENT";
 })(EActionTypes || (EActionTypes = {}));
 /**
  * @title: 刷新 key
@@ -207,6 +208,21 @@ export var updateCurrentStemItem = function updateCurrentStemItem(payload) {
   };
 };
 
+/**
+ * @title: 更新当前步骤信息
+ * @description: 更新当前步骤信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:09
+ */
+export var updateClient = function updateClient(payload) {
+  return {
+    type: EActionTypes.UPDATE_CLIENT,
+    payload: {
+      client: payload
+    }
+  };
+};
+
 /**
  * @title: 更新备份信息
  * @description: 更新备份信息
@@ -321,6 +337,10 @@ export function reducers(state, action) {
       }
       var s = Object.assign({}, (_objectDestructuringEmpty(state.backup), state.backup));
       return _objectSpread(_objectSpread({}, s), action.payload);
+    case EActionTypes.UPDATE_CLIENT:
+      return _objectSpread(_objectSpread({}, state), {}, {
+        client: action.payload['client']
+      });
     default:
       {
         throw new Error("Unhandled action type: ".concat(action.type));

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

@@ -1,5 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["order_id", "name", "symbol", "amount", "mode", "number", "pay", "device", "net"];
+var _excluded = ["order_id", "name", "symbol", "amount", "mode", "number", "pay", "device", "net", "client"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -8,7 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { locales } from '@pisell/utils';
-import { EftposEnum, StatusEnum, PayRouteEnum, ModeEnum } from "../const";
+import { EftposEnum, StatusEnum, PayRouteEnum, ModeEnum, ClientEnum } from "../const";
 /**
  * @title: 初始化 tyro 数据
  * @Author: hongbing.wang
@@ -27,6 +27,7 @@ export default (function (params) {
     pay = _ref.pay,
     device = _ref.device,
     net = _ref.net,
+    client = _ref.client,
     other = _objectWithoutProperties(_ref, _excluded);
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     name: name,
@@ -44,6 +45,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: [],
     render: true,
+    client: client !== 'undefined' ? client : ClientEnum.Merchant,
     custom: other || {}
   }, typeof net !== 'undefined' ? {
     net: net