diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index d3cacb956..3b593d590 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -379,7 +379,7 @@ class LettingsLog < Log def is_internal_transfer? if form.start_year_2026_or_later? - referral_register == 2 + referral_register == 2 || (referral_register == 6 && referral_noms == 3) || (referral_register == 7 && referral_noms == 5) else # 1: Internal Transfer referral == 1 @@ -550,6 +550,10 @@ class LettingsLog < Log [30, 31].any?(prevten) end + def is_prevten_general_needs? + ![30, 31, 32, 33, 35, 38, 6].include?(prevten) + end + def owning_organisation_name owning_organisation&.name end diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index 2c2b46831..cf1962be0 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -173,10 +173,11 @@ module Validations::HouseholdValidations return unless record.owning_organisation if record.form.start_year_2026_or_later? - if record.is_internal_transfer? && record.owning_organisation.la? && ![30, 31, 32, 33, 35, 38, 6].include?(record.prevten) + if record.is_internal_transfer? && record.is_prevten_general_needs? label = record.form.get_question("prevten", record).present? ? record.form.get_question("prevten", record).label_from_value(record.prevten) : "" record.errors.add :prevten, message: I18n.t("validations.lettings.household.prevten.general_needs.internal_transfer", prevten: label) record.errors.add :referral_register, message: I18n.t("validations.lettings.household.referral.general_needs.internal_transfer", prevten: label) + record.errors.add :referral_noms, message: I18n.t("validations.lettings.household.referral.general_needs.internal_transfer", prevten: label) end elsif record.is_internal_transfer? && record.owning_organisation.prp? && record.is_prevten_la_general_needs? record.errors.add :prevten, :internal_transfer_fixed_or_lifetime, message: I18n.t("validations.lettings.household.prevten.la_general_needs.internal_transfer")