@pisell/private-materials 6.6.61 → 6.6.63

package/lib/components/eftpos/index.js

@@ -46,7 +46,13 @@ 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_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var PosTabs = (0, import_react.forwardRef)(
@@ -145,6 +151,9 @@ var eftpos_default = (props) => {
     tyroVersion,
     useTyroLog
   } = props;
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
+  import_utils2.request.setRequest(utils == null ? void 0 : utils.request);
   const [page, setPage] = (0, import_react.useState)("list");
   const [messageApi, contextHolder] = import_antd.message.useMessage({
     prefixCls: "pisell-lowcode__pos_message"
@@ -161,6 +170,9 @@ 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 checkPairRequest = (0, import_hooks.useCheckPairRequest)();
   const onDelDevice = (id) => {
     return onDel(id);
   };
@@ -182,6 +194,31 @@ var eftpos_default = (props) => {
     setPage("edit");
   };
   const onRepair = async (device) => {
+    console.log("onRepair device = ", device);
+    if (type === import_const.Eftpos.MX51) {
+      try {
+        setLoading(true);
+        const checkPairResponse = await checkPairRequest.run({
+          type,
+          pair_response: device == null ? void 0 : device.response
+        });
+        console.log("checkPairResponse = ", checkPairResponse);
+        if ((checkPairResponse == null ? void 0 : checkPairResponse.code) == 200) {
+          messageApi.open({
+            type: "warning",
+            style: {
+              zIndex: (zIndex || 9999) + 1
+            },
+            content: import_utils.locales.getText("page.eftpos.text.repair.message.warning")
+          });
+          return;
+        }
+      } catch (error) {
+        console.error("onRepair error =>", error);
+      } finally {
+        setLoading(false);
+      }
+    }
     const field = getField(type, import_const.DeviceEnum.Repair);
     const list = await (0, import_const.getCommByFields)({ field, value: device, getComm });
     deviceIdRef.current = device.id;
@@ -195,13 +232,35 @@ var eftpos_default = (props) => {
     setDeviceItem(device);
     setPage("log");
   };
-  const onSave = async (device) => {
+  const onSave = async (device, pair_response) => {
     console.log("device = ", device);
+    console.log("pair_response = ", pair_response);
     const update = async () => {
-      await onEdit({ ...device, type }, status || "add").catch(() => {
+      var _a;
+      try {
+        await onEdit({ ...device, type, pair_response }, status || "add");
+        if (type === import_const.Eftpos.MX51 && (status === import_const.DeviceEnum.Add || status === import_const.DeviceEnum.Repair)) {
+          messageApi.open({
+            type: "success",
+            style: {
+              zIndex: (zIndex || 9999) + 1
+            },
+            content: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__pos_message-custom-content_mx51" }, /* @__PURE__ */ import_react.default.createElement("span", null, "Terminal paired successfully."), /* @__PURE__ */ import_react.default.createElement("span", null, /* @__PURE__ */ import_react.default.createElement("span", null, "Pairing Name: ", ((_a = device == null ? void 0 : device.connection) == null ? void 0 : _a.pairing_nickname) || "-"), /* @__PURE__ */ import_react.default.createElement("span", null, "Pairing ID: ", (pair_response == null ? void 0 : pair_response.pairing_id) || "-")))
+          });
+        }
+      } catch (error) {
+        console.error("onSave error =>", error);
+        messageApi.open({
+          type: "error",
+          style: {
+            zIndex: (zIndex || 9999) + 1
+          },
+          content: (error == null ? void 0 : error.message) || import_utils.locales.getText("page.eftpos.text.pair.error")
+        });
+        return;
+      } finally {
         setLoading(false);
-      });
-      setLoading(false);
+      }
       await tableRef.current.loadData();
       setPage("list");
     };
@@ -298,6 +357,47 @@ 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) && (status === import_const.DeviceEnum.Add || status === import_const.DeviceEnum.Repair)) {
+      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, response == null ? void 0 : response.data);
+            }
+          });
+        }
+      } catch (error) {
+        console.error("onSavePair error =>", error);
+        messageApi.open({
+          type: "error",
+          style: {
+            zIndex: (zIndex || 9999) + 1
+          },
+          content: (error == null ? void 0 : error.message) || import_utils.locales.getText("page.eftpos.text.pair.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,
@@ -412,7 +512,18 @@ var eftpos_default = (props) => {
     {
       open: page === "edit",
       onClose: onBack,
-      title: 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, import_utils.locales.getText("page.eftpos.text.simple.cloud.integration"))
+      ) : import_utils.locales.getText("page.eftpos.text.device.add")(status, name),
       titleNoWrap: true,
       zIndex: zIndex || 9999,
       destroyOnClose: true,
@@ -429,8 +540,10 @@ var eftpos_default = (props) => {
         import_device.default,
         {
           formItemList: deviceItemList,
-          onSave,
-          key: `device${type}`
+          onSave: onSavePair,
+          key: `device${type}`,
+          type,
+          status
         },
         pairStatus ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { label: "Status" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Input, { value: pairStatus, disabled: true })) : null,
         pairMessage ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { label: "Message" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Input, { value: pairMessage, disabled: true })) : null
@@ -456,5 +569,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/index.less

@@ -88,7 +88,6 @@
   display: flex;
 }
 
-
 .pisell-lowcode__pos_drawer {
   transform: translateZ(0);
 }
@@ -204,3 +203,35 @@
   display: flex;
   flex-direction: column;
 }
+.pisell-lowcode__pos-device-pair-text {
+  padding: 0 24px 0 34px;
+  color: #101828;
+  font-size: 14px;
+  font-weight: 400;
+}
+
+.pisell-lowcode__pos_message
+  .pisell-lowcode__pos_message-notice-content
+  .pisell-lowcode__pos_message-success {
+  display: flex;
+  align-items: center;
+}
+
+.pisell-lowcode__pos_message-custom-content_mx51 {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: center;
+
+  > span:last-child {
+    display: flex;
+    gap: 10px;
+    flex-wrap: wrap;
+  }
+}
+
+.pisell-lowcode__booking-drawer-title-wrap
+  .pisell-lowcode__booking-drawer-title-line {
+  display: flex;
+  align-items: center;
+}

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

@@ -15,6 +15,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -27,9 +28,24 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
+        'page.eftpos.text.simple.cloud.integration': string;
+        'page.eftpos.text.simple.cloud.integration.steps': string[];
         '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;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
+        'page.eftpos.text.pair.error': string;
     };
     'zh-CN': {
         'page.eftpos.text.manufacturer': string;
@@ -47,6 +63,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -59,9 +76,24 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
+        'page.eftpos.text.simple.cloud.integration': string;
+        'page.eftpos.text.simple.cloud.integration.steps': string[];
         '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;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
+        'page.eftpos.text.pair.error': string;
     };
     'zh-HK': {
         'page.eftpos.text.manufacturer': string;
@@ -79,6 +111,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -91,9 +124,24 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
+        'page.eftpos.text.simple.cloud.integration': string;
+        'page.eftpos.text.simple.cloud.integration.steps': string[];
         '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;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
+        'page.eftpos.text.pair.error': string;
     };
     ja: {
         'page.eftpos.text.manufacturer': string;
@@ -111,6 +159,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -123,9 +172,24 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
+        'page.eftpos.text.simple.cloud.integration': string;
+        'page.eftpos.text.simple.cloud.integration.steps': string[];
         '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;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
+        'page.eftpos.text.pair.error': string;
     };
     pt: {
         'page.eftpos.text.manufacturer': string;
@@ -143,6 +207,7 @@ declare const _default: {
         'page.eftpos.text.edit': string;
         'page.eftpos.text.delete': string;
         'page.eftpos.text.save': string;
+        'page.eftpos.text.pair': string;
         'page.eftpos.text.confim.delete': string;
         'page.eftpos.text.confirm_delete-message': (x: string) => string;
         'page.eftpos.text.confim.cancel': string;
@@ -155,9 +220,24 @@ declare const _default: {
         'page.eftpos.text.table.del.delete': string;
         'page.eftpos.text.table.del.cancel': string;
         'page.eftpos.text.log': string;
+        'page.eftpos.text.settlement': string;
+        'page.eftpos.text.settlement_enquiry': string;
+        'page.eftpos.text.simple.cloud.integration': string;
+        'page.eftpos.text.simple.cloud.integration.steps': string[];
         '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;
+        'page.eftpos.text.repair.message.warning': string;
+        'page.eftpos.text.settlement.failed': string;
+        'page.eftpos.text.settlement.button.done': string;
+        'page.eftpos.text.pair.error': string;
     };
 };
 export default _default;