Browse Source

Update deposit routed_to and guidance

pull/2547/head
Kat 2 years ago
parent
commit
34bbc1a183
  1. 1
      app/models/form/sales/pages/deposit.rb
  2. 3
      app/views/form/guidance/_financial_calculations_discounted_ownership.html.erb
  3. 4
      spec/models/form/sales/pages/deposit_spec.rb

1
app/models/form/sales/pages/deposit.rb

@ -13,6 +13,7 @@ class Form::Sales::Pages::Deposit < ::Form::Page
end end
def routed_to?(log, _user) def routed_to?(log, _user)
return false unless super
return true if log.ownershipsch == 2 || (log.ownershipsch == 3 && log.mortgageused == 1) return true if log.ownershipsch == 2 || (log.ownershipsch == 3 && log.mortgageused == 1)
return false if log.stairowned_100? != @optional && form.start_year_after_2024? return false if log.stairowned_100? != @optional && form.start_year_after_2024?

3
app/views/form/guidance/_financial_calculations_discounted_ownership.html.erb

@ -1,10 +1,11 @@
<% grant_page = log.form.get_question("grant", log).page %> <% grant_page = log.form.get_question("grant", log).page %>
<% mortgage_page = log.form.get_question("mortgage", log).page %> <% mortgage_page = log.form.get_question("mortgage", log).page %>
<% discount_page = log.form.get_question("discount", log).page %> <% discount_page = log.form.get_question("discount", log).page %>
<% deposit_page = log.form.get_question("deposit", log).page %>
<%= govuk_details(summary_text: "How the financial values are calculated") do %> <%= govuk_details(summary_text: "How the financial values are calculated") do %>
<p class="govuk-body"> <p class="govuk-body">
The mortgage amount <%= "(#{govuk_link_to 'Q105', send("#{log.class.name.underscore}_#{mortgage_page.id}_path", log)})".html_safe if mortgage_page.routed_to?(log, current_user) %> The mortgage amount <%= "(#{govuk_link_to 'Q105', send("#{log.class.name.underscore}_#{mortgage_page.id}_path", log)})".html_safe if mortgage_page.routed_to?(log, current_user) %>
cash deposit (<%= govuk_link_to "Q109", send("#{log.class.name.underscore}_#{log.form.get_question('deposit', log).page.id}_path", log) %>) cash deposit <%= "(#{govuk_link_to 'Q109', send("#{log.class.name.underscore}_#{deposit_page.id}_path", log)})".html_safe if deposit_page.routed_to?(log, current_user) %>
and grant <%= "(#{govuk_link_to 'Q102', send("#{log.class.name.underscore}_#{grant_page.id}_path", log)})".html_safe if grant_page.routed_to?(log, current_user) %> and grant <%= "(#{govuk_link_to 'Q102', send("#{log.class.name.underscore}_#{grant_page.id}_path", log)})".html_safe if grant_page.routed_to?(log, current_user) %>
added together must equal added together must equal
the purchase price (<%= govuk_link_to "Q101", send("#{log.class.name.underscore}_#{log.form.get_question('value', log).page.id}_path", log) %>) the purchase price (<%= govuk_link_to "Q101", send("#{log.class.name.underscore}_#{log.form.get_question('value', log).page.id}_path", log) %>)

4
spec/models/form/sales/pages/deposit_spec.rb

@ -5,8 +5,8 @@ RSpec.describe Form::Sales::Pages::Deposit, type: :model do
let(:page_id) { nil } let(:page_id) { nil }
let(:page_definition) { nil } let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection, enabled?: true) } let(:subsection) { instance_double(Form::Subsection, enabled?: true, depends_on: true) }
let(:form) { instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)) } let(:form) { instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1), depends_on_met: true) }
let(:optional) { false } let(:optional) { false }
before do before do

Loading…
Cancel
Save