1 changed files with 30 additions and 23 deletions
Unified View
Diff Options
+ 30
- 23
src/pages/Proof/Reply_Public/ProofForm.js
View File
| @@ -78,10 +78,10 @@ const FormPanel = ({ formData }) => { | |||||
| return; | return; | ||||
| } | } | ||||
| let pm = paymentMethod; | let pm = paymentMethod; | ||||
| if(pm=="demandNote"){ | |||||
| pm = isOverDnReviseDeadline()?"":pm; | |||||
| }else if(pm=="office"){ | |||||
| pm = isOverNpgoReviseDeadline()?"":pm; | |||||
| if (pm == "demandNote") { | |||||
| pm = isOverDnReviseDeadline() ? "" : pm; | |||||
| } else if (pm == "office") { | |||||
| pm = isOverNpgoReviseDeadline() ? "" : pm; | |||||
| } | } | ||||
| if (actionValue == false && isOverReviseDeadline()) { | if (actionValue == false && isOverReviseDeadline()) { | ||||
| @@ -89,7 +89,7 @@ const FormPanel = ({ formData }) => { | |||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| } | } | ||||
| else if(formData.creditor == false && pm == "") { | |||||
| else if (formData.creditor == false && pm == "") { | |||||
| setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' })); | setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' })); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| @@ -164,18 +164,18 @@ const FormPanel = ({ formData }) => { | |||||
| } | } | ||||
| const isOverTime = () => { | const isOverTime = () => { | ||||
| let proofPaymentDeadline = DateUtils.convertToDate(formik.values?.proofPaymentDeadline); | |||||
| let proofPaymentDeadline = DateUtils.convertToDate(formData.proofPaymentDeadline); | |||||
| if (!proofPaymentDeadline) return true; | if (!proofPaymentDeadline) return true; | ||||
| let current = new Date(); | let current = new Date(); | ||||
| return current.getTime() > proofPaymentDeadline; | return current.getTime() > proofPaymentDeadline; | ||||
| } | } | ||||
| const isOverReviseDeadline = () => { | const isOverReviseDeadline = () => { | ||||
| if (paymentMethod == "dn") return isOverDnReviseDeadline(); | |||||
| if (paymentMethod == "npgo") return isOverNpgoReviseDeadline(); | |||||
| // if (paymentMethod == "demandNote") return isOverDnReviseDeadline(); | |||||
| // if (paymentMethod == "office") return isOverNpgoReviseDeadline(); | |||||
| //online payment | //online payment | ||||
| let reviseDeadline = DateUtils.convertToDate(formik.values?.reviseDeadline); | |||||
| reviseDeadline?.setTime(reviseDeadline?.getTime() + (14 * 60 * 60 * 1000));// 14:00 | |||||
| let reviseDeadline = DateUtils.convertToDate(formData.reviseDeadline); | |||||
| // reviseDeadline?.setTime(reviseDeadline?.getTime() + (14 * 60 * 60 * 1000));// 14:00 | |||||
| if (!reviseDeadline) return true; | if (!reviseDeadline) return true; | ||||
| let current = new Date(); | let current = new Date(); | ||||
| return current.getTime() > reviseDeadline; | return current.getTime() > reviseDeadline; | ||||
| @@ -190,7 +190,7 @@ const FormPanel = ({ formData }) => { | |||||
| } | } | ||||
| const isOverNpgoReviseDeadline = () => { | const isOverNpgoReviseDeadline = () => { | ||||
| let reviseDeadline = DateUtils.convertToDate(formik.values?.reviseDeadline); | |||||
| let reviseDeadline = DateUtils.convertToDate(formData.closingDate); | |||||
| reviseDeadline?.setTime(reviseDeadline?.getTime() + (12 * 60 * 60 * 1000));// 12:00 | reviseDeadline?.setTime(reviseDeadline?.getTime() + (12 * 60 * 60 * 1000));// 12:00 | ||||
| if (!reviseDeadline) return true; | if (!reviseDeadline) return true; | ||||
| let current = new Date(); | let current = new Date(); | ||||
| @@ -311,12 +311,15 @@ const FormPanel = ({ formData }) => { | |||||
| </tr> | </tr> | ||||
| <tr> | <tr> | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||
| <Checkbox | |||||
| checked={paymentMethod == "demandNote"} | |||||
| onChange={() => { | |||||
| set_paymentMethod("demandNote") | |||||
| }} | |||||
| /> | |||||
| {isOverDnReviseDeadline() ? | |||||
| <></> : | |||||
| <Checkbox | |||||
| checked={paymentMethod == "demandNote"} | |||||
| onChange={() => { | |||||
| set_paymentMethod("demandNote") | |||||
| }} | |||||
| /> | |||||
| } | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}><FormattedMessage id="payDn" /></td> | <td style={tabelStyle}><FormattedMessage id="payDn" /></td> | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||
| @@ -341,12 +344,16 @@ const FormPanel = ({ formData }) => { | |||||
| </tr> | </tr> | ||||
| <tr> | <tr> | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||
| <Checkbox | |||||
| checked={paymentMethod == "office"} | |||||
| onChange={() => { | |||||
| set_paymentMethod("office") | |||||
| }} | |||||
| /> | |||||
| { | |||||
| isOverNpgoReviseDeadline() ? | |||||
| <></> : | |||||
| <Checkbox | |||||
| checked={paymentMethod == "office"} | |||||
| onChange={() => { | |||||
| set_paymentMethod("office") | |||||
| }} | |||||
| /> | |||||
| } | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}><FormattedMessage id="payNPGO" /></td> | <td style={tabelStyle}><FormattedMessage id="payNPGO" /></td> | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||