diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 6fd2c1a95..da5f4573e 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -102,7 +102,7 @@ module Validations::SetupValidations location_inactive_status = inactive_status(record.startdate, record.location) if location_inactive_status.present? - date, scope, deactivation_date = location_inactive_status.values_at(:date, :scope, :deactivation_date) + date, scope = location_inactive_status.values_at(:date, :scope) record.errors.add :startdate, :not_active, message: I18n.t("validations.lettings.setup.startdate.location.#{scope}.startdate", postcode: record.location.postcode, date:, deactivation_date:) record.errors.add :location_id, :not_active, message: I18n.t("validations.lettings.setup.startdate.location.#{scope}.location_id", postcode: record.location.postcode, date:, deactivation_date:) record.errors.add :scheme_id, :not_active, message: I18n.t("validations.lettings.setup.startdate.location.#{scope}.location_id", postcode: record.location.postcode, date:, deactivation_date:) @@ -115,7 +115,7 @@ module Validations::SetupValidations scheme_inactive_status = inactive_status(record.startdate, record.scheme) if scheme_inactive_status.present? - date, scope, deactivation_date = scheme_inactive_status.values_at(:date, :scope, :deactivation_date) + date, scope = scheme_inactive_status.values_at(:date, :scope) record.errors.add :startdate, I18n.t("validations.lettings.setup.startdate.scheme.#{scope}.startdate", name: record.scheme.service_name, date:, deactivation_date:) record.errors.add :scheme_id, I18n.t("validations.lettings.setup.startdate.scheme.#{scope}.scheme_id", name: record.scheme.service_name, date:, deactivation_date:) end diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb index 7b0ecc420..6f68f788c 100644 --- a/app/models/validations/shared_validations.rb +++ b/app/models/validations/shared_validations.rb @@ -86,7 +86,7 @@ module Validations::SharedValidations when :deactivated then open_deactivation.deactivation_date end - { scope: status, date: date&.to_formatted_s(:govuk_date), deactivation_date: closest_reactivation&.deactivation_date&.to_formatted_s(:govuk_date) } + { scope: status, date: date&.to_formatted_s(:govuk_date) } end def date_valid?(question, record)