From a7ae74e1965e84f35a59d74437ce4c5088170d21 Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 20 Mar 2023 12:45:52 +0000 Subject: [PATCH] Make frombeds optional --- app/models/sales_log.rb | 7 +++++++ spec/models/sales_log_spec.rb | 1 + 2 files changed, 8 insertions(+) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index c1bea2a48..7385d8b43 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -79,6 +79,7 @@ class SalesLog < Log not_required = [] not_required << "proplen" if proplen_optional? not_required << "mortlen" if mortlen_optional? + not_required << "frombeds" if frombeds_optional? not_required |= %w[address_line2 county postcode_full] if saledate && saledate.year >= 2023 @@ -97,6 +98,12 @@ class SalesLog < Log collection_start_year < 2023 end + def frombeds_optional? + return false unless collection_start_year + + collection_start_year < 2023 + end + def not_started? status == "not_started" end diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb index 649c2fae7..890fa069f 100644 --- a/spec/models/sales_log_spec.rb +++ b/spec/models/sales_log_spec.rb @@ -63,6 +63,7 @@ RSpec.describe SalesLog, type: :model do othtype proplen mortlen + frombeds ]) end end