@pisell/private-materials 3.0.139 → 3.0.141

package/lib/components/eftposPay/manufacturer.js

@@ -32,7 +32,7 @@ __export(manufacturer_exports, {
   Payo: () => import_payo.default,
   Tyro: () => import_tyro.default,
   Windcave: () => import_windcave.default,
-  getAmonunt: () => getAmonunt,
+  getAmonunt: () => import_helper.getAmonunt,
   getInitState: () => getInitState
 });
 module.exports = __toCommonJS(manufacturer_exports);
@@ -40,6 +40,7 @@ var import_const = require("./const");
 var import_const2 = __toESM(require("./payo/const"));
 var import_const3 = __toESM(require("./tyro/const"));
 var import_const4 = __toESM(require("./windcave/const"));
+var import_helper = require("./helper");
 var import_payo = __toESM(require("./payo"));
 var import_windcave = __toESM(require("./windcave/windcave"));
 var import_tyro = __toESM(require("./tyro"));
@@ -55,18 +56,6 @@ var getInitState = (type, params) => {
       throw new Error("未知的厂商类型");
   }
 };
-var getAmonunt = (store) => {
-  if (store.eftpos === import_const.EftposEnum.Payo) {
-    return (0, import_const2.getAmonunt)(store);
-  }
-  if (store.eftpos === import_const.EftposEnum.Windcave) {
-    return (0, import_const4.getAmonunt)(store);
-  }
-  if (store.eftpos === import_const.EftposEnum.Tyro) {
-    return (0, import_const3.getAmonunt)(store);
-  }
-  throw new Error("未知的厂商类型");
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Payo,

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

@@ -109,10 +109,10 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
-  const surRate = setting.useOriginSurcharge ? 0 : setting.constant_rate || 0;
-  const surMoney = setting.useOriginSurcharge ? 0 : setting.constant_money || 0;
-  const surcharge = setting.surcharge;
   const useOriginSurcharge = setting.useOriginSurcharge || false;
+  const surRate = setting.constant_rate || 0;
+  const surMoney = setting.constant_money || 0;
+  const surcharge = setting.surcharge;
   return {
     name,
     symbol,

package/lib/components/eftposPay/payo/hooks.js

@@ -28,6 +28,7 @@ var import_helper = require("../helper");
 var useValidate = (timeout) => {
   const controllerRef = (0, import_react.useRef)();
   const ref = (0, import_react.useRef)(true);
+  const isTimeoutCloseRef = (0, import_react.useRef)(false);
   const TimeoutRef = (0, import_react.useRef)();
   const checkApi = (0, import_react.useCallback)(
     async (check, number, time) => {
@@ -49,6 +50,20 @@ var useValidate = (timeout) => {
           await (0, import_helper.sleep)(time - diff);
         }
       }
+      if (isTimeoutCloseRef.current) {
+        if (!res) {
+          return {
+            code: import_const.PayStatus.Timeout
+          };
+        }
+        const { code } = res;
+        if (`${code}` === `200`) {
+          return {
+            ...res,
+            code: import_const.PayStatus.Timeout
+          };
+        }
+      }
       return res;
     },
     []
@@ -59,8 +74,10 @@ var useValidate = (timeout) => {
     (_a = controllerRef.current) == null ? void 0 : _a.abort();
   }, []);
   const run = (...params) => {
+    isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     TimeoutRef.current = setTimeout(() => {
+      isTimeoutCloseRef.current = true;
       close();
     }, timeout);
     return checkApi(...params);

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

@@ -93,10 +93,10 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  const useOriginSurcharge = setting.useOriginSurcharge || false;
   const surRate = setting.constant_rate || 0;
   const surMoney = setting.constant_money || 0;
   const surcharge = setting.surcharge;
-  const useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name,
     symbol,

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

@@ -98,10 +98,10 @@ function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  const useOriginSurcharge = setting.useOriginSurcharge || false;
   const surRate = setting.constant_rate || 0;
   const surMoney = setting.constant_money || 0;
   const surcharge = setting.surcharge;
-  const useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name,
     symbol,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.139",
+  "version": "3.0.141",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,9 +59,9 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
+    "@pisell/utils": "1.0.42",
     "@pisell/materials": "3.0.47",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "1.0.42",
     "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {