| @@ -141,5 +141,5 @@ export const getPaymentMethod = (paymentMethod) => { | |||||
| if(paymentMethod == "online") return 'payOnlineMethod'; | if(paymentMethod == "online") return 'payOnlineMethod'; | ||||
| if(paymentMethod == "demandNote") return 'payDnMethod'; | if(paymentMethod == "demandNote") return 'payDnMethod'; | ||||
| if(paymentMethod == "office") return 'payNPGOMethod'; | if(paymentMethod == "office") return 'payNPGOMethod'; | ||||
| // return null; | |||||
| return "other"; | |||||
| } | } | ||||
| @@ -107,7 +107,7 @@ const FormPanel = ({ formData }) => { | |||||
| files: attachments ? attachments : [], | files: attachments ? attachments : [], | ||||
| onSuccess: function (responseData) { | onSuccess: function (responseData) { | ||||
| if (responseData.msg) { | if (responseData.msg) { | ||||
| setWarningText(intl.formatMessage({ id: 'MSG.proofOutOfTime' })); | |||||
| setWarningText(intl.formatMessage({ id: responseData.msg})); | |||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| return; | return; | ||||
| } | } | ||||
| @@ -166,12 +166,12 @@ const PublicNoticeApplyForm = ({ loadedData, _selections , gazetteIssueList}) => | |||||
| const apply = (values) => { | const apply = (values) => { | ||||
| setSubmitting(true) | setSubmitting(true) | ||||
| let careOf = values.careOf ? values.careOf : "" | |||||
| let remarks = values.remarks ? values.remarks : "" | |||||
| if (isDummyLoggedIn){ | |||||
| let careOf = values.careOf ?? ""; | |||||
| let remarks = values.remarks ??""; | |||||
| if (isDummyLoggedIn()){ | |||||
| careOf = values.careOfDum | careOf = values.careOfDum | ||||
| } | } | ||||
| if (isDummyLoggedIn){ | |||||
| if (isDummyLoggedIn()){ | |||||
| remarks = values.emailAddress | remarks = values.emailAddress | ||||
| } | } | ||||
| HttpUtils.postWithFiles({ | HttpUtils.postWithFiles({ | ||||
| @@ -513,6 +513,7 @@ | |||||
| "content": "Content", | "content": "Content", | ||||
| "subject": "Subject", | "subject": "Subject", | ||||
| "other":"Other", | |||||
| "Dashboard": "Dashboard", | "Dashboard": "Dashboard", | ||||
| "event": "Event" | "event": "Event" | ||||
| @@ -503,6 +503,7 @@ | |||||
| "content": "内容", | "content": "内容", | ||||
| "subject": "主题", | "subject": "主题", | ||||
| "other":"其他", | |||||
| "Dashboard": "仪表板", | "Dashboard": "仪表板", | ||||
| "event": "活动" | "event": "活动" | ||||
| @@ -508,6 +508,7 @@ | |||||
| "content": "内容", | "content": "内容", | ||||
| "subject": "主題", | "subject": "主題", | ||||
| "other":"其他", | |||||
| "Dashboard": "儀表板", | "Dashboard": "儀表板", | ||||
| "event": "活動" | "event": "活動" | ||||