@pisell/private-materials 3.0.138 → 3.0.140

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/store/index.d.ts

@@ -283,7 +283,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "windcave" | "tyro" | "payo" | "stripe" | undefined;
+        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;

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/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

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