@pisell/private-materials 3.0.136 → 3.0.138

package/lib/components/eftposPay/helper.js

@@ -20,10 +20,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   cloneDeep: () => cloneDeep,
+  getPayParams: () => getPayParams,
   getUuid: () => getUuid,
+  limitDecimals: () => limitDecimals,
   sleep: () => sleep
 });
 module.exports = __toCommonJS(helper_exports);
+var import_decimal = require("decimal.js");
+var import_const = require("./const");
 function getUuid() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx".replace(/[xy]/g, (c) => {
     const r = Math.random() * 16 | 0;
@@ -54,9 +58,69 @@ function cloneDeep(source, hash = /* @__PURE__ */ new WeakMap()) {
   });
   return target;
 }
+var getPayParams = (data, statue) => {
+  var _a;
+  if (statue === "fail") {
+    return {
+      number: data.number,
+      device: data.device,
+      order_id: data.order_id
+    };
+  }
+  if (data.mode === import_const.ModeEnum.Pay) {
+    const pay = data.pay;
+    const card_reader_surcharge = ((_a = data.custom) == null ? void 0 : _a.card_reader_surcharge) || 0;
+    const obj = pay || {};
+    const cardReaderSurcharge = card_reader_surcharge;
+    const surCardDeci = new import_decimal.Decimal(Number(cardReaderSurcharge));
+    const surMoneyDeci = new import_decimal.Decimal(Number((obj == null ? void 0 : obj.surMoney) || 0));
+    const surRateMoneyDeci = new import_decimal.Decimal(Number(obj == null ? void 0 : obj.surRateMoney));
+    const surMoneyTotal = surMoneyDeci.add(surCardDeci);
+    const surchargeDeci = surMoneyTotal.add(surRateMoneyDeci);
+    const amount = new import_decimal.Decimal(Number(obj == null ? void 0 : obj.amount));
+    const total = surchargeDeci.add(amount);
+    return {
+      ...obj,
+      cardReaderSurcharge,
+      surMoney: surMoneyTotal.toFixed(2, import_decimal.Decimal.ROUND_HALF_UP),
+      surcharge: surchargeDeci.toFixed(2, import_decimal.Decimal.ROUND_HALF_UP),
+      total: total.toFixed(2, import_decimal.Decimal.ROUND_HALF_UP),
+      number: data.number,
+      device: data.device,
+      order_id: data.order_id
+    };
+  }
+  if (data.mode === import_const.ModeEnum.Refund) {
+    return {
+      amount: data.amount,
+      total: data.amount,
+      number: data.number,
+      device: data.device,
+      order_id: data.order_id
+    };
+  }
+  return {
+    amount: data.amount,
+    total: data.amount,
+    number: data.number,
+    order_id: data.order_id
+  };
+};
+var limitDecimals = (value) => {
+  const reg = /^(\-)*(\d+)\.(\d\d).*$/;
+  if (typeof value === "string") {
+    return !isNaN(Number(value)) ? value.replace(reg, "$1$2.$3") : "";
+  }
+  if (typeof value === "number") {
+    return !isNaN(value) ? String(value).replace(reg, "$1$2.$3") : "";
+  }
+  return "";
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cloneDeep,
+  getPayParams,
   getUuid,
+  limitDecimals,
   sleep
 });

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

@@ -1,4 +1,33 @@
+import React from 'react';
 import { PayStatus } from './const';
+import { ModeEnum } from './const';
+export declare const useStoreRef: <T extends {
+    [key: string]: unknown;
+} = {
+    [key: string]: unknown;
+}, U extends {
+    [key: string]: unknown;
+} = {
+    [key: string]: unknown;
+}>() => {
+    readonly deviceRef: React.MutableRefObject<T>;
+    readonly payRef: React.MutableRefObject<U>;
+    readonly numRef: React.MutableRefObject<string | number | undefined>;
+    readonly orderIdRef: React.MutableRefObject<string | number>;
+    readonly modeRef: React.MutableRefObject<ModeEnum>;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly netRef: React.MutableRefObject<boolean | undefined>;
+    readonly symbolRef: React.MutableRefObject<string>;
+    readonly amountRef: React.MutableRefObject<string | number>;
+    readonly eftposRef: React.MutableRefObject<"windcave" | "tyro" | "payo" | "stripe">;
+};
+/**
+ * @title: 通用失败处理
+ * @description:  固定步骤 错误处理逻辑
+ * @return null
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 11:54
+ */
 export declare const useFail: (index: number, isMark?: boolean) => (res: {
-    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | undefined;
+    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | "701008" | "701009" | "701010" | undefined;
 }) => void;

package/lib/components/eftposPay/hooks.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,29 +14,89 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/eftposPay/hooks.tsx
 var hooks_exports = {};
 __export(hooks_exports, {
-  useFail: () => useFail
+  useFail: () => useFail,
+  useStoreRef: () => useStoreRef
 });
 module.exports = __toCommonJS(hooks_exports);
 var import_utils = require("@pisell/utils");
-var import_react = __toESM(require("react"));
+var import_react = require("react");
 var import_const = require("./const");
 var import_store = require("./store");
 var Max4004 = 1;
+var useStoreRef = () => {
+  const {
+    order_id,
+    device,
+    pay,
+    number,
+    mode,
+    net,
+    status,
+    symbol,
+    amount,
+    eftpos
+  } = (0, import_store.useContextData)();
+  const deviceRef = (0, import_react.useRef)(device);
+  const payRef = (0, import_react.useRef)(pay);
+  const numRef = (0, import_react.useRef)(number);
+  const orderIdRef = (0, import_react.useRef)(order_id);
+  const modeRef = (0, import_react.useRef)(mode);
+  const statusRef = (0, import_react.useRef)(status);
+  const netRef = (0, import_react.useRef)(net);
+  const symbolRef = (0, import_react.useRef)(symbol);
+  const amountRef = (0, import_react.useRef)(amount);
+  const eftposRef = (0, import_react.useRef)(eftpos);
+  (0, import_react.useEffect)(() => {
+    deviceRef.current = device;
+  }, [device]);
+  (0, import_react.useEffect)(() => {
+    payRef.current = pay;
+  }, [pay]);
+  (0, import_react.useEffect)(() => {
+    numRef.current = number;
+  }, [number]);
+  (0, import_react.useEffect)(() => {
+    orderIdRef.current = order_id;
+  }, [order_id]);
+  (0, import_react.useEffect)(() => {
+    modeRef.current = mode;
+  }, [mode]);
+  (0, import_react.useEffect)(() => {
+    statusRef.current = status;
+  }, [status]);
+  (0, import_react.useEffect)(() => {
+    netRef.current = net;
+  }, [net]);
+  (0, import_react.useEffect)(() => {
+    symbolRef.current = symbol;
+  }, [symbol]);
+  (0, import_react.useEffect)(() => {
+    amountRef.current = amount;
+  }, [amount]);
+  (0, import_react.useEffect)(() => {
+    eftposRef.current = eftpos;
+  }, [eftpos]);
+  return {
+    deviceRef,
+    payRef,
+    numRef,
+    orderIdRef,
+    modeRef,
+    statusRef,
+    netRef,
+    symbolRef,
+    amountRef,
+    eftposRef
+  };
+};
 var useFail = (index, isMark = false) => {
-  const { steps, custom, mode } = (0, import_store.useContextData)();
+  const { steps, custom } = (0, import_store.useContextData)();
+  const { modeRef } = useStoreRef();
   const dispatch = (0, import_store.useDispatch)();
   const ref = (0, import_react.useRef)((custom == null ? void 0 : custom.retry) || 0);
   (0, import_react.useEffect)(() => {
@@ -57,14 +115,9 @@ var useFail = (index, isMark = false) => {
         return;
       }
       const [code] = [`${res.code}`];
-      dispatch(
-        (0, import_store.updateCustomStemItem)({
-          step: index
-        })
-      );
       if (code === import_const.PayStatus.Unknown) {
         steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
-          mode
+          modeRef.current
         );
         steps[index].fail = import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.fail"
@@ -80,7 +133,25 @@ var useFail = (index, isMark = false) => {
         );
         return;
       }
-      if (code === import_const.PayStatus.Timeout || code === import_const.PayStatus.PayTimeout) {
+      if (code === import_const.PayStatus.PayTimeout) {
+        steps[index].fail = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.fail.timeout"
+        );
+        steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
+          modeRef.current
+        );
+        steps[index].status = "fail";
+        dispatch((0, import_store.updateSteps)(steps));
+        dispatch((0, import_store.updateComponent)("Fail"));
+        dispatch(
+          (0, import_store.updateCustom)({
+            errorStatus: "know"
+            // unknow know
+          })
+        );
+        return;
+      }
+      if (code === import_const.PayStatus.Timeout) {
         if (isMark) {
           steps[index].status = "fail";
           dispatch((0, import_store.updateSteps)(steps));
@@ -89,7 +160,7 @@ var useFail = (index, isMark = false) => {
               manual: {
                 title: import_utils.locales.getText("page.eftpos-pay.text.timedout.title"),
                 text: import_utils.locales.getText("page.eftpos-pay.text.timedout.text")(
-                  mode
+                  modeRef.current
                 )
               }
             })
@@ -101,17 +172,13 @@ var useFail = (index, isMark = false) => {
             })
           );
           dispatch((0, import_store.updateComponent)("Manual"));
-          dispatch(
-            (0, import_store.updateCustom)({
-              errorStatus: "know"
-              // unknow know
-            })
-          );
           return;
         }
-        steps[index].fail = code === import_const.PayStatus.Timeout ? import_utils.locales.getText("page.eftpos-pay.text.transaction.pay.fail.timeout") : import_utils.locales.getText("page.eftpos-pay.text.transaction.fail.timeout");
+        steps[index].fail = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.pay.fail.timeout"
+        );
         steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
-          mode
+          modeRef.current
         );
         steps[index].status = "fail";
         dispatch((0, import_store.updateSteps)(steps));
@@ -126,14 +193,18 @@ var useFail = (index, isMark = false) => {
       }
       if (code === import_const.PayStatus.NoPay) {
         if (ref.current > Max4004) {
+          dispatch(
+            (0, import_store.updateState)({
+              number: ""
+            })
+          );
           dispatch(
             (0, import_store.updateCustom)({
-              retry: ref.current,
-              number: void 0
+              retry: ref.current
             })
           );
           steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
-            mode
+            modeRef.current
           );
           steps[index].fail = import_utils.locales.getText(
             "page.eftpos-pay.text.transaction.fail"
@@ -144,10 +215,14 @@ var useFail = (index, isMark = false) => {
           return;
         }
         ref.current += 1;
+        dispatch(
+          (0, import_store.updateState)({
+            number: ""
+          })
+        );
         dispatch(
           (0, import_store.updateCustom)({
-            retry: ref.current,
-            number: void 0
+            retry: ref.current
           })
         );
         dispatch((0, import_store.updateKey)(Date.now()));
@@ -172,7 +247,9 @@ var useFail = (index, isMark = false) => {
         return;
       }
       if (code === import_const.PayStatus.PayCardErrorFailed) {
-        steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.transaction.fail.cancel.title");
+        steps[index].title = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.fail.cancel.title"
+        );
         steps[index].fail = import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.fail.cancel"
         );
@@ -191,17 +268,21 @@ var useFail = (index, isMark = false) => {
         steps[index].title = import_utils.locales.getText(
           "page.eftpos-pay.text.interrupted"
         );
-        steps[index].warn = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, import_utils.locales.getText(
+        steps[index].warn = `${import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.eftpos.fail.title"
-        ), /* @__PURE__ */ import_react.default.createElement("br", null), import_utils.locales.getText(
+        )}
+${import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.eftpos.fail.power"
-        ), ". ", /* @__PURE__ */ import_react.default.createElement("br", null), import_utils.locales.getText(
+        )}
+${import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.eftpos.fail.device"
-        ), /* @__PURE__ */ import_react.default.createElement("br", null), import_utils.locales.getText(
+        )}
+${import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.eftpos.fail.network"
-        ), /* @__PURE__ */ import_react.default.createElement("br", null), import_utils.locales.getText("page.eftpos-pay.text.transaction.eftpos.fail.if")(
-          mode
-        ));
+        )}
+${import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.eftpos.fail.if"
+        )(modeRef.current)}`;
         steps[index].status = "warn";
         steps[index].custom = steps[index].custom ? { ...steps[index].custom, isPosNetworkError: true } : { isPosNetworkError: true };
         dispatch((0, import_store.updateSteps)(steps));
@@ -214,7 +295,63 @@ var useFail = (index, isMark = false) => {
         );
         return;
       }
-      steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(mode);
+      if (code === import_const.PayStatus.PayBankRefuses) {
+        steps[index].fail = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.back.declined.text"
+        );
+        steps[index].title = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.back.declined.title"
+        );
+        steps[index].status = "fail";
+        dispatch((0, import_store.updateSteps)(steps));
+        dispatch((0, import_store.updateComponent)("Fail"));
+        dispatch(
+          (0, import_store.updateCustom)({
+            errorStatus: "know"
+            // unknow know
+          })
+        );
+        return;
+      }
+      if (code === import_const.PayStatus.SignatureDeclined) {
+        steps[index].fail = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.user.declined.text"
+        );
+        steps[index].title = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.user.declined.title"
+        );
+        steps[index].status = "fail";
+        dispatch((0, import_store.updateSteps)(steps));
+        dispatch((0, import_store.updateComponent)("Fail"));
+        dispatch(
+          (0, import_store.updateCustom)({
+            errorStatus: "know"
+            // unknow know
+          })
+        );
+        return;
+      }
+      if (code === import_const.PayStatus.UserConfigError) {
+        steps[index].title = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.user.config.title"
+        );
+        steps[index].fail = import_utils.locales.getText(
+          "page.eftpos-pay.text.transaction.user.config.text"
+        );
+        steps[index].status = "fail";
+        dispatch((0, import_store.updateSteps)(steps));
+        dispatch((0, import_store.updateComponent)("Fail"));
+        dispatch(
+          (0, import_store.updateCustom)({
+            errorStatus: "know"
+            // unknow know
+          })
+        );
+        return;
+      }
+      steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
+        modeRef.current
+      );
       steps[index].status = "fail";
       steps[index].fail = import_utils.locales.getText(
         "page.eftpos-pay.text.transaction.fail"
@@ -233,5 +370,6 @@ var useFail = (index, isMark = false) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  useFail
+  useFail,
+  useStoreRef
 });

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

@@ -1,7 +1,5 @@
 import React from 'react';
-import { PosProps, ModeEnum } from './const';
+import { PosProps } from './const';
 import './index.less';
-declare const _default: (props: Omit<PosProps, "action"> & {
-    mode: ModeEnum;
-}) => React.JSX.Element;
+declare const _default: (props: PosProps) => React.JSX.Element;
 export default _default;

package/lib/components/eftposPay/index.js

@@ -50,14 +50,16 @@ var App = ({
   getApi,
   device_number,
   terminal,
+  tyroUrl,
+  tyroVersion,
+  onChangeParams,
   ...props
 }) => {
   var _a;
   const data = (0, import_store.useContextData)();
-  const ref = (0, import_react.useRef)(false);
+  const dispatch = (0, import_store.useDispatch)();
   const [current, setCurrent] = (0, import_react.useState)(action);
   const statusRef = (0, import_react.useRef)(data.status);
-  const actRef = (0, import_react.useRef)(action);
   const context = (0, import_useEngineContext.default)();
   const { formatAmount, isTerminal } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {
     formatAmount: (number, precision, symbol) => `${symbol}${number}`,
@@ -94,17 +96,29 @@ var App = ({
     }
     return {};
   }, [getApi]);
-  const onChange = (status, params) => {
+  (0, import_react.useEffect)(() => {
+    onChangeParams && onChangeParams({
+      ...data,
+      ...data.eftpos === "tyro" ? { custom: { ...data.custom, btnList: [], list: [] } } : {},
+      form: "restore"
+    });
+  }, [data, onChangeParams]);
+  const onChange = (0, import_react.useCallback)((status, params) => {
     if (status === "page" && typeof params === "string") {
       if (["amount", "deviceList", "pay"].includes(params)) {
         setCurrent(params);
+        dispatch((0, import_store.updateState)({ action: params }));
       }
     }
     console.log("状态切换 = ", status, params);
     props.onChangeStatus(status, params);
-  };
+  }, []);
   const onClose = () => {
-    onChange("fail");
+    onChange("fail", {
+      number: data.number,
+      device: data.device,
+      order_id: data.order_id
+    });
   };
   if (current === import_const.RouteEnum.DeviceList) {
     return /* @__PURE__ */ import_react.default.createElement(
@@ -137,11 +151,14 @@ var App = ({
     import_pay.default,
     {
       api,
+      tyroUrl,
+      tyroVersion,
       onChange,
       className: isIpad ? "pisell-lowcode__eft-pay-terminal" : "",
       terminal,
       isIpad,
-      net
+      net,
+      formatAmount
     }
   );
 };
@@ -149,39 +166,67 @@ var eftposPay_default = (props) => {
   var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || { store: {} };
+  const symbol = ((_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) || "$";
   const mode = (0, import_react.useMemo)(() => {
+    if (props.source === "restore") {
+      if (props.params) {
+        if (props.params.mode) {
+          return props.params.mode;
+        }
+      }
+      return import_const.ModeEnum.Pay;
+    }
     if (props.mode) {
       return props.mode;
     }
     return import_const.ModeEnum.Pay;
-  }, [props.mode]);
-  const action = (0, import_react.useMemo)(() => {
-    if (mode === import_const.ModeEnum.Pay) {
-      return import_const.RouteEnum.DeviceList;
-    }
-    if (mode === import_const.ModeEnum.Refund) {
-      return import_const.RouteEnum.DeviceList;
-    }
-    if (mode === import_const.ModeEnum.Query) {
-      return import_const.RouteEnum.Pay;
-    }
-    throw Error("未知模式");
-  }, [mode]);
-  const symbol = ((_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) || "$";
-  const onChangeStatus = (status, params) => {
-    props.onChangeStatus(status, params);
-  };
+  }, [props.mode, props.source, props.params]);
   const state = (0, import_react.useMemo)(() => {
     const current = props.params && props.params.symbol ? props.params.symbol : symbol;
-    console.log("current 单位 = ", props.params.symbol, symbol);
+    if (props.source === "restore") {
+      return props.params;
+    }
     return (0, import_manufacturer.getInitState)(
       props.type,
       props.params ? { mode, ...props.params, symbol: current } : { mode, symbol: current }
     );
   }, [mode, props.params, props.type, symbol]);
-  (0, import_react.useEffect)(() => {
-    document.body.id = "body";
-  }, []);
+  const onChangeStatus = (0, import_react.useCallback)(
+    (status, params) => {
+      props.onChangeStatus(status, params);
+    },
+    []
+  );
+  const action = (0, import_react.useMemo)(() => {
+    const act = (() => {
+      if (state.action) {
+        return state.action;
+      }
+      if (mode === import_const.ModeEnum.Pay) {
+        if (state.device && state.pay) {
+          return import_const.RouteEnum.Pay;
+        }
+        if (state.device) {
+          return import_const.RouteEnum.Amount;
+        }
+        return import_const.RouteEnum.DeviceList;
+      }
+      if (mode === import_const.ModeEnum.Refund) {
+        if (state.device) {
+          return import_const.RouteEnum.Pay;
+        }
+        return import_const.RouteEnum.DeviceList;
+      }
+      if (mode === import_const.ModeEnum.Query) {
+        return import_const.RouteEnum.Pay;
+      }
+      throw Error("未知模式");
+    })();
+    if (props.source === "restore") {
+      onChangeStatus("page", act);
+    }
+    return act;
+  }, [mode, state]);
   console.log("props?.params?.device_number = ", (_e = props == null ? void 0 : props.params) == null ? void 0 : _e.device_number);
   return /* @__PURE__ */ import_react.default.createElement(import_store.Provider, { state }, /* @__PURE__ */ import_react.default.createElement(
     App,
@@ -190,7 +235,9 @@ var eftposPay_default = (props) => {
       params: props.params,
       onChangeStatus,
       terminal: props.terminal,
+      onChangeParams: props.onChangeParams,
       action,
+      source: props.source,
       device_number: (_f = props == null ? void 0 : props.params) == null ? void 0 : _f.device_number
     }
   ));