Skip to content

Commit df5361c

Browse files
suraj-suseelansuraj-suseelan
authored
DDCE-7721: Update "Exclusion complete" page (#322)
* DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Dependencies * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page * DDCE-7721: Update "Exclusion complete" page
1 parent fbdf6f3 commit df5361c

File tree

9 files changed

+379
-12
lines changed

9 files changed

+379
-12
lines changed

‎app/controllers/ExclusionListController.scala‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class ExclusionListController @Inject() (
6666
noNinoExclusionSearchFormView: NoNinoExclusionSearchForm,
6767
searchResultsView: SearchResults,
6868
whatNextExclusionView: WhatNextExclusion,
69+
whatNextExclusionMpbikView: WhatNextExclusionMpbik,
6970
removalConfirmationView: RemovalConfirmation,
7071
whatNextRescindView: WhatNextRescind
7172
)(implicit ec: ExecutionContext)
@@ -697,15 +698,27 @@ class ExclusionListController @Inject() (
697698
val resultFuture = for {
698699
_ <- validateRequest(year, iabdType)
699700
session <- sessionService.fetchPbikSession()
700-
} yield Ok(
701-
whatNextExclusionView(
702-
taxDateUtils.getTaxYearRange(),
703-
year,
704-
iabdType,
705-
session.get.listOfMatches.get.pbikExclusionList.head,
706-
mpbik = mpbikToggle
707-
)
708-
)
701+
} yield {
702+
val view =
703+
if (mpbikToggle) {
704+
whatNextExclusionMpbikView(
705+
taxDateUtils.getTaxYearRange(),
706+
year,
707+
iabdType,
708+
session.get.listOfMatches.get.pbikExclusionList.head,
709+
mpbik = mpbikToggle
710+
)
711+
} else {
712+
whatNextExclusionView(
713+
taxDateUtils.getTaxYearRange(),
714+
year,
715+
iabdType,
716+
session.get.listOfMatches.get.pbikExclusionList.head,
717+
mpbik = mpbikToggle
718+
)
719+
}
720+
Ok(view)
721+
}
709722
controllersReferenceData.responseErrorHandler(resultFuture)
710723
}
711724

‎app/views/GovukLayoutWrapper.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
} else if (showBackLink && showECLBackLink) {
8686
@govukBackLink(BackLink(
8787
href = config.agentClientListUrl,
88-
content = Text(messages("Service.back.ecl")),
88+
content = Text(messages(if(config.mpbikToggle) "Service.back.eclMPBIK" else "Service.back.ecl")),
8989
attributes = Map("id" -> "back-link")
9090
))
9191
} else if (showBackLink && showYTABackLink) {

‎app/views/exclusion/WhatNextExclusionMpbik.scala.html‎

Lines changed: 219 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
@*
2+
* Copyright 2026 HM Revenue & Customs
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*@
16+
17+
@import utils.TaxDateUtils
18+
19+
@import views.templatemodels.PageTitle
20+
@import config.PbikAppConfig
21+
22+
@this(
23+
config:PbikAppConfig,
24+
govukLayoutWrapper: GovukLayoutWrapper,
25+
printLink: components.PrintLink,
26+
taxDateUtils: TaxDateUtils
27+
)
28+
29+
@(
30+
taxYearRange:TaxYearRange,
31+
year:String,
32+
iabdType:IabdType,
33+
person:TracePersonResponse,
34+
mpbik: Boolean
35+
)(implicit request:AuthenticatedRequest[?], messages: Messages)
36+
37+
@benefitLabel = @{ messages("BenefitInKind.label." + iabdType.id) }
38+
39+
@summaryLink = @{
40+
if(mpbik){
41+
routes.HomePageController.onPageLoad
42+
} else {
43+
if(year=="cy"){
44+
routes.HomePageController.onPageLoadCY
45+
} else {
46+
routes.HomePageController.onPageLoadCY1
47+
}
48+
}
49+
}
50+
51+
@govukLayoutWrapper(PageTitle(messages("whatNext.exclude.heading")),
52+
showBackLink = true,
53+
showYTABackLink = request.showYTABackLink,
54+
showECLBackLink = request.showECLBackLink) {
55+
56+
<div id="confirmation" class="govuk-panel govuk-panel--confirmation">
57+
<h1 id="title" class="govuk-panel__title">
58+
@messages("whatNext.exclude.heading")
59+
</h1>
60+
</div>
61+
62+
@printLink(messages("Service.print.linkMPBIK"))
63+
64+
<p id="confirmation-p" class="govuk-body">
65+
@if(year=="cy"){
66+
@if(request.isAgent) {
67+
@messages("whatNextMPBIK.exclude.lede.cy.agent", person.fullName, benefitLabel, taxDateUtils.getDisplayTodayDate(), request.clientName.get)
68+
} else{
69+
@messages("whatNextMPBIK.exclude.lede", person.fullName, benefitLabel, taxDateUtils.getDisplayTodayDate())
70+
}
71+
} else {
72+
@if(request.isAgent) {
73+
@messages("whatNextMPBIK.exclude.lede.agent", person.fullName, benefitLabel, taxDateUtils.getDisplayStartOfCYP1(), request.clientName.get)
74+
}else{
75+
@messages("whatNextMPBIK.exclude.lede", person.fullName, benefitLabel, taxDateUtils.getDisplayStartOfCYP1())
76+
}
77+
}
78+
</p>
79+
80+
<h2 class="govuk-heading-m">
81+
@messages("whatNext.exclude.table.heading")
82+
</h2>
83+
84+
<dl class="govuk-summary-list" id="list-of-excluded-info">
85+
<div class="govuk-summary-list__row">
86+
<dt class="govuk-summary-list__key">
87+
@messages("Service.field.employee.name")
88+
</dt>
89+
<dd class="govuk-summary-list__value">
90+
<p class="govuk-body">@person.fullName</p>
91+
</dd>
92+
</div>
93+
<div class="govuk-summary-list__row">
94+
<dt class="govuk-summary-list__key">
95+
@messages("Service.field.nino") @messages("Service.nino.lastletterMPBIK")
96+
</dt>
97+
<dd class="govuk-summary-list__value">
98+
<p class="govuk-body">@person.nationalInsuranceNumber</p>
99+
</dd>
100+
</div>
101+
<div class="govuk-summary-list__row">
102+
<dt class="govuk-summary-list__key">
103+
@messages("Service.field.worksnumberMPBIK")
104+
</dt>
105+
<dd class="govuk-summary-list__value">
106+
<p class="govuk-body">@person.getWorksPayrollNumber</p>
107+
</dd>
108+
</div>
109+
<div class="govuk-summary-list__row">
110+
<dt class="govuk-summary-list__key">
111+
@messages("Service.field.employer.payeMPBIK")
112+
</dt>
113+
<dd class="govuk-summary-list__value">
114+
<p class="govuk-body">@request.empRef</p>
115+
</dd>
116+
</div>
117+
<div class="govuk-summary-list__row">
118+
<dt class="govuk-summary-list__key">
119+
@messages("Service.field.date.of.exclusion")
120+
</dt>
121+
<dd class="govuk-summary-list__value">
122+
@if(year=="cy"){
123+
<p class="govuk-body">@taxDateUtils.getDisplayTodayDate()</p>
124+
} else {
125+
<p class="govuk-body">@taxDateUtils.getDisplayStartOfCYP1()</p>
126+
}
127+
</dd>
128+
</div>
129+
@if(request.isAgent) {
130+
<div class="govuk-summary-list__row">
131+
<dt class="govuk-summary-list__key">
132+
@messages("Service.field.client.name")
133+
</dt>
134+
<dd class="govuk-summary-list__value">
135+
<p class="govuk-body">@request.clientName.get</p>
136+
</dd>
137+
</div>
138+
}
139+
</dl>
140+
141+
<h2 class="govuk-heading-m">
142+
@messages("whatNextMPBIK.exclude.h2." + request.userType)
143+
</h2>
144+
145+
@if(year=="cy"){
146+
<p id="next-steps-info" class="govuk-body">
147+
@if(request.isAgent) {
148+
@messages("whatNextMPBIK.exclude.p1.cy.before.agent")
149+
@messages("whatNextMPBIK.exclude.p1.cy.link.agent")
150+
@messages("whatNextMPBIK.exclude.p1.cy.after.agent", person.fullName)
151+
} else {
152+
@messages("whatNextMPBIK.exclude.p1.cy.before.organisation")
153+
@messages("whatNextMPBIK.exclude.p1.cy.link.organisation")
154+
@messages("whatNextMPBIK.exclude.p1.cy.after.organisation", person.fullName)
155+
}
156+
</p>
157+
} else {
158+
<p id="next-steps-info" class="govuk-body">
159+
@if(request.isAgent) {
160+
@messages("whatNextMPBIK.exclude.p1.before.agent")
161+
@messages("whatNextMPBIK.exclude.p1.link.agent")
162+
@messages("whatNextMPBIK.exclude.p1.after.agent", person.fullName)
163+
} else {
164+
@messages("whatNextMPBIK.exclude.p1.before.organisation")
165+
@messages("whatNextMPBIK.exclude.p1.link.organisation")
166+
@messages("whatNextMPBIK.exclude.p1.after.organisation", person.fullName)
167+
}
168+
</p>
169+
}
170+
171+
<h2 class="govuk-heading-m">
172+
@messages("whatNext.exclude.you.do.h2")
173+
</h2>
174+
175+
@if(year=="cy"){
176+
<p id="you-can-do-next-info" class="govuk-body">
177+
@messages("whatNextMPBIK.exclude.you.do.p.cy.before." + request.userType)
178+
<a class="govuk-link" href="@summaryLink" id="link-back"> @messages("whatNextMPBIK.exclude.you.do.p.cy.link." + request.userType) </a>
179+
@messages("whatNextMPBIK.exclude.you.do.p.cy.after." + request.userType)
180+
181+
</p>
182+
<ul class="govuk-list govuk-list--bullet" id="next-steps-info-list">
183+
<li>@messages("whatNextMPBIK.exclude.li.view.benefits")</li>
184+
<li>@messages("whatNextMPBIK.exclude.li.other.benefits")</li>
185+
</ul>
186+
} else {
187+
<p id="you-can-do-next-info" class="govuk-body">
188+
@messages("whatNextMPBIK.exclude.you.do.p.before." + request.userType)
189+
<a class="govuk-link" href="@summaryLink" id="link-back"> @messages("whatNextMPBIK.exclude.you.do.p.link." + request.userType) </a>
190+
@messages("whatNextMPBIK.exclude.you.do.p.after." + request.userType)
191+
</p>
192+
<ul class="govuk-list govuk-list--bullet">
193+
<li>@messages("whatNextMPBIK.exclude.li.view.benefits")</li>
194+
<li>@messages("whatNextMPBIK.exclude.li.other.benefits")</li>
195+
</ul>
196+
}
197+
<h3 class="govuk-heading-s">
198+
@messages("whatNextMPBIK.exclude.more.h3")
199+
</h3>
200+
201+
@if(year=="cy"){
202+
<p id="back-to-benefits" class="govuk-body">
203+
@messages("whatNextMPBIK.exclude.more.p.cy.before")
204+
<a class="govuk-link" href="@routes.ExclusionListController.performPageLoad(year, iabdType)" id="link-back-excluded">
205+
@messages("whatNextMPBIK.exclude.more.p.cy.link", benefitLabel)
206+
</a>
207+
@messages("whatNextMPBIK.exclude.more.p.cy.after")
208+
</p>
209+
} else {
210+
<p id="back-to-benefits" class="govuk-body">
211+
@messages("whatNextMPBIK.exclude.more.p.before")
212+
<a class="govuk-link" href="@routes.ExclusionListController.performPageLoad(year, iabdType)" id="link-back-excluded">
213+
@messages("whatNextMPBIK.exclude.more.p.link", benefitLabel)
214+
</a>
215+
@messages("whatNextMPBIK.exclude.more.p.after")
216+
</p>
217+
}
218+
219+
}

0 commit comments

Comments
 (0)