From b4ee4f37ea5c9c132b8e3fb037f86d38102b4a8d Mon Sep 17 00:00:00 2001 From: David May-Miller Date: Mon, 9 Jan 2023 16:57:38 +0000 Subject: [PATCH] CLDC-853 Move income 2 to cya card 2 and commonise combined income validation --- .../sales/questions/buyer2_income_value_check.rb | 2 +- .../validations/sales/financial_validations.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) 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 d6cc756f3..84a47f521 100644 --- a/app/models/form/sales/questions/buyer2_income_value_check.rb +++ b/app/models/form/sales/questions/buyer2_income_value_check.rb @@ -19,7 +19,7 @@ class Form::Sales::Questions::Buyer2IncomeValueCheck < ::Form::Question }, ], } - @check_answers_card_number = 1 + @check_answers_card_number = 2 @page = page end end diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 446a18f27..3a2ee2b48 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -70,4 +70,18 @@ module Validations::Sales::FinancialValidations child_income_validation(record, :income2) end + + def validate_combined_income(record) + if record.income1 && record.income2 + if record.london_property? + if record.income1 + record.income2 > 90_000 + record.errors.add :income1, I18n.t("validations.financial.income.combined_over_hard_max", hard_max: 90_000) + record.errors.add :income2, I18n.t("validations.financial.income.combined_over_hard_max", hard_max: 90_000) + end + elsif record.income1 + record.income2 > 80_000 + record.errors.add :income1, I18n.t("validations.financial.income.combined_over_hard_max", hard_max: 80_000) + record.errors.add :income2, I18n.t("validations.financial.income.combined_over_hard_max", hard_max: 80_000) + end + end + end end