diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js index cec0971..1c4c0e2 100644 --- a/src/pages/Payment/FPS/FPS.js +++ b/src/pages/Payment/FPS/FPS.js @@ -165,17 +165,17 @@ const Index = () => { } else { convertedDateString = timeoutdatetime; } - setFpsmerchanttimeoutdatetime(convertedDateString) + setFpsmerchanttimeoutdatetime(convertedDateString) - const parsedUrl = new URL(responseData.fpsqrcodeurl); - const fpsqrcodeurl = paymentPath+parsedUrl.pathname; - - const openPASGUrl = pasgPath + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback=' - + encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+paymentData.transactionid+"&WEB_TOKEN="+paymentData.webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId")); - const openPASGUrlPrd = pasgPathPrd + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback=' - + encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+paymentData.transactionid+"&WEB_TOKEN="+paymentData.webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId")); - setFpsqrcodeurl(openPASGUrl) - setFpsqrcodeurlPrd(openPASGUrlPrd) + const parsedUrl = new URL(responseData.fpsqrcodeurl); + const fpsqrcodeurl = "https://"+window.location.hostname+'/payment'+parsedUrl.pathname; + + const openPASGUrl = pasgPath + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback=' + + encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+paymentData.transactionid+"&WEB_TOKEN="+paymentData.webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId")); + const openPASGUrlPrd = pasgPathPrd + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback=' + + encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+paymentData.transactionid+"&WEB_TOKEN="+paymentData.webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId")); + setFpsqrcodeurl(openPASGUrl) + setFpsqrcodeurlPrd(openPASGUrlPrd) } });