From 76299fd34d89c82e47affd62db3228316e01ce06 Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Wed, 11 Mar 2026 09:45:16 +0000 Subject: [PATCH] fixup! CLDC-4215: Show Don't Know on all paths of mortgageused --- app/models/form/sales/questions/mortgageused.rb | 2 -- app/models/validations/sales/sale_information_validations.rb | 4 ---- 2 files changed, 6 deletions(-) diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb index 183fb46ec..50f82f17f 100644 --- a/app/models/form/sales/questions/mortgageused.rb +++ b/app/models/form/sales/questions/mortgageused.rb @@ -12,8 +12,6 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question def displayed_answer_options(log, _user = nil) 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 else diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb index 73ebfb7b4..142c29590 100644 --- a/app/models/validations/sales/sale_information_validations.rb +++ b/app/models/validations/sales/sale_information_validations.rb @@ -374,10 +374,6 @@ module Validations::Sales::SaleInformationValidations 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?") end - if record.outright_sale? && record.saledate && !record.form.start_year_2024_or_later? - record.errors.add :mortgageused, I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?") - record.errors.add :saledate, I18n.t("validations.sales.sale_information.saledate.mortgage_used_year") - end if record.shared_ownership_scheme? && record.is_not_staircasing? record.errors.add :mortgageused, I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?") record.errors.add :staircase, I18n.t("validations.sales.sale_information.staircase.mortgage_used_value")