From 5f170f8405dd74d166f7823181f79242a612c95d Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Thu, 9 Nov 2023 14:27:37 +0800
Subject: [PATCH] Update

---
 src/pages/Proof/Payment/Pay.js                |  6 +-
 .../ApplyForm/PublicNoticeApplyForm.js        |  9 ++-
 .../Details_Public/ApplicationDetailCard.js   | 65 +++++++++++--------
 .../ListPanel/SearchPublicNoticeTable.js      |  8 +--
 .../auth-forms/CustomFormWizard.js            |  2 +-
 5 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js
index defd2f2..03da615 100644
--- a/src/pages/Proof/Payment/Pay.js
+++ b/src/pages/Proof/Payment/Pay.js
@@ -77,15 +77,15 @@ const Index = () => {
                             <center>
                                 <Grid item xs={12} md={8} >
                                     <Typography variant="h2" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
-                                        公共啟事：交對完成及付款
+                                        公共啟事：校對完成及付款
                                     </Typography>
 
                                     <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
-                                        我們已收到申請編號: {record?.appNo} 的稿件交對確定及可付印的指示。
+                                        我們已收到申請編號: {record?.appNo} 的稿件校對確定及可付印的指示。
                                         <br /><br />
                                         請於  <span style={{ color: "red" }}>{DateUtils.dateStr_Cht(record?.returnBeforeDate)} 下午 2:00 前</span>  完成繳費，我們將於收到繳費確認後處理刊出事宜。
                                         <br /><br />
-                                        如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件交對確定後，於繳費期限前在「我的公共啟事」內合併付款。
+                                        如你在憲報期數 {record?.issueYear} 年 {record?.issueVolume} 卷, 第 {record?.issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件校對確定後，於繳費期限前在「我的公共啟事」內合併付款。
                                     </Typography>
 
                                     <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index d83449b..e7ab1b8 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -14,7 +14,7 @@ import * as HttpUtils from "utils/HttpUtils";
 import * as UrlUtils from "utils/ApiPathConst";
 import * as FieldUtils from "utils/FieldUtils";
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
-
+import ForwardIcon from '@mui/icons-material/Forward';
 
 import { useNavigate } from "react-router-dom";
 import { notifyActionSuccess } from 'utils/CommonFunction';
@@ -119,7 +119,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
 
 
     return (
-        <Grid container sx={{ minHeight: '95vh', backgroundColor: '#ffffff' }} direction="column" alignItems="center">
+        <Grid container sx={{ minHeight: '95vh', backgroundColor: '#ffffff', mb: 3 }} direction="column" alignItems="center">
             <Grid item xs={12} md={12} width="100%" >
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -127,6 +127,11 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
                     </Stack>
                 </div>
             </Grid>
+            <Grid item xs={12} width="60%">
+                <Button title="返回" sx={{ ml: 0, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/publicNotice") }}>
+                    <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
+                </Button>
+            </Grid>
             {/* <Grid item xs={12}>
                     <Typography variant="h5">申請公共啟事</Typography>
                 </Grid> */}
diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index c255446..7bd2750 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -96,7 +96,7 @@ const ApplicationDetailCard = (
 
     function doPayment() {
         setIsPopUp(false);
-        navigate('/paymentPage', { state: { amount: fee, appIdList: [currentApplicationDetailData.id]} });
+        navigate('/paymentPage', { state: { amount: fee, appIdList: [currentApplicationDetailData.id] } });
     }
 
     return (
@@ -121,7 +121,7 @@ const ApplicationDetailCard = (
                                     <Button
                                         // size="large"
                                         variant="contained"
-                                        onClick={()=>{setIsPopUp(true)}}
+                                        onClick={() => { setIsPopUp(true) }}
                                         disabled={currentApplicationDetailData.status == "rejected" || currentApplicationDetailData.status == "cancelled" || currentApplicationDetailData.status == "paid"}
                                         sx={{
                                             textTransform: 'capitalize',
@@ -191,20 +191,31 @@ const ApplicationDetailCard = (
                                             <FormLabel><Typography variant="h5">申請狀態:</Typography></FormLabel>
                                         </Grid>
 
-                                        <Grid item xs={12} md={2} lg={2}>
+                                        <Grid item xs={12} md={4} lg={4}>
                                             <FormControl variant="outlined">
                                                 {StatusUtils.getStatusByText(currentApplicationDetailData.status)}
                                             </FormControl>
                                         </Grid>
-                                        <Grid item xs={12} md={7} lg={7}>
-                                            <Stack direction="row" justifyContent="flex-start" alignItems="center">
-                                                <FormControl variant="outlined" fullWidth disabled>
-                                                    <Typography id='reason' variant="h5">
-                                                        {currentApplicationDetailData.reason}
-                                                    </Typography>
-                                                </FormControl>
-                                            </Stack>
-                                        </Grid>
+                                        {
+                                            currentApplicationDetailData.reason ?
+                                                <Grid item xs={12} md={5} lg={5}>
+                                                    <Grid container alignItems={"center"}>
+                                                        <Stack direction="row" justifyContent="flex-start" alignItems="center">
+                                                            <Grid item xs={12} md={7} lg={7}>
+                                                                <FormLabel><Typography variant="h5">原因:</Typography></FormLabel>
+                                                            </Grid>
+                                                            <Grid item xs={12} md={5} lg={5}>
+                                                                <FormControl variant="outlined" fullWidth disabled>
+                                                                    <Typography id='reason' variant="h5">
+                                                                        {currentApplicationDetailData.reason}
+                                                                    </Typography>
+                                                                </FormControl>
+                                                            </Grid>
+                                                        </Stack>
+                                                    </Grid>
+                                                </Grid>
+                                                : ""
+                                        }
                                     </Grid>
                                 </Grid>
                             </Grid>
@@ -513,22 +524,22 @@ const ApplicationDetailCard = (
                         </Grid>
                     </Grid>
                     <div>
-                    <Dialog open={isPopUp} onClose={() => setIsPopUp(false)}  >
-                        <DialogTitle></DialogTitle>
-                        <Typography variant="h3" style={{ padding: '16px' }}>確認付款</Typography>
-                        <DialogContent style={{ display: 'flex', }}>
-                            <Stack direction="column" justifyContent="space-between">
-                            <Typography variant="h4">總計金額: {FormatUtils.currencyFormat(fee)}</Typography>
-                            </Stack>
-                        </DialogContent>
-                        <DialogActions>
-                            <Button onClick={() => setIsPopUp(false)}><Typography variant="h5">Close</Typography></Button>
-                            <Button onClick={() => doPayment()}><Typography variant="h5">確認</Typography></Button>
-                        </DialogActions>
-                    </Dialog>
-                </div>
+                        <Dialog open={isPopUp} onClose={() => setIsPopUp(false)}  >
+                            <DialogTitle></DialogTitle>
+                            <Typography variant="h3" style={{ padding: '16px' }}>確認付款</Typography>
+                            <DialogContent style={{ display: 'flex', }}>
+                                <Stack direction="column" justifyContent="space-between">
+                                    <Typography variant="h4">總計金額: {FormatUtils.currencyFormat(fee)}</Typography>
+                                </Stack>
+                            </DialogContent>
+                            <DialogActions>
+                                <Button onClick={() => setIsPopUp(false)}><Typography variant="h5">Close</Typography></Button>
+                                <Button onClick={() => doPayment()}><Typography variant="h5">確認</Typography></Button>
+                            </DialogActions>
+                        </Dialog>
+                    </div>
                 </form>
-            </MainCard>
+            </MainCard >
     );
 };
 
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index 4235186..d6aac1f 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -73,7 +73,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             id: 'status',
             field: 'status',
             headerName: '狀態',
-            width: 100,
+            width: 160,
             renderCell: (params) => {
                 return [StatusUtils.getStatus(params)]
             },
@@ -82,7 +82,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             field: 'actions',
             type: 'actions',
             headerName: '',
-            width: 100,
+            width: 150,
             cellClassName: 'actions',
             renderCell: (params) => {
                 return <Button onClick={handleDetailClick(params)}>查看詳細</Button>;
@@ -95,8 +95,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
     }
 
     return (
-        <div style={{ height: 400, width: '100%' }}>
-
+        <div style={{ minHeight: 400, width: '100%' }}>
             <FiDataGrid
                 rows={rows}
                 columns={columns}
@@ -106,6 +105,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                     },
                 }}
                 onRowDoubleClick={handleRowDoubleClick}
+                getRowHeight={() => 'auto'}
             />
         </div>
     );
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index 143e700..00b061a 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -1685,7 +1685,7 @@ const CustomFormWizard = (props) => {
                                     <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                         <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
                                         <Typography display="inline" variant="h4">帳戶申請已成功提交。</Typography>
-                                        <Typography display="inline" variant="h4">驗證電郵將發送到你的電郵地址，請要指示完成驗證及登入系統。</Typography>
+                                        <Typography display="inline" variant="h4">驗證電郵將發送到你的電郵地址，請依指示完成驗證及登入系統。</Typography>
                                         <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">返回登入頁面</Typography></Button>
                                     </Stack>
                                     :