From bff1fc4afb6421975c2015e6f528644da8303e03 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 31 Oct 2023 15:32:25 +0800
Subject: [PATCH] fix bug

---
 src/pages/Payment/Card/index.js         | 10 --------
 src/pages/Payment/MultiPaymentWindow.js | 31 +++++++++++++++++--------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/pages/Payment/Card/index.js b/src/pages/Payment/Card/index.js
index 8723459..afe5cff 100644
--- a/src/pages/Payment/Card/index.js
+++ b/src/pages/Payment/Card/index.js
@@ -40,7 +40,6 @@ const Index = () => {
 
     const [paymentData, setPaymentData] = React.useState({});
     const [onReady, setOnReady] = React.useState(false);
-    const [fpsmerchanttimeoutdatetime, setFpsmerchanttimeoutdatetime] = React.useState("");
     const [redirecturl, setRedirectUrl] = React.useState("");
     // const [paymentstatuscode, setPaymentstatuscode] = React.useState("");
     // const [fpsqrcodeurl, setFpsqrcodeurl] = React.useState("");
@@ -111,15 +110,6 @@ const Index = () => {
         });
     }
 
-    React.useEffect(() => {
-        const timeOutDate = new Date(fpsmerchanttimeoutdatetime);
-        const currentTime = new Date;
-        if (timeOutDate.getTime() < currentTime.getTime()) {
-            console.log("stop");
-            clearInterval(currentTimer.current);
-        }
-    }, [time])
-
     const cancelPayment = () => {
         HttpUtils.post({
             url: paymentPath + cancelPaymentUrl,
diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js
index e5e7326..48574f3 100644
--- a/src/pages/Payment/MultiPaymentWindow.js
+++ b/src/pages/Payment/MultiPaymentWindow.js
@@ -22,6 +22,12 @@ import * as yup from 'yup';
 import Loadable from 'components/Loadable';
 const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
 
+import VisaIcon from "assets/images/icons/visacard.svg";
+import MasterIcon from "assets/images/icons/mastercard.svg";
+import JcbIcon from "assets/images/icons/jcb.svg";
+import UnionPayIcon from "assets/images/icons/unionpay.svg";
+import PpsIcon from "assets/images/icons/ppshk.svg";
+import FpsIcon from "assets/images/icons/fps.svg";
 
 const MultiPaymentWindow = (props) => {
 
@@ -107,28 +113,33 @@ const MultiPaymentWindow = (props) => {
                 </FormLabel>
               </Grid>
               <Grid item>
-                <Button variant="contained" color="success" onClick={selectedPaymentMethodHandle("FPS")} disabled={props.fpsStatus.active === "N"}>
-                  FPS
+                <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("FPS")} disabled={props.fpsStatus.active === "N"}>
+                <img src={FpsIcon} width="80" height="80" alt="FPS"></img>
                 </Button>
               </Grid>
               <Grid item>
-                <Button variant="contained" color="success" onClick={selectedPaymentMethodHandle("Visa")} disabled={props.creditCardStatus.active === "N"}>
-                  Visa
+                <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("Visa")} disabled={props.creditCardStatus.active === "N"}>
+                <img src={VisaIcon} width="80" height="80" alt="Visa"></img>
                 </Button>
               </Grid>
               <Grid item>
-                <Button variant="contained" color="success" onClick={selectedPaymentMethodHandle("Mastercard")} disabled={props.creditCardStatus.active === "N"}>
-                  Mastercard
+                <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("Mastercard")} disabled={props.creditCardStatus.active === "N"}>
+                <img src={MasterIcon} width="80" height="80" alt="Mastercard"></img>
                 </Button>
               </Grid>
               <Grid item>
-                <Button variant="contained" color="success" onClick={selectedPaymentMethodHandle("UnionPay")} disabled={props.unionPayStatus.active === "N"}>
-                  UnionPay
+                <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("UnionPay")} disabled={props.unionPayStatus.active === "N"}>
+                <img src={UnionPayIcon} width="80" height="80" alt="UnionPay"></img>
                 </Button>
               </Grid>
               <Grid item>
-                <Button variant="contained" color="success" onClick={selectedPaymentMethodHandle("PPS")} disabled={props.ppsStatus.active === "N"}>
-                  PPS
+                <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("JCB")} disabled={props.unionPayStatus.active === "N"}>
+                <img src={JcbIcon} width="80" height="80" alt="JCB"></img>
+                </Button>
+              </Grid>
+              <Grid item>
+                <Button variant="contained" color="white" onClick={selectedPaymentMethodHandle("PPS")} disabled={props.ppsStatus.active === "N"}>
+                <img src={PpsIcon} width="80" height="80" alt="PPS"></img>
                 </Button>
               </Grid>
             </Grid>