diff --git a/app/models/form/sales/pages/buyer1_income_max_value_check.rb b/app/models/form/sales/pages/buyer1_income_max_value_check.rb index b8a0f3a24..72abd2555 100644 --- a/app/models/form/sales/pages/buyer1_income_max_value_check.rb +++ b/app/models/form/sales/pages/buyer1_income_max_value_check.rb @@ -1,6 +1,6 @@ class Form::Sales::Pages::Buyer1IncomeMaxValueCheck < ::Form::Page - def initialize(id, hsh, subsection) - super + def initialize(id, hsh, subsection, check_answers_card_number:) + super(id, hsh, subsection) @depends_on = [ { "income1_over_soft_max?" => true, @@ -17,11 +17,12 @@ class Form::Sales::Pages::Buyer1IncomeMaxValueCheck < ::Form::Page ], } @informative_text = {} + @check_answers_card_number = check_answers_card_number end def questions @questions ||= [ - Form::Sales::Questions::Buyer1IncomeValueCheck.new(nil, nil, self), + Form::Sales::Questions::Buyer1IncomeValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number), ] end end diff --git a/app/models/form/sales/pages/buyer1_income_min_value_check.rb b/app/models/form/sales/pages/buyer1_income_min_value_check.rb index 08ec83d08..a1777d83f 100644 --- a/app/models/form/sales/pages/buyer1_income_min_value_check.rb +++ b/app/models/form/sales/pages/buyer1_income_min_value_check.rb @@ -26,7 +26,7 @@ class Form::Sales::Pages::Buyer1IncomeMinValueCheck < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Buyer1IncomeValueCheck.new(nil, nil, self), + Form::Sales::Questions::Buyer1IncomeValueCheck.new(nil, nil, self, check_answers_card_number: 1), ] end end diff --git a/app/models/form/sales/pages/buyer2_income_max_value_check.rb b/app/models/form/sales/pages/buyer2_income_max_value_check.rb index e65fb4b93..993461f99 100644 --- a/app/models/form/sales/pages/buyer2_income_max_value_check.rb +++ b/app/models/form/sales/pages/buyer2_income_max_value_check.rb @@ -1,6 +1,6 @@ class Form::Sales::Pages::Buyer2IncomeMaxValueCheck < ::Form::Page - def initialize(id, hsh, subsection) - super + def initialize(id, hsh, subsection, check_answers_card_number:) + super(id, hsh, subsection) @depends_on = [ { "income2_over_soft_max?" => true, @@ -17,11 +17,12 @@ class Form::Sales::Pages::Buyer2IncomeMaxValueCheck < ::Form::Page ], } @informative_text = {} + @check_answers_card_number = check_answers_card_number end def questions @questions ||= [ - Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self), + Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number), ] end end diff --git a/app/models/form/sales/pages/buyer2_income_min_value_check.rb b/app/models/form/sales/pages/buyer2_income_min_value_check.rb index 6e1a9a538..6f491fed7 100644 --- a/app/models/form/sales/pages/buyer2_income_min_value_check.rb +++ b/app/models/form/sales/pages/buyer2_income_min_value_check.rb @@ -26,7 +26,7 @@ class Form::Sales::Pages::Buyer2IncomeMinValueCheck < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self), + Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self, check_answers_card_number: 2), ] end end diff --git a/app/models/form/sales/questions/buyer1_income_value_check.rb b/app/models/form/sales/questions/buyer1_income_value_check.rb index 8843d6736..63e3b6478 100644 --- a/app/models/form/sales/questions/buyer1_income_value_check.rb +++ b/app/models/form/sales/questions/buyer1_income_value_check.rb @@ -1,8 +1,8 @@ class Form::Sales::Questions::Buyer1IncomeValueCheck < ::Form::Question - def initialize(id, hsh, page) - super + def initialize(id, hsh, page, check_answers_card_number:) + super(id, hsh, page) @id = "income1_value_check" - @check_answer_label = "Income confirmation" + @check_answer_label = "Buyer 1 income confirmation" @header = "Are you sure this is correct?" @type = "interruption_screen" @answer_options = { @@ -19,6 +19,7 @@ class Form::Sales::Questions::Buyer1IncomeValueCheck < ::Form::Question }, ], } - @check_answers_card_number = 1 + @check_answers_card_number = check_answers_card_number + @page = page end end diff --git a/app/models/form/sales/questions/buyer2_income_value_check.rb b/app/models/form/sales/questions/buyer2_income_value_check.rb index 9508cc59a..37b6cb380 100644 --- a/app/models/form/sales/questions/buyer2_income_value_check.rb +++ b/app/models/form/sales/questions/buyer2_income_value_check.rb @@ -1,8 +1,8 @@ class Form::Sales::Questions::Buyer2IncomeValueCheck < ::Form::Question - def initialize(id, hsh, page) - super + def initialize(id, hsh, page, check_answers_card_number:) + super(id, hsh, page) @id = "income2_value_check" - @check_answer_label = "Income confirmation" + @check_answer_label = "Buyer 2 income confirmation" @header = "Are you sure this is correct?" @type = "interruption_screen" @answer_options = { @@ -19,7 +19,7 @@ class Form::Sales::Questions::Buyer2IncomeValueCheck < ::Form::Question }, ], } - @check_answers_card_number = 2 + @check_answers_card_number = check_answers_card_number @page = page end end diff --git a/app/models/form/sales/subsections/income_benefits_and_savings.rb b/app/models/form/sales/subsections/income_benefits_and_savings.rb index 020074a21..c4d4fecaa 100644 --- a/app/models/form/sales/subsections/income_benefits_and_savings.rb +++ b/app/models/form/sales/subsections/income_benefits_and_savings.rb @@ -10,7 +10,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection @pages ||= [ Form::Sales::Pages::Buyer1Income.new(nil, nil, self), Form::Sales::Pages::Buyer1IncomeMinValueCheck.new("buyer_1_income_min_value_check", nil, self), - Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("buyer_1_income_max_value_check", nil, self), + Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("buyer_1_income_max_value_check", nil, self, check_answers_card_number: 1), Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_1_combined_income_max_value_check", nil, self, check_answers_card_number: 1), Form::Sales::Pages::MortgageValueCheck.new("buyer_1_income_mortgage_value_check", nil, self, 1), Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self), @@ -18,7 +18,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection Form::Sales::Pages::Buyer2Income.new(nil, nil, self), Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self, 2), Form::Sales::Pages::Buyer2IncomeMinValueCheck.new("buyer_2_income_min_value_check", nil, self), - Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("buyer_2_income_max_value_check", nil, self), + Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("buyer_2_income_max_value_check", nil, self, check_answers_card_number: 2), Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_2_combined_income_max_value_check", nil, self, check_answers_card_number: 2), Form::Sales::Pages::Buyer2Mortgage.new(nil, nil, self), Form::Sales::Pages::MortgageValueCheck.new("buyer_2_mortgage_value_check", nil, self, 2), diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb index 88299d528..ffe100dd3 100644 --- a/app/models/form/sales/subsections/property_information.rb +++ b/app/models/form/sales/subsections/property_information.rb @@ -28,8 +28,8 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection Form::Sales::Pages::UprnConfirmation.new(nil, nil, self), Form::Sales::Pages::Address.new(nil, nil, self), Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self), - Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self), - Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self), + Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil), + Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil), Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil), ] end @@ -40,8 +40,8 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection [ Form::Sales::Pages::Postcode.new(nil, nil, self), Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self), - Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self), - Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self), + Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil), + Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil), Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil), ] end