From dfe1e34e69d666432b64deb1aa2f136077b59b0c Mon Sep 17 00:00:00 2001 From: Joshua Hawxwell Date: Thu, 19 Dec 2024 14:46:27 +0000 Subject: [PATCH] Update content for certificate provider signed without identity yet --- .../certificate-provided.cy.js | 8 +++++ .../page/fixtures/certificate_provider.go | 2 ++ lang/cy.json | 4 ++- lang/en.json | 4 ++- web/assets/main.js | 8 +++++ .../certificate_provided.gohtml | 34 ++++++++++++------- web/template/layout/print-this-page.gohtml | 2 +- 7 files changed, 47 insertions(+), 15 deletions(-) diff --git a/cypress/e2e/certificate-provider/certificate-provided.cy.js b/cypress/e2e/certificate-provider/certificate-provided.cy.js index db44a5a3d7..a10db67555 100644 --- a/cypress/e2e/certificate-provider/certificate-provided.cy.js +++ b/cypress/e2e/certificate-provider/certificate-provided.cy.js @@ -18,4 +18,12 @@ describe('Certificate provided', () => { cy.contains('a', 'Go to your dashboard').click(); cy.url().should('contain', '/dashboard'); }); + + describe('when going to the post office', () => { + it('shows a deadline', () => { + cy.visit('/fixtures/certificate-provider?redirect=/certificate-provided&progress=confirmYourIdentity&idStatus=post-office'); + + cy.contains('Now that you have provided the certificate for this LPA, you must confirm your identity and connect it to your LPA account by:'); + }); + }); }) diff --git a/internal/page/fixtures/certificate_provider.go b/internal/page/fixtures/certificate_provider.go index ad238fa21d..ad28e04ee0 100644 --- a/internal/page/fixtures/certificate_provider.go +++ b/internal/page/fixtures/certificate_provider.go @@ -292,6 +292,8 @@ func CertificateProvider( DateOfBirth: certificateProvider.DateOfBirth, } certificateProvider.Tasks.ConfirmYourIdentity = task.IdentityStatePending + case "post-office": + certificateProvider.Tasks.ConfirmYourIdentity = task.IdentityStatePending default: userData = identity.UserData{ Status: identity.StatusConfirmed, diff --git a/lang/cy.json b/lang/cy.json index 90a5dd3272..5af2010c06 100644 --- a/lang/cy.json +++ b/lang/cy.json @@ -1504,5 +1504,7 @@ "youHaveChosenToConfirmYourIdentityAtPostOffice": "Welsh", "whenYouHaveConfirmedAtPostOfficeReturnToTaskList": "Welsh", "youveSubmittedYourLpaToOpg": "Welsh", - "opgIsCheckingYourLpa": "Welsh" + "opgIsCheckingYourLpa": "Welsh", + "weHaveSentAnEmailYouProvidedCertificate": "

Welsh {{.CertificateProviderEmail}}

", + "certificateProviderNowConfirmYourIdentityContent": "

Welsh {{.DonorFullName}} {{.DonorFirstNames}} {{.Deadline}}

" } diff --git a/lang/en.json b/lang/en.json index 4da9458b75..4b85df4ffd 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1400,5 +1400,7 @@ "youHaveChosenToConfirmYourIdentityAtPostOffice": "You have chosen to confirm your identity at a Post Office", "whenYouHaveConfirmedAtPostOfficeReturnToTaskList": "When you have confirmed your identity at a Post Office, return to your task list for the steps you must take to complete this process.", "youveSubmittedYourLpaToOpg": "You’ve submitted your LPA to the Office of the Public Guardian (OPG)", - "opgIsCheckingYourLpa": "OPG is checking your LPA. We will contact you if there is anything you need to do." + "opgIsCheckingYourLpa": "OPG is checking your LPA. We will contact you if there is anything you need to do.", + "weHaveSentAnEmailYouProvidedCertificate": "

We have sent an email confirming that you provided your certificate for this LPA to {{.CertificateProviderEmail}}.

If you would like a paper record, you can also print a copy of this page.

", + "certificateProviderNowConfirmYourIdentityContent": "

Confirm your identity

Your role as {{possessive .DonorFullName}} certificate provider will not be finalized until you confirm your identity.

  1. Visit the Post Office to confirm your identity. When you have done so, you’ll get an email from the Post Office and GOV.UK One Login will be updated.
  2. Log back into your LPA account. Select ‘Confirm identity’ from the task list and follow the prompts to return to GOV.UK One Login.
  3. Your GOV.UK One Login identity confirmation will then be connected to your LPA account.

Now that you have provided the certificate for this LPA, you must confirm your identity and connect it to your LPA account by:

{{.Deadline}}

When you have confirmed your identity

When you have confirmed your identity, you will no longer be able to view or access this LPA from your dashboard.

If the Office of the Public Guardian ever has any concerns about {{possessive .DonorFirstNames}} LPA in future, we may contact you.

If you ever need to report a concern, you can do this at any time using the report a concern about an LPA service.

" } diff --git a/web/assets/main.js b/web/assets/main.js index ddc87906df..6deac3e647 100644 --- a/web/assets/main.js +++ b/web/assets/main.js @@ -48,6 +48,14 @@ function init() { }, false); } + const printThisPage = document.getElementById('print-this-page'); + if (printThisPage) { + printThisPage.addEventListener('click', function(e) { + window.print(); + e.preventDefault(); + }, false); + } + function metaContent(name) { return document.querySelector(`meta[name=${name}]`).content; } diff --git a/web/template/certificateprovider/certificate_provided.gohtml b/web/template/certificateprovider/certificate_provided.gohtml index 5212d8e150..b07787d3e3 100644 --- a/web/template/certificateprovider/certificate_provided.gohtml +++ b/web/template/certificateprovider/certificate_provided.gohtml @@ -3,23 +3,33 @@ {{ define "pageTitle" }}{{ tr .App "youveProvidedTheCertificateForThisLpa" }}{{ end }} {{ define "main" }} -
-
-
-

{{ tr .App "youveProvidedTheCertificateForThisLpa" }}

-
+
+
+
+

{{ tr .App "youveProvidedTheCertificateForThisLpa" }}

+
- {{ trFormatHtml .App "certificateProvidedContent" "DonorFullName" .Lpa.Donor.FullName "DonorFirstNames" .Lpa.Donor.FirstNames "CertificateProviderFullName" .Lpa.CertificateProvider.FullName }} + {{ trFormatHtml .App "certificateProvidedContent" "DonorFullName" .Lpa.Donor.FullName "DonorFirstNames" .Lpa.Donor.FirstNames "CertificateProviderFullName" .Lpa.CertificateProvider.FullName }} - {{ trFormatHtml .App "certificateDetails" "SignedAt" (formatDateTime .App .CertificateProvider.SignedAt) "LpaUID" .Lpa.LpaUID "DonorFullName" .Lpa.Donor.FullName }} + {{ trFormatHtml .App "certificateDetails" "SignedAt" (formatDateTime .App .CertificateProvider.SignedAt) "LpaUID" .Lpa.LpaUID "DonorFullName" .Lpa.Donor.FullName }} - {{ trFormatHtml .App "thisMeansYouveDoneEverythingContent" "DonorFullName" .Lpa.Donor.FullName "CertificateProviderEmail" .Lpa.CertificateProvider.Email }} + {{ if .CertificateProvider.Tasks.ConfirmYourIdentity.IsCompleted }} + {{ trFormatHtml .App "thisMeansYouveDoneEverythingContent" "DonorFullName" .Lpa.Donor.FullName "CertificateProviderEmail" .Lpa.CertificateProvider.Email }} - {{ template "print-this-page" . }} + {{ template "print-this-page" . }} - {{ trFormatHtml .App "certificateProvidedConcerns" "DonorFirstNames" .Lpa.Donor.FirstNames }} + {{ trFormatHtml .App "certificateProvidedConcerns" "DonorFirstNames" .Lpa.Donor.FirstNames }} - {{ tr .App "goToYourDashboard" }} + {{ tr .App "goToYourDashboard" }} + {{ else }} + {{ trFormatHtml .App "weHaveSentAnEmailYouProvidedCertificate" "CertificateProviderEmail" .Lpa.CertificateProvider.Email }} + + {{ template "print-this-page" . }} + + {{ trFormatHtml .App "certificateProviderNowConfirmYourIdentityContent" "DonorFullName" .Lpa.Donor.FullName "Deadline" (formatDate .App .CertificateProvider.IdentityDeadline) "DonorFirstNames" .Lpa.Donor.FirstNames }} + + {{ template "buttons" (button .App "goToYourDashboard" "link" global.Paths.Dashboard.Format) }} + {{ end }} +
-
{{ end }} diff --git a/web/template/layout/print-this-page.gohtml b/web/template/layout/print-this-page.gohtml index 4854ccd3c7..71baa6bfa4 100644 --- a/web/template/layout/print-this-page.gohtml +++ b/web/template/layout/print-this-page.gohtml @@ -14,6 +14,6 @@ - {{ tr .App "printThisPage"}} + {{ tr .App "printThisPage"}}

{{ end }}