diff --git a/cypress/component/manualAccountCreation/FinesMacPaymentTerms/FinesMacPaymentTerms.cy.ts b/cypress/component/manualAccountCreation/FinesMacPaymentTerms/FinesMacPaymentTerms.cy.ts index af401aa975..98a90c968b 100644 --- a/cypress/component/manualAccountCreation/FinesMacPaymentTerms/FinesMacPaymentTerms.cy.ts +++ b/cypress/component/manualAccountCreation/FinesMacPaymentTerms/FinesMacPaymentTerms.cy.ts @@ -696,6 +696,7 @@ describe('FinesMacPaymentTermsComponent', () => { '@JIRA-STORY:PO-429', '@JIRA-STORY:PO-592', '@JIRA-STORY:PO-545', + '@JIRA-STORY:PO-2983', '@JIRA-KEY:POT-4295', ), }, @@ -706,7 +707,9 @@ describe('FinesMacPaymentTermsComponent', () => { finesMacState.paymentTerms.formData.fm_payment_terms_payment_terms = 'payInFull'; finesMacState.paymentTerms.formData.fm_payment_terms_pay_by_date = '01/01/2033'; - cy.get(DOM_ELEMENTS.mojTicketPanel).should('contain', ERROR_MESSAGES.dateInFuture); + cy.get(DOM_ELEMENTS.mojTicketPanel) + .should('contain', ERROR_MESSAGES.dateInFuture) + .and('contain', ERROR_MESSAGES.dateInFutureMessage); }); }); }, diff --git a/cypress/component/manualAccountCreation/FinesMacPaymentTerms/constants/fines_mac_payment_terms_errors.ts b/cypress/component/manualAccountCreation/FinesMacPaymentTerms/constants/fines_mac_payment_terms_errors.ts index f9fe1ea887..70571d768a 100644 --- a/cypress/component/manualAccountCreation/FinesMacPaymentTerms/constants/fines_mac_payment_terms_errors.ts +++ b/cypress/component/manualAccountCreation/FinesMacPaymentTerms/constants/fines_mac_payment_terms_errors.ts @@ -1,6 +1,7 @@ export const ERROR_MESSAGES = { dateInPast: 'Pay by date is in the past', dateInFuture: 'Pay by date is more than 3 years in the future', + dateInFutureMessage: 'You can continue with this date or change', startDateInPast: 'Start date is in the past', startDateInFuture: 'Start date is more than 3 years in the future', paymentTerms: 'Select payment terms', diff --git a/src/app/flows/fines/fines-mac/fines-mac-payment-terms/fines-mac-payment-terms-form/fines-mac-payment-terms-form.component.html b/src/app/flows/fines/fines-mac/fines-mac-payment-terms/fines-mac-payment-terms-form/fines-mac-payment-terms-form.component.html index 1cc41a1efa..577146e5cd 100644 --- a/src/app/flows/fines/fines-mac/fines-mac-payment-terms/fines-mac-payment-terms-form/fines-mac-payment-terms-form.component.html +++ b/src/app/flows/fines/fines-mac/fines-mac-payment-terms/fines-mac-payment-terms-form/fines-mac-payment-terms-form.component.html @@ -424,6 +424,6 @@

Payment terms

{{ fieldName }} is more than 3 years in the future -

You can continue with date in the past or change

+

You can continue with this date or change