Skip to content

Commit

Permalink
Merge pull request #2151 from SkillsFundingAgency/CON-3006-Update-ins…
Browse files Browse the repository at this point in the history
…ert-text-for-Legal-agreement-v5-on-Your-agreements-page

Con 3006 update insert text for legal agreement v5 on your agreements page
  • Loading branch information
Paul Howes authored Jan 29, 2021
2 parents 50e9df1 + da06596 commit 8f98d1e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ IF (NOT EXISTS (SELECT 1 FROM [employer_account].[EmployerAgreementTemplate] WHE
BEGIN
SET IDENTITY_INSERT [employer_account].[EmployerAgreementTemplate] ON
INSERT INTO [employer_account].[EmployerAgreementTemplate] (Id, PartialViewName, VersionNumber, AgreementType, CreatedDate, PublishedDate)
VALUES (6, '_Agreement_V5', 5, 2, GETDATE(), Convert(DateTime,'2021-2-1'))
VALUES (6, '_Agreement_V5', 5, 2, GETDATE(), Convert(DateTime,'2021-1-20'))
SET IDENTITY_INSERT [employer_account].[EmployerAgreementTemplate] OFF
END
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void InsetTextSetCorrectlyForPreviouslySignedv2Agreements(int agreementVe
[TestCase(2, "This is a variation of the agreement that we published 1 May 2017. We updated it to add clause 7 (transfer of funding).")]
[TestCase(3, "This is a new agreement.")]
[TestCase(4, "This is a variation to the agreement we published 9 January 2020. You only need to accept it if you want to access incentive payments for hiring a new apprentice.")]
[TestCase(5, "This is a variation to the agreement we published 9 January 2020. You only need to accept it if you want to access incentive payments for hiring a new apprentice.")]
[TestCase(5, "This is a variation to the agreement we published 9 January 2020.")]
public void InsetTextSetCorrectlyForPreviouslySignedv3Agreements(int agreementVersion, string expectedResult)
{
var model = new AgreementTemplateViewModel
Expand All @@ -112,7 +112,7 @@ public void InsetTextSetCorrectlyForPreviouslySignedv3Agreements(int agreementVe
[TestCase(2, "This is a variation of the agreement that we published 1 May 2017. We updated it to add clause 7 (transfer of funding).")]
[TestCase(3, "This is a new agreement.")]
[TestCase(4, "This is a variation to the agreement we published 9 January 2020. You only need to accept it if you want to access incentive payments for hiring a new apprentice.")]
[TestCase(5, "This is a variation to the agreement we published 9 January 2020. You only need to accept it if you want to access incentive payments for hiring a new apprentice.")]
[TestCase(5, "This is a variation to the agreement we published 9 January 2020.")]
public void InsetTextSetCorrectlyForPreviouslySignedv4Agreements(int agreementVersion, string expectedResult)
{
var model = new AgreementTemplateViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ public static string InsetText(this AgreementTemplateViewModel agreementTemplate
case 3:
return "This is a new agreement.";
case 4:
case 5:
return HasSignedVariationOfv3Agreement(organisationAgreementViewModel) ? "This is a variation to the agreement we published 9 January 2020. You only need to accept it if you want to access incentive payments for hiring a new apprentice." : "This is a new agreement.";
case 5:
return HasSignedVariationOfv3Agreement(organisationAgreementViewModel) ? "This is a variation to the agreement we published 9 January 2020." : "This is a new agreement.";
default:
return string.Empty;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<a class="govuk-link" href="@Url.Action(ControllerConstants.GetSignedPdfAgreementActionName, ControllerConstants.EmployerAgreementControllerName)" target="_blank">
Download your accepted agreement
</a>
&nbsp;(<abbr>PDF</abbr>, 334<abbr>KB</abbr>)
&nbsp;(<abbr>PDF</abbr>, 225<abbr>KB</abbr>)
</p>

<h3 class="govuk-heading-m">What happens next</h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

<h2 class="govuk-heading-l">Agreement between @Model.EmployerAgreement.LegalEntityName and <abbr>ESFA</abbr></h2>

<p class="govuk-body-lead">Updated on 1 February 2021.</p>
<p class="govuk-body-lead">Updated on 20 January 2021.</p>

<p class="govuk-body">For use of the Apprenticeship Service to access funded apprenticeship training</p>

Expand Down Expand Up @@ -1389,7 +1389,7 @@
<h4 class="govuk-body">10.</h4>
</div>
<div class="clause-column-content">
<p class="govuk-body">If the Employer meets the Eligibility Criteria for an Employer Incentive Payment, the <abbr>ESFA</abbr> will pay the Employer the First Incentive Payment or the Second Incentive Payment as relevant, and in accordance with the information about payments published on GOV.UK (https://www.gov.uk/guidance/incentive-payments-for-hiring-a-new-apprentice), by transferring the relevant Employer Incentive by BACS transfer to the bank account specified by the Employer in its application for the Employer Incentive Scheme.</p>
<p class="govuk-body">If the Employer meets the Eligibility Criteria for an Employer Incentive Payment, the <abbr>ESFA</abbr> will pay the Employer the First Incentive Payment or the Second Incentive Payment as relevant, and in accordance with the information about payments published on GOV.UK (<a target="_blank" href="https://www.gov.uk/guidance/incentive-payments-for-hiring-a-new-apprentice" class="govuk-link govuk-link--no-visited-state">https://www.gov.uk/guidance/incentive-payments-for-hiring-a-new-apprentice</a>), by transferring the relevant Employer Incentive by BACS transfer to the bank account specified by the Employer in its application for the Employer Incentive Scheme.</p>
</div>
</div>
</section>
Expand Down Expand Up @@ -1499,7 +1499,7 @@

<hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">

<p class="govuk-body"><a href="@Url.Action("GetPdfAgreement","EmployerAgreement")" class="govuk-link" target="_blank">Download the agreement</a> (<abbr>PDF</abbr>, 637<abbr>KB</abbr>)</p>
<p class="govuk-body"><a href="@Url.Action("GetPdfAgreement","EmployerAgreement")" class="govuk-link" target="_blank">Download the agreement</a> (<abbr>PDF</abbr>, 225<abbr>KB</abbr>)</p>

@if (Model.EmployerAgreement.Status != EmployerAgreementStatus.Signed)
{
Expand Down

0 comments on commit 8f98d1e

Please sign in to comment.