From 9673b300f24c9af70a124ed75f5a149d8b387bb8 Mon Sep 17 00:00:00 2001 From: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:30:22 +0100 Subject: [PATCH] CIV-14709 Add (opens in a new tab) to notifications links (#5134) * CIV-14709 Add (opens in a new tab) to hearing reqs link * CIV-14709 Add (opens in a new tab) to view settlement agreement link * CIV-14709 Add (opens in a new tab) to agreement download link * CIV-14709 Add (opens in a new tab) to defendant settlement agreement link --------- Co-authored-by: Raja Mani --- ...tMediationSuccessfulDashboardNotificationScenarioTest.java | 4 ++-- .../DefendantAcceptsSettlementClaimantNotificationTest.java | 4 ++-- ...endantFullDefenceClaimantRejectsMediationScenarioTest.java | 4 ++-- ...aimFullDefenceProceedDefendantNoMediationScenarioTest.java | 4 ++-- .../ClaimIntentMediationSuccessfulDefendantScenarioTest.java | 4 ++-- .../scenarios/defendant/ClaimRejectedNotPaidScenarioTest.java | 4 ++-- ...aimantIntentMediationUnsuccesfulDefendantScenarioTest.java | 4 ++-- ...fendantAcceptSettlementAgreementDefendantScenarioTest.java | 4 ++-- .../defendant/GoToHearingDefendantPartAdmitScenarioTest.java | 4 ++-- ...alReferralFullDefencePartAdmitPaidPartialScenarioTest.java | 4 ++-- ...__CIV-12805_go_to_hearing_defendant_partadmit_scenario.sql | 4 ++-- ...IV-12806-go-to-hearing-paid-partial-defendant-scenario.sql | 4 ++-- ...ring_defendant_full_defence_claimant_rejects_mediation.sql | 4 ++-- ...3_13_1153__CIV-12811_full_defence_proceed_no_mediation.sql | 4 ++-- ...42__CIV-12808_claim_reject_not_paid_defendant_scenario.sql | 4 ++-- ..._1608__CIV-12898_defendant_accepts_settlement_claimant.sql | 4 ++-- ...ttlement_agreement_defendant_accept_defendant_scenario.sql | 4 ++-- ...5__CIV-12812_mediation_unsuccessful_defendant_scenario.sql | 4 ++-- ...5_1207__CIV-13307_claimant_intent_mediation_successful.sql | 4 ++-- ...4_04_05_1614__CIV-13308-mediation-successful-defendant.sql | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/ClaimantMediationSuccessfulDashboardNotificationScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/ClaimantMediationSuccessfulDashboardNotificationScenarioTest.java index 6406033f57d..db0c3bc7e7c 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/ClaimantMediationSuccessfulDashboardNotificationScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/ClaimantMediationSuccessfulDashboardNotificationScenarioTest.java @@ -92,13 +92,13 @@ void should_create_mediation_scenario() throws Exception { jsonPath("$[0].titleEn").value("You settled the claim through mediation"), jsonPath("$[0].descriptionEn") .value( - "

You made an agreement which means the claim is now ended and sets out the terms of how Mr. Sole Trader must repay you.

Download the agreement

"), + "

You made an agreement which means the claim is now ended and sets out the terms of how Mr. Sole Trader must repay you.

Download the agreement (opens in a new tab)

"), jsonPath("$[0].titleCy").value("Rydych wedi setlo’r hawliad drwy gyfryngu"), jsonPath("$[0].descriptionCy") .value( "

Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. " + "Mae’r cytundeb yn nodi’r telerau ar gyfer sut mae'n rhaid i Mr. Sole Trader eich ad-dalu.

" + - "

Lawrlwytho’r cytundeb

" + "

Lawrlwytho’r cytundeb (yn agor mewn tab newydd)

" ) ); } diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/DefendantAcceptsSettlementClaimantNotificationTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/DefendantAcceptsSettlementClaimantNotificationTest.java index 637b266c282..5ed2e1d229a 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/DefendantAcceptsSettlementClaimantNotificationTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/DefendantAcceptsSettlementClaimantNotificationTest.java @@ -38,11 +38,11 @@ void should_create_defendant_accepts_settlement_agreement() throws Exception { jsonPath("$[0].titleEn").value( "Settlement agreement"), jsonPath("$[0].descriptionEn").value( - "

Dave Indent has accepted the settlement agreement. You cannot request a County Court Judgment(CCJ), unless they break the terms of the agreement.

You can view the settlement agreement or tell us it's settled.

"), + "

Dave Indent has accepted the settlement agreement. You cannot request a County Court Judgment(CCJ), unless they break the terms of the agreement.

You can view the settlement agreement (opens in a new tab) or tell us it's settled.

"), jsonPath("$[0].titleCy").value( "Cytundeb setlo"), jsonPath("$[0].descriptionCy").value( - "

Mae Dave Indent wedi derbyn y cytundeb setlo. Ni allwch wneud cais am Ddyfarniad Llys Sirol(CCJ), oni bai eu bod yn torri telerau’r cytundeb.

Gallwch weld y cytundeb setlo neu ddweud wrthym ei fod wedi’i setlo.

") + "

Mae Dave Indent wedi derbyn y cytundeb setlo. Ni allwch wneud cais am Ddyfarniad Llys Sirol(CCJ), oni bai eu bod yn torri telerau’r cytundeb.

Gallwch weld y cytundeb setlo (yn agor mewn tab newydd) neu ddweud wrthym ei fod wedi’i setlo.

") ); } diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/GoToHearingDefendantFullDefenceClaimantRejectsMediationScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/GoToHearingDefendantFullDefenceClaimantRejectsMediationScenarioTest.java index 8271e4439d8..010e48e2a89 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/GoToHearingDefendantFullDefenceClaimantRejectsMediationScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/claimant/GoToHearingDefendantFullDefenceClaimantRejectsMediationScenarioTest.java @@ -51,13 +51,13 @@ void should_create_go_to_hearing_scenario() throws Exception { .value( "

Mr. John Rambo wants to proceed with the claim. They said no to mediation." + " The case will be referred to a judge who will decide what should happen next.

You can view your" + - " response or view the claimant's hearing requirements.

"), + " response or view the claimant's hearing requirements (opens in a new tab).

"), jsonPath("$[0].titleCy").value("Aros i’r llys adolygu’r achos"), jsonPath("$[0].descriptionCy") .value( "

Mae Mr. John Rambo eisiau parhau â’r hawliad. Mi wnaethant wrthod rhoi cynnig ar gyfryngu." + " Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

Gallwch" + - " weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd.

") + " weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

") ); } } diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimFullDefenceProceedDefendantNoMediationScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimFullDefenceProceedDefendantNoMediationScenarioTest.java index 8e68ca9b411..085b91d8a25 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimFullDefenceProceedDefendantNoMediationScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimFullDefenceProceedDefendantNoMediationScenarioTest.java @@ -46,13 +46,13 @@ void should_create_scenario_for_claim_settled() throws Exception { .value("

Mr. John Rambo wants to proceed with the claim." + " The case will be referred to a judge who will decide what should happen next.

" + "

You can view your response or " + - "view the claimant's hearing requirements.

"), + "view the claimant's hearing requirements (opens in a new tab).

"), jsonPath("$[0].titleCy").value("Aros i’r llys adolygu’r achos"), jsonPath("$[0].descriptionCy").value( "

Mae Mr. John Rambo eisiau parhau â’r hawliad." + " Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

" + "

Gallwch weld eich ymateb neu " + - "weld gofynion ar gyfer y gwrandawiad yr hawlydd.

") + "weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

") ); } } diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimIntentMediationSuccessfulDefendantScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimIntentMediationSuccessfulDefendantScenarioTest.java index 659dfddc32e..bc12d087d63 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimIntentMediationSuccessfulDefendantScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimIntentMediationSuccessfulDefendantScenarioTest.java @@ -42,14 +42,14 @@ void should_create_mediation_successful_scenario() throws Exception { jsonPath("$[0].titleEn").value("You settled the claim through mediation"), jsonPath("$[0].descriptionEn") .value( - "

You made an agreement which means the claim is now ended and sets out the terms of how you must repay Mr. John Rambo.

Download the agreement

Contact Mr. John Rambo if you need their payment details. Make sure you get receipts for any payments.

"), + "

You made an agreement which means the claim is now ended and sets out the terms of how you must repay Mr. John Rambo.

Download the agreement (opens in a new tab)

Contact Mr. John Rambo if you need their payment details. Make sure you get receipts for any payments.

"), jsonPath("$[0].titleCy").value("Rydych wedi setlo’r hawliad drwy gyfryngu"), jsonPath("$[0].descriptionCy") .value( "

Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. Mae’r " + "cytundeb yn nodi’r telerau ar gyfer sut mae rhaid i chi ad-dalu Mr. John Rambo.

" + "

Lawrlwytho’r cytundeb

" + + "class=\"govuk-link\">Lawrlwytho’r cytundeb (yn agor mewn tab newydd)

" + "Cysylltwch â " + "Mr. John Rambo ios oes arnoch angen eu manylion talu. Gwnewch yn siŵr eich bod yn cael derbynebau am unrhyw daliadau.

") ); diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimRejectedNotPaidScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimRejectedNotPaidScenarioTest.java index eb074662f00..446e3440dd6 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimRejectedNotPaidScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimRejectedNotPaidScenarioTest.java @@ -52,14 +52,14 @@ void should_create_scenario_for_claimant_reject_for_not_paid_defendant_notificat + " They said you have not paid the £1000 you admit you owe." + " The case will be referred to a judge who will decide what should happen next.

" + "

You can view your response or " - + "view the claimant's hearing requirements.

"), + + "view the claimant's hearing requirements (opens in a new tab).

"), jsonPath("$[0].descriptionCy") .value( "

Mae Mr. John Rambo eisiau parhau â’r hawliad." + " Maent yn dweud nad ydych wedi talu £1000 sef y swm rydych yn cyfaddef sy’n ddyledus gennych." + " Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

" + "

Gallwch weld eich ymateb neu " - + "weld gofynion ar gyfer y gwrandawiad yr hawlydd.

") + + "weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

") ); } } diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimantIntentMediationUnsuccesfulDefendantScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimantIntentMediationUnsuccesfulDefendantScenarioTest.java index af64c2be083..4d545d28250 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimantIntentMediationUnsuccesfulDefendantScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/ClaimantIntentMediationUnsuccesfulDefendantScenarioTest.java @@ -54,10 +54,10 @@ void should_create_mediation_unsuccessful_scenario() throws Exception { status().is(HttpStatus.OK.value()), jsonPath("$[0].titleEn").value("Mediation was unsuccessful"), jsonPath("$[0].descriptionEn").value( - "

You weren\'t able to resolve John Doe\'s claim against you using mediation. The court will review the case. We\'ll contact you to tell you what to do next. View John Doe\'s hearing requirements.

"), + "

You weren\'t able to resolve John Doe\'s claim against you using mediation. The court will review the case. We\'ll contact you to tell you what to do next. View John Doe\'s hearing requirements (opens in a new tab).

"), jsonPath("$[0].titleCy").value("Nid oedd y cyfryngu yn llwyddiannus"), jsonPath("$[0].descriptionCy").value( - "

Nid oeddech yn gallu datrys hawliad John Doe yn eich erbyn drwy gyfryngu. Bydd y llys yn adolygu’r achos. Mi wnawn gysylltu â chi i ddweud wrthych beth i’w wneud nesaf. Gweld gofynion ar gyfer y gwrandawiad John Doe.

")); + "

Nid oeddech yn gallu datrys hawliad John Doe yn eich erbyn drwy gyfryngu. Bydd y llys yn adolygu’r achos. Mi wnawn gysylltu â chi i ddweud wrthych beth i’w wneud nesaf. Gweld gofynion ar gyfer y gwrandawiad John Doe (yn agor mewn tab newydd).

")); } @Test diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/DefendantAcceptSettlementAgreementDefendantScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/DefendantAcceptSettlementAgreementDefendantScenarioTest.java index 1cd16a288e8..422d2c73251 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/DefendantAcceptSettlementAgreementDefendantScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/DefendantAcceptSettlementAgreementDefendantScenarioTest.java @@ -44,12 +44,12 @@ void should_create_scenario_for_defendant_accept_defendant_plan_settlement_agree .value( "

You have accepted the " + " settlement" - + " agreement. The claimant cannot request a County Court " + + " agreement (opens in a new tab). The claimant cannot request a County Court " + "Judgment (CCJ), unless you break the terms of the agreement.

"), jsonPath("$[0].titleCy").value("Cytundeb setlo"), jsonPath("$[0].descriptionCy") .value( - "

Rydych wedi derbyn y cytundeb setlo." + + "

Rydych wedi derbyn y cytundeb setlo (yn agor mewn tab newydd)." + " Ni all yr hawlydd wneud cais am Ddyfarniad Llys Sirol (CCJ) oni bai eich bod yn torri telerau’r cytundeb.

") ); } diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/GoToHearingDefendantPartAdmitScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/GoToHearingDefendantPartAdmitScenarioTest.java index d1535dfda6d..b4bab2d19cb 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/GoToHearingDefendantPartAdmitScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/GoToHearingDefendantPartAdmitScenarioTest.java @@ -48,7 +48,7 @@ void should_create_go_to_hearing_scenario_defendant_part_admit() throws Exceptio " The case will be referred to a judge who will decide what should happen next.

" + "

You can view your response" + " or " + - "view the claimant's hearing requirements.

"), + "view the claimant's hearing requirements (opens in a new tab).

"), jsonPath("$[0].titleCy").value("Aros i’r llys adolygu’r achos"), jsonPath("$[0].descriptionCy") .value("

Mae Mr. John Rambo eisiau parhau â’r hawliad." + @@ -56,7 +56,7 @@ void should_create_go_to_hearing_scenario_defendant_part_admit() throws Exceptio " Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

" + "

Gallwch weld eich ymateb" + " neu " + - "weld gofynion ar gyfer y gwrandawiad yr hawlydd.

") + "weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

") ); } } diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/JudicialReferralFullDefencePartAdmitPaidPartialScenarioTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/JudicialReferralFullDefencePartAdmitPaidPartialScenarioTest.java index 3db7c72603c..a3a4b9e1a2f 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/JudicialReferralFullDefencePartAdmitPaidPartialScenarioTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/dashboard/scenarios/defendant/JudicialReferralFullDefencePartAdmitPaidPartialScenarioTest.java @@ -53,14 +53,14 @@ void should_create_scenario_for_judicial_referral_full_defence_or_part_admit_pai + " The case will be referred to a judge who will decide what should happen next.

" + "

You can view your response or " + "view the claimant's hearing requirements.

"), + + "class=\"govuk-link\">view the claimant's hearing requirements (opens in a new tab).

"), jsonPath("$[0].descriptionCy") .value("

Mae Mr. John Rambo eisiau parhau â’r hawliad." + " Maent wedi gwrthod eich addefiad o £3000 ond yn derbyn eich bod wedi’i dalu’n barod." + " Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

" + "

Gallwch weld eich ymateb neu " + "weld gofynion ar gyfer y gwrandawiad yr hawlydd.

") + + "class=\"govuk-link\">weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

") ); } } diff --git a/src/main/resources/db/migration/V2024_03_08_1415__CIV-12805_go_to_hearing_defendant_partadmit_scenario.sql b/src/main/resources/db/migration/V2024_03_08_1415__CIV-12805_go_to_hearing_defendant_partadmit_scenario.sql index 288826fe836..fd4e0fdff42 100644 --- a/src/main/resources/db/migration/V2024_03_08_1415__CIV-12805_go_to_hearing_defendant_partadmit_scenario.sql +++ b/src/main/resources/db/migration/V2024_03_08_1415__CIV-12805_go_to_hearing_defendant_partadmit_scenario.sql @@ -14,7 +14,7 @@ INSERT INTO dbs.dashboard_notifications_templates (template_name, title_En, titl ,notification_role) VALUES ('Notice.AAA6.ClaimantIntent.GoToHearing.DefPartAdmit.Defendant', 'Wait for the court to review the case', 'Aros i’r llys adolygu’r achos', '

${applicant1PartyName} wants to proceed with the claim. They rejected your admission of ${defendantAdmittedAmount}. The case will be referred to a judge who will decide what should happen next.

You can view your response' - ' or view the claimant''s hearing requirements.

', + ' or view the claimant''s hearing requirements (opens in a new tab).

', '

Mae ${applicant1PartyName} eisiau parhau â’r hawliad. Maent wedi gwrthod eich addefiad o ${defendantAdmittedAmount}. Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

Gallwch weld eich ymateb' - ' neu weld gofynion ar gyfer y gwrandawiad yr hawlydd.

', + ' neu weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

', 'DEFENDANT'); diff --git a/src/main/resources/db/migration/V2024_03_08_1658__CIV-12806-go-to-hearing-paid-partial-defendant-scenario.sql b/src/main/resources/db/migration/V2024_03_08_1658__CIV-12806-go-to-hearing-paid-partial-defendant-scenario.sql index 6cb46329f79..bcb194b81b3 100644 --- a/src/main/resources/db/migration/V2024_03_08_1658__CIV-12806-go-to-hearing-paid-partial-defendant-scenario.sql +++ b/src/main/resources/db/migration/V2024_03_08_1658__CIV-12806-go-to-hearing-paid-partial-defendant-scenario.sql @@ -14,6 +14,6 @@ INSERT INTO dbs.dashboard_notifications_templates (template_name, title_En, titl VALUES ('Notice.AAA6.ClaimantIntent.GoToHearing.DefPartAdmit.FullDefence.StatesPaid.ClaimantConfirms.Defendant', 'Wait for the court to review the case', 'Aros i’r llys adolygu’r achos', - '

${applicant1PartyName} wants to proceed with the claim. They rejected your admission of ${admissionPaidAmount} although they accept you have already paid it. The case will be referred to a judge who will decide what should happen next.

You can view your response or view the claimant''s hearing requirements.

', - '

Mae ${applicant1PartyName} eisiau parhau â’r hawliad. Maent wedi gwrthod eich addefiad o ${admissionPaidAmount} ond yn derbyn eich bod wedi’i dalu’n barod. Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

Gallwch weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd.

', + '

${applicant1PartyName} wants to proceed with the claim. They rejected your admission of ${admissionPaidAmount} although they accept you have already paid it. The case will be referred to a judge who will decide what should happen next.

You can view your response or view the claimant''s hearing requirements (opens in a new tab).

', + '

Mae ${applicant1PartyName} eisiau parhau â’r hawliad. Maent wedi gwrthod eich addefiad o ${admissionPaidAmount} ond yn derbyn eich bod wedi’i dalu’n barod. Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

Gallwch weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

', 'DEFENDANT'); diff --git a/src/main/resources/db/migration/V2024_03_12_1216__CIV_12809_go_to_hearing_defendant_full_defence_claimant_rejects_mediation.sql b/src/main/resources/db/migration/V2024_03_12_1216__CIV_12809_go_to_hearing_defendant_full_defence_claimant_rejects_mediation.sql index 2561272df9d..ea07251701b 100644 --- a/src/main/resources/db/migration/V2024_03_12_1216__CIV_12809_go_to_hearing_defendant_full_defence_claimant_rejects_mediation.sql +++ b/src/main/resources/db/migration/V2024_03_12_1216__CIV_12809_go_to_hearing_defendant_full_defence_claimant_rejects_mediation.sql @@ -13,8 +13,8 @@ INSERT INTO dbs.dashboard_notifications_templates (template_name, title_En, titl ,notification_role) VALUES ('Notice.AAA6.ClaimantIntent.GoToHearing.DefFullDefence.ClaimantDisputes.NoMediation.Defendant', 'Wait for the court to review the case', 'Aros i’r llys adolygu’r achos', - '

${applicant1PartyName} wants to proceed with the claim. They said no to mediation. The case will be referred to a judge who will decide what should happen next.

You can view your response or view the claimant''s hearing requirements.

', - '

Mae ${applicant1PartyName} eisiau parhau â’r hawliad. Mi wnaethant wrthod rhoi cynnig ar gyfryngu. Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

Gallwch weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd.

', + '

${applicant1PartyName} wants to proceed with the claim. They said no to mediation. The case will be referred to a judge who will decide what should happen next.

You can view your response or view the claimant''s hearing requirements (opens in a new tab).

', + '

Mae ${applicant1PartyName} eisiau parhau â’r hawliad. Mi wnaethant wrthod rhoi cynnig ar gyfryngu. Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

Gallwch weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

', 'DEFENDANT'); /** diff --git a/src/main/resources/db/migration/V2024_03_13_1153__CIV-12811_full_defence_proceed_no_mediation.sql b/src/main/resources/db/migration/V2024_03_13_1153__CIV-12811_full_defence_proceed_no_mediation.sql index c9a95347683..96d52bcd777 100644 --- a/src/main/resources/db/migration/V2024_03_13_1153__CIV-12811_full_defence_proceed_no_mediation.sql +++ b/src/main/resources/db/migration/V2024_03_13_1153__CIV-12811_full_defence_proceed_no_mediation.sql @@ -16,9 +16,9 @@ VALUES ('Notice.AAA6.ClaimantIntent.GoToHearing.DefFullDefence.ClaimantDisputes. '

${applicant1PartyName} wants to proceed with the claim.' ' The case will be referred to a judge who will decide what should happen next.

' '

You can view your response or ' - 'view the claimant''s hearing requirements.

', + 'view the claimant''s hearing requirements (opens in a new tab).

', '

Mae ${applicant1PartyName} eisiau parhau â’r hawliad.' ' Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

' '

Gallwch weld eich ymateb neu ' - 'weld gofynion ar gyfer y gwrandawiad yr hawlydd.

', + 'weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

', 'DEFENDANT'); diff --git a/src/main/resources/db/migration/V2024_03_13_1342__CIV-12808_claim_reject_not_paid_defendant_scenario.sql b/src/main/resources/db/migration/V2024_03_13_1342__CIV-12808_claim_reject_not_paid_defendant_scenario.sql index 9a59047c937..1fc650433df 100644 --- a/src/main/resources/db/migration/V2024_03_13_1342__CIV-12808_claim_reject_not_paid_defendant_scenario.sql +++ b/src/main/resources/db/migration/V2024_03_13_1342__CIV-12808_claim_reject_not_paid_defendant_scenario.sql @@ -17,9 +17,9 @@ VALUES ('Notice.AAA6.ClaimantIntent.GoToHearing.DefPartAdmit.FullDefence.StatesP '

${applicant1PartyName} wants to proceed with the claim.' ' They said you have not paid the ${claimSettledAmount} you admit you owe.' ' The case will be referred to a judge who will decide what should happen next.

' - '

You can view your response or view the claimant''s hearing requirements.

', + '

You can view your response or view the claimant''s hearing requirements (opens in a new tab).

', '

Mae ${applicant1PartyName} eisiau parhau â’r hawliad.' ' Maent yn dweud nad ydych wedi talu ${claimSettledAmount} sef y swm rydych yn cyfaddef sy’n ddyledus gennych.' ' Bydd yr achos yn cael ei gyfeirio at farnwr a fydd yn penderfynu beth ddylai ddigwydd nesaf.

' - '

Gallwch weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd.

', + '

Gallwch weld eich ymateb neu weld gofynion ar gyfer y gwrandawiad yr hawlydd (yn agor mewn tab newydd).

', 'DEFENDANT'); diff --git a/src/main/resources/db/migration/V2024_03_13_1608__CIV-12898_defendant_accepts_settlement_claimant.sql b/src/main/resources/db/migration/V2024_03_13_1608__CIV-12898_defendant_accepts_settlement_claimant.sql index db72916cd75..b1588e333ad 100644 --- a/src/main/resources/db/migration/V2024_03_13_1608__CIV-12898_defendant_accepts_settlement_claimant.sql +++ b/src/main/resources/db/migration/V2024_03_13_1608__CIV-12898_defendant_accepts_settlement_claimant.sql @@ -14,6 +14,6 @@ INSERT INTO dbs.dashboard_notifications_templates ( template_name, title_En, tit VALUES ('Notice.AAA6.ClaimantIntent.Settlement.DefendantResponseAccepts.Claimant', 'Settlement agreement', 'Cytundeb setlo', - '

${respondent1PartyName} has accepted the settlement agreement. You cannot request a County Court Judgment(CCJ), unless they break the terms of the agreement.

You can view the settlement agreement or tell us it''s settled.

', - '

Mae ${respondent1PartyName} wedi derbyn y cytundeb setlo. Ni allwch wneud cais am Ddyfarniad Llys Sirol(CCJ), oni bai eu bod yn torri telerau’r cytundeb.

Gallwch weld y cytundeb setlo neu ddweud wrthym ei fod wedi’i setlo.

', + '

${respondent1PartyName} has accepted the settlement agreement. You cannot request a County Court Judgment(CCJ), unless they break the terms of the agreement.

You can view the settlement agreement (opens in a new tab) or tell us it''s settled.

', + '

Mae ${respondent1PartyName} wedi derbyn y cytundeb setlo. Ni allwch wneud cais am Ddyfarniad Llys Sirol(CCJ), oni bai eu bod yn torri telerau’r cytundeb.

Gallwch weld y cytundeb setlo (yn agor mewn tab newydd) neu ddweud wrthym ei fod wedi’i setlo.

', 'CLAIMANT'); diff --git a/src/main/resources/db/migration/V2024_03_14_1530__CIV-12897_defendant_settlement_agreement_defendant_accept_defendant_scenario.sql b/src/main/resources/db/migration/V2024_03_14_1530__CIV-12897_defendant_settlement_agreement_defendant_accept_defendant_scenario.sql index 525c455da4c..410014aa3d4 100644 --- a/src/main/resources/db/migration/V2024_03_14_1530__CIV-12897_defendant_settlement_agreement_defendant_accept_defendant_scenario.sql +++ b/src/main/resources/db/migration/V2024_03_14_1530__CIV-12897_defendant_settlement_agreement_defendant_accept_defendant_scenario.sql @@ -11,6 +11,6 @@ VALUES ('Scenario.AAA6.ClaimantIntent.SettlementAgreement.DefendantAccepted.Defe INSERT INTO dbs.dashboard_notifications_templates (template_name, title_En, title_Cy, description_En, description_Cy ,notification_role) VALUES ('Notice.AAA6.ClaimantIntent.SettlementAgreement.DefendantAccepted.Defendant', 'Settlement agreement', 'Cytundeb setlo', - '

You have accepted the settlement agreement. The claimant cannot request a County Court Judgment (CCJ), unless you break the terms of the agreement.

', - '

Rydych wedi derbyn y cytundeb setlo. Ni all yr hawlydd wneud cais am Ddyfarniad Llys Sirol (CCJ) oni bai eich bod yn torri telerau’r cytundeb.

', + '

You have accepted the settlement agreement (opens in a new tab). The claimant cannot request a County Court Judgment (CCJ), unless you break the terms of the agreement.

', + '

Rydych wedi derbyn y cytundeb setlo (yn agor mewn tab newydd). Ni all yr hawlydd wneud cais am Ddyfarniad Llys Sirol (CCJ) oni bai eich bod yn torri telerau’r cytundeb.

', 'DEFENDANT'); diff --git a/src/main/resources/db/migration/V2024_03_21_1415__CIV-12812_mediation_unsuccessful_defendant_scenario.sql b/src/main/resources/db/migration/V2024_03_21_1415__CIV-12812_mediation_unsuccessful_defendant_scenario.sql index 6a3c8d2c9d6..47c424b0199 100644 --- a/src/main/resources/db/migration/V2024_03_21_1415__CIV-12812_mediation_unsuccessful_defendant_scenario.sql +++ b/src/main/resources/db/migration/V2024_03_21_1415__CIV-12812_mediation_unsuccessful_defendant_scenario.sql @@ -12,6 +12,6 @@ VALUES ('Scenario.AAA6.ClaimantIntent.MediationUnsuccessful.Defendant', INSERT INTO dbs.dashboard_notifications_templates (template_name, title_En, title_Cy, description_En, description_Cy ,notification_role) VALUES ('Notice.AAA6.ClaimantIntent.MediationUnsuccessful.Defendant', 'Mediation was unsuccessful', 'Nid oedd y cyfryngu yn llwyddiannus', - '

You weren''t able to resolve ${applicant1PartyName}''s claim against you using mediation. The court will review the case. We''ll contact you to tell you what to do next. View ${applicant1PartyName}''s hearing requirements.

', - '

Nid oeddech yn gallu datrys hawliad ${applicant1PartyName} yn eich erbyn drwy gyfryngu. Bydd y llys yn adolygu’r achos. Mi wnawn gysylltu â chi i ddweud wrthych beth i’w wneud nesaf. Gweld gofynion ar gyfer y gwrandawiad ${applicant1PartyName}.

', + '

You weren''t able to resolve ${applicant1PartyName}''s claim against you using mediation. The court will review the case. We''ll contact you to tell you what to do next. View ${applicant1PartyName}''s hearing requirements (opens in a new tab).

', + '

Nid oeddech yn gallu datrys hawliad ${applicant1PartyName} yn eich erbyn drwy gyfryngu. Bydd y llys yn adolygu’r achos. Mi wnawn gysylltu â chi i ddweud wrthych beth i’w wneud nesaf. Gweld gofynion ar gyfer y gwrandawiad ${applicant1PartyName} (yn agor mewn tab newydd).

', 'DEFENDANT'); diff --git a/src/main/resources/db/migration/V2024_04_05_1207__CIV-13307_claimant_intent_mediation_successful.sql b/src/main/resources/db/migration/V2024_04_05_1207__CIV-13307_claimant_intent_mediation_successful.sql index 9a0582f0f28..565362c7ba8 100644 --- a/src/main/resources/db/migration/V2024_04_05_1207__CIV-13307_claimant_intent_mediation_successful.sql +++ b/src/main/resources/db/migration/V2024_04_05_1207__CIV-13307_claimant_intent_mediation_successful.sql @@ -12,6 +12,6 @@ VALUES ('Scenario.AAA6.ClaimantIntent.MediationSuccessful.Claimant', INSERT INTO dbs.dashboard_notifications_templates (template_name, title_En, title_Cy, description_En, description_Cy ,notification_role) VALUES ('Notice.AAA6.ClaimantIntent.MediationSuccessful.Claimant', 'You settled the claim through mediation', 'Rydych wedi setlo’r hawliad drwy gyfryngu', - '

You made an agreement which means the claim is now ended and sets out the terms of how ${respondent1PartyName} must repay you.

Download the agreement

', - '

Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. Mae’r cytundeb yn nodi’r telerau ar gyfer sut mae''n rhaid i ${respondent1PartyName} eich ad-dalu.

Lawrlwytho’r cytundeb

', + '

You made an agreement which means the claim is now ended and sets out the terms of how ${respondent1PartyName} must repay you.

Download the agreement (opens in a new tab)

', + '

Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. Mae’r cytundeb yn nodi’r telerau ar gyfer sut mae''n rhaid i ${respondent1PartyName} eich ad-dalu.

Lawrlwytho’r cytundeb (yn agor mewn tab newydd)

', 'CLAIMANT'); diff --git a/src/main/resources/db/migration/V2024_04_05_1614__CIV-13308-mediation-successful-defendant.sql b/src/main/resources/db/migration/V2024_04_05_1614__CIV-13308-mediation-successful-defendant.sql index 70946ce1660..0c1b7470390 100644 --- a/src/main/resources/db/migration/V2024_04_05_1614__CIV-13308-mediation-successful-defendant.sql +++ b/src/main/resources/db/migration/V2024_04_05_1614__CIV-13308-mediation-successful-defendant.sql @@ -13,7 +13,7 @@ INSERT INTO dbs.dashboard_notifications_templates ( template_name, title_En, tit , notification_role) VALUES ('Notice.AAA6.ClaimantIntent.MediationSuccessful.Defendant', 'You settled the claim through mediation', 'Rydych wedi setlo’r hawliad drwy gyfryngu', - '

You made an agreement which means the claim is now ended and sets out the terms of how you must repay ${applicant1PartyName}.

Download the agreement

Contact ${applicant1PartyName} if you need their payment details. Make sure you get receipts for any payments.

', - '

Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. Mae’r cytundeb yn nodi’r telerau ar gyfer sut mae rhaid i chi ad-dalu ${applicant1PartyName}.

Lawrlwytho’r cytundeb

Cysylltwch â ${applicant1PartyName} ios oes arnoch angen eu manylion talu. Gwnewch yn siŵr eich bod yn cael derbynebau am unrhyw daliadau.

', + '

You made an agreement which means the claim is now ended and sets out the terms of how you must repay ${applicant1PartyName}.

Download the agreement (opens in a new tab)

Contact ${applicant1PartyName} if you need their payment details. Make sure you get receipts for any payments.

', + '

Mi wnaethoch gytundeb sy’n golygu bod yr hawliad nawr ar ben. Mae’r cytundeb yn nodi’r telerau ar gyfer sut mae rhaid i chi ad-dalu ${applicant1PartyName}.

Lawrlwytho’r cytundeb (yn agor mewn tab newydd)

Cysylltwch â ${applicant1PartyName} ios oes arnoch angen eu manylion talu. Gwnewch yn siŵr eich bod yn cael derbynebau am unrhyw daliadau.

', 'DEFENDANT');