fix payment detail

src/pages/Payment/Details_Public/PaymentDetails.js

@@ -35,10 +35,18 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
     }, [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";
+        let paymentmethod = ""
+        if (data?.payload!=null) {
+            paymentmethod = data.payload?.paymentdetail.paymentmethod;
+            if("01" == paymentmethod) return "PPS";
+            if("02" == paymentmethod || "03" == paymentmethod) return "Credit Card";
+            if("04" == paymentmethod) return "FPS";
+        } else {
+            paymentmethod = data.payMethod;
+            if("01,PPSB,PPS" == paymentmethod) return "PPS";
+            if("02,BCMP,CreditCard" == paymentmethod || "03,BCMP,CreditCard" == paymentmethod) return "Credit Card";
+            if("04,BCFP,FPS" == paymentmethod) return "FPS";
+        }
         return paymentmethod;
     }
 
@@ -85,7 +93,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                                         </Grid>
                                         <Grid item xs={6} md={6} sx={{ textAlign: "left" }}>
                                             <FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
-                                                {data.payload?.transactionid}
+                                                {data.payload?.transactionid?data.payload?.transactionid:data.transNo}
                                             </FormLabel>
                                         </Grid>
                                     </Grid>
@@ -141,7 +149,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                                         </Grid>
                                         <Grid item xs={6} md={6} sx={{textAlign: "left" }}>
                                             <FormLabel sx={{ fontSize: "16px", color: "#000000" }}>
-                                                {"HK$ " + FormatUtils.currencyFormat(data.payload?.amount)}
+                                                {"HK$ " + FormatUtils.currencyFormat(data.payload?.amount?data.payload?.amount:data.payAmount)}
                                             </FormLabel>
                                         </Grid>
                                     </Grid>

src/pages/Payment/Details_Public/index.js

@@ -36,6 +36,8 @@ const Index = () => {
     const params = useParams();
     const navigate = useNavigate()
     const intl = useIntl();
+    const [responeData, setResponeData] = React.useState({});
+    const [transactionData, setTransactionData] = React.useState({});
 
     const [record, setRecord] = React.useState({});
     const [itemList, setItemList] = React.useState([]);
@@ -46,15 +48,20 @@ const Index = () => {
 
     React.useEffect(() => {
         loadForm();
-
         // window.addEventListener('resize', handleResize)
     }, []);
 
     React.useEffect(() => {
-        if (Object.keys(record).length > 0) {
+        if (Object.keys(responeData).length > 0) {
+            setTransactionData(responeData);
+        }
+    }, [responeData]);
+    
+    React.useEffect(() => {
+        if (Object.keys(transactionData).length > 0) {
             setOnReady(true);
         }
-    }, [record]);
+    }, [transactionData]);
 
     // const handleResize = () => {
     //     setDetailsOrder(window.innerWidth > 1023 ? 2 : -1);
@@ -96,13 +103,15 @@ const Index = () => {
                                 responseData2.paymentItemList.data["transTimeStr"] = DateUtils.dateFormat(responseData2.data.transDateTime, "HH:mm:ss");
                                 setItemList(responseData2.paymentItemList)
                                 setRecord(responseData2.data);
-                                location.reload()
+                                setResponeData(responseData2.paymentItemList)
                             },
                             onError: function(){
                                 responseData.data["transDateStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "DD/MM/YYYY");
                                 responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss");
                                 setItemList(responseData.paymentItemList)
                                 setRecord(responseData.data);
+                                setResponeData(responseData.paymentItemList)
+
                             }
                         });
                     }else{
@@ -110,6 +119,7 @@ const Index = () => {
                         responseData.data["transTimeStr"] = DateUtils.dateFormat(responseData.data.transDateTime, "HH:mm:ss");
                         setItemList(responseData.paymentItemList)
                         setRecord(responseData.data);
+                        setResponeData(responseData.paymentItemList)
                     }
                 }
             });

src/pages/PublicNotice/ListPanel/index.js

@@ -118,8 +118,8 @@ const PublicNotice = () => {
                         </Stack>
                     </div>
                 </Grid>
-                <Grid item xs={12} sm={12} md={12} lg={12} mt={1} sx={{ mt: 3,mr:{xs:3, sm:3, md:0 }}} >
-                    <Stack direction="row" justifyContent="flex-end" alignItems="center">
+                <Grid item xs={12} sm={12} md={12} lg={12} mt={1} sx={{ mt: 3,mr:{xs:0, sm:3, md:0 }}} >
+                    <Stack direction="row" justifyContent={{xs:"center", sm:"flex-end", md:"flex-end", lg:"flex-end"}} alignItems="center">
                         <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
                         <Box sx={{ mr: { md: "47px" } }}>
                             <Button aria-label={intl.formatMessage({id: 'applyPublicNotice'})} variant="contained" onClick={() => { onBtnClick() }}>
@@ -170,7 +170,7 @@ const PublicNotice = () => {
                             </TabContext>
                         </Grid>
                     ) : (
-                        <Grid item xs={12} sx={{ minHeight: '80vh',height:"100%", maxHeight:'300vh', maxWidth: '95%', width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr:{xs:1,md:3}, ml:{xs:1,md:3}, mb: 3, ..._sx }}>
+                        <Grid item xs={12} sx={{ minHeight: '80vh',height:"100%", maxHeight:'400vh', maxWidth: '95%', width: "-webkit-fill-available", backgroundColor: "#fff", mt: 3, mr:{xs:1,md:3}, ml:{xs:1,md:3}, mb: 3, ..._sx }}>
                             <TabContext value={selectedTab}>
                                 <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
                                     <TabList variant="scrollable" onChange={handleChange} aria-label="lab API tabs example">