| @@ -81,9 +81,9 @@ const FormPanel = ({ formData }) => { | |||||
| } | } | ||||
| let pm = paymentMethod; | let pm = paymentMethod; | ||||
| if (!isDummyLoggedIn()) { | if (!isDummyLoggedIn()) { | ||||
| if (pm == "demandNote") { | |||||
| if (actionValue==true && pm == "demandNote") { | |||||
| pm = isOverDnReviseDeadline() ? "" : pm; | pm = isOverDnReviseDeadline() ? "" : pm; | ||||
| } else if (pm == "office") { | |||||
| } else if (actionValue==true && pm == "office") { | |||||
| pm = isOverNpgoReviseDeadline() ? "" : pm; | pm = isOverNpgoReviseDeadline() ? "" : pm; | ||||
| } | } | ||||
| } | } | ||||
| @@ -94,7 +94,7 @@ const FormPanel = ({ formData }) => { | |||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| } | } | ||||
| else if (formData.creditor == false && pm == "") { | |||||
| else if (actionValue == true && formData.creditor == false && pm == "") { | |||||
| setWarningTitle(intl.formatMessage({ id: "attention" })) | setWarningTitle(intl.formatMessage({ id: "attention" })) | ||||
| setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' })); | setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' })); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| @@ -126,7 +126,7 @@ const FormPanel = ({ formData }) => { | |||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| } | } | ||||
| if (responseData.id == params.id) { | |||||
| if (actionValue== true && responseData.id == params.id) { | |||||
| notifyActionSuccess(intl.formatMessage({ id: "submitted" })) | notifyActionSuccess(intl.formatMessage({ id: "submitted" })) | ||||
| navigate("/proof/pay/" + params.id); | navigate("/proof/pay/" + params.id); | ||||
| } else { | } else { | ||||