diff --git a/app/models/form/sales/questions/address_line1.rb b/app/models/form/sales/questions/address_line1.rb index edee2e7ee..73803d5bb 100644 --- a/app/models/form/sales/questions/address_line1.rb +++ b/app/models/form/sales/questions/address_line1.rb @@ -6,7 +6,7 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question @header = "Address line 1" @type = "text" @plain_label = true - @check_answer_label = "Q15 - Address" + @check_answer_label = "Q15 - Address lines 1 and 2" @disable_clearing_if_not_routed_or_dynamic_answer_options = true end @@ -14,17 +14,6 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question [ log.address_line1, log.address_line2, - log.postcode_full, - log.town_or_city, - log.county, ].select(&:present?).join("\n") end - - def get_extra_check_answer_value(log) - return unless log.is_la_inferred? - - la = LocalAuthority.find_by(code: log.la)&.name - - la.presence - end end diff --git a/app/models/form/sales/questions/county.rb b/app/models/form/sales/questions/county.rb index 6586cb9e6..8989fea72 100644 --- a/app/models/form/sales/questions/county.rb +++ b/app/models/form/sales/questions/county.rb @@ -5,10 +5,7 @@ class Form::Sales::Questions::County < ::Form::Question @header = "County (optional)" @type = "text" @plain_label = true + @check_answer_label = "Q15 - County" @disable_clearing_if_not_routed_or_dynamic_answer_options = true end - - def hidden_in_check_answers?(_log = nil, _current_user = nil) - true - end end diff --git a/app/models/form/sales/questions/postcode_for_full_address.rb b/app/models/form/sales/questions/postcode_for_full_address.rb index 5d3b9f122..0f43d73f2 100644 --- a/app/models/form/sales/questions/postcode_for_full_address.rb +++ b/app/models/form/sales/questions/postcode_for_full_address.rb @@ -17,10 +17,7 @@ class Form::Sales::Questions::PostcodeForFullAddress < ::Form::Question }, } @plain_label = true + @check_answer_label = "Q15 - Postcode" @disable_clearing_if_not_routed_or_dynamic_answer_options = true end - - def hidden_in_check_answers?(_log = nil, _current_user = nil) - true - end end diff --git a/app/models/form/sales/questions/town_or_city.rb b/app/models/form/sales/questions/town_or_city.rb index 25acfe036..073a85dc3 100644 --- a/app/models/form/sales/questions/town_or_city.rb +++ b/app/models/form/sales/questions/town_or_city.rb @@ -5,10 +5,7 @@ class Form::Sales::Questions::TownOrCity < ::Form::Question @header = "Town or city" @type = "text" @plain_label = true + @check_answer_label = "Q15 - Town or city" @disable_clearing_if_not_routed_or_dynamic_answer_options = true end - - def hidden_in_check_answers?(_log = nil, _current_user = nil) - true - end end