@pisell/private-materials 3.0.136 → 3.0.138

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

@@ -1,6 +1,26 @@
 import { Amount, ModeEnum } from '../const';
 import { State } from '../store';
+/**
+ * @title: payo 步骤信息
+ * @description:
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:19
+ */
 export declare const getStep: (mode?: ModeEnum) => State['steps'];
-declare const getInitState: (params: any) => State;
-export default getInitState;
+/**
+ * @title: 初始化  payo 数据
+ * @description:
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:19
+ */
+declare const _default: (params: any) => State;
+export default _default;
+/**
+ * @title:  payo 金额信息
+ * @description: 在 amount 页面设置则使用 pay ,如果有 setting 则使用 setting 信息 ,都没有则设置0
+ * @param {State} store : 全局store数据管理
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:24
+ */
 export declare function getAmonunt(store: State): Amount;

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

@@ -1,11 +1,21 @@
 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"];
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(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";
+/**
+ * @title: payo 步骤信息
+ * @description:
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:19
+ */
 export var getStep = function getStep() {
   var mode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ModeEnum.Pay;
   return [{
@@ -20,74 +30,114 @@ export var getStep = function getStep() {
     status: StatusEnum.Loading
   }];
 };
-var getInitState = function getInitState(params) {
-  return _objectSpread({
-    mode: (params === null || params === void 0 ? void 0 : params.mode) || ModeEnum.Pay,
+
+/**
+ * @title: 初始化  payo 数据
+ * @description:
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:19
+ */
+export default (function (params) {
+  var _ref = params || {
+      mode: ModeEnum.Pay
+    },
+    order_id = _ref.order_id,
+    name = _ref.name,
+    symbol = _ref.symbol,
+    amount = _ref.amount,
+    mode = _ref.mode,
+    number = _ref.number,
+    pay = _ref.pay,
+    device = _ref.device,
+    net = _ref.net,
+    other = _objectWithoutProperties(_ref, _excluded);
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    order_id: order_id,
+    name: name,
+    symbol: symbol,
+    amount: amount,
+    mode: mode,
     eftpos: EftposEnum.Payo,
     key: Date.now(),
-    warn: locales.getText('page.eftpos-pay.text.waiting.pay')((params === null || params === void 0 ? void 0 : params.mode) || ModeEnum.Pay),
-    // 'If you have confirmed the payment status from the PoS, you can press Manual marking buttonto skip.',
+    warn: locales.getText('page.eftpos-pay.text.waiting.pay')(mode),
     step: 0,
     type: PayRouteEnum.Step,
-    title: locales.getText('page.eftpos-pay.text.loading')((params === null || params === void 0 ? void 0 : params.mode) || ModeEnum.Pay),
-    // 'Payment in  process...',
+    title: locales.getText('page.eftpos-pay.text.loading')(mode),
     component: '',
     status: StatusEnum.Loading,
-    steps: getStep((params === null || params === void 0 ? void 0 : params.mode) || ModeEnum.Pay),
-    custom: params,
-    render: true
-  }, params.device ? {
-    device: params.device
+    steps: getStep(mode),
+    render: true,
+    custom: other || {}
+  }, typeof net !== 'undefined' ? {
+    net: net
+  } : {}), typeof number !== 'undefined' ? {
+    number: number
+  } : {}), typeof pay !== 'undefined' ? {
+    pay: pay
+  } : {}), typeof device !== 'undefined' ? {
+    device: device
   } : {});
-};
-export default getInitState;
+});
+
+/**
+ * @title:  payo 金额信息
+ * @description: 在 amount 页面设置则使用 pay ,如果有 setting 则使用 setting 信息 ,都没有则设置0
+ * @param {State} store : 全局store数据管理
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:24
+ */
 export function getAmonunt(store) {
   var device = store.device,
-    custom = store.custom;
+    pay = store.pay,
+    custom = store.custom,
+    name = store.name,
+    symbol = store.symbol,
+    amount = store.amount;
   if (!device || !custom) {
     throw Error('device or custom is not defined');
   }
-  var name = custom.name;
-  var symbol = custom.symbol;
-  // const format = custom.format as string;
-  var money = custom.amount;
-  var pay = custom.pay;
   var setting = device.setting;
+  // 从 金额编辑页 获取到 支付数据
   if (pay) {
     return {
       name: name,
       symbol: symbol,
       // format,
-      money: money,
+      money: Number(amount),
       amount: Number(pay.amount),
       surRate: Number(pay.surRate),
       surMoney: Number(pay.surMoney),
-      surcharge: (setting === null || setting === void 0 ? void 0 : setting.surcharge) || false
+      surcharge: (setting === null || setting === void 0 ? void 0 : setting.surcharge) || false,
+      useOriginSurcharge: (pay === null || pay === void 0 ? void 0 : pay.useOriginSurcharge) || false
     };
   }
+  // 原始支付总额
   if (!setting) {
     return {
       name: name,
       symbol: symbol,
       // format,
-      money: money,
-      amount: money,
+      money: Number(amount),
+      amount: Number(amount),
       surRate: 0,
       surMoney: 0,
-      surcharge: false
+      surcharge: false,
+      useOriginSurcharge: false
     };
   }
-  var surRate = setting.constant_rate || 0;
-  var surMoney = setting.constant_money || 0;
+  // 直接设备中手续费金额 + 原始支付总额
+  var surRate = setting.useOriginSurcharge ? 0 : setting.constant_rate || 0;
+  var surMoney = setting.useOriginSurcharge ? 0 : setting.constant_money || 0;
   var surcharge = setting.surcharge;
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name: name,
     symbol: symbol,
-    // format,
-    money: money,
-    amount: money,
-    surRate: surcharge ? surRate : 0,
-    surMoney: surcharge ? surMoney : 0,
-    surcharge: surcharge
+    money: Number(amount),
+    amount: Number(amount),
+    surRate: useOriginSurcharge ? 0 : surcharge ? surRate : 0,
+    surMoney: useOriginSurcharge ? 0 : surcharge ? surMoney : 0,
+    surcharge: surcharge,
+    useOriginSurcharge: useOriginSurcharge
   };
 }

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

@@ -1,4 +1,9 @@
 import { PayStatus } from '../const';
+/**
+ * @title: 循环查询 接口状态
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 13:29
+ */
 export declare const useValidate: (timeout: number) => readonly [(params_0: (...agrn: unknown[]) => Promise<any>, params_1: number, params_2?: number | undefined) => Promise<{
     [key: string]: unknown;
     code: `${PayStatus}`;

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

@@ -7,6 +7,12 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useCallback, useEffect, useRef } from 'react';
 import { PayStatus } from "../const";
 import { sleep } from "../helper";
+
+/**
+ * @title: 循环查询 接口状态
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 13:29
+ */
 export var useValidate = function useValidate(timeout) {
   var controllerRef = useRef();
   var ref = useRef(true);
@@ -23,12 +29,14 @@ export var useValidate = function useValidate(timeout) {
               code: PayStatus.Timeout
             };
             console.log('循环开始前...');
+
+            // 获取到超时状态码 则进行查询
           case 4:
-            if (!(ref.current && res && ("".concat(res.code) === PayStatus.Timeout || "".concat(res.code) === PayStatus.PayTimeout))) {
+            if (!(ref.current && res && "".concat(res.code) === PayStatus.Timeout)) {
               _context.next = 16;
               break;
             }
-            start = Date.now();
+            start = Date.now(); // 发送接口
             _context.next = 8;
             return check({
               number: number
@@ -41,6 +49,8 @@ export var useValidate = function useValidate(timeout) {
             res = _context.sent;
             diff = Date.now() - start;
             console.log(diff, time, time - diff, 'diff', res);
+
+            // 未到执行时长上限 则进入等待 直到执行时长上限 进行下一步行为
             if (!(diff < time)) {
               _context.next = 14;
               break;
@@ -62,6 +72,12 @@ export var useValidate = function useValidate(timeout) {
       return _ref.apply(this, arguments);
     };
   }(), []);
+
+  /**
+   * @title: 关闭循环
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 13:48
+   */
   var close = useCallback(function () {
     var _controllerRef$curren;
     ref.current = false;
@@ -69,6 +85,7 @@ export var useValidate = function useValidate(timeout) {
   }, []);
   var run = function run() {
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
+    // 开启计时
     TimeoutRef.current = setTimeout(function () {
       close();
     }, timeout);

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

@@ -1,11 +1,10 @@
 import React, { ReactNode } from 'react';
-import { DeviceStatusType, StatusType, ModeType } from '../const';
+import { DeviceStatusType, StatusType, ModeType, RouteType } from '../const';
 import { ThunkDispatch } from './useThunkReducer';
 export declare enum EActionTypes {
     UPDATE_INIT = "UPDATE_INIT",
     UPDATE_CUSTOM = "UPDATE_CUSTOM",
     UPDATE_KEY = "UPDATE_KEY",
-    UPDATE_STEP = "UPDATE_STEP",
     UPDATE_STEP_KEY = "UPDATE_STEP_KEY",
     UPDATE_DEVICE = "UPDATE_DEVICE",
     UPDATE_NEXT_STEP = "UPDATE_NEXT_STEP",
@@ -14,59 +13,80 @@ export declare enum EActionTypes {
     UPDATE_LOADING = "UPDATE_LOADING",
     UPDATE_COMPONENT = "UPDATE_COMPONENT",
     UPDATE_STEPS = "UPDATE_STEPS",
-    UPDATE_WARN = "UPDATE_WARN",
     UPDATE_STEP_CURRENT_ITEM_CUSTOM = "UPDATE_STEP_CURRENT_ITEM_CUSTOM",
-    UPDATE_STEP_ITEM_CUSTOM = "UPDATE_STEP_ITEM_CUSTOM",
     UPDATE_STEP_ITEM = "UPDATE_STEP_ITEM",
     BACKUP_PRODUCTION = "BACKUP_PRODUCTION",
     BACKUP_FREE = "BACKUP_FREE"
 }
 export declare type State = {
+    /** 支付名称 */
+    name: string;
+    /** 金额单位 */
+    symbol: string;
+    /** 支付原始金额 */
+    amount: string | number;
+    /** 模式 */
     mode: ModeType;
+    /** 订单号 */
+    order_id: string | number;
     /** 厂商 */
     eftpos: DeviceStatusType;
+    action?: RouteType;
     /** 用于重置页面特指 =》全部步骤 */
     key: number;
     /** 当前执行到哪一步了 */
     step: number;
     /** 标题 */
     title: string;
+    /** 标题 */
+    subTitle?: string;
     /** step : 常规步骤页面 ,unset 自定义页面 */
     type: 'step' | 'unset';
     render: boolean;
+    /** 网络 */
+    net?: boolean;
     /** 上面  unset 自定义页面,这里需要指定到具体页面 */
     component: string;
-    lastComponent?: string;
+    form?: string;
     /** 页面状态 */
     status: StatusType;
     /** 警告文案 */
-    warn: ReactNode;
+    warn: string;
     steps: {
         /** 用于重置当前步骤 */
         key: number;
-        title?: ReactNode;
-        text?: ReactNode;
-        warn?: ReactNode;
-        tip?: ReactNode;
-        success?: ReactNode;
-        fail?: ReactNode;
-        loading?: ReactNode;
+        title?: string;
+        text?: string;
+        warn?: string;
+        tip?: string;
+        success?: string;
+        fail?: string;
+        loading?: string;
         /** 步骤状态 */
         status: StatusType;
         custom?: {
-            /**  厂商自定义 */
+            /**  步骤自定义 */
             [key: string]: unknown;
         };
     }[];
+    /** 支付流水号 */
+    number?: string | number;
+    /** 设备信息 */
     device?: {
         [key: string]: unknown;
     };
+    /** 支付信息 */
+    pay?: {
+        [key: string]: unknown;
+    };
     custom?: {
         [key: string]: unknown;
     };
     manual?: {
         title: string;
         text: string;
+        status?: boolean;
+        money?: number;
     };
     backup?: Omit<State, 'backup'>;
 };
@@ -74,12 +94,26 @@ export declare type Action = {
     type: EActionTypes;
     payload: Partial<State>;
 };
+/**
+ * @title: 刷新 key
+ * @description: 用户重置组件生命周期,
+ * @param {number} key
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 09:56
+ */
 export declare const updateKey: (key: number) => {
     type: EActionTypes;
     payload: {
         key: number;
     };
 };
+/**
+ * @title: 更新设备信息
+ * @description: 用户选择设备将回填到此处
+ * @param {object} payload
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 09:57
+ */
 export declare const updateDevice: (payload: {
     device: State['device'];
 }) => {
@@ -88,10 +122,23 @@ export declare const updateDevice: (payload: {
         device: State['device'];
     };
 };
+/**
+ * @title: 刷新 步骤key
+ * @description: 重置某一步生命周期
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 09:58
+ */
 export declare const updateStepKey: () => {
     type: EActionTypes;
     payload: {};
 };
+/**
+ * @title: 更新至下一步
+ * @description: 更新至下一步
+ * @param {string} warn?: 错误信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 09:58
+ */
 export declare const updateNextStep: (warn?: string) => {
     type: EActionTypes;
     payload: {
@@ -100,16 +147,13 @@ export declare const updateNextStep: (warn?: string) => {
         warn?: undefined;
     };
 };
-export declare const updateStep: (payload: {
-    step: number;
-    warn?: ReactNode;
-}) => {
-    type: EActionTypes;
-    payload: {
-        step: number;
-        warn?: ReactNode;
-    };
-};
+/**
+ * @title: 更新自定义信息
+ * @description: 更新自定义信息
+ * @param {object} payload
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:03
+ */
 export declare const updateCustom: (payload: {
     [key: string]: unknown;
 }) => {
@@ -118,18 +162,28 @@ export declare const updateCustom: (payload: {
         [key: string]: unknown;
     };
 };
+/**
+ * @title: 更新 全局状态
+ * @description: 更新 全局状态
+ * @param {string} status : 状态
+ *  * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:03
+ */
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
         status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
-export declare const updateWarn: (warn: ReactNode) => {
-    type: EActionTypes;
-    payload: {
-        warn: React.ReactNode;
-    };
-};
+/**
+ * @title: 更新自定义组件
+ * @description: 更新自定义组件
+ * @param {string} component 组件名称
+ * @param {boolean} render : true : 隐藏 原组件(维持原组件内状态)  ;false : 卸载
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:04
+ */
 export declare const updateComponent: (component: string, render?: boolean) => {
     type: EActionTypes;
     payload: {
@@ -142,19 +196,26 @@ export declare const updateComponent: (component: string, render?: boolean) => {
         readonly component?: undefined;
     };
 };
+/**
+ * @title: 更新步骤信息
+ * @description: 更新某一步骤信息
+ * @param {State} steps 某一步骤信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:07
+ */
 export declare const updateSteps: (steps: State['steps']) => {
     type: EActionTypes;
     payload: {
         steps: {
             /** 用于重置当前步骤 */
             key: number;
-            title?: ReactNode;
-            text?: ReactNode;
-            warn?: ReactNode;
-            tip?: ReactNode;
-            success?: ReactNode;
-            fail?: ReactNode;
-            loading?: ReactNode;
+            title?: string | undefined;
+            text?: string | undefined;
+            warn?: string | undefined;
+            tip?: string | undefined;
+            success?: string | undefined;
+            fail?: string | undefined;
+            loading?: string | undefined;
             /** 步骤状态 */
             status: StatusType;
             custom?: {
@@ -163,69 +224,109 @@ export declare const updateSteps: (steps: State['steps']) => {
         }[];
     };
 };
+/**
+ * @title: 更新状态管理信息
+ * @description: 更新状态管理信息
+ * @param {Partial} payload
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:08
+ */
 export declare const updateState: (payload: Partial<State>) => {
     type: EActionTypes;
     payload: Partial<State>;
 };
+/**
+ * @title: 更新当前步骤自定义信息
+ * @description: 更新当前步骤自定义信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:09
+ */
 export declare const updateCurrentCustomStemItem: (payload: NonNullable<Partial<State['steps'][number]['custom']>>) => {
     type: EActionTypes;
     payload: Partial<{
         [key: string]: unknown;
     }>;
 };
-export declare const updateCustomStemItem: (payload: NonNullable<Partial<State['steps'][number]['custom']>>) => {
-    type: EActionTypes;
-    payload: Partial<{
-        [key: string]: unknown;
-    }>;
-};
+/**
+ * @title: 更新当前步骤信息
+ * @description: 更新当前步骤信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:09
+ */
 export declare const updateCurrentStemItem: (payload: any) => {
     type: EActionTypes;
     payload: any;
 };
+/**
+ * @title: 更新备份信息
+ * @description: 更新备份信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:25
+ */
 export declare const backUpProduction: (payload: Partial<State>) => {
     type: EActionTypes;
     payload: Partial<State>;
 };
+/**
+ * @title: 释放备份信息
+ * @description: 释放备份信息
+ * @param {Partial} payload
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:27
+ */
 export declare const backUpFree: (payload: Partial<State>) => {
     type: EActionTypes;
     payload: {
+        name?: string | undefined;
+        symbol?: string | undefined;
+        amount?: string | number | undefined;
         mode?: "refund" | "pay" | "query" | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "eftpos" | undefined;
+        order_id?: string | number | undefined;
+        eftpos?: "windcave" | "tyro" | "payo" | "stripe" | undefined;
+        action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
+        subTitle?: string | undefined;
         type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
+        net?: boolean | undefined;
         component?: string | undefined;
-        lastComponent?: string | undefined;
+        form?: string | undefined;
         status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
-        warn?: ReactNode;
+        warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */
             key: number;
-            title?: ReactNode;
-            text?: ReactNode;
-            warn?: ReactNode;
-            tip?: ReactNode;
-            success?: ReactNode;
-            fail?: ReactNode;
-            loading?: ReactNode;
+            title?: string | undefined;
+            text?: string | undefined;
+            warn?: string | undefined;
+            tip?: string | undefined;
+            success?: string | undefined;
+            fail?: string | undefined;
+            loading?: string | undefined;
             /** 步骤状态 */
             status: StatusType;
             custom?: {
                 [key: string]: unknown;
             } | undefined;
         }[] | undefined;
+        number?: string | number | undefined;
         device?: {
             [key: string]: unknown;
         } | undefined;
+        pay?: {
+            [key: string]: unknown;
+        } | undefined;
         custom?: {
             [key: string]: unknown;
         } | undefined;
         manual?: {
             title: string;
             text: string;
+            status?: boolean | undefined;
+            money?: number | undefined;
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
     };