From 78ac6902a96e99a16cafc6a823f0de4895e34ed6 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 4 Jun 2024 15:21:57 +0800 Subject: [PATCH 1/3] fix bug --- src/pages/Proof/Reply_Public/ProofForm.js | 2 +- src/translations/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 19af85f..bba41c7 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -491,7 +491,7 @@ const FormPanel = ({ formData }) => {
{ - setWarningTitle(intl.formatMessage({ id: "payDn" })) + setWarningTitle(intl.formatMessage({ id: "payNPGO" })) setWarningText( <>
    diff --git a/src/translations/en.json b/src/translations/en.json index 9f641f6..0a52552 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -419,7 +419,7 @@ "confirmingDealine": "Deadline for Confirming Proof", "PaymentCoonpletDealine": "Deadline for Payment Completion", "payOnline":"Pay online via this system PNSPS", - "payDn":"Pay by issuance of General Demand Note (Note)", + "payDn":"Pay by issuance of General Demand Note", "payNPGO":"Pay at NPGO Collection Office", "paymentMeans":"Payment Means", "paymentMethodMeans":"Payment Methods Available Under the Payment Means", From a7b3f4ebb4826a9439a0adc238d920685a3a466a Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 4 Jun 2024 15:30:34 +0800 Subject: [PATCH 2/3] update UI --- src/pages/Proof/Payment/Pay.js | 1 - src/pages/Proof/Payment/Pay_Creditor.js | 1 - src/pages/Proof/Payment/Pay_DN.js | 1 - src/pages/Proof/Payment/Pay_Office.js | 1 - src/pages/Proof/Payment/Pay_Online.js | 1 - 5 files changed, 5 deletions(-) diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js index af855b6..c64d0a4 100644 --- a/src/pages/Proof/Payment/Pay.js +++ b/src/pages/Proof/Payment/Pay.js @@ -155,7 +155,6 @@ const Index = ({ record }) => { > - （） diff --git a/src/pages/Proof/Payment/Pay_Creditor.js b/src/pages/Proof/Payment/Pay_Creditor.js index 99ed049..9f4186c 100644 --- a/src/pages/Proof/Payment/Pay_Creditor.js +++ b/src/pages/Proof/Payment/Pay_Creditor.js @@ -70,7 +70,6 @@ const Index = ({ record }) => { navigate("/publicNotice"); }} > - diff --git a/src/pages/Proof/Payment/Pay_DN.js b/src/pages/Proof/Payment/Pay_DN.js index 4010d02..11ec541 100644 --- a/src/pages/Proof/Payment/Pay_DN.js +++ b/src/pages/Proof/Payment/Pay_DN.js @@ -105,7 +105,6 @@ const Index = ({ record }) => { navigate("/publicNotice"); }} > - diff --git a/src/pages/Proof/Payment/Pay_Office.js b/src/pages/Proof/Payment/Pay_Office.js index d1fd51d..7ef8e5b 100644 --- a/src/pages/Proof/Payment/Pay_Office.js +++ b/src/pages/Proof/Payment/Pay_Office.js @@ -101,7 +101,6 @@ const Index = ({ record }) => { navigate("/publicNotice"); }} > - diff --git a/src/pages/Proof/Payment/Pay_Online.js b/src/pages/Proof/Payment/Pay_Online.js index 54e3290..3b63177 100644 --- a/src/pages/Proof/Payment/Pay_Online.js +++ b/src/pages/Proof/Payment/Pay_Online.js @@ -199,7 +199,6 @@ const Index = () => { > - （） From 4a28235727e78dc2afe907398f7d0d23ebfecedc Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 4 Jun 2024 16:23:34 +0800 Subject: [PATCH 3/3] update UI --- src/pages/Proof/Reply_Public/ProofForm.js | 242 ++++++++++++---------- 1 file changed, 127 insertions(+), 115 deletions(-) diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index bba41c7..3ebc526 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -81,9 +81,9 @@ const FormPanel = ({ formData }) => { } let pm = paymentMethod; if (!isDummyLoggedIn()) { - if (actionValue==true && pm == "demandNote") { + if (actionValue == true && pm == "demandNote") { pm = isOverDnReviseDeadline() ? "" : pm; - } else if (actionValue==true && pm == "office") { + } else if (actionValue == true && pm == "office") { pm = isOverNpgoReviseDeadline() ? "" : pm; } } @@ -121,16 +121,16 @@ const FormPanel = ({ formData }) => { files: attachments ? attachments : [], onSuccess: function (responseData) { console.log(responseData) - if (responseData.success === false){ - navigate("/publicNotice/"+responseData.id); - }else{ + if (responseData.success === false) { + navigate("/publicNotice/" + responseData.id); + } else { if (responseData.msg) { setWarningTitle(intl.formatMessage({ id: "attention" })) setWarningText(intl.formatMessage({ id: responseData.msg })); setIsWarningPopUp(true); return; } - if (actionValue== true && responseData.id == params.id) { + if (actionValue == true && responseData.id == params.id) { notifyActionSuccess(intl.formatMessage({ id: "submitted" })) navigate("/proof/pay/" + params.id); } else { @@ -396,125 +396,137 @@ const FormPanel = ({ formData }) => { : - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
    - { - set_paymentMethod("online") - }} - /> - - -
    { - setWarningTitle(intl.formatMessage({ id: "payOnline" })) - setWarningText( - <> -
      -
      • -
      • -
      • -
    - - ); - setIsWarningPopUp(true); - }}>     -     		{DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}{DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}
    - {isOverDnReviseDeadline() ? - <> : + <> + + + + + + + + + + - - - - - - - - + + + + + + - - - - - - -
    { - set_paymentMethod("demandNote") + set_paymentMethod("online") }} /> - } - - -
    { - setWarningTitle(intl.formatMessage({ id: "payDn" })) - setWarningText( - <> -
      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    - - ); - setIsWarningPopUp(true); - }}>     -     		{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m. - -
    - { - isOverNpgoReviseDeadline() ? + + +
    { + setWarningTitle(intl.formatMessage({ id: "payOnline" })) + setWarningText( + <> +
      +
      • +
      • +
      • +
    + + ); + setIsWarningPopUp(true); + }}>     +     		{DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}{DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}
    + {isOverDnReviseDeadline() ? <> : { - set_paymentMethod("office") + set_paymentMethod("demandNote") }} /> - } - - -
    { - setWarningTitle(intl.formatMessage({ id: "payNPGO" })) - setWarningText( - <> -
      -
      • -
      • -
    - - ); - setIsWarningPopUp(true); - }}>     -     		{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 12:00 p.m. - -
    -     + } +     		+ +
    { + setWarningTitle(intl.formatMessage({ id: "payDn" })) + setWarningText( + <> +
      +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    + + ); + setIsWarningPopUp(true); + }}>     +     		{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m. + +
    + { + isOverNpgoReviseDeadline() ? + <> : + { + set_paymentMethod("office") + }} + /> + } + + +
    { + setWarningTitle(intl.formatMessage({ id: "payNPGO" })) + setWarningText( + <> +
      +
      • +
      • +
    + + ); + setIsWarningPopUp(true); + }}>     +     		{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 12:00 p.m. + +
    +     + + +
    + + + + +
    + + + : actionValue ? <>