From 892b70ff81c65787209a3b70265c7ababe892085 Mon Sep 17 00:00:00 2001 From: David May-Miller Date: Wed, 14 Dec 2022 14:24:12 +0000 Subject: [PATCH] CLDC-853 Fix linting errors --- app/models/form/sales/pages/buyer2_income_value_check.rb | 2 +- .../form/sales/questions/buyer2_income_value_check.rb | 2 +- app/models/validations/sales/shared_validations.rb | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/form/sales/pages/buyer2_income_value_check.rb b/app/models/form/sales/pages/buyer2_income_value_check.rb index 3070a1b4d..1dadd53d0 100644 --- a/app/models/form/sales/pages/buyer2_income_value_check.rb +++ b/app/models/form/sales/pages/buyer2_income_value_check.rb @@ -14,7 +14,7 @@ class Form::Sales::Pages::Buyer2IncomeValueCheck < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self) + Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self), ] 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 bb9a0b22b..d6cc756f3 100644 --- a/app/models/form/sales/questions/buyer2_income_value_check.rb +++ b/app/models/form/sales/questions/buyer2_income_value_check.rb @@ -7,7 +7,7 @@ class Form::Sales::Questions::Buyer2IncomeValueCheck < ::Form::Question @type = "interruption_screen" @answer_options = { "0" => { "value" => "Yes" }, - "1" => { "value"=> "No" }, + "1" => { "value" => "No" }, } @hidden_in_check_answers = { "depends_on" => [ diff --git a/app/models/validations/sales/shared_validations.rb b/app/models/validations/sales/shared_validations.rb index 801f0740e..08cbb9176 100644 --- a/app/models/validations/sales/shared_validations.rb +++ b/app/models/validations/sales/shared_validations.rb @@ -1,9 +1,7 @@ module Validations::Sales::SharedValidations def child_income_validation(record, field) - if record.relat2 && record.income2 - if record.relat2 == "C" && record.income2 > 0 - record.errors.add field, I18n.t("validations.financial.income.child_has_income") - end + if record.relat2 && record.income2 && (record.relat2 == "C" && record.income2.positive?) + record.errors.add field, I18n.t("validations.financial.income.child_has_income") end end end