Browse Source

Fix bug clearing uprn from see all answers

CLDC-3787-Autocomplete-address-search
Manny Dinssa 5 days ago
parent
commit
a66c47a1ab
  1. 2
      app/models/derived_variables/lettings_log_variables.rb
  2. 1
      app/models/derived_variables/sales_log_variables.rb
  3. 2
      app/models/validations/property_validations.rb
  4. 2
      app/models/validations/sales/property_validations.rb

2
app/models/derived_variables/lettings_log_variables.rb

@ -102,6 +102,7 @@ module DerivedVariables::LettingsLogVariables
self.uprn = nil self.uprn = nil
self.uprn_known = 0 self.uprn_known = 0
self.uprn_confirmed = nil self.uprn_confirmed = nil
self.uprn_selection = nil
self.address_line1 = nil self.address_line1 = nil
self.address_line2 = nil self.address_line2 = nil
self.town_or_city = nil self.town_or_city = nil
@ -356,6 +357,7 @@ private
self.uprn = nil self.uprn = nil
self.uprn_known = nil self.uprn_known = nil
self.uprn_confirmed = nil self.uprn_confirmed = nil
self.uprn_selection = nil
self.address_line1 = nil self.address_line1 = nil
self.address_line2 = nil self.address_line2 = nil
self.town_or_city = nil self.town_or_city = nil

1
app/models/derived_variables/sales_log_variables.rb

@ -241,6 +241,7 @@ private
def reset_address_fields! def reset_address_fields!
self.uprn = nil self.uprn = nil
self.uprn_known = nil self.uprn_known = nil
self.uprn_selection = nil
self.address_line1 = nil self.address_line1 = nil
self.address_line2 = nil self.address_line2 = nil
self.town_or_city = nil self.town_or_city = nil

2
app/models/validations/property_validations.rb

@ -50,7 +50,7 @@ module Validations::PropertyValidations
end end
def validate_la_in_england(record) def validate_la_in_england(record)
return unless record.form.start_year_2025_or_later? || (record.startdate_changed? && record.startdate_was&.year == 2025 && record.startdate.year == 2024) return unless record.form.start_year_2025_or_later?
if record.is_general_needs? if record.is_general_needs?
return unless record.la return unless record.la

2
app/models/validations/sales/property_validations.rb

@ -40,7 +40,7 @@ module Validations::Sales::PropertyValidations
end end
def validate_la_in_england(record) def validate_la_in_england(record)
return unless record.form.start_year_2025_or_later? || (record.saledate_changed? && record.saledate_was&.year == 2025 && record.saledate.year == 2024) return unless record.form.start_year_2025_or_later?
return unless record.la return unless record.la
return if record.la.in?(LocalAuthority.england.pluck(:code)) return if record.la.in?(LocalAuthority.england.pluck(:code))

Loading…
Cancel
Save