Browse Source

fix bug

master
Anna Ho 1 year ago
parent
commit
4c2ead0543
5 changed files with 16 additions and 16 deletions
  1. +1
    -1
      src/pages/Payment/Card/index.js
  2. +2
    -2
      src/pages/Payment/FPS/FPS.js
  3. +6
    -6
      src/pages/Payment/index.js
  4. +1
    -1
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
  5. +6
    -6
      src/routes/PublicUserRoutes.js

+ 1
- 1
src/pages/Payment/Card/index.js View File

@@ -90,7 +90,7 @@ const Index = () => {
},
// "locale":"<locale>",
// "eserviceid":"<eserviceid>",
"returnurl": window.location.hostname+"/payment/success"
"returnurl": window.location.hostname+"/paymentPage/success"
},
onSuccess: function(responseData){
/*


+ 2
- 2
src/pages/Payment/FPS/FPS.js View File

@@ -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")


+ 6
- 6
src/pages/Payment/index.js View File

@@ -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"} });
}
}


+ 1
- 1
src/pages/PublicNotice/ListPanel/PendingPaymentTab.js View File

@@ -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 (


+ 6
- 6
src/routes/PublicUserRoutes.js View File

@@ -67,27 +67,27 @@ const PublicDashboard = {
element: <ProofPayment/>
},
{
path: 'payment',
path: 'paymentPage',
element: <Payment_Multi/>
},
{
path: 'payment/fps',
path: 'paymentPage/fps',
element: <Payment_FPS/>
},
{
path: 'payment/card',
path: 'paymentPage/card',
element: <Payment_Card/>
},
{
path: 'payment/success',
path: 'paymentPage/success',
element: <Payment_Success/>
},
{
path: 'payment/fps/fpscallback',
path: 'paymentPage/fps/fpscallback',
element: <Payment_FPS_CallBack/>
},
{
path: 'payment/fps/ackpage',
path: 'paymentPage/fps/ackpage',
element: <Payment_FPS_Ackpage/>
},
]


Loading…
Cancel
Save