@pisell/private-materials 6.3.121 → 6.3.122

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

@@ -1,6 +1,6 @@
 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"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;

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

@@ -52,31 +52,25 @@ 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 = () => {
     onChange("page", "pay");
-    const params = {
-      ...originalParams || {},
-      mode,
-      name,
-      symbol,
-      amount,
-      order_id
-    };
-    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,

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

@@ -55,8 +55,7 @@ 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)();
@@ -65,7 +64,6 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,
@@ -86,7 +84,6 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,

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

@@ -36,6 +36,7 @@ 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");
@@ -69,7 +70,9 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
         number,
         uniquePaymentNumber: number,
         device,
-        order_id
+        order_id,
+        manual_marking_flag: 1
+        // 手动标记标志
       });
       return;
     }
@@ -82,6 +85,7 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
     }
     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) {
@@ -119,8 +123,11 @@ 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 = () => {

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.js

@@ -43,8 +43,6 @@ var import_ChevronRight = __toESM(require("@pisell/icon/es/ChevronRight"));
 var import_store = require("./store");
 var import_manufacturer = require("./manufacturer");
 var import_device = require("./device.less");
-var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
-var import_utils2 = require("@pisell/utils");
 var device_default = ({
   api,
   onChange,
@@ -56,15 +54,12 @@ var device_default = ({
   client,
   formatAmount = (number, precision, symbol) => `${symbol}${number}`
 }) => {
-  const context = (0, import_useEngineContext.default)();
-  const { isTerminal, interaction } = context.appHelper.utils || {};
   const store = (0, import_store.useContextData)();
-  const { device, symbol, mode, eftpos, order_id } = store;
+  const { device, symbol, mode, eftpos } = store;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [dataStaus, setDataStaus] = (0, import_react.useState)(true);
   const [list, setList] = (0, import_react.useState)([]);
   const dispatch = (0, import_store.useDispatch)();
-  const timerRef = (0, import_react.useRef)();
   const onClick = (event) => {
     if (!net) {
       import_antd.message.open({
@@ -77,41 +72,10 @@ var device_default = ({
     const [index] = [Number(event.currentTarget.dataset.index)];
     setDevice(list[index]);
   };
-  const triggerCloseButton = (bool) => {
-    var _a, _b;
-    if (!(isTerminal == null ? void 0 : isTerminal())) {
-      return;
-    }
-    (_b = (_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.postMessageToApp) == null ? void 0 : _b.call(_a, {
-      module: "pos",
-      key: "other",
-      data: {
-        key: bool ? "show_close_button" : "hide_close_button"
-      }
-    });
-  };
-  const closeFirstWithDelayShow = () => {
-    timerRef.current && clearTimeout(timerRef.current);
-    if (!(isTerminal == null ? void 0 : isTerminal())) {
-      return;
-    }
-    triggerCloseButton(false);
-    timerRef.current = setTimeout(() => {
-      triggerCloseButton(true);
-    }, 5e3);
-  };
-  const clearTimer = () => {
-    if (timerRef.current) {
-      clearTimeout(timerRef.current);
-      timerRef.current = void 0;
-    }
-  };
   (0, import_ahooks.useMount)(() => {
     setLoading(true);
-    closeFirstWithDelayShow();
     api.getDeviceList({ type: eftpos, status: "paired" }).then(
       (res) => {
-        clearTimer();
         setLoading(false);
         if (res && Array.isArray(res.list) && res.list.length > 0) {
           if (device_number) {
@@ -136,65 +100,24 @@ var device_default = ({
           setList(setDeviceList(res.list));
           if (res.list.length === 1) {
             setDevice(res.list[0]);
-          } else {
-            triggerCloseButton(true);
           }
           return;
         }
-        triggerCloseButton(true);
         setDataStaus(false);
       },
       () => {
-        clearTimer();
-        triggerCloseButton(true);
         setDataStaus(false);
         setLoading(false);
       }
     );
   });
-  (0, import_ahooks.useUnmount)(() => {
-    timerRef.current && clearTimeout(timerRef.current);
-  });
-  const checkIsActiveWithDelay = async (time = 100) => {
-    var _a, _b, _c;
-    if (!(isTerminal == null ? void 0 : isTerminal())) {
-      return true;
-    }
-    await new Promise((resolve) => setTimeout(resolve, time));
-    if ((_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.asyncDataManager) {
-      try {
-        const activeStatus = await ((_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.asyncDataManager) == null ? void 0 : _c.call(_b, {
-          module: "get",
-          key: "pay_webview_active"
-        }));
-        return activeStatus !== "unActive";
-      } catch (error) {
-        return true;
-      }
-    }
-    return true;
-  };
-  const setDevice = async (device2) => {
+  const setDevice = (device2) => {
     dispatch((0, import_store.updateDevice)({ device: device2 }));
     if (typeof api.selectDevice === "function") {
       api.selectDevice(device2);
     }
     if (typeof onChange === "function") {
       if (mode === import_const.ModeEnum.Pay) {
-        triggerCloseButton(false);
-        const isActive = await checkIsActiveWithDelay(100);
-        if (!isActive) {
-          (0, import_utils2.sendWarningLog)({
-            title: "支付-当前页面非活跃状态，无法进行支付",
-            content: [
-              {
-                key: "activeStatus",
-                value: JSON.stringify({ order_id, isActive })
-              }
-            ]
-          });
-          return;
-        }
         if (device2.pay) {
           dispatch(
             (0, import_store.updateState)({
@@ -229,19 +152,14 @@ var device_default = ({
       className: "pisell-lowcode__eft-pay-device-list",
       style: isMobile ? { marginTop: "20px" } : {}
     },
-    /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Spin,
+    /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: loading, style: { flex: 1, overflow: "auto" } }, /* @__PURE__ */ import_react.default.createElement(
+      "div",
       {
-        spinning: loading,
-        size: "large",
-        style: { flex: 1, overflow: "auto", minHeight: "200px" }
+        style: { display: "flex", flexDirection: "column", gap: "10px" }
       },
-      /* @__PURE__ */ import_react.default.createElement(
-        "div",
-        {
-          style: { display: "flex", flexDirection: "column", gap: "10px" }
-        },
-        list.map(({ id, name, pay }, index) => /* @__PURE__ */ import_react.default.createElement(
+      list.map(({ id, name, pay, connection }, index) => {
+        var _a;
+        return /* @__PURE__ */ import_react.default.createElement(
           "div",
           {
             key: id,
@@ -255,16 +173,16 @@ var device_default = ({
             "page.eftpos-pay.text.surcharge.edit.inc.surcharge"
           ), ": ", formatAmount(`${pay.surcharge}`, 2, symbol), " (", import_utils.locales.getText(
             "page.eftpos-pay.text.surcharge.edit.rate"
-          ), ":", pay.surRate, "% +", " ", formatAmount(`${pay.surMoney}`, 2, symbol), ")"))),
+          ), ":", pay.surRate, "% +", " ", formatAmount(`${pay.surMoney}`, 2, symbol), ")"), eftpos === import_const.EftposEnum.MX51 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-device-sucharge" }, "Pairing ID: ", (_a = connection == null ? void 0 : connection.response) == null ? void 0 : _a.pairing_id) : null)),
           /* @__PURE__ */ import_react.default.createElement("div", { style: { flexShrink: 0 } }, /* @__PURE__ */ import_react.default.createElement(
             import_ChevronRight.default,
             {
               style: { fontWeight: "600", fontSize: "24px" }
             }
           ))
-        ))
-      )
-    )
+        );
+      })
+    ))
   ) : /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly" | "mx51">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/index.js

@@ -94,14 +94,10 @@ var eftposPay_default = (props) => {
     if (props.source === import_const.RestoreEumn.Restore) {
       return props.params;
     }
-    const initState = (0, import_manufacturer.getInitState)(
+    return (0, import_manufacturer.getInitState)(
       props.type,
       props.params ? { mode, ...props.params, symbol: current } : { mode, symbol: current }
     );
-    return {
-      ...initState || {},
-      originalParams: props.params || {}
-    };
   }, [mode, props.params, props.type, symbol]);
   const stateRef = (0, import_react.useRef)(state);
   (0, import_react.useEffect)(() => {

package/lib/components/eftposPay/linkly/const.js

@@ -72,7 +72,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== "undefined" && client !== void 0 ? client : import_const.ClientEnum.Merchant,
+    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
     warn: "",
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},

package/lib/components/eftposPay/linkly/index.js

@@ -126,6 +126,7 @@ var Linkly = ({ api, onChange }) => {
   }, [fail]);
   (0, import_react.useEffect)(() => {
     var _a, _b, _c;
+    console.log("statusRef.current11111", statusRef.current);
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }