diff --git a/src/pages/Payment/Card/index.js b/src/pages/Payment/Card/index.js index 3a5ca9a..e5ecb81 100644 --- a/src/pages/Payment/Card/index.js +++ b/src/pages/Payment/Card/index.js @@ -90,7 +90,7 @@ const Index = () => { }, // "locale":"", // "eserviceid":"", - "returnurl": window.location.hostname+"/payment/success" + "returnurl": window.location.hostname+"/paymentPage/success" }, onSuccess: function(responseData){ /* diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js index 2dc6595..01f1024 100644 --- a/src/pages/Payment/FPS/FPS.js +++ b/src/pages/Payment/FPS/FPS.js @@ -162,10 +162,10 @@ const Index = () => { if (paymentstatuscode != "" && paymentstatuscode != "INPR" ){ if (paymentstatuscode === 'APPR') { const timestamp = Date.now(); - navigate('/payment/fps/ackpage', {state:{transactionDateTime:timestamp,transactionid:paymentData.transactionid,webtoken:paymentData.webtoken, paymentid:responseData.paymentdetail.paymentid} }); + navigate('/paymentPage/fps/ackpage', {state:{transactionDateTime:timestamp,transactionid:paymentData.transactionid,webtoken:paymentData.webtoken, paymentid:responseData.paymentdetail.paymentid} }); } else if (paymentstatuscode === 'CANC') { // window.top.location.href = paymentPath + payment.config.indexPagePath; - navigate('/payment'); + navigate('/paymentPage'); } else { // window.top.location.href = paymentPath + payment.config.errPagePath; alert("ERROR") diff --git a/src/pages/Payment/index.js b/src/pages/Payment/index.js index 28ab1bc..a0ad2d5 100644 --- a/src/pages/Payment/index.js +++ b/src/pages/Payment/index.js @@ -83,18 +83,18 @@ const Index = () => { // let webtoken = ""; if(selectedPaymentMethod === "FPS"){ - navigate('/payment/fps', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken} }); + navigate('/paymentPage/fps', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken} }); // navigate('/payment/fps', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken} }); }else if(selectedPaymentMethod ==="Visa"){ - navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"Visa", paymentMethod:"02,BCMP,CreditCard"} }); + navigate('/paymentPage/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"Visa", paymentMethod:"02,BCMP,CreditCard"} }); }else if(selectedPaymentMethod ==="Mastercard"){ - navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"Mastercard", paymentMethod:"02,BCMP,CreditCard"} }); + navigate('/paymentPage/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"Mastercard", paymentMethod:"02,BCMP,CreditCard"} }); }else if(selectedPaymentMethod ==="UnionPay" ){ - navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"UnionPay", paymentMethod:"03,BCMP,CreditCard"} }); + navigate('/paymentPage/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"UnionPay", paymentMethod:"03,BCMP,CreditCard"} }); }else if(selectedPaymentMethod ==="JCB"){ - navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"JCB", paymentMethod:"03,BCMP,CreditCard"} }); + navigate('/paymentPage/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"JCB", paymentMethod:"03,BCMP,CreditCard"} }); }else if(selectedPaymentMethod ==="PPS"){ - navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"PPS", paymentMethod:"01,PPSB,PPS"} }); + navigate('/paymentPage/card', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken, type:"PPS", paymentMethod:"01,PPSB,PPS"} }); } } diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index 78f3385..d63db70 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -127,7 +127,7 @@ export default function SubmittedTab({ rows }) { for (var i = 0; i < datas?.length; i++) { totalAmount += datas[i].fee; } - navigate('/payment', { state: { amount: totalAmount } }); + navigate('/paymentPage', { state: { amount: totalAmount } }); } return ( diff --git a/src/routes/PublicUserRoutes.js b/src/routes/PublicUserRoutes.js index eaa9b94..16158c9 100644 --- a/src/routes/PublicUserRoutes.js +++ b/src/routes/PublicUserRoutes.js @@ -67,27 +67,27 @@ const PublicDashboard = { element: }, { - path: 'payment', + path: 'paymentPage', element: }, { - path: 'payment/fps', + path: 'paymentPage/fps', element: }, { - path: 'payment/card', + path: 'paymentPage/card', element: }, { - path: 'payment/success', + path: 'paymentPage/success', element: }, { - path: 'payment/fps/fpscallback', + path: 'paymentPage/fps/fpscallback', element: }, { - path: 'payment/fps/ackpage', + path: 'paymentPage/fps/ackpage', element: }, ]