From 035376a182b84718a343592bfa5b27e620c53741 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 31 Oct 2023 12:39:12 +0800
Subject: [PATCH] card

---
 src/pages/Payment/Card/index.js | 21 +++++++++++++++++----
 src/pages/Payment/index.js      | 14 +++++++++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/pages/Payment/Card/index.js b/src/pages/Payment/Card/index.js
index c77c215..0874998 100644
--- a/src/pages/Payment/Card/index.js
+++ b/src/pages/Payment/Card/index.js
@@ -8,10 +8,15 @@ import {
 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 { useLocation } from 'react-router-dom';
 import {paymentPath} from "auth/utils";
 // import {poll} from "utils/Utils";
+import VisaIcon from "assets/images/icons/visacard.svg";
+import MasterIcon from "assets/images/icons/mastercard.svg";
+import JcbIcon from "assets/images/icons/jcb.svg";
+import UnionPayIcon from "assets/images/icons/unionpay.svg";
+import PpsIcon from "assets/images/icons/ppshk.svg";
 
 import Loadable from 'components/Loadable';
 const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
@@ -74,7 +79,7 @@ const Index = () => {
         setFpsmerchanttimeoutdatetime(convertedDateString)
 
         HttpUtils.post({
-            url: paymentPath+loadPaymentUrl+paymentData.type,
+            url: paymentPath+loadPaymentUrl+(paymentData.type=="PPS"?"pps":"creditcard"),
             params:{
                 "transactionid": paymentData.transactionid,
                 "apprefid:": paymentData.transactionid,
@@ -105,7 +110,7 @@ const Index = () => {
                     }
                 */
                setRedirectUrl(responseData.redirecturl);
-              
+               window.open(redirecturl);
             }
         });
     }
@@ -187,6 +192,14 @@ const Index = () => {
     //     });       
     // }
 
+    const getIcon = () => {
+        if(paymentData.type=="Visa") return VisaIcon;
+        if(paymentData.type=="Mastercard") return MasterIcon;
+        if(paymentData.type=="UnionPay") return UnionPayIcon;
+        if(paymentData.type=="JCB") return JcbIcon;
+        if(paymentData.type=="PPS") return PpsIcon;
+    }
+
     return (
         !onReady ?
             <LoadingComponent />
@@ -207,7 +220,7 @@ const Index = () => {
                                 <Grid item xs={12} md={12} >
 
                                     <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
-                                        <img src={FpsIcon} width="80" height="80" alt="FPS"></img>
+                                        <img src={getIcon()} width="80" height="80" alt={paymentData.type}></img>
                                         <br />
                                         支付金額
                                         <br />
diff --git a/src/pages/Payment/index.js b/src/pages/Payment/index.js
index 355d32e..2fd2ab0 100644
--- a/src/pages/Payment/index.js
+++ b/src/pages/Payment/index.js
@@ -78,12 +78,16 @@ const Index = () => {
             if(selectedPaymentMethod === "FPS"){
                 navigate('/payment/fps', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken} });
                 // navigate('/payment/fps', {state:{amount:totalAmount,transactionid:transactionData.transactionid,webtoken:transactionData.webtoken} });
-            }else if(selectedPaymentMethod ==="Visa" || selectedPaymentMethod ==="Mastercard"){
-                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"creditcard", paymentMethod:"02,BCMP,CreditCard"} });
-            }else if(selectedPaymentMethod ==="UnionPay" || selectedPaymentMethod ==="JCB"){
-                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"creditcard", paymentMethod:"03,BCMP,CreditCard"} });
+            }else if(selectedPaymentMethod ==="Visa"){
+                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"Visa", paymentMethod:"02,BCMP,CreditCard"} });
+            }else if(selectedPaymentMethod ==="Mastercard"){
+                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"Mastercard", paymentMethod:"02,BCMP,CreditCard"} });
+            }else if(selectedPaymentMethod ==="UnionPay" ){
+                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"UnionPay", paymentMethod:"03,BCMP,CreditCard"} });
+            }else if(selectedPaymentMethod ==="JCB"){
+                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"JCB", paymentMethod:"03,BCMP,CreditCard"} });
             }else if(selectedPaymentMethod ==="PPS"){
-                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"pps", paymentMethod:"01,PPSB,PPS"} });
+                navigate('/payment/card', {state:{amount:totalAmount,transactionid:transactionid,webtoken:webtoken, type:"PPS", paymentMethod:"01,PPSB,PPS"} });
             }
             
         }