From 84ee9ae2d18aaae5d3db82ad8c508c524b4c3f47 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 28 Nov 2023 17:44:13 +0800
Subject: [PATCH] fix bug returnBeforeDate

---
 src/pages/Proof/Reply_GLD/ApplicationDetails.js    | 2 +-
 src/pages/Proof/Reply_Public/ApplicationDetails.js | 2 +-
 src/pages/Proof/Reply_Public/ProofForm.js          | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/Proof/Reply_GLD/ApplicationDetails.js b/src/pages/Proof/Reply_GLD/ApplicationDetails.js
index 0837a10..1f0dc09 100644
--- a/src/pages/Proof/Reply_GLD/ApplicationDetails.js
+++ b/src/pages/Proof/Reply_GLD/ApplicationDetails.js
@@ -252,7 +252,7 @@ const ApplicationDetailCard = ({
                                         <Typography variant="h5">Deadline for payment and reply：</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
-                                        <Typography variant="h5">{DateUtils.dateStr(data.returnBeforeDate)} Before 2:00 PM</Typography>
+                                        <Typography variant="h5">Before {DateUtils.datetimeStr(data.returnBeforeDate)}</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js
index 71996ef..995c416 100644
--- a/src/pages/Proof/Reply_Public/ApplicationDetails.js
+++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js
@@ -207,7 +207,7 @@ const ApplicationDetailCard = ({ formData, }) => {
                                         <Typography variant="h5" display="inline"><Typography variant="h5" style={{color:'red'}} display="inline">繳費及</Typography>返稿最後限期：</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
-                                        <Typography variant="h5">&emsp;{DateUtils.dateStr_Cht(data.returnBeforeDate)} 下午 2:00前</Typography>
+                                        <Typography variant="h5">&emsp;{DateUtils.datetimeStr_Cht(data.returnBeforeDate)} 前</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 4aba0c5..530d700 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -125,8 +125,6 @@ const FormPanel = ({ formData }) => {
     const isOverTime = () => {
         let returnBeforeDate = DateUtils.convertToDate(formik.values?.returnBeforeDate);
         if (!returnBeforeDate) return true;
-        returnBeforeDate = returnBeforeDate.setHours(14, 0, 0, 0);
-
         let current = new Date();
         return current.getTime() > returnBeforeDate;
     }