From a591027d2985a11db0183782c3dfeaa10e6464f6 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Wed, 13 Nov 2024 18:25:20 +0800
Subject: [PATCH] update fps

---
 src/assets/images/icons/expiredQrcode.png | Bin 0 -> 8770 bytes
 src/pages/Payment/FPS/FPS.js              |  45 ++++++++++++++--------
 2 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 src/assets/images/icons/expiredQrcode.png

diff --git a/src/assets/images/icons/expiredQrcode.png b/src/assets/images/icons/expiredQrcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8bd622dfef3c354a963c1f4a6bb285c8476867f
GIT binary patch
literal 8770
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
alD2BkVxnNzfbTxUu3WUfP=4Mm>i+<dDF34X

literal 0
HcmV?d00001

diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js
index 7f87c2b..4107c69 100644
--- a/src/pages/Payment/FPS/FPS.js
+++ b/src/pages/Payment/FPS/FPS.js
@@ -10,6 +10,7 @@ import * as HttpUtils from "utils/HttpUtils";
 import * as UrlUtils from "utils/ApiPathConst";
 import { useNavigate } from "react-router-dom";
 import FpsIcon from "assets/images/icons/fps.svg";
+import expiredQrcode from "assets/images/icons/expiredQrcode.png";
 import { useLocation } from 'react-router-dom';
 // import {paymentPath} from "auth/utils";
 import {currencyFormat} from "utils/FormatUtils";
@@ -30,6 +31,7 @@ const BackgroundHead = {
     backgroundPosition: 'right'
 }
 
+
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 const Index = () => {
@@ -39,6 +41,8 @@ const Index = () => {
     const [locationData, setLocationData] = React.useState({});
     const [paymentData, setPaymentData] = React.useState({});
     const [onReady, setOnReady] = React.useState(false);
+    const [qrCodeTimeout, setqrCodeTimeout] = React.useState(false);
+    const [paymentStatusCode, setPaymentStatusCode] = React.useState("");
     
     const [responeData, setResponeDataData] = React.useState({});
     const [fpsTransctionData, setFpsTransctionData] = React.useState({});
@@ -241,6 +245,7 @@ const Index = () => {
                 },
                 onSuccess: function(responseData){
                     const paymentstatuscode = responseData.paymentdetail.result.paymentstatuscode;
+                    setPaymentStatusCode(paymentstatuscode)
                     if (paymentstatuscode != "" && paymentstatuscode != "INPR" ){
                         if (paymentstatuscode === 'APPR') {
                             // const timestamp = Date.now();
@@ -279,26 +284,30 @@ const Index = () => {
         if (timeOutDate.getTime()<currentTime.getTime()){
             // console.log("stop");
             clearInterval(currentTimer.current);
-            cancelPayment()
+            setqrCodeTimeout(true)
+            // cancelPayment()
         }
     },[time])
 
     const cancelPayment = ()=>{
         if (Object.keys(paymentData).length>0){
-            HttpUtils.post({
-                url: UrlUtils.CANCEL_PAYMENT_URL,
-                params:{
-                    "transactionid": paymentData.transactionid,
-                    "webtoken": paymentData.webtoken,
-                    "paymentid": fpsTransctionData.paymentid
-                },
-                onSuccess: function(){
-                    // navigate('/paymentPage/fps/ackpage');
-                    let page = '/paymentPage/fps/ackpage';
-                    let stateParams = { state: { transactionid: paymentData.transactionid} }
-                    navigate(page, stateParams);                    
-                }
-            });       
+            getPaymentStatus()
+            if (paymentStatusCode === "INPR"){
+                HttpUtils.post({
+                    url: UrlUtils.CANCEL_PAYMENT_URL,
+                    params:{
+                        "transactionid": paymentData.transactionid,
+                        "webtoken": paymentData.webtoken,
+                        "paymentid": fpsTransctionData.paymentid
+                    },
+                    onSuccess: function(){
+                        // navigate('/paymentPage/fps/ackpage');
+                        let page = '/paymentPage/fps/ackpage';
+                        let stateParams = { state: { transactionid: paymentData.transactionid} }
+                        navigate(page, stateParams);                    
+                    }
+                });
+            }
         }
     }
 
@@ -389,7 +398,11 @@ const Index = () => {
                                         <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
                                             <FormattedMessage id="fpsQrcodeTitle1"/>
                                             <br />
-                                            <img src={fpsTransctionData.fpsqrcodeimgbase64} alt="QR Code"/>
+                                            { 
+                                                !qrCodeTimeout?
+                                                <img src={fpsTransctionData.fpsqrcodeimgbase64} alt="QR Code"/>
+                                                :<img src={expiredQrcode} alt="Expired QR Code"/>
+                                            }
                                             <br />
                                             {"["+paymentId+"]"}
                                             <br/>