Skip to content

Commit

Permalink
fix(rfh): add default confirmation page
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwinKruglov committed Sep 14, 2023
1 parent 40a8922 commit 740820b
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 40 deletions.
31 changes: 31 additions & 0 deletions app/views/framework_request_submissions/_default.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<h1 class="govuk-heading-m">
<%= I18n.t("faf_submissions.header.what_happens_next") %>
</h1>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next.default", days: 2)[0] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next.common")[0] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next.common")[1] %>
</p>

<h1 class="govuk-heading-m">
<%= I18n.t("faf_submissions.header.what_you_can_do_next") %>
</h1>

<p class="govuk-body">
<%= I18n.t("faf_submissions.what_you_can_do_next.default.list_start") %>
<ul class="govuk-list govuk-list--bullet">
<li>
<%= I18n.t("faf_submissions.what_you_can_do_next.default.bullets.how_to_buy_what_you_need", how_to_buy_what_you_need_link: link_to(I18n.t("faf_submissions.what_you_can_do_next.default.how_to_buy_what_you_need_link"), "https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools", class: "govuk-link govuk-link--no-visited-state")).html_safe %>
</li>
<li>
<%= I18n.t("faf_submissions.what_you_can_do_next.default.bullets.what_to_consider", what_to_consider_link: link_to(I18n.t("faf_submissions.what_you_can_do_next.default.what_to_consider_link"), "https://www.gov.uk/guidance/buying-for-schools-things-to-consider-before-you-start", class: "govuk-link govuk-link--no-visited-state")).html_safe %>
</li>
<li>
<%= I18n.t("faf_submissions.what_you_can_do_next.default.bullets.agreements_and_faf", agreements_and_faf_link: link_to(I18n.t("faf_submissions.what_you_can_do_next.default.agreements_and_faf_link"), "https://www.gov.uk/guidance/find-a-dfe-approved-framework-for-your-school", class: "govuk-link govuk-link--no-visited-state")).html_safe %>
</li>
</ul>
</p>
28 changes: 28 additions & 0 deletions app/views/framework_request_submissions/_energy.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<h1 class="govuk-heading-m">
<%= I18n.t("faf_submissions.header.what_happens_next") %>
</h1>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next.energy", days: 2)[0] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next.energy")[1] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next.common")[0] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next.common")[1] %>
</p>

<h1 class="govuk-heading-m">
<%= I18n.t("faf_submissions.header.what_you_can_do_next") %>
</h1>

<p class="govuk-body">
<%= I18n.t("faf_submissions.what_you_can_do_next.energy.list_start", guidance_link: link_to(I18n.t("faf_submissions.what_you_can_do_next.energy.guidance_link"), "https://www.gov.uk/guidance/buying-for-schools/energy", class: "govuk-link govuk-link--no-visited-state")).html_safe %>
<ul class="govuk-list govuk-list--bullet">
<% for bullet in I18n.t("faf_submissions.what_you_can_do_next.energy.bullets") %>
<li><%= bullet %></li>
<% end %>
</ul>
</p>
36 changes: 6 additions & 30 deletions app/views/framework_request_submissions/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<div class="govuk-width-container">
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">

<div class="govuk-panel govuk-panel--confirmation">
<h1 class="govuk-panel__title">
<%= I18n.t("faf_submissions.header.confirmation") %>
Expand All @@ -14,34 +13,11 @@
</div>
</div>

<h1 class="govuk-heading-m">
<%= I18n.t("faf_submissions.header.what_happens_next") %>
</h1>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next", days: 2)[0] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next")[1] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next")[2] %>
</p>
<p class="govuk-body">
<%= I18n.t("faf_submissions.body.what_happens_next")[3] %>
</p>

<h1 class="govuk-heading-m">
<%= I18n.t("faf_submissions.header.what_you_can_do_next") %>
</h1>

<p class="govuk-body">
<%= I18n.t("faf_submissions.what_you_can_do_next.list_start", guidance_link: link_to(I18n.t("faf_submissions.what_you_can_do_next.guidance_link"), "https://www.gov.uk/guidance/buying-for-schools/energy", class: "govuk-link govuk-link--no-visited-state")).html_safe %>
<ul class="govuk-list govuk-list--bullet">
<% for bullet in I18n.t("faf_submissions.what_you_can_do_next.bullets") %>
<li><%= bullet %></li>
<% end %>
</ul>
</p>
<% if @framework_request.is_energy_request %>
<%= render "energy" %>
<% else %>
<%= render "default" %>
<% end %>
</div>
</div>
</div>
</div>
34 changes: 24 additions & 10 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -562,23 +562,37 @@ en:
title: Support Request Confirmed - Get help buying for schools
body:
what_happens_next:
- The Get help buying for schools team will now review your request and energy bills if you've sent them. We'll be in touch within %{days} working days to find a convenient time to discuss your options.
- If you chose to email your bills, there will be instructions in the confirmation email telling you how to do this.
- Please check to make sure you receive an email confirmation from us within the next 10 minutes. Check your junk folder if you do not see it.
- You'll need to submit your request again if you do not receive an email from us because this is how we'll be contacting you.
default:
- The Get help buying for schools team will review your request. We'll be in touch within %{days} working days.
energy:
- The Get help buying for schools team will now review your request and energy bills if you've sent them. We'll be in touch within %{days} working days to find a convenient time to discuss your options.
- If you chose to email your bills, there will be instructions in the confirmation email telling you how to do this.
common:
- Please check to make sure you receive an email confirmation from us within the next 10 minutes. Check your junk folder if you do not see it.
- You'll need to submit your request again if you do not receive an email from us because this is how we'll be contacting you.
header:
confirmation: Your request for support has been sent
what_happens_next: What happens next
what_you_can_do_next: What you can do next
sub_header:
confirmation: 'We have sent a confirmation email to:'
what_you_can_do_next:
list_start: 'You can read our guidance about %{guidance_link}. It includes:'
guidance_link: buying energy for your school
bullets:
- whether you can get a reduced rate VAT
- how to choose between fixed, flexible or variable price contracts
- what to think about when choosing contract length
default:
list_start: 'Read guidance about:'
how_to_buy_what_you_need_link: how to buy what you need
what_to_consider_link: what to consider before buying specific goods and services
agreements_and_faf_link: framework agreements and the find a framework tool
bullets:
how_to_buy_what_you_need: "%{how_to_buy_what_you_need_link} to learn more about the buying process"
what_to_consider: "%{what_to_consider_link}"
agreements_and_faf: "%{agreements_and_faf_link}"
energy:
list_start: 'You can read our guidance about %{guidance_link}. It includes:'
guidance_link: buying energy for your school
bullets:
- whether you can get a reduced rate VAT
- how to choose between fixed, flexible or variable price contracts
- what to think about when choosing contract length
feedback:
confirmation_details:
message: Thank you for opting in to take part in user research.
Expand Down

0 comments on commit 740820b

Please sign in to comment.