From 6bd5838961b00943f39c0e13cf99f10e6ab0ea1d Mon Sep 17 00:00:00 2001
From: samyou-softwire <samuel.young@softwire.com>
Date: Fri, 24 Apr 2026 14:20:39 +0100
Subject: [PATCH] CLDC-4402: sales logic

---
 .../derived_variables/sales_log_variables.rb  | 26 +++++++++----------
 app/models/sales_log.rb                       |  5 ++--
 .../validations/sales/soft_validations.rb     |  2 +-
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb
index b93acedb6..246755f87 100644
--- a/app/models/derived_variables/sales_log_variables.rb
+++ b/app/models/derived_variables/sales_log_variables.rb
@@ -29,7 +29,7 @@ module DerivedVariables::SalesLogVariables
       end
     end
 
-    if saledate && form.start_year_2024_or_later? && discounted_ownership_sale?
+    if saledate && discounted_ownership_sale?
       self.ppostcode_full = postcode_full
       self.ppcodenk = pcodenk
       self.prevloc = la
@@ -44,7 +44,7 @@ module DerivedVariables::SalesLogVariables
     self.hhmemb = number_of_household_members
     self.hhtype = household_type
 
-    if saledate && form.start_year_2024_or_later?
+    if saledate
       self.soctenant = soctenant_from_prevten_values
       clear_child_ecstat_for_age_changes!
       child_under_16_constraints!
@@ -65,18 +65,16 @@ module DerivedVariables::SalesLogVariables
       self.uprn_confirmed = nil
     end
 
-    if form.start_year_2024_or_later?
-      if manual_address_entry_selected
-        self.uprn_known = 0
-        self.uprn_selection = nil
-        self.uprn_confirmed = nil
-      else
-        self.uprn_confirmed = 1 if uprn.present?
-        self.uprn_known = 1 if uprn.present?
-        reset_address_fields! if uprn.blank?
-        if uprn_changed?
-          self.uprn_selection = uprn
-        end
+    if manual_address_entry_selected
+      self.uprn_known = 0
+      self.uprn_selection = nil
+      self.uprn_confirmed = nil
+    else
+      self.uprn_confirmed = 1 if uprn.present?
+      self.uprn_known = 1 if uprn.present?
+      reset_address_fields! if uprn.blank?
+      if uprn_changed?
+        self.uprn_selection = uprn
       end
     end
 
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 4d6e152a2..6c1c36d60 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -141,7 +141,7 @@ class SalesLog < Log
 
   def dynamically_not_required
     not_required = []
-    not_required << "deposit" if form.start_year_2024_or_later? && stairowned_100?
+    not_required << "deposit" if stairowned_100?
     not_required += %w[address_line2 county]
 
     not_required
@@ -472,7 +472,6 @@ class SalesLog < Log
   def should_process_address_change?
     return unless uprn_selection || select_best_address_match
     return unless saledate
-    return unless form.start_year_2024_or_later?
     return if skip_address_lookup
 
     if select_best_address_match
@@ -552,7 +551,7 @@ class SalesLog < Log
   end
 
   def soctenant_is_inferred?
-    form.start_year_2024_or_later?
+    true
   end
 
   def duplicates
diff --git a/app/models/validations/sales/soft_validations.rb b/app/models/validations/sales/soft_validations.rb
index a15236bd4..e34ad8170 100644
--- a/app/models/validations/sales/soft_validations.rb
+++ b/app/models/validations/sales/soft_validations.rb
@@ -129,7 +129,7 @@ module Validations::Sales::SoftValidations
 
   def grant_outside_common_range?
     return unless grant && type && saledate
-    return if form.start_year_2024_or_later? && [21, 8].include?(type)
+    return if [21, 8].include?(type)
 
     !grant.between?(9_000, 16_000)
   end