diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 7459d13..df3919e 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -28,7 +28,7 @@ import { ThemeProvider } from "@emotion/react"; import { FormattedMessage, useIntl } from "react-intl"; import { isDummyLoggedIn, - checkIsOnlyOnlinePayment + checkIsOnlyOnlinePaymentByIssueDate } from "utils/Utils" const UploadFileTable = Loadable(React.lazy(() => import('./UploadFileTable'))); @@ -65,10 +65,10 @@ const FormPanel = ({ formData }) => { React.useEffect(() => { if (formData) { setData(formData); - setOnlyOnlinePayment(checkIsOnlyOnlinePayment()) + setOnlyOnlinePayment(checkIsOnlyOnlinePaymentByIssueDate(formData.issueDate)) if (isDummyLoggedIn()) { set_paymentMethod("demandNote") - } else if (checkIsOnlyOnlinePayment()){ + } else if (checkIsOnlyOnlinePaymentByIssueDate(formData.issueDate)){ set_paymentMethod("online") } } diff --git a/src/utils/Utils.js b/src/utils/Utils.js index ca8f9d5..48a19b9 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -184,8 +184,8 @@ export const isPasswordExpiry = () =>{ } export const checkIsOnlyOnlinePaymentByIssueDate = (date) => { - const targetDate = new Date(2026, 0, 28, 8, 0, 0) //2026-01-28T08:00:00.000Z - // const targetDate = new Date(2025, 6, 13, 8, 0, 0); //2025-07-13T08:00:00.000Z + const targetDate = new Date(2026, 1, 6, 0, 0, 0) //2026-02-06T00:00:00.000Z + // const targetDate = new Date(2025, 6, 18, 0, 0, 0); //2025-07-13T00:00:00.000Z const checkDate = DateUtils.convertToDate(date) if (isDummyLoggedIn()){ return false; @@ -200,7 +200,7 @@ export const checkIsOnlyOnlinePaymentByIssueDate = (date) => { } export const checkIsOnlyOnlinePayment = () => { - const targetDate = new Date(2026, 0, 28, 8, 0, 0) + const targetDate = new Date(2026, 1, 6, 8, 0, 0) const checkDate = DateUtils.convertToDate(new Date()) if (isDummyLoggedIn()){ return false; @@ -215,7 +215,7 @@ export const checkIsOnlyOnlinePayment = () => { } export const checkMarkAsCreditClient = () => { - const targetDate = new Date(2026, 0, 28, 8, 0, 0) + const targetDate = new Date(2026, 1, 6, 8, 0, 0) const checkDate = DateUtils.convertToDate(new Date()) // console.log(targetDate) // console.log(checkDate >= targetDate)