diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb index 2ce30c5bd..b432e0700 100644 --- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb +++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb @@ -10,6 +10,8 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection def pages @pages ||= [ Form::Sales::Pages::AboutDeposit.new("about_deposit_discounted_ownership", nil, self), + Form::Sales::Pages::AboutPriceRtb.new("about_deposit_discounted_ownership", nil, self), + Form::Sales::Pages::AboutPriceNotRtb.new("about_deposit_discounted_ownership", nil, self), ] end diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb index 1837e5399..b22adc11e 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -15,6 +15,8 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection Form::Sales::Pages::LaNominations.new(nil, nil, self), Form::Sales::Pages::BuyerPrevious.new(nil, nil, self), Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self), + Form::Sales::Pages::AboutPrice.new(nil, nil, self), + Form::Sales::Pages::AboutPriceSocialHousing.new(nil, nil, self), Form::Sales::Pages::AboutDeposit.new("about_deposit_shared_ownership", nil, self), Form::Sales::Pages::MonthlyRent.new(nil, nil, self), Form::Sales::Pages::ExchangeDate.new(nil, nil, self), diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index d3066974f..cda76d10e 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -111,4 +111,8 @@ class SalesLog < Log def income2_used_for_mortgage? inc2mort == 1 end + + def right_to_buy? + [9, 14, 27].include?(type) + end end diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index b2d07496c..6ac65c072 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -69,6 +69,8 @@ FactoryBot.define do ecstat6 { 1 } deposit { 10_000 } cashdis { 1_000 } + value { 110_000 } + grant { 1_000 } end end end diff --git a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb index 1a608031e..c3220bb51 100644 --- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb @@ -13,7 +13,9 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model it "has correct pages" do expect(discounted_ownership_scheme.pages.map(&:id)).to eq( - %w[about_deposit_discounted_ownership], + %w[about_deposit_discounted_ownership + about_price_rtb + about_price_not_rtb], ) end diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb index 8edabca53..ecabae734 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -20,6 +20,8 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do la_nominations buyer_previous previous_bedrooms + about_price + about_price_social_housing about_deposit_shared_ownership monthly_rent exchange_contracts diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 253481886..880068012 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(79) + expect(form.pages.count).to eq(83) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(79) + expect(form.pages.count).to eq(83) expect(form.name).to eq("2021_2022_sales") end end