From 555b5455ca1f902d9d2a0383ce6c2935119323b5 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:50:55 +0100 Subject: [PATCH 1/6] AP-3809: simple content changes Move details into translation file to follow pattern for rest of the codebase --- .../providers/check_capital_answers/show.html.erb | 6 ++++-- .../check_passported_answers/show.html.erb | 4 +++- .../_with_bank_statement_uploads.html.erb | 2 +- .../_with_cfe_result_details.html.erb | 2 +- app/views/shared/check_answers/_assets.html.erb | 13 ++++--------- app/views/shared/check_answers/_property.html.erb | 14 +++++++------- .../shared/check_answers/_restrictions.html.erb | 4 ++-- app/views/shared/check_answers/_vehicles.html.erb | 2 +- .../_income_payments_and_assets.html.erb | 2 +- ...s_and_assets_for_bank_statement_upload.html.erb | 2 +- config/locales/en/providers.yml | 1 + config/locales/en/shared.yml | 11 ++++++++++- 12 files changed, 36 insertions(+), 27 deletions(-) diff --git a/app/views/providers/check_capital_answers/show.html.erb b/app/views/providers/check_capital_answers/show.html.erb index 84839cd44c..746d67ee93 100644 --- a/app/views/providers/check_capital_answers/show.html.erb +++ b/app/views/providers/check_capital_answers/show.html.erb @@ -1,8 +1,10 @@ +<% individual = "_with_partner" if @legal_aid_application.applicant.has_partner_with_no_contrary_interest? %> + <%= page_template(page_title: t(".h1-heading")) do %> -

<%= t(".capital-section-heading") %>

+

<%= t(".capital-section-heading#{individual}") %>

- <%= render "shared/check_answers/assets" %> + <%= render "shared/check_answers/assets", individual: %>

<%= t(".what_happens_next.heading") %>

<%= t(".what_happens_next.text") %>

diff --git a/app/views/providers/check_passported_answers/show.html.erb b/app/views/providers/check_passported_answers/show.html.erb index 1bacdd9c55..98df2aa368 100644 --- a/app/views/providers/check_passported_answers/show.html.erb +++ b/app/views/providers/check_passported_answers/show.html.erb @@ -1,3 +1,5 @@ +<% individual = "_with_partner" if @legal_aid_application.applicant.has_partner_with_no_contrary_interest? %> + <%= page_template( page_title: t(".h1-heading"), back_link: { path: reset_providers_legal_aid_application_check_passported_answers_path(@legal_aid_application), method: :patch }, @@ -5,7 +7,7 @@

<%= t(".h2-heading") %>

- <%= render "shared/check_answers/assets" %> + <%= render "shared/check_answers/assets", individual: %>

<%= t(".chances_of_success_h2") %>

diff --git a/app/views/providers/means_reports/_with_bank_statement_uploads.html.erb b/app/views/providers/means_reports/_with_bank_statement_uploads.html.erb index 36884f14d6..5dc074a383 100644 --- a/app/views/providers/means_reports/_with_bank_statement_uploads.html.erb +++ b/app/views/providers/means_reports/_with_bank_statement_uploads.html.erb @@ -54,7 +54,7 @@ <%= t(".assets_heading") %> -<%= render "shared/check_answers/assets", read_only: true %> +<%= render "shared/check_answers/assets", read_only: true, individual: "" %> <% if @legal_aid_application.passported? && @manual_review_determiner.manual_review_required? %> <%= render "caseworker_review" %> diff --git a/app/views/providers/means_reports/_with_cfe_result_details.html.erb b/app/views/providers/means_reports/_with_cfe_result_details.html.erb index 3de46ad704..2458a1db67 100644 --- a/app/views/providers/means_reports/_with_cfe_result_details.html.erb +++ b/app/views/providers/means_reports/_with_cfe_result_details.html.erb @@ -67,7 +67,7 @@ <%= t(".assets_heading") %> -<%= render "shared/check_answers/assets", read_only: true %> +<%= render "shared/check_answers/assets", read_only: true, individual: "" %> <% if @legal_aid_application.passported? && @manual_review_determiner.manual_review_required? %> <%= render "caseworker_review" %> diff --git a/app/views/shared/check_answers/_assets.html.erb b/app/views/shared/check_answers/_assets.html.erb index b7e4f30d2c..d404289430 100644 --- a/app/views/shared/check_answers/_assets.html.erb +++ b/app/views/shared/check_answers/_assets.html.erb @@ -1,14 +1,9 @@ <% read_only = false unless local_assigns.key?(:read_only) %> <% online_savings_accounts = @legal_aid_application.online_savings_accounts_balance %> <% online_current_accounts = @legal_aid_application.online_current_accounts_balance %> -<% individual = if @legal_aid_application.applicant.has_partner_with_no_contrary_interest? - "your client or their partner" - else - "your client" - end %>
- <%= render "shared/check_answers/property", read_only: %> + <%= render "shared/check_answers/property", read_only:, individual: %>
@@ -115,7 +110,7 @@ "shared/check_answers/one_link_section", name: :savings_and_investments, url: check_answer_url_for(journey_type, :savings_and_investments, @legal_aid_application), - question: t(".assets.savings_and_investments"), + question: t(".assets.savings_and_investments#{individual}"), answer_hash: capital_assets_list( @legal_aid_application, locale_namespace: "shared.forms.revealing_checkbox.attribute.#{journey_type}.savings_and_investments.check_box_", @@ -127,7 +122,7 @@ "shared/check_answers/one_link_section", name: :other_assets, url: check_answer_url_for(journey_type, :other_assets, @legal_aid_application), - question: t(".assets.other_assets"), + question: t(".assets.other_assets#{individual}"), answer_hash: capital_amounts_list( @legal_aid_application, locale_namespace: "shared.forms.revealing_checkbox.attribute.#{journey_type}.other_assets.check_box_", @@ -136,7 +131,7 @@ read_only:, ) %> - <%= render("shared/check_answers/restrictions", read_only:) if @legal_aid_application.own_capital? %> + <%= render("shared/check_answers/restrictions", read_only:, individual:) if @legal_aid_application.own_capital? %>
<% if @legal_aid_application.policy_disregards.present? %> diff --git a/app/views/shared/check_answers/_property.html.erb b/app/views/shared/check_answers/_property.html.erb index 2bff328fe5..475c49b027 100644 --- a/app/views/shared/check_answers/_property.html.erb +++ b/app/views/shared/check_answers/_property.html.erb @@ -7,18 +7,18 @@ html_attributes: { id: "property-question" }, ) do |summary_list| %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__own_home" }) do |row| %> - <%= row.with_key(text: t("shared.check_answers.assets.property.own_home"), classes: "govuk-!-width-one-half") %> + <%= row.with_key(text: t("shared.check_answers.assets.property.own_home#{individual}"), classes: "govuk-!-width-one-half") %> <%= row.with_value { @legal_aid_application.own_home.blank? ? "" : t("shared.forms.own_home_form.#{@legal_aid_application.own_home}") } %> <%= row.with_action( text: t("generic.change"), href: check_answer_url_for(journey_type, :own_homes, @legal_aid_application), - visually_hidden_text: t("shared.check_answers.assets.property.own_home"), + visually_hidden_text: t("shared.check_answers.assets.property.own_home#{individual}"), ) %> <% end %> <% end %> <% if @legal_aid_application.own_home? %> -

<%= t("shared.check_answers.assets.property.heading_property_details") %>

+

<%= t("shared.check_answers.assets.property.heading_property_details#{individual}") %>

<%= govuk_summary_list( actions: !read_only, classes: "govuk-!-margin-bottom-9", @@ -47,22 +47,22 @@ <% end %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__shared_ownership" }) do |row| %> - <%= row.with_key(text: t("shared.check_answers.assets.property.shared_ownership"), classes: "govuk-!-width-one-half") %> + <%= row.with_key(text: t("shared.check_answers.assets.property.shared_ownership#{individual}"), classes: "govuk-!-width-one-half") %> <%= row.with_value { @legal_aid_application.shared_ownership.blank? ? "" : t("shared.forms.shared_ownership_form.#{@legal_aid_application.shared_ownership}") } %> <%= row.with_action( text: t("generic.change"), href: check_answer_url_for(journey_type, :property_details, @legal_aid_application), - visually_hidden_text: t("shared.check_answers.assets.property.shared_ownership"), + visually_hidden_text: t("shared.check_answers.assets.property.shared_ownership#{individual}"), ) %> <% end %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__percentage_home" }) do |row| %> - <%= row.with_key(text: t("shared.check_answers.assets.property.percentage_home"), classes: "govuk-!-width-one-half") %> + <%= row.with_key(text: t("shared.check_answers.assets.property.percentage_home#{individual}"), classes: "govuk-!-width-one-half") %> <%= row.with_value { number_to_percentage(@legal_aid_application.percentage_home, precision: 2) } %> <%= row.with_action( text: t("generic.change"), href: check_answer_url_for(journey_type, :property_details, @legal_aid_application), - visually_hidden_text: t("shared.check_answers.assets.property.percentage_home"), + visually_hidden_text: t("shared.check_answers.assets.property.percentage_home#{individual}"), ) %> <% end %> <% end %> diff --git a/app/views/shared/check_answers/_restrictions.html.erb b/app/views/shared/check_answers/_restrictions.html.erb index 7309d14aa7..82d4119180 100644 --- a/app/views/shared/check_answers/_restrictions.html.erb +++ b/app/views/shared/check_answers/_restrictions.html.erb @@ -1,4 +1,4 @@ -

<%= t(".#{journey_type}.heading") %>

+

<%= t(".#{journey_type}.heading#{individual}") %>

<%= check_answer_link( name: :restrictions, @@ -13,7 +13,7 @@ <%= check_answer_link( name: :restrictions_details, url: check_answer_url_for(journey_type, :restrictions, @legal_aid_application), - question: "Details of restrictions", + question: t(".details"), answer: @legal_aid_application.restrictions_details, no_border: @legal_aid_application.has_restrictions?, read_only:, diff --git a/app/views/shared/check_answers/_vehicles.html.erb b/app/views/shared/check_answers/_vehicles.html.erb index 0be06b6fc1..23d62bc4ac 100644 --- a/app/views/shared/check_answers/_vehicles.html.erb +++ b/app/views/shared/check_answers/_vehicles.html.erb @@ -20,7 +20,7 @@ html_attributes: { id: "vehicles-questions" }, ) do |summary_list| %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__own-vehicle" }) do |row| %> - <%= row.with_key(text: t(".providers.own", individual:), classes: "govuk-!-width-one-half") %> + <%= row.with_key(text: t(".providers.own#{individual}"), classes: "govuk-!-width-one-half") %> <%= row.with_value { yes_no(@legal_aid_application.own_vehicle?) } %> <% end %> <% end %> diff --git a/app/views/shared/review_application/_income_payments_and_assets.html.erb b/app/views/shared/review_application/_income_payments_and_assets.html.erb index 8ebc0c69a4..bd5a6ca0c2 100644 --- a/app/views/shared/review_application/_income_payments_and_assets.html.erb +++ b/app/views/shared/review_application/_income_payments_and_assets.html.erb @@ -48,6 +48,6 @@
- <%= render "shared/check_answers/assets", read_only: true %> + <%= render "shared/check_answers/assets", read_only: true, individual: "" %>
diff --git a/app/views/shared/review_application/_income_payments_and_assets_for_bank_statement_upload.html.erb b/app/views/shared/review_application/_income_payments_and_assets_for_bank_statement_upload.html.erb index cc5c01e4c1..7d866f816e 100644 --- a/app/views/shared/review_application/_income_payments_and_assets_for_bank_statement_upload.html.erb +++ b/app/views/shared/review_application/_income_payments_and_assets_for_bank_statement_upload.html.erb @@ -99,6 +99,6 @@

<%= t(".capital-heading") %>

- <%= render "shared/check_answers/assets", read_only: true %> + <%= render "shared/check_answers/assets", read_only: true, individual: "" %>
diff --git a/config/locales/en/providers.yml b/config/locales/en/providers.yml index c0c5578b09..89584fb0a0 100644 --- a/config/locales/en/providers.yml +++ b/config/locales/en/providers.yml @@ -1167,6 +1167,7 @@ en: show: h1-heading: Check your answers capital-section-heading: Your client's capital + capital-section-heading_with_partner: Your client's and their partner's capital what_happens_next: heading: What happens next text: We'll use your answers to check your client's financial eligibility for legal aid. diff --git a/config/locales/en/shared.yml b/config/locales/en/shared.yml index e54a43f99a..687e7eca26 100644 --- a/config/locales/en/shared.yml +++ b/config/locales/en/shared.yml @@ -238,8 +238,10 @@ en: assets: assets: other_assets: Which assets does your client have? + other_assets_with_partner: Which assets does either your client or their partner have? policy_disregards: Payments from scheme or charities savings_and_investments: Which savings or investments does your client have? + savings_and_investments_with_partner: Which savings or investments does either your client or their partner have? savings_account: Savings account current_account: Current account bank_accounts: Which bank accounts does your client have? @@ -248,11 +250,15 @@ en: property: heading_own_home: Property heading_property_details: Your client's property + heading_property_details_with_partner: Your client's and their partner's property own_home: Does your client own the home that they live in? + own_home_with_partner: Does your client or their partner own the home that they live in? property_value: How much is the home they live in worth? outstanding_mortgage: How much is left to pay on the mortgage? shared_ownership: Does your client own the home with anyone else? + shared_ownership_with_partner: Does your client or their partner own the home with anyone else? percentage_home: What percentage of the home does your client legally own? + percentage_home_with_partner: What percentage of the home do your client and their partner legally own? offline_savings_accounts: heading: Does your client have any savings accounts they cannot access online? offline_savings_accounts: Has savings accounts they cannot access online @@ -463,16 +469,19 @@ en: costs: *costs work: *work restrictions: + details: Details of restrictions citizens: heading: Restrictions on your assets question: Are there any legal restrictions that prevent you from selling or borrowing against your assets? providers: heading: Restrictions on your client's assets + heading_with_partner: Restrictions on your client's or their partner's assets question: Is your client banned from selling or borrowing against their assets? vehicles: providers: heading: Vehicles - own: Does %{individual} own a vehicle? + own: Does your client own a vehicle? + own_with_partner: Does your client or their partner own a vehicle? owner: Who owns the vehicle? estimated_value: What is the estimated value of the vehicle? payment_remaining: Are there any payments left on the vehicle? From b07e14631107230b5f4ec844e0a2c4ebf87c7290 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:54:59 +0100 Subject: [PATCH 2/6] AP-3809: Bank account section content changes Update content in bank account section. Change instances of "No" and "None" to match designs. Update feature tests so they still pass. --- app/helpers/capital_helper.rb | 2 +- app/helpers/policy_disregards_helper.rb | 2 +- app/views/shared/check_answers/_assets.html.erb | 17 +++++++++-------- config/locales/en/shared.yml | 7 ++++--- features/providers/means_report.feature | 12 ++++++------ features/providers/review_and_print.feature | 8 ++++---- features/step_definitions/means_report_steps.rb | 4 ++-- .../check_capital_answers_controller_spec.rb | 2 +- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/app/helpers/capital_helper.rb b/app/helpers/capital_helper.rb index 47116877dd..68a1941d99 100644 --- a/app/helpers/capital_helper.rb +++ b/app/helpers/capital_helper.rb @@ -53,7 +53,7 @@ def capital_amount_items(items, locale_namespace, percentage_values) def capital_amount_text(amount, type) if amount.nil? - "No" + t("generic.no") elsif type == :percentage number_to_percentage(amount, precision: 2) else diff --git a/app/helpers/policy_disregards_helper.rb b/app/helpers/policy_disregards_helper.rb index 3c74d08668..dbbe9fc0b5 100644 --- a/app/helpers/policy_disregards_helper.rb +++ b/app/helpers/policy_disregards_helper.rb @@ -16,7 +16,7 @@ def policy_disregards_list(policy_disregards) items&.compact! items.map do |item| - item.amount_text ||= "No" + item.amount_text ||= t("generic.no") end { diff --git a/app/views/shared/check_answers/_assets.html.erb b/app/views/shared/check_answers/_assets.html.erb index d404289430..84eec56b6f 100644 --- a/app/views/shared/check_answers/_assets.html.erb +++ b/app/views/shared/check_answers/_assets.html.erb @@ -9,20 +9,21 @@
<%= render "shared/check_answers/vehicles", read_only:, individual: %> +

<%= t(".assets.bank_accounts") %>

<% if @legal_aid_application.non_passported? && !@legal_aid_application.uploading_bank_statements? %> <% if read_only %> -

<%= t(".assets.bank_accounts") %>

+

<%= t(".assets.client_bank_accounts") %>

<%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { "data-test": "applicant-bank-accounts" }) do |summary_list| %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__online_current_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.current_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { online_current_accounts.present? ? gds_number_to_currency(online_current_accounts) : t("generic.none_declared") } %> + <%= row.with_value { online_current_accounts.present? ? gds_number_to_currency(online_current_accounts) : t("generic.none") } %> <% end %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__online_savings_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.savings_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { online_savings_accounts.present? ? gds_number_to_currency(online_savings_accounts) : t("generic.none_declared") } %> + <%= row.with_value { online_savings_accounts.present? ? gds_number_to_currency(online_savings_accounts) : t("generic.none") } %> <% end %> <% end %> <% end %> @@ -34,7 +35,7 @@ "shared/check_answers/one_link_section", name: :bank_accounts, url: check_answer_url_for(journey_type, :offline_accounts, @legal_aid_application), - question: t(".assets.bank_accounts"), + question: t(".assets.client_bank_accounts"), answer_hash: capital_accounts_list( @legal_aid_application, locale_namespace: "shared.forms.revealing_checkbox.attribute.#{journey_type}.bank_accounts.check_box_", @@ -68,11 +69,11 @@ <%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { "data-test": "partner-bank-accounts" }) do |summary_list| %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__partner_online_current_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.current_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.partner_offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.partner_offline_current_accounts) : t("generic.none_declared") } %> + <%= row.with_value { @legal_aid_application.savings_amount.partner_offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.partner_offline_current_accounts) : t("generic.none") } %> <% end %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__partner_online_savings_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.savings_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.partner_offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.partner_offline_savings_accounts) : t("generic.none_declared") } %> + <%= row.with_value { @legal_aid_application.savings_amount.partner_offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.partner_offline_savings_accounts) : t("generic.none") } %> <% end %> <% end %> <% end %> @@ -97,11 +98,11 @@ <%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { "data-test": "joint-bank-accounts" }) do |summary_list| %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__joint_online_current_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.current_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_current_accounts) : t("generic.none_declared") } %> + <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_current_accounts) : t("generic.none") } %> <% end %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__joint_online_savings_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.savings_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_savings_accounts) : t("generic.none_declared") } %> + <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_savings_accounts) : t("generic.none") } %> <% end %> <% end %> <% end %> diff --git a/config/locales/en/shared.yml b/config/locales/en/shared.yml index 687e7eca26..d808f2cb92 100644 --- a/config/locales/en/shared.yml +++ b/config/locales/en/shared.yml @@ -244,9 +244,10 @@ en: savings_and_investments_with_partner: Which savings or investments does either your client or their partner have? savings_account: Savings account current_account: Current account - bank_accounts: Which bank accounts does your client have? - partner_bank_accounts: Which bank accounts does the partner have? - joint_bank_accounts: Joint bank accounts + bank_accounts: Bank accounts + client_bank_accounts: Your client's accounts + partner_bank_accounts: The partner's accounts + joint_bank_accounts: Joint accounts property: heading_own_home: Property heading_property_details: Your client's property diff --git a/features/providers/means_report.feature b/features/providers/means_report.feature index 9319323283..2ad7cf97d6 100644 --- a/features/providers/means_report.feature +++ b/features/providers/means_report.feature @@ -20,7 +20,7 @@ Feature: Means report | h2 | Property, savings and other assets | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | @@ -132,7 +132,7 @@ Feature: Means report | The vehicle was bought more than three years ago? | | Is the vehicle in regular use? | - And the "Which bank accounts does your client have?", for static bank account totals, questions should exist: + And the "Bank accounts", for static bank account totals, questions should exist: | question | | Current account | | Savings account | @@ -192,7 +192,7 @@ Feature: Means report | h2 | Property, savings and other assets | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h3 | Does your client have any savings accounts they cannot access online? | | h2 | Property, savings and other assets | | h2 | Which savings or investments does your client have? | @@ -300,7 +300,7 @@ Feature: Means report | The vehicle was bought more than three years ago? | | Is the vehicle in regular use? | - And the "Which bank accounts does your client have?", for open banking accounts, questions should exist: + And the "Bank accounts", for open banking accounts, questions should exist: | question | | Current account | | Savings account | @@ -359,7 +359,7 @@ Feature: Means report | h2 | Property, savings and other assets | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | @@ -403,7 +403,7 @@ Feature: Means report | h2 | Property, savings and other assets | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | diff --git a/features/providers/review_and_print.feature b/features/providers/review_and_print.feature index 97b313bdd9..877f37e622 100644 --- a/features/providers/review_and_print.feature +++ b/features/providers/review_and_print.feature @@ -25,7 +25,7 @@ Feature: Review and print your application | h2 | Your client's capital | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | @@ -64,7 +64,7 @@ Feature: Review and print your application | h2 | Your client's capital | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | @@ -97,7 +97,7 @@ Feature: Review and print your application | h3 | Regular payments | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h3 | Does your client have any savings accounts they cannot access online? | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | @@ -160,7 +160,7 @@ Feature: Review and print your application | h3 | Regular payments | | h3 | Property | | h3 | Vehicles | - | h2 | Which bank accounts does your client have? | + | h2 | Bank accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | diff --git a/features/step_definitions/means_report_steps.rb b/features/step_definitions/means_report_steps.rb index 44b6340e82..0259d83032 100644 --- a/features/step_definitions/means_report_steps.rb +++ b/features/step_definitions/means_report_steps.rb @@ -222,11 +222,11 @@ end end -Then("the \"Which bank accounts does your client have?\", for static bank account totals, questions should exist:") do |table| +Then("the \"Bank accounts\", for static bank account totals, questions should exist:") do |table| expect_questions_in(selector: "#app-check-your-answers__bank_accounts_items", expected: table) end -Then("the \"Which bank accounts does your client have?\", for open banking accounts, questions should exist:") do |table| +Then("the \"Bank accounts\", for open banking accounts, questions should exist:") do |table| expect_questions_in(selector: "[data-test=\"applicant-bank-accounts\"]", expected: table) end diff --git a/spec/requests/providers/check_capital_answers_controller_spec.rb b/spec/requests/providers/check_capital_answers_controller_spec.rb index 902d01dd27..675036ff51 100644 --- a/spec/requests/providers/check_capital_answers_controller_spec.rb +++ b/spec/requests/providers/check_capital_answers_controller_spec.rb @@ -96,7 +96,7 @@ context "and they have offline bank_accounts" do it "shows the partner bank values" do expect(page).to have_css("#app-check-your-answers__partner_offline_savings_accounts", - text: "Which bank accounts does the partner have?") + text: "The partner's accounts") end end end From a0ac51b6d5a0bfe6aed5d8f0604175ffa64a64a8 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:53:37 +0100 Subject: [PATCH 3/6] AP-3809: Fix change link routing --- app/models/concerns/non_passported_state_machine.rb | 1 + app/services/flow/flows/provider_capital.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/non_passported_state_machine.rb b/app/models/concerns/non_passported_state_machine.rb index e7d3c79952..e1f4d0edf5 100644 --- a/app/models/concerns/non_passported_state_machine.rb +++ b/app/models/concerns/non_passported_state_machine.rb @@ -81,6 +81,7 @@ def case_add_requestor transitions from: %i[ provider_assessing_means provider_entering_merits + checking_means_income ], to: :checking_non_passported_means end diff --git a/app/services/flow/flows/provider_capital.rb b/app/services/flow/flows/provider_capital.rb index 857d82e44c..b2eb6bf942 100644 --- a/app/services/flow/flows/provider_capital.rb +++ b/app/services/flow/flows/provider_capital.rb @@ -77,7 +77,7 @@ class ProviderCapital < FlowSteps offline_accounts: { path: ->(application) { urls.providers_legal_aid_application_offline_account_path(application) }, forward: :savings_and_investments, - check_answers: ->(application) { application.checking_non_passported_means? ? :check_income_answers : :check_passported_answers }, + check_answers: ->(application) { application.checking_non_passported_means? ? :check_capital_answers : :check_passported_answers }, }, savings_and_investments: { path: ->(application) { urls.providers_legal_aid_application_means_savings_and_investment_path(application) }, From 53855cd6059b46f5f23bd60f6c61adca85a44cdc Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:55:20 +0100 Subject: [PATCH 4/6] AP-3809: Use summary list component on _restrictions partial --- .../check_answers/_restrictions.html.erb | 44 ++++++++++--------- config/locales/en/shared.yml | 1 + 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/app/views/shared/check_answers/_restrictions.html.erb b/app/views/shared/check_answers/_restrictions.html.erb index 82d4119180..76a86156b9 100644 --- a/app/views/shared/check_answers/_restrictions.html.erb +++ b/app/views/shared/check_answers/_restrictions.html.erb @@ -1,24 +1,28 @@

<%= t(".#{journey_type}.heading#{individual}") %>

-
- <%= check_answer_link( - name: :restrictions, - url: check_answer_url_for(journey_type, :restrictions, @legal_aid_application), - question: t(".#{journey_type}.question"), - answer: yes_no(@legal_aid_application.has_restrictions), - no_border: @legal_aid_application.has_restrictions?, - read_only:, - ) %> +<%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { id: "restrictions-on-clients-assets-questions" }) do |summary_list| %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__restrictions" }) do |row| %> + <%= row.with_key(text: t(".#{journey_type}.question#{individual}"), classes: "govuk-!-width-one-half") %> + <%= row.with_value { yes_no(@legal_aid_application.has_restrictions) } %> + <% unless read_only %> + <%= row.with_action( + text: t("generic.change"), + href: check_answer_url_for(journey_type, :restrictions, @legal_aid_application), + visually_hidden_text: t(".#{journey_type}.question"), + ) %> + <% end %> + <% end %> <% if @legal_aid_application.has_restrictions %> - <%= check_answer_link( - name: :restrictions_details, - url: check_answer_url_for(journey_type, :restrictions, @legal_aid_application), - question: t(".details"), - answer: @legal_aid_application.restrictions_details, - no_border: @legal_aid_application.has_restrictions?, - read_only:, - ) %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__restrictions_details" }) do |row| %> + <%= row.with_key(text: t(".details"), classes: "govuk-!-width-one-half") %> + <%= row.with_value { @legal_aid_application.restrictions_details } %> + <% unless read_only %> + <%= row.with_action( + text: t("generic.change"), + href: check_answer_url_for(journey_type, :restrictions, @legal_aid_application), + visually_hidden_text: t(".details"), + ) %> + <% end %> + <% end %> + <% end %> <% end %> -
-
-
diff --git a/config/locales/en/shared.yml b/config/locales/en/shared.yml index d808f2cb92..f503d54f6d 100644 --- a/config/locales/en/shared.yml +++ b/config/locales/en/shared.yml @@ -478,6 +478,7 @@ en: heading: Restrictions on your client's assets heading_with_partner: Restrictions on your client's or their partner's assets question: Is your client banned from selling or borrowing against their assets? + question_with_partner: Is your client or their partner banned from selling or borrowing against their assets? vehicles: providers: heading: Vehicles From e8cf17fea4d4a793e3412be59896e2cd48165d73 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:10:59 +0100 Subject: [PATCH 5/6] AP-3809: Update bank accounts on CYA page Update content, change conditional displaying of different bank accounts, removed now unused method --- app/models/savings_amount.rb | 7 -- .../shared/check_answers/_assets.html.erb | 101 ++++++++++-------- config/locales/cy/shared.yml | 4 +- config/locales/en/shared.yml | 18 ++-- .../check_your_means_answers.feature | 2 +- features/providers/check_your_answers.feature | 10 +- features/providers/means_report.feature | 16 +-- features/providers/review_and_print.feature | 2 +- .../step_definitions/means_report_steps.rb | 2 +- .../check_capital_answers_controller_spec.rb | 2 +- 10 files changed, 88 insertions(+), 76 deletions(-) diff --git a/app/models/savings_amount.rb b/app/models/savings_amount.rb index fcd693ffce..84e616d041 100644 --- a/app/models/savings_amount.rb +++ b/app/models/savings_amount.rb @@ -7,13 +7,6 @@ def values? all_attributes.map { |attr| send(attr).present? }.any? end - def has_joint_values? - %i[ - joint_offline_current_accounts - joint_offline_savings_accounts - ].any? - end - private def all_attributes diff --git a/app/views/shared/check_answers/_assets.html.erb b/app/views/shared/check_answers/_assets.html.erb index 84eec56b6f..3560b0f121 100644 --- a/app/views/shared/check_answers/_assets.html.erb +++ b/app/views/shared/check_answers/_assets.html.erb @@ -18,11 +18,11 @@ <%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { "data-test": "applicant-bank-accounts" }) do |summary_list| %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__online_current_accounts" }) do |row| %> - <%= row.with_key(text: t(".assets.current_account"), classes: "govuk-!-width-one-half") %> + <%= row.with_key(text: t(".assets.client_current_account"), classes: "govuk-!-width-one-half") %> <%= row.with_value { online_current_accounts.present? ? gds_number_to_currency(online_current_accounts) : t("generic.none") } %> <% end %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__online_savings_accounts" }) do |row| %> - <%= row.with_key(text: t(".assets.savings_account"), classes: "govuk-!-width-one-half") %> + <%= row.with_key(text: t(".assets.client_savings_account"), classes: "govuk-!-width-one-half") %> <%= row.with_value { online_savings_accounts.present? ? gds_number_to_currency(online_savings_accounts) : t("generic.none") } %> <% end %> <% end %> @@ -31,17 +31,32 @@ <%= render "shared/check_answers/offline_savings_accounts", read_only: %> <% else %> - <%= render( - "shared/check_answers/one_link_section", - name: :bank_accounts, - url: check_answer_url_for(journey_type, :offline_accounts, @legal_aid_application), - question: t(".assets.client_bank_accounts"), - answer_hash: capital_accounts_list( - @legal_aid_application, - locale_namespace: "shared.forms.revealing_checkbox.attribute.#{journey_type}.bank_accounts.check_box_", - ), - read_only:, - ) %> +
+
+

<%= t(".assets.client_bank_accounts") %>

+
+ <% if read_only == false %> +
+

+ <%= govuk_link_to( + t("generic.change"), + check_answer_url_for(journey_type, :offline_accounts, @legal_aid_application), + "aria-label": "#{t('generic.change')} #{t('.assets.client_bank_accounts')} values", + ) %> +

+
+ <% end %> +
+ <%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { id: "app-check-your-answers__bank_accounts_items", "data-test": "applicant-bank-accounts" }) do |summary_list| %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__offline_current_accounts" }) do |row| %> + <%= row.with_key(text: t(".assets.client_current_account"), classes: "govuk-!-width-one-half") %> + <%= row.with_value { @legal_aid_application.savings_amount.offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.offline_current_accounts) : t("generic.none") } %> + <% end %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__offline_savings_accounts" }) do |row| %> + <%= row.with_key(text: t(".assets.client_savings_account"), classes: "govuk-!-width-one-half") %> + <%= row.with_value { @legal_aid_application.savings_amount.offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.offline_savings_accounts) : t("generic.none") } %> + <% end %> + <% end %> <% end %> <% if @legal_aid_application&.partner&.has_offline_savings? %> @@ -50,7 +65,7 @@ else :offline_accounts end %> -
+

<%= t(".assets.partner_bank_accounts") %>

@@ -67,42 +82,42 @@ <% end %>
<%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { "data-test": "partner-bank-accounts" }) do |summary_list| %> - <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__partner_online_current_accounts" }) do |row| %> - <%= row.with_key(text: t(".assets.current_account"), classes: "govuk-!-width-one-half") %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__partner_offline_current_accounts" }) do |row| %> + <%= row.with_key(text: t(".assets.partner_current_account"), classes: "govuk-!-width-one-half") %> <%= row.with_value { @legal_aid_application.savings_amount.partner_offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.partner_offline_current_accounts) : t("generic.none") } %> <% end %> - <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__partner_online_savings_accounts" }) do |row| %> - <%= row.with_key(text: t(".assets.savings_account"), classes: "govuk-!-width-one-half") %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__partner_offline_savings_accounts" }) do |row| %> + <%= row.with_key(text: t(".assets.partner_savings_account"), classes: "govuk-!-width-one-half") %> <%= row.with_value { @legal_aid_application.savings_amount.partner_offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.partner_offline_savings_accounts) : t("generic.none") } %> <% end %> <% end %> - <% end %> - <% if @legal_aid_application&.savings_amount&.has_joint_values? %> -
-
-

<%= t(".assets.joint_bank_accounts") %>

-
- <% if read_only == false %> -
-

- <%= govuk_link_to( - t("generic.change"), - check_answer_url_for(journey_type, :offline_accounts, @legal_aid_application), - "aria-label": "#{t('generic.change')} #{t('.assets.joint_bank_accounts')} values", - ) %> -

+ <% if @legal_aid_application.uploading_bank_statements? || !@legal_aid_application.non_passported? %> +
+
+

<%= t(".assets.joint_bank_accounts") %>

- <% end %> -
- <%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { "data-test": "joint-bank-accounts" }) do |summary_list| %> - <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__joint_online_current_accounts" }) do |row| %> - <%= row.with_key(text: t(".assets.current_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_current_accounts) : t("generic.none") } %> - <% end %> - <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__joint_online_savings_accounts" }) do |row| %> - <%= row.with_key(text: t(".assets.savings_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_savings_accounts) : t("generic.none") } %> + <% if read_only == false %> +
+

+ <%= govuk_link_to( + t("generic.change"), + check_answer_url_for(journey_type, :offline_accounts, @legal_aid_application), + "aria-label": "#{t('generic.change')} #{t('.assets.joint_bank_accounts')} values", + ) %> +

+
+ <% end %> +
+ <%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { "data-test": "joint-bank-accounts" }) do |summary_list| %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__joint_offline_current_accounts" }) do |row| %> + <%= row.with_key(text: t(".assets.joint_current_account"), classes: "govuk-!-width-one-half") %> + <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_current_accounts) : t("generic.none") } %> + <% end %> + <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__joint_offline_savings_accounts" }) do |row| %> + <%= row.with_key(text: t(".assets.joint_savings_account"), classes: "govuk-!-width-one-half") %> + <%= row.with_value { @legal_aid_application.savings_amount.joint_offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.joint_offline_savings_accounts) : t("generic.none") } %> + <% end %> <% end %> <% end %> <% end %> diff --git a/config/locales/cy/shared.yml b/config/locales/cy/shared.yml index 5950e4771b..75492725d9 100644 --- a/config/locales/cy/shared.yml +++ b/config/locales/cy/shared.yml @@ -117,8 +117,8 @@ cy: policy_disregards: seitirahc ro emehcs morf stnemyaP savings_and_investments: "?evah tneilc ruoy seod stnemtsevni ro sgnivas fo sepyt hcihW" - savings_account: tnuocca sgnivaS - current_account: tnuocca tnerruC + client_savings_account: tnuocca sgnivaS + client_current_account: tnuocca tnerruC bank_accounts: "?evah tneilc ruoy seod stnuocca knab hcihW" property: outstanding_mortgage: "?emoh s'tneilc ruoy no egagtrom gnidnatstuo eht si diff --git a/config/locales/en/shared.yml b/config/locales/en/shared.yml index f503d54f6d..67086ecaef 100644 --- a/config/locales/en/shared.yml +++ b/config/locales/en/shared.yml @@ -242,9 +242,13 @@ en: policy_disregards: Payments from scheme or charities savings_and_investments: Which savings or investments does your client have? savings_and_investments_with_partner: Which savings or investments does either your client or their partner have? - savings_account: Savings account - current_account: Current account bank_accounts: Bank accounts + client_current_account: Client's current accounts + client_savings_account: Client's savings accounts + partner_savings_account: Partner's savings accounts + partner_current_account: Partner's current accounts + joint_savings_account: Joint savings accounts + joint_current_account: Joint current accounts client_bank_accounts: Your client's accounts partner_bank_accounts: The partner's accounts joint_bank_accounts: Joint accounts @@ -261,7 +265,7 @@ en: percentage_home: What percentage of the home does your client legally own? percentage_home_with_partner: What percentage of the home do your client and their partner legally own? offline_savings_accounts: - heading: Does your client have any savings accounts they cannot access online? + heading: Your client's accounts offline_savings_accounts: Has savings accounts they cannot access online offline_savings_amount: Amount in offline savings accounts bank_transaction_table: @@ -583,16 +587,16 @@ en: hint: check_box_valuable_items_value: For example, jewellery, art or antiques – do not include wedding or engagement rings, furniture, clothing or tools used for work. offline_accounts: - check_box_offline_current_accounts: Current account - check_box_offline_savings_accounts: Savings account + check_box_offline_current_accounts: Client's current accounts + check_box_offline_savings_accounts: Client's savings accounts hint: revealing_check_box_offline_current_accounts: Include accounts with a negative balance or no money in them. revealing_check_box_offline_savings_accounts: Include accounts with a negative balance or no money in them. offline_current_accounts: Enter the total in all current accounts offline_savings_accounts: Enter the total in all savings accounts bank_accounts: - check_box_offline_current_accounts: Current account - check_box_offline_savings_accounts: Savings account + check_box_offline_current_accounts: Client's current accounts + check_box_offline_savings_accounts: Client's savings accounts hint: revealing_check_box_offline_current_accounts: If your client has multiple accounts, take the lowest balance from each account last month, add them, then enter the total offline_current_accounts: Enter the lowest balance last month diff --git a/features/providers/bank_statement_upload/check_your_means_answers.feature b/features/providers/bank_statement_upload/check_your_means_answers.feature index 29d639639c..33b1d2a18d 100644 --- a/features/providers/bank_statement_upload/check_your_means_answers.feature +++ b/features/providers/bank_statement_upload/check_your_means_answers.feature @@ -36,7 +36,7 @@ Feature: Bank statement upload check your answers And I should see "Uploaded bank statements" And I should see 'Does your client get student finance?' - And I should not see 'Does your client have any savings accounts they cannot access online?' + And I should not see "Your client's accounts" And the "Payments your client receives" section's questions and answers should match: | question | answer | diff --git a/features/providers/check_your_answers.feature b/features/providers/check_your_answers.feature index cbc727b3e4..237b967f96 100644 --- a/features/providers/check_your_answers.feature +++ b/features/providers/check_your_answers.feature @@ -74,7 +74,7 @@ Feature: Checking answers backwards and forwards Then I visit the applications page Then I view the previously created application Then I am on the check your answers page for other assets - And I click Check Your Answers Change link for 'bank accounts' + And I click Check Your Answers Change link for 'offline accounts link' Then I should be on a page showing 'Which bank accounts does your client have?' Then I select 'Savings account' Then I fill 'offline_savings_accounts' with '678.99' @@ -89,7 +89,7 @@ Feature: Checking answers backwards and forwards Then I visit the applications page Then I view the previously created application Then I am on the check your answers page for other assets - And I click Check Your Answers Change link for 'bank accounts' + And I click Check Your Answers Change link for 'offline accounts link' Then I should be on a page showing "Which bank accounts does your client have?" Then I select 'None of these' Then I click 'Save and continue' @@ -207,7 +207,7 @@ Feature: Checking answers backwards and forwards @javascript Scenario: I want to view bank accounts via the capital check your answers page Given I complete the passported journey as far as capital check your answers - And I click Check Your Answers Change link for 'bank accounts' + And I click Check Your Answers Change link for 'offline accounts link' Then I should be on a page showing "Which bank accounts does your client have?" Then I select 'None of these' Then I click 'Save and continue' @@ -315,7 +315,7 @@ Feature: Checking answers backwards and forwards | h2 | Your client's capital | | h3 | Property | | h3 | Vehicles | - | h3 | Does your client have any savings accounts they cannot access online? | + | h3 | Your client's accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | @@ -348,7 +348,7 @@ Feature: Checking answers backwards and forwards | h2 | Your client's capital | | h3 | Property | | h3 | Vehicles | - | h3 | Does your client have any savings accounts they cannot access online? | + | h3 | Your client's accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | diff --git a/features/providers/means_report.feature b/features/providers/means_report.feature index 2ad7cf97d6..5b21e928a2 100644 --- a/features/providers/means_report.feature +++ b/features/providers/means_report.feature @@ -28,7 +28,7 @@ Feature: Means report | h3 | Bank statements | Then the following sections should not exist: - | h3 | Does your client have any savings accounts they cannot access online? | + | h3 | Your client's accounts | Then the following sections should not exist: | tag | section | @@ -134,8 +134,8 @@ Feature: Means report And the "Bank accounts", for static bank account totals, questions should exist: | question | - | Current account | - | Savings account | + | Client's current accounts | + | Client's savings accounts | And the "Which savings or investments does your client have?" questions should exist: | question | @@ -193,7 +193,7 @@ Feature: Means report | h3 | Property | | h3 | Vehicles | | h2 | Bank accounts | - | h3 | Does your client have any savings accounts they cannot access online? | + | h3 | Your client's accounts | | h2 | Property, savings and other assets | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | @@ -302,10 +302,10 @@ Feature: Means report And the "Bank accounts", for open banking accounts, questions should exist: | question | - | Current account | - | Savings account | + | Client's current accounts | + | Client's savings accounts | - And the "Does your client have any savings accounts they cannot access online?" questions should exist: + And the "Your client's accounts" questions should exist: | question | | Has savings accounts they cannot access online | | Amount in offline savings accounts | @@ -409,7 +409,7 @@ Feature: Means report | h2 | Restrictions on your client's assets | | h2 | Payments from scheme or charities | | h3 | Bank statements | - | h3 | Does your client have any savings accounts they cannot access online? | + | h3 | Your client's accounts| And the "Client details" check your answers section should contain: | question | answer | diff --git a/features/providers/review_and_print.feature b/features/providers/review_and_print.feature index 877f37e622..9bbb65a55a 100644 --- a/features/providers/review_and_print.feature +++ b/features/providers/review_and_print.feature @@ -98,7 +98,7 @@ Feature: Review and print your application | h3 | Property | | h3 | Vehicles | | h2 | Bank accounts | - | h3 | Does your client have any savings accounts they cannot access online? | + | h3 | Your client's accounts | | h2 | Which savings or investments does your client have? | | h2 | Which assets does your client have? | | h2 | Restrictions on your client's assets | diff --git a/features/step_definitions/means_report_steps.rb b/features/step_definitions/means_report_steps.rb index 0259d83032..c0251e3954 100644 --- a/features/step_definitions/means_report_steps.rb +++ b/features/step_definitions/means_report_steps.rb @@ -230,7 +230,7 @@ expect_questions_in(selector: "[data-test=\"applicant-bank-accounts\"]", expected: table) end -Then("the \"Does your client have any savings accounts they cannot access online?\" questions should exist:") do |table| +Then("the \"Your client's accounts\" questions should exist:") do |table| expect_questions_in(selector: "[data-test=\"offline-savings-accounts\"]", expected: table) end diff --git a/spec/requests/providers/check_capital_answers_controller_spec.rb b/spec/requests/providers/check_capital_answers_controller_spec.rb index 675036ff51..302b9ca113 100644 --- a/spec/requests/providers/check_capital_answers_controller_spec.rb +++ b/spec/requests/providers/check_capital_answers_controller_spec.rb @@ -96,7 +96,7 @@ context "and they have offline bank_accounts" do it "shows the partner bank values" do expect(page).to have_css("#app-check-your-answers__partner_offline_savings_accounts", - text: "The partner's accounts") + text: "Partner's savings accounts") end end end From 526ac294f0abdae1e36844b391bc1bc5ce1667b5 Mon Sep 17 00:00:00 2001 From: Adam Goldstone <13471320+agoldstone93@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:11:39 +0100 Subject: [PATCH 6/6] AP-3809: Add safe navigation operator to client bank accounts Add back in safe navigation operator. Update spec to properly test for nil savings by adding trait to test for when none_selected is true --- app/helpers/capital_helper.rb | 5 ----- app/views/shared/check_answers/_assets.html.erb | 4 ++-- spec/factories/legal_aid_applications.rb | 4 ++++ spec/factories/savings_amounts.rb | 1 + spec/requests/providers/check_passported_answers_spec.rb | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/helpers/capital_helper.rb b/app/helpers/capital_helper.rb index 68a1941d99..42c7e275d7 100644 --- a/app/helpers/capital_helper.rb +++ b/app/helpers/capital_helper.rb @@ -7,11 +7,6 @@ def capital_amounts_list(legal_aid_application, locale_namespace:, percentage_va build_asset_list(attributes, locale_namespace, percentage_values) end - def capital_accounts_list(legal_aid_application, locale_namespace:, percentage_values: []) - attributes = capital_amount_attributes(legal_aid_application.savings_amount, legal_aid_application)&.reject! { |a| !a.end_with?("accounts") } - build_asset_list(attributes, locale_namespace, percentage_values) - end - def capital_assets_list(legal_aid_application, locale_namespace:, percentage_values: []) attributes = capital_amount_attributes(legal_aid_application.savings_amount, legal_aid_application)&.reject! { |a| a.end_with?("accounts") } build_asset_list(attributes, locale_namespace, percentage_values) diff --git a/app/views/shared/check_answers/_assets.html.erb b/app/views/shared/check_answers/_assets.html.erb index 3560b0f121..990fffdbc3 100644 --- a/app/views/shared/check_answers/_assets.html.erb +++ b/app/views/shared/check_answers/_assets.html.erb @@ -50,11 +50,11 @@ <%= govuk_summary_list(classes: "govuk-!-margin-bottom-9", html_attributes: { id: "app-check-your-answers__bank_accounts_items", "data-test": "applicant-bank-accounts" }) do |summary_list| %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__offline_current_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.client_current_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.offline_current_accounts) : t("generic.none") } %> + <%= row.with_value { @legal_aid_application&.savings_amount&.offline_current_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.offline_current_accounts) : t("generic.none") } %> <% end %> <%= summary_list.with_row(html_attributes: { id: "app-check-your-answers__offline_savings_accounts" }) do |row| %> <%= row.with_key(text: t(".assets.client_savings_account"), classes: "govuk-!-width-one-half") %> - <%= row.with_value { @legal_aid_application.savings_amount.offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.offline_savings_accounts) : t("generic.none") } %> + <%= row.with_value { @legal_aid_application&.savings_amount&.offline_savings_accounts.present? ? gds_number_to_currency(@legal_aid_application.savings_amount.offline_savings_accounts) : t("generic.none") } %> <% end %> <% end %> <% end %> diff --git a/spec/factories/legal_aid_applications.rb b/spec/factories/legal_aid_applications.rb index 7a3c1a044d..b799815705 100644 --- a/spec/factories/legal_aid_applications.rb +++ b/spec/factories/legal_aid_applications.rb @@ -496,6 +496,10 @@ savings_amount { build(:savings_amount, :with_values) } end + trait :with_nil_savings_amount do + savings_amount { build(:savings_amount, :all_nil) } + end + trait :with_fixed_offline_savings_accounts do savings_amount { build(:savings_amount, :all_zero, offline_savings_accounts: 1001) } end diff --git a/spec/factories/savings_amounts.rb b/spec/factories/savings_amounts.rb index d2ffe5874f..cb9ac65160 100644 --- a/spec/factories/savings_amounts.rb +++ b/spec/factories/savings_amounts.rb @@ -20,6 +20,7 @@ trait :all_nil do offline_current_accounts { nil } offline_savings_accounts { nil } + none_selected { true } cash { nil } other_person_account { nil } national_savings { nil } diff --git a/spec/requests/providers/check_passported_answers_spec.rb b/spec/requests/providers/check_passported_answers_spec.rb index 42c7e11170..a0c9bcc975 100644 --- a/spec/requests/providers/check_passported_answers_spec.rb +++ b/spec/requests/providers/check_passported_answers_spec.rb @@ -125,6 +125,7 @@ let(:application) do create(:legal_aid_application, :with_applicant, + :with_nil_savings_amount, :with_proceedings, :with_policy_disregards, :without_own_home,