Merge branch 'Paging_Enhancement' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI into Paging_Enhancement

src/pages/Proof/Reply_Public/ProofForm.js

@@ -337,7 +337,7 @@ const FormPanel = ({ formData }) => {
                                                             <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
                                                             <td style={tabelStyle}>
                                                                 <FormattedMessage id="payDnRemark" values={{
-                                                                    date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."
+                                                                    date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:00 p.m."
                                                                 }} />
                                                             </td>
                                                         </tr>
@@ -424,7 +424,7 @@ const FormPanel = ({ formData }) => {
                                                             <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
                                                             <td style={tabelStyle}>
                                                                 <FormattedMessage id="payDnRemark" values={{
-                                                                    date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."
+                                                                    date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:00 p.m."
                                                                 }} />
                                                             </td>
                                                         </tr>

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -333,7 +333,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections , gazetteIssueList}) =>
                                             <tr>
                                                 <td style={tabelStyle}><FormattedMessage id="payDn" /></td>
                                                 <td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m.</td>
-                                                <td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} 12:30 p.m.</td>
+                                                <td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} 12:00 p.m.</td>
                                             </tr>
                                             <tr>
                                                 <td style={tabelStyle}><FormattedMessage id="payNPGO" /></td>

src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js

@@ -272,11 +272,13 @@ const ApplicationDetailCard = (
                                                             // size="large"
                                                             variant="contained"
                                                             onClick={revokeClick()}
+                                                            disabled={currentApplicationDetailData.paymentMethod=="online"||currentApplicationDetailData.paymentMethod==null}
                                                             sx={{
                                                                 textTransform: 'capitalize',
                                                                 alignItems: 'end',
                                                                 backgroundColor: '#ffa733'
                                                             }}>
+                                                            
                                                             <ReplayIcon />
                                                             <Typography ml={1} variant="h5">Revoke Payment</Typography>
                                                         </Button>

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -219,7 +219,12 @@ export default function SubmittedTab({ setCount, url }) {
             renderCell: (params) => (
                 <div>
                     <FormattedMessage id={utils.getPaymentMethod(params.row.paymentMethod)} /><br />
-                    <div>{dateStr(params.row.closingDateOff)}</div>
+                    <div>
+                        {dateStr(params.row.closingDateOff)}
+                        {params.row.paymentMethod=="online" ? " 2pm"
+                            :params.row.paymentMethod=="demandNote" ? " 12:00pm"
+                                : " 12:30pm"}
+                    </div>
                 </div>
             )
         },

src/pages/iAmSmart/AuthCallback/index.js

@@ -67,7 +67,7 @@ const Index = () => {
                         //     }
                         // }
                         dispatch(handleLogin(data))
-                        navigate('iamsmart/loginSucess', {state:{loginMethod:"iAmSmart"}});
+                        navigate('/iamsmart/loginSucess', {state:{loginMethod:"iAmSmart"}});
                 },
                 onFail: (response)=>{
                     console.log("onFail");

src/pages/iAmSmart/SuccessCallback/index.js

@@ -6,11 +6,12 @@ import {
     Button
 } from '@mui/material';
 import * as React from "react";
-import { FormattedMessage } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 import { useLocation } from "react-router-dom";
 import { useNavigate } from "react-router-dom";
 import Loadable from 'components/Loadable';
 const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
+import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
 
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 const BackgroundHead = {
@@ -26,16 +27,17 @@ const BackgroundHead = {
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 const Index = () => {
+    const intl = useIntl();
     const location = useLocation();
     const navigate = useNavigate()
     const [onReady, setOnReady] = React.useState(false);
 
     React.useEffect(() => {
-        if("iAmSmart"==location.state.loginMethod){
+        if ("iAmSmart" == location?.state?.loginMethod) {
             setOnReady(true);
-        }else{
+        } else {
             navigate('/dashboard');
-        }        
+        }
     }, []);
 
     return (
@@ -60,9 +62,10 @@ const Index = () => {
                 <Grid item xs={12} md={12} >
                     <Grid container justifyContent="flex-start" alignItems="center" >
                         <center>
+                        <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
                             <Grid item xs={12} md={12} >
                                 <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
-                                    <FormattedMessage id="loginSuccessMessage2" />
+                                    <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'loginSuccessMessage2' }) }} />
                                 </Typography>
                             </Grid>
                         </center>
@@ -77,7 +80,9 @@ const Index = () => {
                                 variant="contained"
                                 size="large"
                                 sx={{ m: 4 }}
-                                onClick={() => { navigate("/dashboard"); }}
+                                onClick={() => {
+                                    navigate("/dashboard");
+                                }}
                             >
                                 <FormattedMessage id="loginSuccessMessage3" />
                             </Button>

src/routes/AfterLoginRoutes.js

@@ -5,7 +5,6 @@ import Loadable from 'components/Loadable';
 import { Navigate } from "react-router";
 
 const MainLayout = Loadable(lazy(() => import('layout/MainLayout')));
-const IAmSmart_SuccessCallback = Loadable(lazy(() => import('pages/iAmSmart/SuccessCallback')));
 
 // ==============================|| MAIN ROUTING ||============================== //
 
@@ -41,10 +40,6 @@ const AfterLoginRoutes = {
       path: 'iamsmart/loginFail',
       element: <Navigate to="/dashboard" />
     },
-    {
-      path: 'iamsmart/loginSucess',
-      element: <IAmSmart_SuccessCallback/>
-    },
     {
       path: 'verify/:verifyCode/:email',
       element: <Navigate to="/dashboard" />

src/routes/GLDUserRoutes.js

@@ -46,7 +46,7 @@ const GLDUserRoutes = {
       path: '/',
       children: [
         {
-          path: 'dashboard',
+          path: '/dashboard',
           element: <DashboardDefault />
         },
         {

src/routes/PublicUserRoutes.js

@@ -29,6 +29,7 @@ const OrganizationDetailPage = Loadable(lazy(() => import('pages/Organization/De
 const Msg_Details = Loadable(lazy(() => import('pages/Message/Details')));
 const Msg_Search = Loadable(lazy(() => import('pages/Message/Search')));
 const AnnouncementSearch = Loadable(lazy(() => import('pages/Announcement/Search_Public')));
+const IAmSmart_SuccessCallback = Loadable(lazy(() => import('pages/iAmSmart/SuccessCallback')));
 
 
 // ==============================|| MAIN ROUTING ||============================== //
@@ -48,6 +49,10 @@ const PublicDashboard = {
           path: 'dashboard',
           element: <DashboardDefault />
         },
+        {
+          path: 'iamsmart/loginSucess',
+          element: <IAmSmart_SuccessCallback/>
+        },
         {
           path: 'setting/manageUser',
           element: <ManageOrgUser />

src/translations/en.json

@@ -155,7 +155,7 @@
   "loginErrorMessage6":"User account not found",
 
   "loginSuccessMessage1":"User account not found",
-  "loginSuccessMessage2":"You are our existing user and successfully linked your existing account. From now on, you can log in through \"iAm Smart\".",
+  "loginSuccessMessage2":"You are our existing user and successfully linked your existing account.<br/>From now on, you can log in through \"iAm Smart\".",
   "loginSuccessMessage3":"Continue to use e-Service",
 
   "newPassword": "New Password",

src/translations/zh-CN.json

@@ -181,7 +181,7 @@
   "loginErrorMessage6":"找不到用户帐户",
 
   "loginSuccessMessage1":"成功连结现有帐户",
-  "loginSuccessMessage2":"你是我们的现有用户，已成功连结现有帐户，以后可以透过「智方便」登入。",
+  "loginSuccessMessage2":"你是我们的现有用户，已成功连结现有帐户。<br/>以后可以透过「智方便」登入。",
   "loginSuccessMessage3":"继续使用e-Service",
 
   "newPassword": "新密码",

src/translations/zh-HK.json

@@ -182,7 +182,7 @@
   "loginErrorMessage6":"找不到用戶帳戶",
 
   "loginSuccessMessage1":"成功連結現有帳戶",
-  "loginSuccessMessage2":"你是我們的現有用戶，已成功連結現有帳戶，以後可以透過「智方便」登入。",
+  "loginSuccessMessage2":"你是我們的現有用戶，已成功連結現有帳戶。<br/>以後可以透過「智方便」登入。",
   "loginSuccessMessage3":"繼續使用e-Service",
 
   "newPassword": "新密碼",