From 9bad3bf58d11533ea22fee81604877e9d82cb69d Mon Sep 17 00:00:00 2001 From: David May-Miller Date: Tue, 10 Jan 2023 10:16:29 +0000 Subject: [PATCH] CLDC-853 Actually use the validate_combined_income method --- app/models/validations/sales/financial_validations.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 3a2ee2b48..f2139442b 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -27,6 +27,8 @@ module Validations::Sales::FinancialValidations record.errors.add :income1, I18n.t("validations.financial.income.combined_over_hard_max", hard_max: 80_000) end end + validate_combined_income(record) + end def validate_cash_discount(record) return unless record.cashdis @@ -60,13 +62,7 @@ module Validations::Sales::FinancialValidations end end - if record.income1 && record.income2 - if record.london_property? - record.errors.add :income2, I18n.t("validations.financial.income.combined_over_hard_max", hard_max: 90_000) if record.income1 + record.income2 > 90_000 - elsif record.income1 + record.income2 > 80_000 - record.errors.add :income2, I18n.t("validations.financial.income.combined_over_hard_max", hard_max: 80_000) - end - end + validate_combined_income(record) child_income_validation(record, :income2) end