From 1c2cdbc10ae0816d75d2909d315b9fb07e8b006d Mon Sep 17 00:00:00 2001 From: ngmjohnstone <68429510+ngmjohnstone@users.noreply.github.com> Date: Thu, 7 Mar 2024 15:11:54 +0000 Subject: [PATCH 1/2] PODS-9186: WIP Code: - Added new page to display when an individual registering as a PSP declares that they are not a UK resident --- .../AreYouUKResidentController.scala | 1 - .../NonUKPractitionerController.scala | 44 +++++++++++++++++++ app/navigators/IndividualNavigator.scala | 2 +- conf/individual.routes | 2 +- conf/messages.en | 8 ++++ conf/views/individual/nonUKPractitioner.njk | 38 ++++++++++++++++ 6 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 app/controllers/individual/NonUKPractitionerController.scala create mode 100644 conf/views/individual/nonUKPractitioner.njk diff --git a/app/controllers/individual/AreYouUKResidentController.scala b/app/controllers/individual/AreYouUKResidentController.scala index dc0dd8da..debf2fa0 100644 --- a/app/controllers/individual/AreYouUKResidentController.scala +++ b/app/controllers/individual/AreYouUKResidentController.scala @@ -76,7 +76,6 @@ class AreYouUKResidentController @Inject()(override val messagesApi: MessagesApi "submitUrl" -> routes.AreYouUKResidentController.onSubmit(mode).url, "radios" -> Radios.yesNo(formWithErrors("value")) ) - renderer.render("individual/areYouUKResident.njk", json).map(BadRequest(_)) }, value => diff --git a/app/controllers/individual/NonUKPractitionerController.scala b/app/controllers/individual/NonUKPractitionerController.scala new file mode 100644 index 00000000..07c9b3f6 --- /dev/null +++ b/app/controllers/individual/NonUKPractitionerController.scala @@ -0,0 +1,44 @@ +/* + * Copyright 2024 HM Revenue & Customs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package controllers.individual + +import controllers.Retrievals +import controllers.actions._ +import play.api.i18n.{I18nSupport, MessagesApi} +import play.api.libs.json.Json +import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} +import renderer.Renderer +import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController +import utils.annotations.AuthMustHaveNoEnrolmentWithIV + +import javax.inject.Inject +import scala.concurrent.ExecutionContext + +class NonUKPractitionerController @Inject()( + override val messagesApi: MessagesApi, + @AuthMustHaveNoEnrolmentWithIV authenticate: AuthAction, + getData: DataRetrievalAction, + val controllerComponents: MessagesControllerComponents, + renderer: Renderer + )(implicit ec: ExecutionContext) extends FrontendBaseController + with I18nSupport with Retrievals { + + def onPageLoad: Action[AnyContent] = (authenticate andThen getData).async { + implicit request => + renderer.render(template = "individual/nonUKPractitioner.njk", Json.obj()).map(Ok(_)) + } +} diff --git a/app/navigators/IndividualNavigator.scala b/app/navigators/IndividualNavigator.scala index 6069ea8c..09df3e55 100644 --- a/app/navigators/IndividualNavigator.scala +++ b/app/navigators/IndividualNavigator.scala @@ -34,7 +34,7 @@ class IndividualNavigator @Inject()(countryOptions: CountryOptions) extends Navi case AreYouUKResidentPage => ua.get(AreYouUKResidentPage) match { case Some(true) => IsThisYouController.onPageLoad(NormalMode) - case Some(false) => IndividualNameController.onPageLoad(NormalMode) + case Some(false) => NonUKPractitionerController.onPageLoad() case _ => controllers.routes.SessionExpiredController.onPageLoad() } case IndividualDetailsPage => IndividualEnterRegisteredAddressController.onPageLoad(NormalMode) diff --git a/conf/individual.routes b/conf/individual.routes index 28cb6510..fee66f2c 100644 --- a/conf/individual.routes +++ b/conf/individual.routes @@ -61,4 +61,4 @@ GET /change-address-manual controllers.indi POST /change-address-manual controllers.individual.IndividualEnterRegisteredAddressController.onSubmit(mode: Mode = CheckMode) GET /outside-eu-eea controllers.individual.OutsideEuEeaController.onPageLoad() - +GET /non-uk-practitioner controllers.individual.NonUKPractitionerController.onPageLoad() diff --git a/conf/messages.en b/conf/messages.en index 9eef1ee2..88654ba1 100644 --- a/conf/messages.en +++ b/conf/messages.en @@ -601,6 +601,14 @@ outsideEuEea.title = You cannot register as a PSP outsideEuEea.p1 = This is because you are based in {0} and outside of the European Union and European Economic Area. outsideEuEea.p2 = Only people based inside the European Union and European Economic Area can register as a PSP. +nonUKPractitioner.title = You cannot register as a scheme practitioner +nonUKPractitioner.heading = You cannot register as a scheme practitioner +nonUKPractitioner.p1 = You must be a UK resident. +nonUKPractitioner.p2.1 = To register, email +nonUKPractitioner.p2.email = administrationpensions@hmrc.gov.uk +nonUKPractitioner.p2.emailHref = administrationpensions@hmrc.gov.uk?subject=Non-UK +nonUKPractitioner.p2.2 = and include ‘Non-UK’ in the title. + businessRegistrationType.title = What is the business registered as? businessRegistrationType.heading = What is the business registered as? businessRegistrationType.company = Company diff --git a/conf/views/individual/nonUKPractitioner.njk b/conf/views/individual/nonUKPractitioner.njk new file mode 100644 index 00000000..4ef8cdaa --- /dev/null +++ b/conf/views/individual/nonUKPractitioner.njk @@ -0,0 +1,38 @@ +{% extends "includes/layout.njk" %} + +{% from "macros/title.njk" import title %} +{% from "govuk/components/button/macro.njk" import govukButton %} +{% from "govuk/components/inset-text/macro.njk" import govukInsetText %} + + +{% block pageTitle %} + {{ title(messages("nonUKPractitioner.title")) }} +{% endblock %} + +{% block mainContent %} + +
+
+ +

+ {{ messages("nonUKPractitioner.heading") }} +

+ +

+ {{ messages("nonUKPractitioner.p1") }} +

+ +

+ {{ messages("nonUKPractitioner.p2.1") }} + + {{ messages("nonUKPractitioner.p2.email") }} + + {{ messages("nonUKPractitioner.p2.2") }} +

+ +
+
+ + + +{% endblock %} From 39f8e702aa265e02cea62db9615327d9d4ecfa74 Mon Sep 17 00:00:00 2001 From: ngmjohnstone <68429510+ngmjohnstone@users.noreply.github.com> Date: Fri, 8 Mar 2024 12:17:08 +0000 Subject: [PATCH 2/2] PODS-9186: Updated test Code: - Changed routing location in test --- test/navigators/IndividualNavigatorSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/navigators/IndividualNavigatorSpec.scala b/test/navigators/IndividualNavigatorSpec.scala index 51cefb0f..9993419b 100644 --- a/test/navigators/IndividualNavigatorSpec.scala +++ b/test/navigators/IndividualNavigatorSpec.scala @@ -44,7 +44,7 @@ class IndividualNavigatorSpec extends NavigatorBehaviour { ("Id", "UserAnswers", "Next Page"), row(WhatYouWillNeedPage)(controllers.individual.routes.AreYouUKResidentController.onPageLoad(NormalMode)), row(AreYouUKResidentPage)(controllers.individual.routes.IsThisYouController.onPageLoad(NormalMode), Some(areYouUKResident(true))), - row(AreYouUKResidentPage)(controllers.individual.routes.IndividualNameController.onPageLoad(NormalMode), Some(areYouUKResident(false))), + row(AreYouUKResidentPage)(controllers.individual.routes.NonUKPractitionerController.onPageLoad(), Some(areYouUKResident(false))), row(AreYouUKResidentPage)(controllers.routes.SessionExpiredController.onPageLoad(), None), row(IndividualDetailsPage)(controllers.individual.routes.IndividualEnterRegisteredAddressController.onPageLoad(NormalMode), None), row(IndividualAddressPage)(controllers.individual.routes.UseAddressForContactController.onPageLoad(NormalMode), Some(uaAddress("FR"))),