From f37ed24a7f7bea384d048a97e07697f1ea4e4267 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 28 Nov 2023 12:14:42 +0800
Subject: [PATCH] fix payment bug

---
 .../Payment/Details_GLD/PaymentDetails.js     |  9 +-
 .../Payment/Details_Public/PaymentDetails.js  |  9 +-
 src/pages/Payment/FPS/AckPage.js              | 85 +------------------
 src/pages/Payment/PaymentCallback.js          | 85 +------------------
 4 files changed, 18 insertions(+), 170 deletions(-)

diff --git a/src/pages/Payment/Details_GLD/PaymentDetails.js b/src/pages/Payment/Details_GLD/PaymentDetails.js
index 0a4bbfe..5d6ba36 100644
--- a/src/pages/Payment/Details_GLD/PaymentDetails.js
+++ b/src/pages/Payment/Details_GLD/PaymentDetails.js
@@ -29,6 +29,13 @@ const PaymentDetails = ({ formData, }) => {
         }
     }, [data]);
 
+    const getPaymentMethod=()=>{
+        let paymentmethod = data.payload.paymentdetail.paymentmethod;
+        if("01" == paymentmethod) return "PPS";
+        if("02" == paymentmethod || "03" == paymentmethod) return "Credit Card";
+        if("04" == paymentmethod) return "FPS";
+        return paymentmethod;
+    }
 
     return (
         !onReady ?
@@ -136,7 +143,7 @@ const PaymentDetails = ({ formData, }) => {
                                 </Grid>
                                 <Grid item xs={9} md={9} sx={{ textAlign: "left" }}>
                                     <FormLabel sx={{ color: "#000000" }}>
-                                        {data.payload?.paymentdetail?.subtype ?? (data.payload.paymentdetail.paymentmethod === "01" ? "PPS" : "")}
+                                        {getPaymentMethod()}
                                     </FormLabel>
                                 </Grid>
                             </Grid>
diff --git a/src/pages/Payment/Details_Public/PaymentDetails.js b/src/pages/Payment/Details_Public/PaymentDetails.js
index a4c7fff..0305e6b 100644
--- a/src/pages/Payment/Details_Public/PaymentDetails.js
+++ b/src/pages/Payment/Details_Public/PaymentDetails.js
@@ -29,6 +29,13 @@ const PaymentDetails = ({ formData, }) => {
         }
     }, [data]);
 
+    const getPaymentMethod=()=>{
+        let paymentmethod = data.payload.paymentdetail.paymentmethod;
+        if("01" == paymentmethod) return "PPS";
+        if("02" == paymentmethod || "03" == paymentmethod) return "Credit Card";
+        if("04" == paymentmethod) return "FPS";
+        return paymentmethod;
+    }
 
     return (
         !onReady ?
@@ -136,7 +143,7 @@ const PaymentDetails = ({ formData, }) => {
                                 </Grid>
                                 <Grid item xs={9} md={9} sx={{ textAlign: "left" }}>
                                     <FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
-                                        {data.payload?.paymentdetail?.subtype ?? (data.payload.paymentdetail.paymentmethod === "01" ? "PPS" : "")}
+                                        {getPaymentMethod()}
                                     </FormLabel>
                                 </Grid>
                             </Grid>
diff --git a/src/pages/Payment/FPS/AckPage.js b/src/pages/Payment/FPS/AckPage.js
index f49e8df..3087b9a 100644
--- a/src/pages/Payment/FPS/AckPage.js
+++ b/src/pages/Payment/FPS/AckPage.js
@@ -184,90 +184,7 @@ const AckPage = () => {
                                                     </Grid>
                                                 </Grid>
                                             </Grid>
-                                            {/* <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            交易參考號:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {"P" + transactionData.transactionid}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            交易日期:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionDate + " (DD/MM/YYYY)"}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            交易時間:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionTime + " (HH:MI:SS)"}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            EGIS 參考號:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionData.transactionid}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            支付金額
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {"HK$ " + transactionData.amount}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            付款方式:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionData.paymentdetail.subtype ?? (transactionData.paymentdetail.paymentmethod === "01" ? "PPS" : "")}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid> */}
+                                         
                                         </Grid>
                                     </Grid>
                                 </center>
diff --git a/src/pages/Payment/PaymentCallback.js b/src/pages/Payment/PaymentCallback.js
index 82de1c7..4f4295a 100644
--- a/src/pages/Payment/PaymentCallback.js
+++ b/src/pages/Payment/PaymentCallback.js
@@ -189,90 +189,7 @@ const Index = () => {
                                                     </Grid>
                                                 </Grid>
                                             </Grid>
-                                            {/* <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            交易參考號:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {"P" + transactionData.transactionid}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            交易日期:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionDate + " (DD/MM/YYYY)"}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            交易時間:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionTime + " (HH:MI:SS)"}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            EGIS 參考號:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionData.transactionid}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            支付金額
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {"HK$ " + transactionData.amount}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                            <Grid item xs={12} md={12}>
-                                                <Grid container >
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            付款方式:
-                                                        </FormLabel>
-                                                    </Grid>
-                                                    <Grid item>
-                                                        <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                            {transactionData.paymentdetail.subtype ?? (transactionData.paymentdetail.paymentmethod === "01" ? "PPS" : "")}
-                                                        </FormLabel>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid> */}
+                                           
                                         </Grid>
                                     </Grid>
                                 </center>