From 740820b029aa862cf4b4870fd62537a86125ff61 Mon Sep 17 00:00:00 2001 From: Edwin Kruglov Date: Wed, 6 Sep 2023 16:34:02 +0100 Subject: [PATCH] fix(rfh): add default confirmation page --- .../_default.html.erb | 31 ++++++++++++++++ .../_energy.html.erb | 28 +++++++++++++++ .../show.html.erb | 36 ++++--------------- config/locales/en.yml | 34 ++++++++++++------ 4 files changed, 89 insertions(+), 40 deletions(-) create mode 100644 app/views/framework_request_submissions/_default.html.erb create mode 100644 app/views/framework_request_submissions/_energy.html.erb diff --git a/app/views/framework_request_submissions/_default.html.erb b/app/views/framework_request_submissions/_default.html.erb new file mode 100644 index 000000000..c400b176d --- /dev/null +++ b/app/views/framework_request_submissions/_default.html.erb @@ -0,0 +1,31 @@ +

+ <%= I18n.t("faf_submissions.header.what_happens_next") %> +

+

+ <%= I18n.t("faf_submissions.body.what_happens_next.default", days: 2)[0] %> +

+

+ <%= I18n.t("faf_submissions.body.what_happens_next.common")[0] %> +

+

+ <%= I18n.t("faf_submissions.body.what_happens_next.common")[1] %> +

+ +

+ <%= I18n.t("faf_submissions.header.what_you_can_do_next") %> +

+ +

+ <%= I18n.t("faf_submissions.what_you_can_do_next.default.list_start") %> +

+

diff --git a/app/views/framework_request_submissions/_energy.html.erb b/app/views/framework_request_submissions/_energy.html.erb new file mode 100644 index 000000000..1473e4dc1 --- /dev/null +++ b/app/views/framework_request_submissions/_energy.html.erb @@ -0,0 +1,28 @@ +

+ <%= I18n.t("faf_submissions.header.what_happens_next") %> +

+

+ <%= I18n.t("faf_submissions.body.what_happens_next.energy", days: 2)[0] %> +

+

+ <%= I18n.t("faf_submissions.body.what_happens_next.energy")[1] %> +

+

+ <%= I18n.t("faf_submissions.body.what_happens_next.common")[0] %> +

+

+ <%= I18n.t("faf_submissions.body.what_happens_next.common")[1] %> +

+ +

+ <%= I18n.t("faf_submissions.header.what_you_can_do_next") %> +

+ +

+ <%= 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 %> +

+

diff --git a/app/views/framework_request_submissions/show.html.erb b/app/views/framework_request_submissions/show.html.erb index 930436e21..881f8cc36 100644 --- a/app/views/framework_request_submissions/show.html.erb +++ b/app/views/framework_request_submissions/show.html.erb @@ -3,7 +3,6 @@
-

<%= I18n.t("faf_submissions.header.confirmation") %> @@ -14,34 +13,11 @@

-

- <%= I18n.t("faf_submissions.header.what_happens_next") %> -

-

- <%= I18n.t("faf_submissions.body.what_happens_next", days: 2)[0] %> -

-

- <%= I18n.t("faf_submissions.body.what_happens_next")[1] %> -

-

- <%= I18n.t("faf_submissions.body.what_happens_next")[2] %> -

-

- <%= I18n.t("faf_submissions.body.what_happens_next")[3] %> -

- -

- <%= I18n.t("faf_submissions.header.what_you_can_do_next") %> -

- -

- <%= 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 %> -

    - <% for bullet in I18n.t("faf_submissions.what_you_can_do_next.bullets") %> -
  • <%= bullet %>
    • - <% end %> -
-

+ <% if @framework_request.is_energy_request %> + <%= render "energy" %> + <% else %> + <%= render "default" %> + <% end %>
- \ No newline at end of file + diff --git a/config/locales/en.yml b/config/locales/en.yml index e4997b391..457f011c6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -562,10 +562,14 @@ 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 @@ -573,12 +577,22 @@ en: 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.