From 067d363ed34c3d78021131172a4d17bafc4b8b24 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Wed, 1 Nov 2023 10:48:36 +0800
Subject: [PATCH] update payment success page

---
 src/pages/Payment/PaymentSuccess.js | 17 ++++++++++-------
 src/pages/Payment/index.js          |  3 ++-
 src/routes/PublicUserRoutes.js      |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/Payment/PaymentSuccess.js b/src/pages/Payment/PaymentSuccess.js
index 0434ada..df0beee 100644
--- a/src/pages/Payment/PaymentSuccess.js
+++ b/src/pages/Payment/PaymentSuccess.js
@@ -8,9 +8,8 @@ import {
 } from '@mui/material';
 import * as React from "react";
 import * as HttpUtils from "utils/HttpUtils";
-// import { useNavigate } from "react-router-dom";
 // import FpsIcon from "assets/images/icons/fps.svg";
-import { useParams } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { paymentPath } from "auth/utils";
 // import {poll} from "utils/Utils";
 
@@ -31,8 +30,7 @@ const BackgroundHead = {
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 const Index = () => {
-    // const navigate = useNavigate()
-    const params = useParams();
+    const navigate = useNavigate()
     const [responeData, setResponeDataData] = React.useState({});
 
     const [transactionData, setTransactionData] = React.useState({});
@@ -41,11 +39,16 @@ const Index = () => {
     const [onReady, setOnReady] = React.useState(false);
     const updatePaymentApi = "/api/payment/updatepayment";
     const paymentStatusApi = "/api/payment/status/";
+    let webtoken = "";
 
 
     React.useEffect(() => {
-        if (params.webtoken != "") {
+        if (localStorage.getItem("webtoken") != null && localStorage.getItem("webtoken") != "") {
+            webtoken = localStorage.getItem("webtoken");
+            localStorage.removeItem("webtoken");
             loadForm();
+        }else{
+            navigate("/dashboard");
         }
     }, []);
 
@@ -69,7 +72,7 @@ const Index = () => {
         const trnTime = date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
         setTransactionDate(trnDate)
         setTransactionTime(trnTime)
-        const params = new URLSearchParams(window.location.pathname);
+        const params = new URLSearchParams(window.location.search);
         let transactionid = params.get("TRANSACTION_ID")
         let receipt_token = params.get("RECEIPT_TOKEN").replace("%3D", "=")
 
@@ -107,7 +110,7 @@ const Index = () => {
                     url: paymentPath + paymentStatusApi + transactionid,
                     params: {
                         "apprefid": transactionid,
-                        "webtoken": params.webtoken,
+                        "webtoken": webtoken,
                     },
                     onSuccess: function (responseData) {
                         setResponeDataData(responseData)
diff --git a/src/pages/Payment/index.js b/src/pages/Payment/index.js
index 3f732b5..794889e 100644
--- a/src/pages/Payment/index.js
+++ b/src/pages/Payment/index.js
@@ -68,7 +68,8 @@ const Index = () => {
         setSelectedPaymentMethod("")
         setConfirmPayment(false)
         if (totalAmount>0){
-            getTransactionId()  
+            getTransactionId()
+            localStorage.setItem(webtoken, transactionData.webtoken)
             setOpen(true)
         }
     };
diff --git a/src/routes/PublicUserRoutes.js b/src/routes/PublicUserRoutes.js
index 26a4212..16158c9 100644
--- a/src/routes/PublicUserRoutes.js
+++ b/src/routes/PublicUserRoutes.js
@@ -79,7 +79,7 @@ const PublicDashboard = {
           element: <Payment_Card/>
         },
         {
-          path: 'paymentPage/success/:webtoken',
+          path: 'paymentPage/success',
           element: <Payment_Success/>
         },
         {