From ff471ed85e5ed11af875c01e2937e94402ef1913 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 27 Jan 2023 12:08:17 +0000 Subject: [PATCH] Fix optional field name, add validation message --- app/models/sales_log.rb | 2 +- config/locales/en.yml | 2 ++ spec/models/sales_log_spec.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 586b3814b..1ca6ee8a1 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -35,7 +35,7 @@ class SalesLog < Log scope :search_by, ->(param) { filter_by_id(param) } scope :filter_by_organisation, ->(org, _user = nil) { where(owning_organisation: org) } - OPTIONAL_FIELDS = %w[purchid monthly_charges_type_value_check old_persons_shared_ownership_value_check].freeze + OPTIONAL_FIELDS = %w[purchid monthly_charges_value_check old_persons_shared_ownership_value_check].freeze RETIREMENT_AGES = { "M" => 65, "F" => 60, "X" => 65 }.freeze def startdate diff --git a/config/locales/en.yml b/config/locales/en.yml index 98f57ae73..07eb15c89 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -470,6 +470,8 @@ en: shared_owhership_deposit: title_text: "Mortgage, deposit and cash discount total should equal £%{expected_shared_ownership_deposit_value}" old_persons_shared_ownership: "At least one buyer should be aged over 64 for Older persons’ shared ownership scheme" + monthly_charges_over_soft_max: + title_text: "The amount of monthly charges is high for this type of property and sale type" devise: two_factor_authentication: diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb index 26bce3d9d..0b4fa4459 100644 --- a/spec/models/sales_log_spec.rb +++ b/spec/models/sales_log_spec.rb @@ -47,7 +47,7 @@ RSpec.describe SalesLog, type: :model do let(:sales_log) { build(:sales_log) } it "returns optional fields" do - expect(sales_log.optional_fields).to eq(%w[purchid monthly_charges_type_value_check old_persons_shared_ownership_value_check]) + expect(sales_log.optional_fields).to eq(%w[purchid monthly_charges_value_check old_persons_shared_ownership_value_check]) end end