diff --git a/src/pages/Proof/Reply_GLD/ProofForm.js b/src/pages/Proof/Reply_GLD/ProofForm.js index e80858c..74c2b33 100644 --- a/src/pages/Proof/Reply_GLD/ProofForm.js +++ b/src/pages/Proof/Reply_GLD/ProofForm.js @@ -15,7 +15,6 @@ import * as DateUtils from "utils/DateUtils" const FormPanel = ({ formData, isOverTime }) => { - const [data, setData] = React.useState({}); const params = useParams(); diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 1c6b73b..21c7698 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -64,7 +64,6 @@ const FormPanel = ({ formData }) => { padding: "right" } - React.useEffect(() => { if (formData) { // console.log("formData", formData) diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 947e96f..5bc9f7a 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -23,7 +23,6 @@ import { isCreditorLoggedIn, // checkIsOnlyOnlinePaymentByIssueDate, checkIsOnlyOnlinePayment, - checkMarkAsCreditClient, } from "utils/Utils"; import { useNavigate } from "react-router-dom"; @@ -361,7 +360,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => - {isCreditorLoggedIn() && checkMarkAsCreditClient()? + {isCreditorLoggedIn() ? null : diff --git a/src/utils/Utils.js b/src/utils/Utils.js index 3da8f64..32eced6 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -195,7 +195,7 @@ export const isPasswordExpiry = () =>{ export const checkIsOnlyOnlinePaymentByIssueDate = (date) => { // const targetDate = new Date(2025, 7, 1, 0, 0, 0) //2026-01-28T08:00:00.000Z hardcode - const targetDate = new Date(2026, 0, 28, 0, 0, 0) //2026-01-28T08:00:00.000Z + const targetDate = new Date(2025, 11, 3, 0, 0, 0) //2026-01-28T08:00:00.000Z const checkDate = DateUtils.convertToDate(date) if (isDummyLoggedIn()){ return false; @@ -211,7 +211,7 @@ export const checkIsOnlyOnlinePaymentByIssueDate = (date) => { export const checkIsOnlyOnlinePayment = () => { // const targetDate = new Date(2025, 10, 17, 0, 0, 0) // hardcode - const targetDate = new Date(2026, 0, 28, 0, 0, 0) // hardcode new Date(2026, 0, 28, 0, 0, 0) 28 Jan 2026 + const targetDate = new Date(2025, 11, 3, 0, 0, 0) // hardcode new Date(2026, 0, 28, 0, 0, 0) 28 Jan 2026 const checkDate = DateUtils.convertToDate(new Date()) if (isDummyLoggedIn()){ return false; @@ -227,7 +227,7 @@ export const checkIsOnlyOnlinePayment = () => { export const checkMarkAsCreditClient = () => { // const targetDate = new Date(2025, 10, 17, 0, 0, 0) // hardcode - const targetDate = new Date(2026, 0, 27, 0, 0, 0) // hardcode new Date(2026, 0, 28, 0, 0, 0) 28 Jan 2026 + const targetDate = new Date(2025, 11, 3, 0, 0, 0) // hardcode new Date(2026, 0, 28, 0, 0, 0) 28 Jan 2026 const checkDate = DateUtils.convertToDate(new Date()) // console.log(targetDate) // console.log(checkDate >= targetDate) @@ -240,7 +240,7 @@ export const checkMarkAsCreditClient = () => { export const checkIsNoPaymentByCreateDate = (date) => { // const targetDate = new Date(2025, 10, 18, 0, 0, 0) //2026-01-28T08:00:00.000Z hardcode - const targetDate = new Date(2026, 0, 27, 0, 0, 0) //2026-01-28T08:00:00.000Z + const targetDate = new Date(2025, 11, 3, 0, 0, 0) //2026-01-28T08:00:00.000Z const checkDate = DateUtils.convertToDate(date) if (isDummyLoggedIn()){ return false;