From 6f1abc224d194fd264bc711b45ef31772ddd3863 Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Wed, 4 Mar 2026 10:00:11 +0000 Subject: [PATCH] CLDC-4215: Show Don't Know on all paths of mortgageused --- app/models/form/sales/questions/mortgageused.rb | 4 +++- app/models/validations/sales/sale_information_validations.rb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb index fc5818886..183fb46ec 100644 --- a/app/models/form/sales/questions/mortgageused.rb +++ b/app/models/form/sales/questions/mortgageused.rb @@ -10,7 +10,9 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question end def displayed_answer_options(log, _user = nil) - if log.outright_sale? && log.saledate && !form.start_year_2024_or_later? + if form.start_year_2026_or_later? + ANSWER_OPTIONS + elsif log.outright_sale? && log.saledate && !form.start_year_2024_or_later? answer_options_without_dont_know elsif log.stairowned_100? || log.outright_sale? || (log.is_staircase? && form.start_year_2025_or_later?) ANSWER_OPTIONS diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb index 063c16599..73ebfb7b4 100644 --- a/app/models/validations/sales/sale_information_validations.rb +++ b/app/models/validations/sales/sale_information_validations.rb @@ -369,6 +369,7 @@ module Validations::Sales::SaleInformationValidations def validate_mortgage_used_dont_know(record) return unless record.mortgage_use_unknown? + return if record.form.start_year_2026_or_later? if record.discounted_ownership_sale? record.errors.add :mortgageused, I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?")