From f4c943a154c4ace227ff28e253f97bf216841e8c Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Fri, 15 Jan 2021 15:14:30 +0000 Subject: [PATCH 1/5] Updated inset text and published date --- .../Scripts/PostDeployment/CreateAgreementTemplates.sql | 2 +- .../Extensions/AgreementTemplateExtensionsTests.cs | 2 +- .../Extensions/AgreementTemplateExtensions.cs | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SFA.DAS.EAS.Employer_Account.Database/Scripts/PostDeployment/CreateAgreementTemplates.sql b/src/SFA.DAS.EAS.Employer_Account.Database/Scripts/PostDeployment/CreateAgreementTemplates.sql index 5c2c4b63b4..3038ad143e 100644 --- a/src/SFA.DAS.EAS.Employer_Account.Database/Scripts/PostDeployment/CreateAgreementTemplates.sql +++ b/src/SFA.DAS.EAS.Employer_Account.Database/Scripts/PostDeployment/CreateAgreementTemplates.sql @@ -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 \ No newline at end of file diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs index 0b049d88fb..5321037539 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs @@ -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 diff --git a/src/SFA.DAS.EmployerAccounts.Web/Extensions/AgreementTemplateExtensions.cs b/src/SFA.DAS.EmployerAccounts.Web/Extensions/AgreementTemplateExtensions.cs index 9cc1950cdd..fa9f9e2597 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Extensions/AgreementTemplateExtensions.cs +++ b/src/SFA.DAS.EmployerAccounts.Web/Extensions/AgreementTemplateExtensions.cs @@ -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; } From 5f1098dff846ba8e8dff72c2e4f61f1a03a227f9 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Fri, 15 Jan 2021 16:33:20 +0000 Subject: [PATCH 2/5] Update AgreementTemplateExtensionsTests.cs --- .../Extensions/AgreementTemplateExtensionsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs index 5321037539..1b716631ba 100644 --- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs +++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/AgreementTemplateExtensionsTests.cs @@ -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 From 7ef923f6dc2076bb5c578a63c0a30ba5b92d1660 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Mon, 18 Jan 2021 10:02:46 +0000 Subject: [PATCH 3/5] Update _Agreement_v5.cshtml --- .../Views/Shared/_Agreement_v5.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml index 8727149ce1..cdc54d6782 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml @@ -1499,7 +1499,7 @@
-

Download the agreement (PDF, 637KB)

+

Download the agreement (PDF, 225KB)

@if (Model.EmployerAgreement.Status != EmployerAgreementStatus.Signed) { From e45d6b779b93fdbfcdfecabbd2729cf3d648aa38 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Mon, 18 Jan 2021 10:03:30 +0000 Subject: [PATCH 4/5] Update _Agreement_v5.cshtml --- .../Views/Shared/_Agreement_v5.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml index cdc54d6782..c7a5b4722a 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml @@ -93,7 +93,7 @@

Agreement between @Model.EmployerAgreement.LegalEntityName and ESFA

-

Updated on 1 February 2021.

+

Updated on 20 January 2021.

For use of the Apprenticeship Service to access funded apprenticeship training

From 86ef2781355096b9a20d113510f30fdd86873f39 Mon Sep 17 00:00:00 2001 From: Paul Howes Date: Mon, 18 Jan 2021 12:01:10 +0000 Subject: [PATCH 5/5] Content updates --- .../Views/EmployerAgreement/AcceptedEmployerAgreement.cshtml | 2 +- .../Views/Shared/_Agreement_v5.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/AcceptedEmployerAgreement.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/AcceptedEmployerAgreement.cshtml index 4a45fe3cc2..7b332dce7d 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/AcceptedEmployerAgreement.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerAgreement/AcceptedEmployerAgreement.cshtml @@ -22,7 +22,7 @@ Download your accepted agreement -  (PDF, 334KB) +  (PDF, 225KB)

What happens next

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml index c7a5b4722a..8b475e3709 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/Shared/_Agreement_v5.cshtml @@ -1389,7 +1389,7 @@

10.

-

If the Employer meets the Eligibility Criteria for an Employer Incentive Payment, the ESFA 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.

+

If the Employer meets the Eligibility Criteria for an Employer Incentive Payment, the ESFA 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.