@pisell/private-materials 6.3.125 → 6.3.126

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页
@@ -17,5 +16,5 @@ declare const _default: ({ className, onChange, onClose, formatAmount, isMobile,
     isMobile: boolean;
     net: boolean;
     client: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/amount.js

@@ -36,13 +36,11 @@ var import_utils = require("@pisell/utils");
 var import_antd = require("antd");
 var import_decimal = require("decimal.js");
 var import_react = __toESM(require("react"));
-var import_ahooks = require("ahooks");
 var import_alert = __toESM(require("./component/alert"));
 var import_titlebar = __toESM(require("./component/header/titlebar"));
 var import_manufacturer = require("./manufacturer");
 var import_helper = require("./helper");
 var import_store = require("./store");
-var import_payLog = __toESM(require("./utils/payLog"));
 var amount_default = ({
   className = "",
   onChange,
@@ -90,14 +88,6 @@ var amount_default = ({
     const currentMoneyDeci = new import_decimal.Decimal(currentMoney);
     return moneyDeci.sub(currentMoneyDeci).toFixed(2, import_decimal.Decimal.ROUND_HALF_UP);
   }, [currentMoney, money]);
-  (0, import_ahooks.useMount)(() => {
-    import_payLog.default.log("金额页面展示", {
-      amount: currentMoney,
-      surcharge: totalSurMoney,
-      total,
-      surRate: curSurRate
-    });
-  });
   const onSubmit = () => {
     if (!status) {
       setStatus(true);
@@ -125,7 +115,7 @@ var amount_default = ({
       surRateMoney: `${surRateMoney}`,
       totalUnit: formatAmount(total, 2, symbol)
     };
-    import_payLog.default.log("金额页-确认提交", { pay });
+    console.log("amount pay = ", pay);
     dispatch((0, import_store.updateState)({ pay }));
     dispatch((0, import_store.updateComponent)(""));
     onChange && onChange("page", "pay");
@@ -135,11 +125,9 @@ var amount_default = ({
       setStatus(true);
       return;
     }
-    import_payLog.default.log("金额页-点击取消");
     onClose();
   };
   const onEdit = () => {
-    import_payLog.default.log("金额页-点击编辑");
     setStatus(false);
     setTempSurRate(curSurRate);
     setTempSurMoney(curSurMoney);

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;
@@ -7,5 +6,5 @@ declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion
     isMobile: boolean;
     channel?: string | undefined;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default App;

package/lib/components/eftposPay/app.js

@@ -39,7 +39,6 @@ var import_const = require("./const");
 var import_device = __toESM(require("./device"));
 var import_pay = __toESM(require("./pay"));
 var import_store = require("./store");
-var import_payLog = __toESM(require("./utils/payLog"));
 var App = ({
   action,
   api,
@@ -105,12 +104,12 @@ var App = ({
           dispatch((0, import_store.updateState)({ action: params }));
         }
       }
+      console.log("状态切换 = ", status, params, other);
       props.onChangeStatus(status, params, other);
     },
     []
   );
   const onClose = () => {
-    import_payLog.default.log("关闭支付");
     onChange("fail", {
       number: data.number,
       uniquePaymentNumber: data.number,

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

@@ -2,5 +2,5 @@ import React from 'react';
 import './index.less';
 declare const _default: ({ children }: {
     children: React.ReactNode;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/alert/warn.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const _default: () => React.JSX.Element;
+declare const _default: () => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/failCustom.d.ts

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

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

@@ -41,7 +41,6 @@ var import_manufacturer = require("../../manufacturer");
 var import_XClose = __toESM(require("@pisell/icon/es/XClose"));
 var import_store = require("../../store");
 var import_header = __toESM(require("../header"));
-var import_payLog = __toESM(require("../../utils/payLog"));
 var failCustom_default = ({ className = "", isMobile, onChange }) => {
   const {
     eftpos,
@@ -53,47 +52,37 @@ var failCustom_default = ({ className = "", isMobile, onChange }) => {
     order_id,
     number,
     device,
-    client,
-    originalParams
+    client
   } = (0, import_store.useContextData)();
   const failCustom = custom == null ? void 0 : custom.failCustom;
   const dispatch = (0, import_store.useDispatch)();
   const onRetry = () => {
-    import_payLog.default.log("自定义失败页：重试");
     onChange("page", "pay");
-    const params = {
-      ...originalParams || {},
-      mode,
-      name,
-      symbol,
-      amount,
-      order_id,
-      client
-    };
-    if (mode !== import_const.ModeEnum.Query) {
-      params.number = "";
-    }
-    dispatch((0, import_store.updateState)((0, import_manufacturer.getInitState)(eftpos, params)));
+    dispatch(
+      (0, import_store.updateState)(
+        (0, import_manufacturer.getInitState)(
+          eftpos,
+          mode === import_const.ModeEnum.Query ? { mode, name, symbol, amount, order_id } : { mode, name, symbol, amount, order_id, number: "" }
+        )
+      )
+    );
   };
   const onModify = () => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,
           amount,
           order_id,
-          number: "",
-          client
+          number: ""
         })
       )
     );
     onChange("page", "amount");
   };
   const onManually = () => {
-    import_payLog.default.log("自定义失败页：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -109,15 +98,12 @@ var failCustom_default = ({ className = "", isMobile, onChange }) => {
     dispatch((0, import_store.updateComponent)("Manual"));
   };
   const onNotin = () => {
-    import_payLog.default.log("自定义失败页：点击打印小票");
     onChange("print", [], "print_on_timeout");
   };
   const onClose = () => {
-    import_payLog.default.log("自定义失败页：关闭");
     onChange("fail", { number, uniquePaymentNumber: number, device, order_id });
   };
   (0, import_ahooks.useMount)(() => {
-    import_payLog.default.log("自定义失败页展示", { status: failCustom == null ? void 0 : failCustom.status });
     if ((failCustom == null ? void 0 : failCustom.status) === "fail") {
       onChange("page", "fail");
     }

package/lib/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/lib/components/eftposPay/component/fail/index.js

@@ -41,7 +41,6 @@ var import_const = require("../../const");
 var import_manufacturer = require("../../manufacturer");
 var import_store = require("../../store");
 var import_header = __toESM(require("../header"));
-var import_payLog = __toESM(require("../../utils/payLog"));
 var fail_default = ({ onChange, className = "", isMobile }) => {
   var _a, _b;
   const {
@@ -56,18 +55,15 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     number,
     device,
     client,
-    custom,
-    originalParams
+    custom
   } = (0, import_store.useContextData)();
   const isPosNetworkError = ((_b = (_a = steps[step]) == null ? void 0 : _a.custom) == null ? void 0 : _b.isPosNetworkError) || false;
   const dispatch = (0, import_store.useDispatch)();
   const onRetry = () => {
-    import_payLog.default.log("失败页：点击重试");
     onChange("page", "pay");
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,
@@ -79,8 +75,7 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
             "operator_type": custom.operator_type,
             "platform": custom.platform,
             "custom_payment_id": custom.custom_payment_id
-          } : {},
-          client
+          } : {}
         })
       )
     );
@@ -89,21 +84,18 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,
           amount,
           order_id,
-          number: "",
-          client
+          number: ""
         })
       )
     );
     onChange("page", "amount");
   };
   const onManually = () => {
-    import_payLog.default.log("失败页：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -119,15 +111,12 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch((0, import_store.updateComponent)("Manual"));
   };
   const onNotin = () => {
-    import_payLog.default.log("失败页：点击打印小票");
     onChange("print", [], "print_on_timeout");
   };
   const onClose = () => {
-    import_payLog.default.log("失败页：点击关闭");
     onChange("fail", { number, uniquePaymentNumber: number, device, order_id });
   };
   (0, import_ahooks.useMount)(() => {
-    import_payLog.default.log("失败页展示", { status: steps[step].status });
     if (steps[step].status === "fail") {
       onChange("page", "fail");
     }

package/lib/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/lib/components/eftposPay/component/fail/network.js

@@ -36,11 +36,9 @@ var import_utils = require("@pisell/utils");
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_header = __toESM(require("../header"));
-var import_payLog = __toESM(require("../../utils/payLog"));
 var network_default = ({ className = "" }) => {
   const [hasBtn, setBtn] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
-    import_payLog.default.log("断网提示页展示");
     const clear = setTimeout(() => {
       setBtn(true);
     }, 1e3);
@@ -49,7 +47,6 @@ var network_default = ({ className = "" }) => {
     };
   }, []);
   const onReconnect = () => {
-    import_payLog.default.log("断网提示页：点击重新连接");
     import_antd.message.open({
       key: "net-warning",
       type: "loading",

package/lib/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/lib/components/eftposPay/component/fail/unknow.js

@@ -35,19 +35,13 @@ module.exports = __toCommonJS(unknow_exports);
 var import_utils = require("@pisell/utils");
 var import_antd = require("antd");
 var import_react = __toESM(require("react"));
-var import_ahooks = require("ahooks");
 var import_const = require("../../const");
 var import_store = require("../../store");
 var import_header = __toESM(require("../header"));
-var import_payLog = __toESM(require("../../utils/payLog"));
 var unknow_default = ({ onChange, className = "" }) => {
   const { form, mode, client } = (0, import_store.useContextData)();
   const dispatch = (0, import_store.useDispatch)();
-  (0, import_ahooks.useMount)(() => {
-    import_payLog.default.log("未知状态处理页展示");
-  });
   const onManually = () => {
-    import_payLog.default.log("未知状态处理页：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -63,12 +57,10 @@ var unknow_default = ({ onChange, className = "" }) => {
     dispatch((0, import_store.updateComponent)("Manual"));
   };
   const onNotin = () => {
-    import_payLog.default.log("未知状态处理页：点击打印小票");
     onChange("print", [], "print_on_timeout");
   };
   (0, import_react.useEffect)(() => {
     if (form === "Network" || form === "restore") {
-      import_payLog.default.log("未知状态处理页：网络终端");
       dispatch((0, import_store.updateComponent)(""));
     }
   }, [form]);

package/lib/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/lib/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/lib/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/lib/components/eftposPay/component/manual/index.js

@@ -36,18 +36,15 @@ var import_utils = require("@pisell/utils");
 var import_decimal = require("decimal.js");
 var import_antd = require("antd");
 var import_react = __toESM(require("react"));
+var import_materials = require("@pisell/materials");
 var import_usePrefix = __toESM(require("../../../../hooks/usePrefix"));
 var import_const = require("../../const");
 var import_store = require("../../store");
 var import_helper = require("../../helper");
-var import_payLog = __toESM(require("../../utils/payLog"));
 var import_index = require("./index.less");
 var manual_default = ({ onChange, className = "", formatAmount }) => {
   const dispatch = (0, import_store.useDispatch)();
   const { symbol, manual, order_id, mode, device, number, pay, amount } = (0, import_store.useContextData)();
-  (0, import_react.useEffect)(() => {
-    import_payLog.default.log("手动标记页展示");
-  }, []);
   const start = (0, import_react.useMemo)(() => {
     if (typeof (manual == null ? void 0 : manual.money) === "number" || typeof (manual == null ? void 0 : manual.money) === "string") {
       return Number(manual == null ? void 0 : manual.money);
@@ -63,11 +60,9 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
   const [isUpdateAmount, updateAmountStatus] = (0, import_react.useState)(manual == null ? void 0 : manual.status);
   const onSuccess = () => {
     if (disabled) {
-      import_payLog.default.log("手动标记：点击成功被拦截");
       return;
     }
     if (mode === import_const.ModeEnum.Refund) {
-      import_payLog.default.log("手动标记(退款)：点击标记为成功");
       setDisabled(true);
       onChange("success", {
         amount,
@@ -75,11 +70,12 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
         number,
         uniquePaymentNumber: number,
         device,
-        order_id
+        order_id,
+        manual_marking_flag: 1
+        // 手动标记标志
       });
       return;
     }
-    import_payLog.default.log("手动标记：点击标记为成功");
     updateAmountStatus(true);
     dispatch((0, import_store.updateState)({ manual: { ...manual, status: true } }));
   };
@@ -87,15 +83,14 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
     if (disabled) {
       return;
     }
-    import_payLog.default.log("手动标记：点击标记为失败");
     setDisabled(true);
     onChange("fail", { number, uniquePaymentNumber: number, device, order_id });
+    (0, import_materials.PisellToast)({ content: import_utils.locales.getText("page.eftpos-pay.text.manual.fail.toast") });
   };
   const onSubmit = () => {
     if (disabled) {
       return;
     }
-    import_payLog.default.log("手动标记-确认金额：点击确认", { money });
     setDisabled(true);
     if (mode === import_const.ModeEnum.Refund || mode === import_const.ModeEnum.Query) {
       return;
@@ -128,12 +123,14 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
       number,
       uniquePaymentNumber: number,
       device,
-      order_id
+      order_id,
+      manual_marking_flag: 1
+      // 手动标记标志
     });
+    (0, import_materials.PisellToast)({ content: import_utils.locales.getText("page.eftpos-pay.text.manual.success.toast") });
     return;
   };
   const onCancel = () => {
-    import_payLog.default.log("手动标记-确认金额：点击取消");
     updateAmountStatus(false);
     setMoney(pay == null ? void 0 : pay.total);
     dispatch(

package/lib/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/lib/components/eftposPay/component/signature/index.js

@@ -37,17 +37,14 @@ var import_antd = require("antd");
 var import_react = __toESM(require("react"));
 var import_store = require("../../store");
 var import_header = __toESM(require("../header"));
-var import_payLog = __toESM(require("../../utils/payLog"));
 var signature_default = ({ api, className = "" }) => {
   const dispatch = (0, import_store.useDispatch)();
   const { number, mode } = (0, import_store.useContextData)();
   const [disabled, setDisabled] = (0, import_react.useState)(false);
   const onBack = () => {
-    import_payLog.default.log("取消签名确认页：点击返回");
     dispatch((0, import_store.updateComponent)(""));
   };
   const onConfirm = () => {
-    import_payLog.default.log("取消签名确认页：点击确认");
     setDisabled(true);
     api.update({
       type: "NO",

package/lib/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/lib/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/lib/components/eftposPay/const.d.ts

@@ -6,7 +6,10 @@ export declare enum EftposEnum {
     /** 后端支付 - 支付 + 退款  */
     Windcave = "windcave",
     Stripe = "stripe",
-    Linkly = "linkly"
+    /** 后端支付 - 支付 + 退款  */
+    Linkly = "linkly",
+    /** mx51支付 - 支付 + 退款  */
+    MX51 = "mx51"
 }
 export declare enum StatusEnum {
     Loading = "loading",
@@ -171,7 +174,9 @@ export declare enum PayStatus {
     /** 签名拒绝 */
     'SignatureDeclined' = "701009",
     /** 配置参数错误 */
-    'UserConfigError' = "701010"
+    'UserConfigError' = "701010",
+    /** mx51未知状态 */
+    'UnknownMx51' = "702001"
 }
 export interface ActionProps {
     onChange: (status: `${StatusEnum.Success}` | `${StatusEnum.Fail}` | 'page', params?: {

package/lib/components/eftposPay/const.js

@@ -36,6 +36,7 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
   EftposEnum2["Windcave"] = "windcave";
   EftposEnum2["Stripe"] = "stripe";
   EftposEnum2["Linkly"] = "linkly";
+  EftposEnum2["MX51"] = "mx51";
   return EftposEnum2;
 })(EftposEnum || {});
 var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
@@ -101,6 +102,7 @@ var PayStatus = /* @__PURE__ */ ((PayStatus2) => {
   PayStatus2["PayBankRefuses"] = "701008";
   PayStatus2["SignatureDeclined"] = "701009";
   PayStatus2["UserConfigError"] = "701010";
+  PayStatus2["UnknownMx51"] = "702001";
   return PayStatus2;
 })(PayStatus || {});
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**
@@ -20,5 +19,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;