@pisell/private-materials 6.3.87 → 6.3.88

package/lib/components/eftpos/index.js

@@ -46,7 +46,11 @@ var import_hooks = require("./hooks");
 var import_apiKey = __toESM(require("./icon/apiKey"));
 var import_device2 = __toESM(require("./icon/device"));
 var import_locales2 = require("../../utils/locales");
+var import_hooks2 = require("./PairModal/hooks");
+var import_PairModal = __toESM(require("./PairModal/index"));
 var import_const = require("./const");
+var import_materials = require("@pisell/materials");
+var import_mx51SCI = __toESM(require("./assets/mx51SCI.svg"));
 var import_index = require("./index.less");
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var PosTabs = (0, import_react.forwardRef)(
@@ -161,6 +165,8 @@ var eftpos_default = (props) => {
   const [systemConfigStatus, setSystemConfigStatus] = (0, import_react.useState)(true);
   const posTabRef = (0, import_react.useRef)(null);
   const [posLoading, setPosLoading] = (0, import_react.useState)(false);
+  const pairModalHook = (0, import_hooks2.usePairModal)();
+  const pairRequest = (0, import_hooks.usePairRequest)();
   const onDelDevice = (id) => {
     return onDel(id);
   };
@@ -311,6 +317,40 @@ var eftpos_default = (props) => {
   (0, import_react.useEffect)(() => {
     setPage("list");
   }, [type]);
+  const onSavePair = async (device) => {
+    const eftposList = [import_const.Eftpos.MX51];
+    if (eftposList.includes(type)) {
+      try {
+        setLoading(true);
+        const response = await pairRequest.run({
+          ...(device == null ? void 0 : device.connection) || {},
+          type
+        });
+        if ((response == null ? void 0 : response.code) == 200) {
+          pairModalHook.open({
+            data: {
+              type,
+              device,
+              pairResponse: response == null ? void 0 : response.data
+            },
+            onCancel: () => {
+              pairModalHook.close();
+            },
+            onConfirm: () => {
+              pairModalHook.close();
+              onSave(device);
+            }
+          });
+        }
+      } catch (error) {
+        console.error("onSavePair error =>", error);
+      } finally {
+        setLoading(false);
+      }
+    } else {
+      onSave(device);
+    }
+  };
   if (type === import_const.Eftpos.Windcave) {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
       PosTabs,
@@ -425,7 +465,18 @@ var eftpos_default = (props) => {
     {
       open: page === "edit",
       onClose: onBack,
-      title: type === import_const.Eftpos.MX51 ? "Simple Cloud Integration" : import_utils.locales.getText("page.eftpos.text.device.add")(status, name),
+      title: type === import_const.Eftpos.MX51 ? /* @__PURE__ */ import_react.default.createElement(
+        "span",
+        {
+          style: {
+            display: "inline-flex",
+            alignItems: "center",
+            gap: "4px"
+          }
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_materials.Image, { src: import_mx51SCI.default, preview: false, width: 24 }),
+        /* @__PURE__ */ import_react.default.createElement("span", null, "Simple Cloud Payments")
+      ) : import_utils.locales.getText("page.eftpos.text.device.add")(status, name),
       titleNoWrap: true,
       zIndex: zIndex || 9999,
       destroyOnClose: true,
@@ -442,7 +493,7 @@ var eftpos_default = (props) => {
         import_device.default,
         {
           formItemList: deviceItemList,
-          onSave,
+          onSave: onSavePair,
           key: `device${type}`,
           type,
           status
@@ -471,5 +522,5 @@ var eftpos_default = (props) => {
         device: deviceItem
       }
     )
-  ), contextHolder);
+  ), contextHolder, pairModalHook.visible && /* @__PURE__ */ import_react.default.createElement(import_PairModal.default, { ...pairModalHook.modalProps }));
 };

package/lib/components/eftpos/locales.d.ts

@@ -31,6 +31,13 @@ declare const _default: {
         'page.eftpos.text.setting': string;
         'page.eftpos.text.setting.tip': string;
         'page.eftpos.text.setting.btn': string;
+        'page.eftpos.text.pair.modal.content.text-info': (status: string) => {
+            title: string;
+            description: string;
+            codeTitle: string;
+            cancenButtonText: string;
+            okButtonText: string;
+        } | undefined;
     };
     'zh-CN': {
         'page.eftpos.text.manufacturer': string;
@@ -64,6 +71,13 @@ declare const _default: {
         'page.eftpos.text.setting': string;
         'page.eftpos.text.setting.tip': string;
         'page.eftpos.text.setting.btn': string;
+        'page.eftpos.text.pair.modal.content.text-info': (status: string) => {
+            title: string;
+            description: string;
+            codeTitle: string;
+            cancenButtonText: string;
+            okButtonText: string;
+        } | undefined;
     };
     'zh-HK': {
         'page.eftpos.text.manufacturer': string;
@@ -97,6 +111,13 @@ declare const _default: {
         'page.eftpos.text.setting': string;
         'page.eftpos.text.setting.tip': string;
         'page.eftpos.text.setting.btn': string;
+        'page.eftpos.text.pair.modal.content.text-info': (status: string) => {
+            title: string;
+            description: string;
+            codeTitle: string;
+            cancenButtonText: string;
+            okButtonText: string;
+        } | undefined;
     };
 };
 export default _default;

package/lib/components/eftpos/locales.js

@@ -23,7 +23,7 @@ __export(locales_exports, {
 });
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
-  "en": {
+  en: {
     "page.eftpos.text.manufacturer": "Manufacturer",
     "page.eftpos.text.description": "Description",
     "page.eftpos.text.status": "status",
@@ -60,7 +60,34 @@ var locales_default = {
     "page.eftpos.text.log": "Log",
     "page.eftpos.text.setting": "Setting",
     "page.eftpos.text.setting.tip": "You have not configured the necessary parameters, which may affect the normal use of your POS! ",
-    "page.eftpos.text.setting.btn": "Go to configure"
+    "page.eftpos.text.setting.btn": "Go to configure",
+    "page.eftpos.text.pair.modal.content.text-info": (status) => {
+      if (status === "pairing") {
+        return {
+          title: "Pairing",
+          description: "Confirm the code on the EFTPOS terminal to continue.",
+          codeTitle: "Code",
+          cancenButtonText: "Cancel",
+          okButtonText: "Check status"
+        };
+      } else if (status === "success") {
+        return {
+          title: "Pairing is active",
+          description: "You are ready to go!",
+          codeTitle: "",
+          cancenButtonText: "Unpair",
+          okButtonText: "Confirm"
+        };
+      } else if (status === "failed") {
+        return {
+          title: "Pairing not active",
+          description: "Check the terminal, confirm the pairing code, then try again.",
+          codeTitle: "Code",
+          cancenButtonText: "Cancel",
+          okButtonText: "Check status"
+        };
+      }
+    }
   },
   "zh-CN": {
     "page.eftpos.text.manufacturer": "厂商",
@@ -99,7 +126,34 @@ var locales_default = {
     "page.eftpos.text.log": "日志",
     "page.eftpos.text.setting": "设置",
     "page.eftpos.text.setting.tip": "您尚未配置必要参数，这可能会影响您Pos的正常使用！",
-    "page.eftpos.text.setting.btn": "前往配置"
+    "page.eftpos.text.setting.btn": "前往配置",
+    "page.eftpos.text.pair.modal.content.text-info": (status) => {
+      if (status === "pairing") {
+        return {
+          title: "正在配对",
+          description: "请在刷卡机上确认配对码以继续。",
+          codeTitle: "配对码",
+          cancenButtonText: "取消",
+          okButtonText: "检查状态"
+        };
+      } else if (status === "success") {
+        return {
+          title: "配对成功",
+          description: "设备已成功连接，可开始使用。",
+          codeTitle: "",
+          cancenButtonText: "解除配对",
+          okButtonText: "确认"
+        };
+      } else if (status === "failed") {
+        return {
+          title: "配对未生效",
+          description: "请检查刷卡机并确认配对码后重试。",
+          codeTitle: "配对码",
+          cancenButtonText: "取消",
+          okButtonText: "检查状态"
+        };
+      }
+    }
   },
   "zh-HK": {
     "page.eftpos.text.manufacturer": "廠商",
@@ -138,6 +192,33 @@ var locales_default = {
     "page.eftpos.text.log": "日誌",
     "page.eftpos.text.setting": "设置",
     "page.eftpos.text.setting.tip": "您尚未配置必要參數，這可能會影響您Pos的正常使用！",
-    "page.eftpos.text.setting.btn": "前往配置"
+    "page.eftpos.text.setting.btn": "前往配置",
+    "page.eftpos.text.pair.modal.content.text-info": (status) => {
+      if (status === "pairing") {
+        return {
+          title: "正在配對",
+          description: "請在刷卡機上確認配對碼以繼續。",
+          codeTitle: "配對碼",
+          cancenButtonText: "取消",
+          okButtonText: "檢查狀態"
+        };
+      } else if (status === "success") {
+        return {
+          title: "配對成功",
+          description: "設備已成功連接，可開始使用。",
+          codeTitle: "",
+          cancenButtonText: "解除配對",
+          okButtonText: "確認"
+        };
+      } else if (status === "failed") {
+        return {
+          title: "配對未生效",
+          description: "請檢查刷卡機並確認配對碼後重試。",
+          codeTitle: "配對碼",
+          cancenButtonText: "取消",
+          okButtonText: "檢查狀態"
+        };
+      }
+    }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.87",
+  "version": "6.3.88",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,10 +76,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "6.3.23",
-    "@pisell/utils": "3.0.5",
-    "@pisell/date-picker": "3.0.8"
+    "@pisell/date-picker": "3.0.8",
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.5"
   },
   "peerDependencies": {
     "react": "^18.0.0",