test payment

src/layout/MainLayout/Header/index.js

@@ -516,20 +516,6 @@ function Header(props) {
 
               {isGranted("MAINTAIN_SETTING") ? (
                 <>
-                  <li>
-                    <Link className="systemSetting" to="/setting/hkidKeyMigration">
-                      <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>
-                        HKID Key Migration
-                      </Typography>
-                    </Link>
-                  </li>
-                  <li>
-                    <Link className="systemSetting" to="/setting/userPiiEncryption">
-                      <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>
-                        User PII Encryption
-                      </Typography>
-                    </Link>
-                  </li>
                   <li>
                     <Link className="systemSetting" to="/setting/sys">
                       <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>

src/pages/Payment/MultiPaymentWindow.js

@@ -217,8 +217,10 @@ const MultiPaymentWindow = (props) => {
             });
             const latestDataObjects = Object.values(latestData);
             
-            // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
-            const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+            const filteredData = latestDataObjects.filter(item =>
+                item.status == "CANC" || item.status == "REJT"
+                || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+            );
 
             const filteredAppIds = filteredData.map(item => item.appId);
             

src/pages/Proof/Payment/Pay.js

@@ -62,8 +62,10 @@ const Index = ({ record }) => {
                 });
                 const latestDataObjects = Object.values(latestData);
                 
-                // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
 
                 const filteredAppIds = filteredData.map(item => item.appId);
 

src/pages/Proof/Payment/Pay_Online.js

@@ -140,7 +140,10 @@ const Index = () => {
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status !== "APPR");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -156,8 +156,10 @@ const ApplicationDetailCard = (
                 });
                 const latestDataObjects = Object.values(latestData);
 
-                // const filteredData = latestDataObjects.filter(item => item.timeDiff > 20 || item.status !== "APPR");
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
 
                 const filteredAppIds = filteredData.map(item => item.appId);
 

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -151,7 +151,10 @@ export default function SubmittedTab({ setCount, url }) {
                 });
                 const latestDataObjects = Object.values(latestData);
                 
-                const filteredData = latestDataObjects.filter(item => item.timeDiff > 30 || item.status == "CANC" || item.status == "REJT");
+                const filteredData = latestDataObjects.filter(item =>
+                    item.status == "CANC" || item.status == "REJT"
+                    || (item.status !== "INPR" && item.status != null && item.timeDiff > 30)
+                );
                 const filteredAppIds = filteredData.map(item => item.appId);
 
                 const appIdsNotInData = appIdList.filter(appId => !latestDataObjects.some(item => item.appId === appId));

src/pages/Setting/HkidKeyMigration/index.js

@@ -64,7 +64,7 @@ const HkidKeyMigration = () => {
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="space-between" alignItems="center">
                         <Typography ml={15} color='#FFF' variant="h4" sx={{ textShadow: "0px 0px 25px #0C489E" }}>
-                            HKID Key Migration
+                            Encryption Key Migration
                         </Typography>
                     </Stack>
                 </div>
@@ -74,7 +74,6 @@ const HkidKeyMigration = () => {
                 <Box sx={{ borderRadius: '10px', backgroundColor: '#fff', p: 4 }}>
                     <Typography variant="body1" sx={{ mb: 2 }}>
                         Re-encrypt identification and checkDigit from the legacy key to the new key.
-                        Ensure Tomcat has both <code>security.hkid-secret</code> and <code>security.hkid-secret-legacy</code> configured before running.
                     </Typography>
                     <Stack direction="row" spacing={2}>
                         <Button variant="outlined" size="large" disabled={wait} onClick={() => runMigration(true)}>

src/pages/Setting/UserPiiEncryption/index.js

@@ -94,7 +94,7 @@ const UserPiiEncryption = () => {
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="space-between" alignItems="center">
                         <Typography ml={15} color='#FFF' variant="h4" sx={{ textShadow: "0px 0px 25px #0C489E" }}>
-                            User PII Encryption
+                            User Fields Encryption
                         </Typography>
                     </Stack>
                 </div>