@pisell/private-materials 6.3.126 → 6.3.127

package/lib/components/eftpos/table.js

@@ -36,8 +36,6 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_XClose = __toESM(require("@pisell/icon/es/XClose"));
 var import_utils = require("@pisell/utils");
-var import_const = require("./const");
-var import_SettlementModal = __toESM(require("./SettlementModal"));
 var { Column } = import_antd.Table;
 var { Title, Text } = import_antd.Typography;
 var App = ({
@@ -80,8 +78,6 @@ var App = ({
     total: 0
   });
   const [data, setData] = (0, import_react.useState)([]);
-  const [settlementModalOpen, setSettlementModalOpen] = (0, import_react.useState)(false);
-  const [settlementModalData, setSettlementModalData] = (0, import_react.useState)(null);
   const loadData = async (current) => {
     if (typeof getList !== "function") {
       return Promise.reject(`getList ${getList} is not function`);
@@ -150,16 +146,6 @@ var App = ({
   (0, import_react.useImperativeHandle)(ref, () => ({
     loadData
   }));
-  const onSettlement = (device) => {
-    console.log("onSettlement", device);
-    setSettlementModalOpen(true);
-    setSettlementModalData({ type: "SETTLEMENT", card_reader_id: device.id });
-  };
-  const onSettlementEnquiry = (device) => {
-    console.log("onSettlementEnquiry", device);
-    setSettlementModalOpen(true);
-    setSettlementModalData({ type: "ENQUIRY", card_reader_id: device.id });
-  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -253,17 +239,10 @@ var App = ({
         Column,
         {
           title: import_utils.locales.getText("page.eftpos.text.table.opeartion"),
-          width: type === import_const.Eftpos.MX51 ? 600 : size[3],
+          width: size[3],
           key: "opeartion",
           className: "pisell-lowcode__pos-table-col",
-          render: (record) => /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: "middle" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onRepairDevice(record) }, import_utils.locales.getText("page.eftpos.text.repair")), useTyroLog && type === "tyro" ? /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onLogDevice(record) }, import_utils.locales.getText("page.eftpos.text.log")) : null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onEditDevice(record) }, import_utils.locales.getText("page.eftpos.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onDelDevice(record) }, import_utils.locales.getText("page.eftpos.text.delete")), type === import_const.Eftpos.MX51 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onSettlement(record) }, import_utils.locales.getText("page.eftpos.text.settlement")), /* @__PURE__ */ import_react.default.createElement(
-            import_antd.Button,
-            {
-              type: "link",
-              onClick: () => onSettlementEnquiry(record)
-            },
-            import_utils.locales.getText("page.eftpos.text.settlement_enquiry")
-          )) : null)
+          render: (record) => /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: "middle" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onRepairDevice(record) }, import_utils.locales.getText("page.eftpos.text.repair")), useTyroLog && type === "tyro" ? /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onLogDevice(record) }, import_utils.locales.getText("page.eftpos.text.log")) : null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onEditDevice(record) }, import_utils.locales.getText("page.eftpos.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: () => onDelDevice(record) }, import_utils.locales.getText("page.eftpos.text.delete")))
         }
       )
     ),
@@ -308,13 +287,6 @@ var App = ({
     /* @__PURE__ */ import_react.default.createElement("div", { style: { height: "34px" } }),
     /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-table-del-title" }, import_utils.locales.getText("page.eftpos.text.table.del.title")),
     /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos-table-del-text" }, import_utils.locales.getText("page.eftpos.text.table.del.text"))
-  ), settlementModalOpen && /* @__PURE__ */ import_react.default.createElement(
-    import_SettlementModal.default,
-    {
-      open: settlementModalOpen,
-      onClose: () => setSettlementModalOpen(false),
-      data: settlementModalData
-    }
   ));
 };
 var table_default = import_react.default.forwardRef(App);

package/lib/components/eftposPay/amount.js

@@ -36,11 +36,13 @@ 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,
@@ -88,6 +90,14 @@ 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);
@@ -115,7 +125,7 @@ var amount_default = ({
       surRateMoney: `${surRateMoney}`,
       totalUnit: formatAmount(total, 2, symbol)
     };
-    console.log("amount pay = ", pay);
+    import_payLog.default.log("金额页-确认提交", { pay });
     dispatch((0, import_store.updateState)({ pay }));
     dispatch((0, import_store.updateComponent)(""));
     onChange && onChange("page", "pay");
@@ -125,9 +135,11 @@ 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.js

@@ -39,6 +39,7 @@ 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,
@@ -104,12 +105,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/warn.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

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

@@ -41,6 +41,7 @@ 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,
@@ -52,37 +53,47 @@ var failCustom_default = ({ className = "", isMobile, onChange }) => {
     order_id,
     number,
     device,
-    client
+    client,
+    originalParams
   } = (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");
-    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 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)));
   };
   const onModify = () => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,
           amount,
           order_id,
-          number: ""
+          number: "",
+          client
         })
       )
     );
     onChange("page", "amount");
   };
   const onManually = () => {
+    import_payLog.default.log("自定义失败页：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -98,12 +109,15 @@ 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.js

@@ -41,6 +41,7 @@ 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 {
@@ -55,15 +56,18 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     number,
     device,
     client,
-    custom
+    custom,
+    originalParams
   } = (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,
@@ -75,7 +79,8 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
             "operator_type": custom.operator_type,
             "platform": custom.platform,
             "custom_payment_id": custom.custom_payment_id
-          } : {}
+          } : {},
+          client
         })
       )
     );
@@ -84,18 +89,21 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
+          ...originalParams || {},
           mode,
           name,
           symbol,
           amount,
           order_id,
-          number: ""
+          number: "",
+          client
         })
       )
     );
     onChange("page", "amount");
   };
   const onManually = () => {
+    import_payLog.default.log("失败页：点击手动标记");
     dispatch(
       (0, import_store.updateState)({
         manual: {
@@ -111,12 +119,15 @@ 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.js

@@ -36,9 +36,11 @@ 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);
@@ -47,6 +49,7 @@ 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.js

@@ -35,13 +35,19 @@ 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: {
@@ -57,10 +63,12 @@ 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/titlebar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/manual/index.js

@@ -36,15 +36,18 @@ 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);
@@ -60,9 +63,11 @@ 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,
@@ -70,12 +75,11 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
         number,
         uniquePaymentNumber: number,
         device,
-        order_id,
-        manual_marking_flag: 1
-        // 手动标记标志
+        order_id
       });
       return;
     }
+    import_payLog.default.log("手动标记：点击标记为成功");
     updateAmountStatus(true);
     dispatch((0, import_store.updateState)({ manual: { ...manual, status: true } }));
   };
@@ -83,14 +87,15 @@ 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;
@@ -123,14 +128,12 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
       number,
       uniquePaymentNumber: number,
       device,
-      order_id,
-      manual_marking_flag: 1
-      // 手动标记标志
+      order_id
     });
-    (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.js

@@ -37,14 +37,17 @@ 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,3 +1,4 @@
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

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

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

package/lib/components/eftposPay/const.js

@@ -36,7 +36,6 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
   EftposEnum2["Windcave"] = "windcave";
   EftposEnum2["Stripe"] = "stripe";
   EftposEnum2["Linkly"] = "linkly";
-  EftposEnum2["MX51"] = "mx51";
   return EftposEnum2;
 })(EftposEnum || {});
 var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
@@ -102,7 +101,6 @@ 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: