CLDC-4402: sales pages

app/models/form/sales/pages/buyer1_nationality.rb

@@ -5,14 +5,10 @@ class Form::Sales::Pages::Buyer1Nationality < ::Form::Page
   end
 
   def questions
-    @questions ||= if form.start_year_2024_or_later?
+    @questions ||= [
-                     [
+      Form::Sales::Questions::NationalityAllGroup.new("nationality_all_group", nil, self, 1),
-                       Form::Sales::Questions::NationalityAllGroup.new("nationality_all_group", nil, self, 1),
+      Form::Sales::Questions::NationalityAll.new("nationality_all", nil, self, 1),
-                       Form::Sales::Questions::NationalityAll.new("nationality_all", nil, self, 1),
+    ]
-                     ]
-                   else
-                     [Form::Sales::Questions::Buyer1Nationality.new(nil, nil, self)]
-                   end
   end
 
   def routed_to?(log, _current_user)

app/models/form/sales/pages/buyer2_nationality.rb

@@ -5,14 +5,10 @@ class Form::Sales::Pages::Buyer2Nationality < ::Form::Page
   end
 
   def questions
-    @questions ||= if form.start_year_2024_or_later?
+    @questions ||= [
-                     [
+      Form::Sales::Questions::NationalityAllGroup.new("nationality_all_buyer2_group", nil, self, 2),
-                       Form::Sales::Questions::NationalityAllGroup.new("nationality_all_buyer2_group", nil, self, 2),
+      Form::Sales::Questions::NationalityAll.new("nationality_all_buyer2", nil, self, 2),
-                       Form::Sales::Questions::NationalityAll.new("nationality_all_buyer2", nil, self, 2),
+    ]
-                     ]
-                   else
-                     [Form::Sales::Questions::Buyer2Nationality.new(nil, nil, self)]
-                   end
   end
 
   def routed_to?(log, _current_user)

app/models/form/sales/pages/buyer_previous.rb

@@ -13,7 +13,7 @@ class Form::Sales::Pages::BuyerPrevious < ::Form::Page
   end
 
   def routed_to?(log, _current_user)
-    return false if log.is_staircase? && form.start_year_2024_or_later?
+    return false if log.is_staircase?
 
     super
   end

app/models/form/sales/pages/deposit.rb

@@ -15,7 +15,7 @@ class Form::Sales::Pages::Deposit < ::Form::Page
   def routed_to?(log, _user)
     return false unless super
     return true if log.ownershipsch == 2 || (log.ownershipsch == 3 && log.mortgageused == 1)
-    return false if log.stairowned_100? != @optional && form.start_year_2024_or_later?
+    return false if log.stairowned_100? != @optional
 
     log.ownershipsch == 1
   end

app/models/form/sales/pages/deposit_discount.rb

@@ -11,10 +11,6 @@ class Form::Sales::Pages::DepositDiscount < ::Form::Page
   end
 
   def depends_on
-    if form.start_year_2024_or_later?
+    [{ "social_homebuy?" => true, "stairowned_100?" => @optional }]
-      [{ "social_homebuy?" => true, "stairowned_100?" => @optional }]
-    else
-      [{ "social_homebuy?" => true }]
-    end
   end
 end

app/models/form/sales/pages/la_nominations.rb

@@ -12,7 +12,7 @@ class Form::Sales::Pages::LaNominations < ::Form::Page
   end
 
   def routed_to?(log, _current_user)
-    return false if log.staircase == 1 && form.start_year_2024_or_later?
+    return false if log.staircase == 1
 
     super
   end

app/models/form/sales/pages/last_accommodation.rb

@@ -13,7 +13,7 @@ class Form::Sales::Pages::LastAccommodation < ::Form::Page
   end
 
   def routed_to?(log, _user)
-    return false if form.start_year_2024_or_later? && log.discounted_ownership_sale?
+    return false if log.discounted_ownership_sale?
 
     super
   end

app/models/form/sales/pages/last_accommodation_la.rb

@@ -16,7 +16,7 @@ class Form::Sales::Pages::LastAccommodationLa < ::Form::Page
   end
 
   def routed_to?(log, _user)
-    return false if form.start_year_2024_or_later? && log.discounted_ownership_sale?
+    return false if log.discounted_ownership_sale?
 
     super
   end

app/models/form/sales/pages/managing_organisation.rb

@@ -13,19 +13,12 @@ class Form::Sales::Pages::ManagingOrganisation < ::Form::Page
   def routed_to?(log, current_user)
     return false unless current_user
 
-    if form.start_year_2024_or_later?
+    organisation = current_user.support? ? log.owning_organisation : current_user.organisation
-      organisation = current_user.support? ? log.owning_organisation : current_user.organisation
 
-      return false unless organisation
+    return false unless organisation
-      return false if log.owning_organisation != organisation && !organisation.holds_own_stock?
+    return false if log.owning_organisation != organisation && !organisation.holds_own_stock?
-      return true unless organisation.holds_own_stock?
+    return true unless organisation.holds_own_stock?
 
-      organisation.managing_agents.count >= 1
+    organisation.managing_agents.count >= 1
-    else
-      return false unless current_user.support?
-      return false unless log.owning_organisation
-
-      log.owning_organisation.managing_agents.count >= 1
-    end
   end
 end

app/models/form/sales/pages/uprn.rb

@@ -13,20 +13,12 @@ class Form::Sales::Pages::Uprn < ::Form::Page
   end
 
   def skip_text
-    if form.start_year_2024_or_later?
+    "Search for address instead"
-      "Search for address instead"
-    else
-      "Enter address instead"
-    end
   end
 
   def skip_href(log = nil)
     return unless log
 
-    if form.start_year_2024_or_later?
+    "address-matcher"
-      "address-matcher"
-    else
-      "address"
-    end
   end
 end

app/models/form/sales/questions/buyer1_nationality.rb

@@ -1,26 +0,0 @@
-class Form::Sales::Questions::Buyer1Nationality < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "national"
-    @type = "radio"
-    @answer_options = ANSWER_OPTIONS
-    @check_answers_card_number = 1
-    @inferred_check_answers_value = [{
-      "condition" => {
-        "national" => 13,
-      },
-      "value" => "Prefers not to say",
-    }]
-    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
-  end
-
-  ANSWER_OPTIONS = {
-    "18" => { "value" => "United Kingdom" },
-    "17" => { "value" => "Republic of Ireland" },
-    "19" => { "value" => "European Economic Area (EEA), excluding ROI" },
-    "12" => { "value" => "Other" },
-    "13" => { "value" => "Buyer prefers not to say" },
-  }.freeze
-
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 26, 2025 => 24, 2026 => 26 }.freeze
-end

app/models/form/sales/questions/buyer2_nationality.rb

@@ -1,26 +0,0 @@
-class Form::Sales::Questions::Buyer2Nationality < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "nationalbuy2"
-    @type = "radio"
-    @answer_options = ANSWER_OPTIONS
-    @check_answers_card_number = 2
-    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
-    @inferred_check_answers_value = [{
-      "condition" => {
-        "national" => 13,
-      },
-      "value" => "Prefers not to say",
-    }]
-  end
-
-  ANSWER_OPTIONS = {
-    "18" => { "value" => "United Kingdom" },
-    "17" => { "value" => "Republic of Ireland" },
-    "19" => { "value" => "European Economic Area (EEA), excluding ROI" },
-    "12" => { "value" => "Other" },
-    "13" => { "value" => "Buyer prefers not to say" },
-  }.freeze
-
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 34, 2025 => 32 }.freeze
-end