Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
fb9dd8c
DTR-4472 Feat: Screen VH-02a/b/c Verification request submitted
abhinavgupta-hmrc Apr 27, 2026
03f3185
DTR-4472 Fix: remove commented code line
abhinavgupta-hmrc Apr 27, 2026
bc5a71f
DTR-4472 Fix: commented code removed and full stop issue fixed
abhinavgupta-hmrc Apr 28, 2026
40f48e7
DTR-4472 Fix: resolve merge issues
abhinavgupta-hmrc Apr 29, 2026
0fdbf79
DTR-4472 refactor: integration implmented for two data source
abhinavgupta-hmrc May 5, 2026
a2e5d3d
[DTR-4461] - add comma to stub data fopr lastname, firstname
jassalrichy Apr 28, 2026
4491a5b
DTR-4694: CIS VSF: Screen SM-07 Verification failure (departmental er…
edpau-hmrc May 1, 2026
f7763eb
DTR-4160: update GetNewestVerificationBatchResponse and GetCurrentVer…
codeneto-hmrc May 1, 2026
d3d0160
DTR-4160: move files from verification folder to verify
codeneto-hmrc May 1, 2026
5c8de2e
DTR-4160: fix integration test
codeneto-hmrc May 1, 2026
bf86503
[DTR-000-FIX] - fix intermittently failing test for VerificationServi…
jassalrichy May 5, 2026
4cd6e70
[DTR-000-FIX] - scala formatting
jassalrichy May 5, 2026
d34ada6
DTR-4806 business function F4 - conditional routing (#158)
Mounkumar May 5, 2026
994fc0d
DTR-4694Fix: update heading to Large (L) heading size (#162)
edpau-hmrc May 5, 2026
90ea150
DTR-4484 - Screen VF-03c Which subcontractors do you want to reverify?
Juely-Kaikade-HMRC Apr 27, 2026
1bae393
DTR-4484 - updated controller and view to save the id & name
Juely-Kaikade-HMRC Apr 28, 2026
96cb9a0
DTR-4484 - view model spec file
Juely-Kaikade-HMRC Apr 28, 2026
bec29c7
DTR-4484 - Save id & name in the mongo
Juely-Kaikade-HMRC Apr 29, 2026
00764e0
DTR-4484 - view & message file updated
Juely-Kaikade-HMRC Apr 29, 2026
a611f94
DTR-4484 - Message file is upadated
Juely-Kaikade-HMRC Apr 29, 2026
7da56a9
DTR-4484 - Files updated for pagination and error messages conditions
Juely-Kaikade-HMRC May 1, 2026
22896bb
DTR-4484 - Controller unit test added
Juely-Kaikade-HMRC May 5, 2026
0a20eec
DTR-4484 - Css is updated
Juely-Kaikade-HMRC May 5, 2026
3338905
DTR-4484 - view file is updated
Juely-Kaikade-HMRC May 5, 2026
ca08bb2
DTR-4472 Feat: Screen VH-02a/b/c Verification request submitted
abhinavgupta-hmrc Apr 27, 2026
ccaf7b6
DTR-4472 Fix: resolve merge issues
abhinavgupta-hmrc Apr 29, 2026
e95703a
Merge branch 'main' into DTR-4472
abhinavgupta-hmrc May 6, 2026
c6d4bcf
Sync messages.en from main
abhinavgupta-hmrc May 6, 2026
4aa7f40
DTR-4472 Fix: merge issues resolved in messages file
abhinavgupta-hmrc May 6, 2026
427edae
DTR-4472 Fix: merge issues resolved in messages file
abhinavgupta-hmrc May 6, 2026
99e053c
DTR-4472 Fix: merge issues resolved in app routes file
abhinavgupta-hmrc May 6, 2026
42a8680
DTR-4472 Fix: subcontractors to reverify data integration
abhinavgupta-hmrc May 6, 2026
a539810
DTR-4472 Fix: subcontractors to reverify data integration
abhinavgupta-hmrc May 6, 2026
140820f
DTR-4472 merge issues for app route page
abhinavgupta-hmrc May 6, 2026
f06cc75
DTR-4472 Fix: deleting redundant refactored files
abhinavgupta-hmrc May 6, 2026
efbf1bd
DTR-4472 Fix: removed commented code
abhinavgupta-hmrc May 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Comment thread
jassalrichy marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright 2026 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.verify

import config.FrontendAppConfig
import controllers.actions.*
import play.api.i18n.{I18nSupport, MessagesApi}
import play.api.mvc.{Action, AnyContent, MessagesControllerComponents}
import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController
import viewmodels.checkAnswers.verify.VerificationRequestSubmittedViewModel
import views.html.verify.VerificationRequestSubmittedView
import javax.inject.Inject

class VerificationRequestSubmittedController @Inject() (
override val messagesApi: MessagesApi,
identify: IdentifierAction,
getData: DataRetrievalAction,
requireData: DataRequiredAction,
val controllerComponents: MessagesControllerComponents,
view: VerificationRequestSubmittedView
)(implicit appConfig: FrontendAppConfig)
extends FrontendBaseController
with I18nSupport {

def onPageLoad(): Action[AnyContent] =
(identify andThen getData andThen requireData) { implicit request =>
val vm =
VerificationRequestSubmittedViewModel
.fromUserAnswers(request.userAnswers)
Ok(view(vm))
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* Copyright 2026 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 viewmodels.checkAnswers.verify
import models.UserAnswers
import pages.verify._
import java.time.LocalDateTime

case class VerificationRequestSubmittedViewModel(
referenceNumber: String,
submittedAt: LocalDateTime,
subcontractorsToVerify: Seq[String],
subcontractorsToReverify: Seq[String] = Seq.empty,
confirmationEmail: Option[String] = None
) {
def showEmail: Boolean = confirmationEmail.isDefined
def showVerify: Boolean = subcontractorsToVerify.nonEmpty
def showReverify: Boolean = subcontractorsToReverify.nonEmpty
}

object VerificationRequestSubmittedViewModel {

def fromUserAnswers(userAnswers: UserAnswers): VerificationRequestSubmittedViewModel =
VerificationRequestSubmittedViewModel(
// TODO: Replace below with actuals - 1. referenceNumber 2. submittedAt
referenceNumber = "Reference Number 12345",
submittedAt = LocalDateTime.now(),
subcontractorsToVerify = userAnswers
.get(SelectSubcontractorPage)
.getOrElse(Seq.empty)
.map(_.name)
.toSeq,
subcontractorsToReverify = userAnswers
.get(SelectSubcontractorsToReverifyPage)
.getOrElse(Seq.empty)
.map(_.name)
.toSeq,
confirmationEmail = userAnswers.get(EmailAddressPage)
)
}
29 changes: 29 additions & 0 deletions app/views/components/PrintLink.scala.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
@*
* Copyright 2026 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.
*@

@this()

@(textKey: String, id: String = "print-link", extraClasses: String = "")(implicit messages: play.api.i18n.Messages)

<p class="govuk-body">
<a
id="@id"
href="#"
class="govuk-link hmrc-!-js-visible govuk-!-display-none-print@if(extraClasses.nonEmpty){ @extraClasses}"
data-module="hmrc-print-link">
@messages(textKey)
</a>
</p>
181 changes: 181 additions & 0 deletions app/views/verify/VerificationRequestSubmittedView.scala.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
@*
* Copyright 2026 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.
*@

@import config.FrontendAppConfig
@import java.time.LocalDateTime
@import java.time.format.DateTimeFormatter
@import uk.gov.hmrc.govukfrontend.views.viewmodels.panel.Panel
@import uk.gov.hmrc.govukfrontend.views.Aliases.*

@import uk.gov.hmrc.govukfrontend.views.viewmodels.summarylist._
@import viewmodels.govuk.summarylist.SummaryListViewModel

@import views.html.components._
@import viewmodels.checkAnswers.verify.VerificationRequestSubmittedViewModel


@this(
layout: templates.Layout,
govukPanel: GovukPanel,
govukInsetText: GovukInsetText,
govukSummaryList: GovukSummaryList,
heading: H1,
subHeading: H2,
paragraph: Paragraph,
printLink: PrintLink,
link: Link
)

@(vm: VerificationRequestSubmittedViewModel
)(implicit request: Request[_],appConfig: FrontendAppConfig, messages: Messages)

@layout(pageTitle = titleNoForm(messages("verify.verificationRequestSubmitted.title"))) {

@govukPanel(
Panel(
title = Text(messages("verify.verificationRequestSubmitted.heading")),
content = HtmlContent(
s"""
<p>${messages("verify.verificationRequestSubmitted.reference")}</p>
<strong>(${HtmlFormat.escape(vm.referenceNumber)})</strong>
"""
)
)
)

@paragraph(
messages(
"verify.verificationRequestSubmitted.submittedAt",
vm.submittedAt.format(DateTimeFormatter.ofPattern("HH:mm 'on' dd MMMM yyyy"))
)
)

@subHeading(
messages(
"verify.verificationRequestSubmitted.details.subHeading"
)
)

@if(vm.showVerify) {
@govukSummaryList(
SummaryListViewModel(
rows = Seq(
SummaryListRowViewModel(
key = messages("verify.verificationRequestSubmitted.subcontractorsToVerify.label"),
value = ValueViewModel(
HtmlContent(
vm.subcontractorsToVerify
.map(name => s"<li>$name</li>")
.mkString("<ul class='govuk-list govuk-list--bullet'>", "", "</ul>")
)
)
)
)
)
)
}

@if(vm.showReverify) {
@govukSummaryList(
SummaryListViewModel(
rows = Seq(
SummaryListRowViewModel(
key = messages("verify.verificationRequestSubmitted.subcontractorsToReverify.label"),
value = ValueViewModel(
HtmlContent(
vm.subcontractorsToReverify
.map(name => s"<li>$name</li>")
.mkString("<ul class='govuk-list govuk-list--bullet'>", "", "</ul>")
)
)
)
)
)
)
}


@if(vm.showEmail) {
@vm.confirmationEmail.map { email =>
@paragraph(
messages(
"verify.verificationRequestSubmitted.email.confirmation",
<strong>{email}</strong>,
"verify.verificationRequestSubmitted.fullStop"
)
)
}
}

@link(
linkTextKey = "verify.verificationRequestSubmitted.email.verification.link",
linkUrl = appConfig.cisGeneralEnquiries, // TODO: Link to be updated later
hasFullStop = true,
prefixTextKey = "verify.verificationRequestSubmitted.email.verification"
)

@govukInsetText(
InsetText(
content = HtmlContent(
s"""
${paragraph(messages("verify.verificationRequestSubmitted.print.text"))}
${printLink("verify.verificationRequestSubmitted.print.link")}
"""
)
)
)

@subHeading(
messages(
"verify.verificationRequestSubmitted.needHelp.subHeading")
)

@link(
linkTextKey = "verify.verificationRequestSubmitted.needHelp.contactHMRC.link",
linkUrl = appConfig.cisGeneralEnquiries,
hasFullStop = true,
prefixTextKey = "verify.verificationRequestSubmitted.needHelp.p1",
)

@paragraph(
messages(
"verify.verificationRequestSubmitted.needHelp.p2"
)
)

@link(
linkTextKey = "verify.verificationRequestSubmitted.needHelp.manageSubcontractors.link",
linkUrl = appConfig.manageSubcontractorsUrl, // TODO: Link to be updated later.
hasFullStop = true,
prefixTextKey = "verify.verificationRequestSubmitted.needHelp.p3",
)

@subHeading(
messages("verify.verificationRequestSubmitted.feedback.subHeading")
)

@paragraph(
messages(
"verify.verificationRequestSubmitted.feedback.p1"
)
)

@link(
"verify.verificationRequestSubmitted.feedback.survey.link",
appConfig.exitSurveyUrl, // TODO: Link to be confirmed & verified
suffixTextKey = "verify.verificationRequestSubmitted.feedback.p2"
)
}
3 changes: 2 additions & 1 deletion conf/app.routes
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ POST /verify/confirmation-email-stored controllers.verify.Contra
GET /verify/change-confirmation-email-stored controllers.verify.ContractorEmailConfirmationStoredController.onPageLoad(mode: Mode = CheckMode)
POST /verify/change-confirmation-email-stored controllers.verify.ContractorEmailConfirmationStoredController.onSubmit(mode: Mode = CheckMode)


GET /verify/select-subcontractors-to-reverify controllers.verify.SelectSubcontractorsToReverifyController.onPageLoad(mode: Mode = NormalMode, page: Int ?= 1)
POST /verify/select-subcontractors-to-reverify controllers.verify.SelectSubcontractorsToReverifyController.onSubmit(mode: Mode = NormalMode, page: Int ?= 1)
GET /verify/change-select-subcontractors-to-reverify controllers.verify.SelectSubcontractorsToReverifyController.onPageLoad(mode: Mode = CheckMode, page: Int ?= 1)
Expand All @@ -398,3 +397,5 @@ GET /verify/no-new-subcontractors-to-verify controllers.verify.Verify
POST /verify/no-new-subcontractors-to-verify controllers.verify.VerifyYourSubcontractorsYesNoController.onSubmit

GET /verify/problem-with-verification-warning controllers.verify.VerifyDepartmentalErrorController.onPageLoad()

GET /verify/verification-request-submitted controllers.verify.VerificationRequestSubmittedController.onPageLoad()
Loading