From 4d74c29810d37d886eed7e1709731839559bbe44 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Mon, 26 Aug 2024 17:07:26 +0800
Subject: [PATCH] date change

---
 .../ListPanel/PendingPaymentTab.js            | 32 ++++++++++++++++---
 src/utils/DateUtils.js                        |  8 +++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index 1deba7d..c7473f9 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -24,7 +24,7 @@ import { useNavigate } from "react-router-dom";
 import {
     isORGLoggedIn,
 } from "utils/Utils";
-import { dateStr } from "utils/DateUtils";
+// import { dateStr } from "utils/DateUtils";
 import { ThemeProvider, useTheme } from "@emotion/react";
 import { PNSPS_BUTTON_THEME } from "../../../themes/buttonConst";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -48,6 +48,7 @@ export default function SubmittedTab({ setCount, url }) {
     const theme = useTheme();
     const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
     const intl = useIntl();
+    const { locale } = intl;
 
     //const [amount, setAmount] = React.useState(0);
     const navigate = useNavigate()
@@ -225,10 +226,33 @@ export default function SubmittedTab({ setCount, url }) {
                 <div>
                     <FormattedMessage id={utils.getPaymentMethod(params.row.paymentMethod)} /><br />
                     <div>
-                        {dateStr(params.row.closingDate)}
-                        {params.row.paymentMethod=="online" ? " 2:00pm"
+                        {/* {dateStr(params.row.closingDate)} */}
+                        {
+                            params.row.paymentMethod=="online"?
+                                locale === 'en' ?
+                                    `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
+                                    :
+                                    `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}`
+                                :params.row.paymentMethod=="demandNote" ?
+                                    locale === 'en' ?
+                                        `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 0)?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
+                                        :
+                                        `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 0)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}`
+                                    :
+                                        locale === 'en' ?
+                                                `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 30)?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
+                                                :
+                                                `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 12, 30)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}`
+                        }
+                        {/* {
+                            locale === 'en' ?
+                                `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
+                                :
+                                `${DateUtils.dateFormatWithFix(params.row.closingDate, intl.formatMessage({ id: "datetimeFormate" }), 14, 30)?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}`
+                        }
+                        {params.row.paymentMethod=="online" ? " 2:30pm"
                             :params.row.paymentMethod=="demandNote" ? " 12:00pm"
-                                : " 12:30pm"}
+                                : " 12:30pm"} */}
                     </div>
                 </div>
             )
diff --git a/src/utils/DateUtils.js b/src/utils/DateUtils.js
index d095ee4..dc78c95 100644
--- a/src/utils/DateUtils.js
+++ b/src/utils/DateUtils.js
@@ -65,6 +65,14 @@ export const dateFormat = (date, format) =>{
     return "";
 };
 
+export const dateFormatWithFix = (date, format, hours, minutes) =>{
+    date = convertToDate(date);
+    date.setHours(hours);
+    date.setMinutes(minutes);
+    if(date) return dayjs(date).format(format);
+    return "";
+};
+
 export const getWeekdayStr_ZH = (date) =>{
     date = convertToDate(date);
     if(date) return days_ZH[date.getDay()]