@pisell/private-materials 3.0.187 → 3.0.189

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

@@ -39,6 +39,7 @@ var const_default = (params) => {
     pay,
     device,
     net,
+    client,
     ...other
   } = params || {
     mode: import_const.ModeEnum.Pay
@@ -59,6 +60,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: [],
     render: true,
+    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
     custom: other ? { ...other, list: [], step: 1 /* Free */ } : { list: [], step: 1 /* Free */ },
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

package/lib/components/eftposPay/windcave/helper.js

@@ -44,7 +44,7 @@ var Max4004 = 1;
 var useFail = () => {
   const dispatch = (0, import_store.useDispatch)();
   const { custom } = (0, import_store.useContextData)();
-  const { modeRef } = (0, import_hooks.useStoreRef)();
+  const { modeRef, clientRef } = (0, import_hooks.useStoreRef)();
   const ref = (0, import_react.useRef)((custom == null ? void 0 : custom.retry) || 0);
   (0, import_react.useEffect)(() => {
     ref.current = (custom == null ? void 0 : custom.retry) || 0;
@@ -135,6 +135,23 @@ var useFail = () => {
       }
       if (code === import_const.PayStatus.Timeout) {
         if (isMark) {
+          if (clientRef.current === import_const.ClientEnum.User) {
+            dispatch(
+              (0, import_store.updateCustom)({
+                failCustom: {
+                  isPosNetworkError: true,
+                  status: "warn",
+                  fail: null,
+                  title: import_utils.locales.getText("page.eftpos-pay.text.timedout.title"),
+                  warn: import_utils.locales.getText(
+                    "page.eftpos-pay.text.transaction.eftpos.fail.other"
+                  )
+                }
+              })
+            );
+            dispatch((0, import_store.updateComponent)("FailCustom"));
+            return;
+          }
           dispatch(
             (0, import_store.updateState)({
               manual: {
@@ -211,7 +228,7 @@ var useFail = () => {
               status: "warn",
               fail: null,
               title: import_utils.locales.getText("page.eftpos-pay.text.interrupted"),
-              warn: `${import_utils.locales.getText(
+              warn: clientRef.current === import_const.ClientEnum.Merchant ? `${import_utils.locales.getText(
                 "page.eftpos-pay.text.transaction.eftpos.fail.title"
               )}
 ${import_utils.locales.getText(
@@ -225,31 +242,9 @@ ${import_utils.locales.getText(
               )}
 ${import_utils.locales.getText(
                 "page.eftpos-pay.text.transaction.eftpos.fail.if"
-              )(modeRef.current)}
-              `
-              // warn: (
-              //   <>
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.title'
-              //     )}
-              //     <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.power'
-              //     )}
-              //     . <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.device'
-              //     )}
-              //     <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.network'
-              //     )}
-              //     <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.if'
-              //     )(modeRef.current)}
-              //   </>
-              // ),
+              )(modeRef.current)}` : import_utils.locales.getText(
+                "page.eftpos-pay.text.transaction.eftpos.fail.other"
+              )
             }
           })
         );
@@ -331,7 +326,7 @@ var useValidate = (check, num, onChange) => {
   const failRef = (0, import_react.useRef)(fail);
   const ref = (0, import_react.useRef)();
   const { custom } = (0, import_store.useContextData)();
-  const { netRef, payRef, numRef, modeRef } = (0, import_hooks.useStoreRef)();
+  const { netRef, payRef, numRef, modeRef, clientRef } = (0, import_hooks.useStoreRef)();
   const stepRef = (0, import_react.useRef)(custom == null ? void 0 : custom.step);
   const listRef = (0, import_react.useRef)(custom == null ? void 0 : custom.list);
   (0, import_react.useEffect)(() => {

package/lib/components/eftposPay/windcave/windcave.js

@@ -59,7 +59,8 @@ var windcave_default = ({
     netRef,
     symbolRef,
     amountRef,
-    eftposRef
+    eftposRef,
+    clientRef
   } = (0, import_hooks.useStoreRef)();
   const dispatch = (0, import_store.useDispatch)();
   const fail = (0, import_helper2.useFail)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.187",
+  "version": "3.0.189",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "3.0.53",
     "@pisell/date-picker": "1.0.100",
-    "@pisell/materials": "3.0.53"
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",