Merge branch 'main' into CLDC-3344-Sales-csv-download-label-bug-for-persion-2-ecstat-child

# Conflicts:
#	spec/models/sales_log_spec.rb

Gemfile

@@ -62,6 +62,8 @@ gem "possessive"
 # Strip whitespace from active record attributes
 gem "auto_strip_attributes"
 # Use sidekiq for background processing
+gem "factory_bot_rails"
+gem "faker"
 gem "method_source", "~> 1.1"
 gem "rails_admin", "~> 3.1"
 gem "ruby-openai"
@@ -75,8 +77,6 @@ group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem "byebug", platforms: %i[mri mingw x64_mingw]
   gem "dotenv-rails"
-  gem "factory_bot_rails"
-  gem "faker"
   gem "pry-byebug"
 
   gem "parallel_tests"

app/components/create_log_actions_component.html.erb

@@ -7,5 +7,10 @@
     <% if user.support? %>
       <%= govuk_button_link_to view_uploads_button_copy, view_uploads_button_href, secondary: true %>
     <% end %>
+
+    <% if FeatureToggle.create_test_logs_enabled? %>
+      <%= govuk_button_link_to "Create test log", create_test_log_href, secondary: true %>
+      <%= govuk_button_link_to "Create test log (setup only)", create_setup_test_log_href, secondary: true %>
+    <% end %>
 <% end %>
 </div>

app/components/create_log_actions_component.rb

@@ -34,6 +34,14 @@ class CreateLogActionsComponent < ViewComponent::Base
     send("bulk_upload_#{log_type}_log_path", id: "start")
   end
 
+  def create_test_log_href
+    send("create_test_#{log_type}_log_path")
+  end
+
+  def create_setup_test_log_href
+    send("create_setup_test_#{log_type}_log_path")
+  end
+
   def view_uploads_button_copy
     "View #{log_type} bulk uploads"
   end

app/controllers/csv_downloads_controller.rb

@@ -0,0 +1,27 @@
+class CsvDownloadsController < ApplicationController
+  before_action :authenticate_user!
+
+  def show
+    @csv_download = CsvDownload.find(params[:id])
+    authorize @csv_download
+
+    return render "errors/download_link_expired" if @csv_download.expired?
+  end
+
+  def download
+    csv_download = CsvDownload.find(params[:id])
+    authorize csv_download
+
+    return render "errors/download_link_expired" if csv_download.expired?
+
+    downloader = Csv::Downloader.new(csv_download:)
+
+    if Rails.env.development?
+      downloader.call
+      send_file downloader.path, filename: csv_download.filename, type: "text/csv"
+    else
+      presigned_url = downloader.presigned_url
+      redirect_to presigned_url, allow_other_host: true
+    end
+  end
+end

app/controllers/lettings_logs_controller.rb

@@ -149,6 +149,20 @@ class LettingsLogsController < LogsController
     end
   end
 
+  def create_test_log
+    return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+    log = FactoryBot.create(:lettings_log, :completed, assigned_to: current_user, ppostcode_full: "SW1A 1AA")
+    redirect_to lettings_log_path(log)
+  end
+
+  def create_setup_test_log
+    return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+    log = FactoryBot.create(:lettings_log, :setup_completed, assigned_to: current_user)
+    redirect_to lettings_log_path(log)
+  end
+
 private
 
   def session_filters

app/controllers/merge_requests_controller.rb

@@ -116,6 +116,7 @@ private
   def merge_request_params
     merge_params = params.fetch(:merge_request, {}).permit(
       :requesting_organisation_id,
+      :has_helpdesk_ticket,
       :helpdesk_ticket,
       :status,
       :absorbing_organisation_id,
@@ -124,6 +125,7 @@ private
     )
 
     merge_params[:requesting_organisation_id] = current_user.organisation.id
+    merge_params[:helpdesk_ticket] = nil if merge_params[:has_helpdesk_ticket] == "false"
 
     merge_params
   end
@@ -143,6 +145,7 @@ private
 
       if [day, month, year].none?(&:blank?) && Date.valid_date?(year.to_i, month.to_i, day.to_i)
         merge_request_params["merge_date"] = Time.zone.local(year.to_i, month.to_i, day.to_i)
+        @merge_request.errors.add(:merge_date, :more_than_year_from_today) if Time.zone.local(year.to_i, month.to_i, day.to_i) - 1.year > Time.zone.today
       else
         @merge_request.errors.add(:merge_date, :invalid)
       end
@@ -150,6 +153,14 @@ private
       if merge_request_params[:existing_absorbing_organisation].nil?
         @merge_request.errors.add(:existing_absorbing_organisation, :blank)
       end
+    when "helpdesk_ticket"
+      @merge_request.has_helpdesk_ticket = merge_request_params[:has_helpdesk_ticket]
+      @merge_request.helpdesk_ticket = merge_request_params[:helpdesk_ticket]
+      if merge_request_params[:has_helpdesk_ticket].blank?
+        @merge_request.errors.add(:has_helpdesk_ticket, :blank)
+      elsif merge_request_params[:has_helpdesk_ticket] == "true" && merge_request_params[:helpdesk_ticket].blank?
+        @merge_request.errors.add(:helpdesk_ticket, :blank)
+      end
     end
   end
 

app/controllers/organisations_controller.rb

@@ -24,7 +24,7 @@ class OrganisationsController < ApplicationController
   end
 
   def schemes
-    organisation_schemes = Scheme.visible.where(owning_organisation: [@organisation] + @organisation.parent_organisations)
+    organisation_schemes = Scheme.visible.where(owning_organisation: [@organisation] + @organisation.parent_organisations + @organisation.absorbed_organisations.visible.merged_during_open_collection_period)
 
     @pagy, @schemes = pagy(filter_manager.filtered_schemes(organisation_schemes, search_term, session_filters))
     @searched = search_term.presence

app/controllers/sales_logs_controller.rb

@@ -119,6 +119,20 @@ class SalesLogsController < LogsController
     end
   end
 
+  def create_test_log
+    return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+    log = FactoryBot.create(:sales_log, :completed, assigned_to: current_user)
+    redirect_to sales_log_path(log)
+  end
+
+  def create_setup_test_log
+    return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+    log = FactoryBot.create(:sales_log, :shared_ownership_setup_complete, assigned_to: current_user)
+    redirect_to sales_log_path(log)
+  end
+
 private
 
   def session_filters

app/controllers/schemes_controller.rb

@@ -118,6 +118,10 @@ class SchemesController < ApplicationController
     validation_errors scheme_params
 
     if @scheme.errors.empty? && @scheme.save
+      if @scheme.owning_organisation.merge_date.present?
+        deactivation = SchemeDeactivationPeriod.new(scheme: @scheme, deactivation_date: @scheme.owning_organisation.merge_date)
+        deactivation.save!(validate: false)
+      end
       redirect_to scheme_primary_client_group_path(@scheme)
     else
       if @scheme.errors.any? { |error| error.attribute == :owning_organisation }
@@ -152,7 +156,7 @@ class SchemesController < ApplicationController
           flash[:notice] = if scheme_previously_confirmed
                              "#{@scheme.service_name} has been updated."
                            else
-                             "#{@scheme.service_name} has been created. It does not require helpdesk approval."
+                             "#{@scheme.service_name} has been created."
                            end
           redirect_to scheme_path(@scheme)
         end

app/controllers/users_controller.rb

@@ -114,6 +114,7 @@ class UsersController < ApplicationController
 
     validate_attributes
     if @user.errors.empty? && @user.save
+      flash[:notice] = "Invitation sent to #{@user.email}"
       redirect_to created_user_redirect_path
     else
       unless @user.errors[:organisation].empty?

app/helpers/filters_helper.rb

@@ -192,9 +192,15 @@ module FiltersHelper
   end
 
   def show_scheme_managing_org_filter?(user)
+    return true if user.support?
+
     org = user.organisation
+    stock_owners = org.stock_owners.count
+    recently_absorbed_with_stock = org.absorbed_organisations.visible.merged_during_open_collection_period.where(holds_own_stock: true).count
+
+    relevant_orgs_count = stock_owners + recently_absorbed_with_stock + (org.holds_own_stock? ? 1 : 0)
 
-    user.support? || org.stock_owners.count > 1 || (org.holds_own_stock? && org.stock_owners.count.positive?)
+    relevant_orgs_count > 1
   end
 
   def logs_for_both_needstypes_present?(organisation)

app/helpers/merge_requests_helper.rb

@@ -9,7 +9,7 @@ module MergeRequestsHelper
   def request_details(merge_request)
     [
       { label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) },
-      { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request_action(merge_request, "helpdesk_ticket") },
+      { label: "Helpdesk ticket", value: helpdesk_ticket_value(merge_request), action: merge_request_action(merge_request, "helpdesk_ticket") },
       { label: "Status", value: status_tag(merge_request.status) },
     ]
   end
@@ -276,4 +276,18 @@ module MergeRequestsHelper
   def any_organisations_share_logs?(organisations, type)
     organisations.any? { |organisation| organisation.send("#{type}_logs").filter_by_managing_organisation(organisations.where.not(id: organisation.id)).exists? }
   end
+
+  def begin_merge_disabled?(merge_request)
+    merge_request.status != "ready_to_merge" || merge_request.merge_date.future?
+  end
+
+  def helpdesk_ticket_value(merge_request)
+    if merge_request.helpdesk_ticket.present?
+      link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://mhclgdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer")
+    elsif merge_request.has_helpdesk_ticket == false
+      "Not reported by a helpdesk ticket"
+    else
+      display_value_or_placeholder(nil)
+    end
+  end
 end

app/helpers/schemes_helper.rb

@@ -20,11 +20,14 @@ module SchemesHelper
   end
 
   def owning_organisation_options(current_user)
-    all_orgs = Organisation.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    if current_user.support?
-    user_org = [OpenStruct.new(id: current_user.organisation_id, name: current_user.organisation.name)]
+      Organisation.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
-    stock_owners = current_user.organisation.stock_owners.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    else
-    merged_organisations = current_user.organisation.absorbed_organisations.visible.merged_during_open_collection_period.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+      user_org = [current_user.organisation]
-    current_user.support? ? all_orgs : user_org + stock_owners + merged_organisations
+      stock_owners = current_user.organisation.stock_owners.visible.filter { |org| org.status == :active || (org.status == :merged && org.merge_date >= FormHandler.instance.start_date_of_earliest_open_for_editing_collection_period) }
+      merged_organisations = current_user.organisation.absorbed_organisations.visible.merged_during_open_collection_period
+      (user_org + stock_owners + merged_organisations).map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    end
   end
 
   def null_option
@@ -81,7 +84,12 @@ module SchemesHelper
     when :deactivating_soon
       "This scheme deactivates on #{scheme.last_deactivation_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Reactivate the scheme to add locations active after this date."
     when :deactivated
-      "This scheme deactivated on #{scheme.last_deactivation_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Reactivate the scheme to add locations active after this date."
+      case scheme.owning_organisation.status
+      when :active
+        "This scheme deactivated on #{scheme.last_deactivation_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Reactivate the scheme to add locations active after this date."
+      when :merged
+        "This scheme has been deactivated due to #{scheme.owning_organisation.name} merging into #{scheme.owning_organisation.absorbing_organisation.name} on #{scheme.owning_organisation.merge_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Use the after merge organisation for schemes and locations active after this date."
+      end
     end
   end
 

app/helpers/tag_helper.rb

@@ -30,8 +30,7 @@ module TagHelper
   }.freeze
 
   COLOUR = {
-    not_started: "grey",
+    not_started: "light-blue",
-    cannot_start_yet: "grey",
     in_progress: "blue",
     completed: "green",
     active: "green",
@@ -58,6 +57,8 @@ module TagHelper
   }.freeze
 
   def status_tag(status, classes = [])
+    return nil if COLOUR[status.to_sym].nil?
+
     govuk_tag(
       classes:,
       colour: COLOUR[status.to_sym],
@@ -65,6 +66,10 @@ module TagHelper
     )
   end
 
+  def status_text(status)
+    TEXT[status.to_sym]
+  end
+
   def status_tag_from_resource(resource, classes = [])
     status = resource.status
     status = :active if resource.deactivates_in_a_long_time?

app/helpers/tasklist_helper.rb

@@ -41,12 +41,19 @@ module TasklistHelper
   def subsection_link(subsection, log, current_user)
     if subsection.status(log) != :cannot_start_yet
       next_page_path = next_page_or_check_answers(subsection, log, current_user).to_s
-      govuk_link_to(subsection.label, next_page_path.dasherize, aria: { describedby: subsection.id.dasherize })
+      govuk_link_to(subsection.label, next_page_path.dasherize, class: "govuk-task-list__link", aria: { describedby: subsection.id.dasherize })
     else
       subsection.label
     end
   end
 
+  def subsection_href(subsection, log, current_user)
+    if subsection.status(log) != :cannot_start_yet
+      next_page_path = next_page_or_check_answers(subsection, log, current_user).to_s
+      next_page_path.dasherize
+    end
+  end
+
   def review_log_text(log)
     if log.collection_period_open?
       path = log.sales? ? review_sales_log_path(id: log, sales_log: true) : review_lettings_log_path(log)
@@ -59,6 +66,10 @@ module TasklistHelper
     end
   end
 
+  def tasklist_link_class(status)
+    status == :cannot_start_yet ? "" : "govuk-task-list__item--with-link"
+  end
+
 private
 
   def breadcrumb_organisation(log)

app/jobs/email_csv_job.rb

@@ -1,9 +1,10 @@
 class EmailCsvJob < ApplicationJob
+  include Rails.application.routes.url_helpers
   queue_as :default
 
   BYTE_ORDER_MARK = "\uFEFF".freeze # Required to ensure Excel always reads CSV as UTF-8
 
-  EXPIRATION_TIME = 24.hours.to_i
+  EXPIRATION_TIME = 48.hours.to_i
 
   def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil, codes_only_export = false, log_type = "lettings", year = nil) # rubocop:disable Style/OptionalBooleanParameter - sidekiq can't serialise named params
     export_type = codes_only_export ? "codes" : "labels"
@@ -20,10 +21,16 @@ class EmailCsvJob < ApplicationJob
 
     filename = "#{[log_type, 'logs', organisation&.name, Time.zone.now].compact.join('-')}.csv"
 
-    storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+    storage_service = if FeatureToggle.upload_enabled?
+                        Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+                      else
+                        Storage::LocalDiskService.new
+                      end
+
     storage_service.write_file(filename, BYTE_ORDER_MARK + csv_string)
+    csv_download = CsvDownload.create!(user:, organisation: user.organisation, filename:, download_type: log_type, expiration_time: EXPIRATION_TIME)
 
-    url = storage_service.get_presigned_url(filename, EXPIRATION_TIME)
+    url = csv_download_url(csv_download.id, host: ENV["APP_HOST"])
 
     CsvDownloadMailer.new.send_csv_download_mail(user, url, EXPIRATION_TIME)
   end

app/jobs/scheme_email_csv_job.rb

@@ -1,9 +1,10 @@
 class SchemeEmailCsvJob < ApplicationJob
+  include Rails.application.routes.url_helpers
   queue_as :default
 
   BYTE_ORDER_MARK = "\uFEFF".freeze # Required to ensure Excel always reads CSV as UTF-8
 
-  EXPIRATION_TIME = 24.hours.to_i
+  EXPIRATION_TIME = 48.hours.to_i
 
   def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil, download_type = "combined") # rubocop:disable Style/OptionalBooleanParameter - sidekiq can't serialise named params
     unfiltered_schemes = if organisation.present? && user.support?
@@ -23,10 +24,16 @@ class SchemeEmailCsvJob < ApplicationJob
       filename = "#{['schemes-and-locations', organisation&.name, Time.zone.now].compact.join('-')}.csv"
     end
 
-    storage_service = Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+    storage_service = if FeatureToggle.upload_enabled?
+                        Storage::S3Service.new(Configuration::EnvConfigurationService.new, ENV["BULK_UPLOAD_BUCKET"])
+                      else
+                        Storage::LocalDiskService.new
+                      end
+
     storage_service.write_file(filename, BYTE_ORDER_MARK + csv_string)
+    csv_download = CsvDownload.create!(user:, organisation: user.organisation, filename:, download_type:, expiration_time: EXPIRATION_TIME)
 
-    url = storage_service.get_presigned_url(filename, EXPIRATION_TIME)
+    url = csv_download_url(csv_download.id, host: ENV["APP_HOST"])
 
     CsvDownloadMailer.new.send_csv_download_mail(user, url, EXPIRATION_TIME)
   end

app/models/csv_download.rb

@@ -0,0 +1,10 @@
+class CsvDownload < ApplicationRecord
+  enum download_type: { lettings: "lettings", sales: "sales", schemes: "schemes", locations: "locations", combined: "combined" }
+
+  belongs_to :user
+  belongs_to :organisation
+
+  def expired?
+    created_at < expiration_time.seconds.ago
+  end
+end

app/models/derived_variables/lettings_log_variables.rb

@@ -124,6 +124,11 @@ module DerivedVariables::LettingsLogVariables
 
     self.nationality_all = nationality_all_group if nationality_uk_or_prefers_not_to_say?
 
+    if startdate_changed? && !LocalAuthority.active(startdate).where(code: la).exists?
+      self.la = nil
+      self.is_la_inferred = false
+    end
+
     reset_address_fields! if is_supported_housing?
   end
 

app/models/derived_variables/sales_log_variables.rb

@@ -75,6 +75,14 @@ module DerivedVariables::SalesLogVariables
     self.nationality_all = nationality_all_group if nationality_uk_or_prefers_not_to_say?
     self.nationality_all_buyer2 = nationality_all_buyer2_group if nationality2_uk_or_prefers_not_to_say?
 
+    if saledate_changed? && !LocalAuthority.active(saledate).where(code: la).exists?
+      self.la = nil
+      self.is_la_inferred = false
+    end
+
+    self.numstair = is_firststair? ? 1 : nil if numstair == 1 && firststair_changed?
+    self.mrent = 0 if stairowned_100?
+
     set_encoded_derived_values!(DEPENDENCIES)
   end
 

app/models/form/lettings/subsections/household_needs.rb

@@ -2,7 +2,6 @@ class Form::Lettings::Subsections::HouseholdNeeds < ::Form::Subsection
   def initialize(id, hsh, section)
     super
     @id = "household_needs"
-    @copy_key = "lettings.household_needs.housingneeds_type"
     @label = "Household needs"
     @depends_on = [{ "non_location_setup_questions_completed?" => true }]
   end

app/models/form/page.rb

@@ -25,7 +25,7 @@ class Form::Page
   delegate :form, to: :subsection
 
   def copy_key
-    @copy_key ||= "#{form.type}.#{subsection.id}.#{questions[0].id}"
+    @copy_key ||= "#{form.type}.#{subsection.copy_key}.#{questions[0].id}"
   end
 
   def header

app/models/form/question.rb

@@ -51,7 +51,7 @@ class Form::Question
   delegate :form, to: :subsection
 
   def copy_key
-    @copy_key ||= "#{form.type}.#{subsection.id}.#{id}"
+    @copy_key ||= "#{form.type}.#{subsection.copy_key}.#{id}"
   end
 
   def check_answer_label

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

@@ -18,7 +18,7 @@ class Form::Sales::Pages::AboutStaircase < ::Form::Page
   end
 
   def staircase_sale_question
-    if form.start_date.year >= 2023
+    if [2023, 2024].include?(form.start_date.year)
       Form::Sales::Questions::StaircaseSale.new(nil, nil, self)
     end
   end

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer1IncomeMaxValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck < ::Form::Page
   def initialize(id, hsh, subsection, check_answers_card_number:)
     super(id, hsh, subsection)
     @depends_on = [
       {
-        "income1_over_soft_max?" => true,
+        "income1_over_soft_max_for_discounted_ownership?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income1_value_check.max"
+    @copy_key = "sales.soft_validations.income1_value_check.discounted"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer1IncomeMinValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer1IncomeEcstatValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @depends_on = [
       {
-        "income1_under_soft_min?" => true,
+        "income1_outside_soft_range_for_ecstat?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income1_value_check.min"
+    @copy_key = "sales.soft_validations.income1_value_check.ecstat"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [
@@ -15,16 +15,16 @@ class Form::Sales::Pages::Buyer1IncomeMinValueCheck < ::Form::Page
           "arguments_for_key" => "income1",
           "i18n_template" => "income",
         },
-        {
-          "key" => "income_soft_min_for_ecstat",
-          "arguments_for_key" => "ecstat1",
-          "i18n_template" => "minimum",
-        },
       ],
     }
     @informative_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
-      "arguments" => [],
+      "arguments" => [
+        {
+          "key" => "income1_more_or_less_text",
+          "i18n_template" => "more_or_less",
+        },
+      ],
     }
   end
 

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer2IncomeMaxValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck < ::Form::Page
   def initialize(id, hsh, subsection, check_answers_card_number:)
     super(id, hsh, subsection)
     @depends_on = [
       {
-        "income2_over_soft_max?" => true,
+        "income2_over_soft_max_for_discounted_ownership?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income2_value_check.max"
+    @copy_key = "sales.soft_validations.income2_value_check.discounted"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [

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

@@ -1,12 +1,12 @@
-class Form::Sales::Pages::Buyer2IncomeMinValueCheck < ::Form::Page
+class Form::Sales::Pages::Buyer2IncomeEcstatValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @depends_on = [
       {
-        "income2_under_soft_min?" => true,
+        "income2_outside_soft_range_for_ecstat?" => true,
       },
     ]
-    @copy_key = "sales.soft_validations.income2_value_check.min"
+    @copy_key = "sales.soft_validations.income2_value_check.ecstat"
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [
@@ -15,16 +15,16 @@ class Form::Sales::Pages::Buyer2IncomeMinValueCheck < ::Form::Page
           "arguments_for_key" => "income2",
           "i18n_template" => "income",
         },
-        {
-          "key" => "income_soft_min_for_ecstat",
-          "arguments_for_key" => "ecstat2",
-          "i18n_template" => "minimum",
-        },
       ],
     }
     @informative_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
-      "arguments" => [],
+      "arguments" => [
+        {
+          "key" => "income2_more_or_less_text",
+          "i18n_template" => "more_or_less",
+        },
+      ],
     }
   end
 

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

@@ -2,7 +2,7 @@ class Form::Sales::Pages::BuyerInterview < ::Form::Page
   def initialize(id, hsh, subsection, joint_purchase:)
     super(id, hsh, subsection)
     @joint_purchase = joint_purchase
-    @copy_key = "sales.#{subsection.id}.noint.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
+    @copy_key = "sales.#{subsection.copy_key}.noint.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
   end
 
   def questions

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

@@ -3,7 +3,7 @@ class Form::Sales::Pages::CombinedIncomeMaxValueCheck < ::Form::Page
     super(id, hsh, subsection)
     @depends_on = [
       {
-        "combined_income_over_soft_max?" => true,
+        "combined_income_over_soft_max_for_discounted_ownership?" => true,
       },
     ]
     @copy_key = "sales.soft_validations.combined_income_value_check"

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

@@ -3,7 +3,6 @@ class Form::Sales::Pages::Deposit < ::Form::Page
     super(id, hsh, subsection)
     @ownershipsch = ownershipsch
     @optional = optional
-    @copy_key = "sales.sale_information.deposit"
   end
 
   def questions

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::DepositDiscount < ::Form::Page
   def initialize(id, hsh, subsection, optional:)
     super(id, hsh, subsection)
     @optional = optional
-    @copy_key = "sales.sale_information.cashdis"
   end
 
   def questions

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::Discount < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "discount"
-    @copy_key = "sales.sale_information.discount"
     @depends_on = [{
       "right_to_buy?" => true,
     }]

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

@@ -1,7 +1,6 @@
 class Form::Sales::Pages::Equity < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @id = "equity"
     @copy_key = "sales.sale_information.equity"
   end
 

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

@@ -0,0 +1,13 @@
+class Form::Sales::Pages::EstateManagementFee < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @copy_key = "sales.sale_information.management_fee"
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::HasManagementFee.new(nil, nil, self),
+      Form::Sales::Questions::ManagementFee.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::ExtraBorrowing < ::Form::Page
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @ownershipsch = ownershipsch
-    @copy_key = "sales.sale_information.extrabor"
     @description = ""
     @subsection = subsection
     @depends_on = [{

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::Grant < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "grant"
-    @copy_key = "sales.sale_information.grant"
     @depends_on = [{
       "right_to_buy?" => false,
       "rent_to_buy_full_ownership?" => false,

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

@@ -19,11 +19,17 @@ class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page
     end
   end
 
-  def depends_on
+  def routed_to?(log, _user)
+    super && page_routed_to?(log)
+  end
+
+  def page_routed_to?(log)
+    return false if form.start_year_2025_or_later? && log.resale != 2
+
     if @joint_purchase
-      [{ "joint_purchase?" => true }]
+      log.joint_purchase?
     else
-      [{ "not_joint_purchase?" => true }, { "jointpur" => nil }]
+      log.not_joint_purchase? || log.jointpur.nil?
     end
   end
 end

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::MonthlyRent < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "monthly_rent"
-    @copy_key = "sales.sale_information.mrent"
   end
 
   def questions

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

@@ -0,0 +1,17 @@
+class Form::Sales::Pages::MonthlyRentStaircasing < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "monthly_rent_staircasing"
+    @copy_key = "sales.sale_information.mrent_staircasing"
+    @depends_on = [{
+      "stairowned_100?" => false,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::MonthlyRentBeforeStaircasing.new(nil, nil, self),
+      Form::Sales::Questions::MonthlyRentAfterStaircasing.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,17 @@
+class Form::Sales::Pages::MonthlyRentStaircasingOwned < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "monthly_rent_staircasing_owned"
+    @copy_key = "sales.sale_information.mrent_staircasing"
+    @header = ""
+    @depends_on = [{
+      "stairowned_100?" => true,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::MonthlyRentBeforeStaircasing.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageAmount < ::Form::Page
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @ownershipsch = ownershipsch
-    @copy_key = "sales.sale_information.mortgage"
     @depends_on = [{ "mortgage_used?" => true }]
   end
 

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageLender < ::Form::Page
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @ownershipsch = ownershipsch
-    @copy_key = "sales.sale_information.mortgagelender"
     @description = ""
     @subsection = subsection
     @depends_on = [{

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageLenderOther < ::Form::Page
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @ownershipsch = ownershipsch
-    @copy_key = "sales.sale_information.mortgagelenderother"
     @description = ""
     @subsection = subsection
     @depends_on = [{

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageLength < ::Form::Page
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @ownershipsch = ownershipsch
-    @copy_key = "sales.sale_information.mortlen"
     @depends_on = [{
       "mortgageused" => 1,
     }]

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

@@ -1,7 +1,6 @@
 class Form::Sales::Pages::Mortgageused < ::Form::Page
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
-    @copy_key = "sales.sale_information.mortgageused"
     @ownershipsch = ownershipsch
   end
 

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::PreviousBedrooms < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "previous_bedrooms"
-    @copy_key = "sales.sale_information.frombeds"
     @depends_on = [
       {
         "soctenant" => 1,

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::PreviousPropertyType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "previous_property_type"
-    @copy_key = "sales.sale_information.fromprop"
     @description = ""
     @subsection = subsection
     @depends_on = [

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::PreviousTenure < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "shared_ownership_previous_tenure"
-    @copy_key = "sales.sale_information.socprevten"
     @header = ""
     @description = ""
     @subsection = subsection

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

@@ -1,7 +1,7 @@
 class Form::Sales::Pages::PrivacyNotice < ::Form::Page
   def initialize(id, hsh, subsection, joint_purchase:)
     super(id, hsh, subsection)
-    @copy_key = "sales.#{subsection.id}.privacynotice.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
+    @copy_key = "sales.#{subsection.copy_key}.privacynotice.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
     @joint_purchase = joint_purchase
   end
 

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

@@ -2,7 +2,6 @@ class Form::Sales::Pages::Resale < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "resale"
-    @copy_key = "sales.sale_information.resale"
     @depends_on = [
       {
         "staircase" => 2,

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

@@ -3,7 +3,7 @@ class Form::Sales::Pages::Staircase < ::Form::Page
     super
     @id = "staircasing"
     @depends_on = [{ "ownershipsch" => 1 }]
-    @copy_key = "sales.#{subsection.id}.staircasing"
+    @copy_key = "sales.#{subsection.copy_key}.staircasing"
   end
 
   def questions

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

@@ -0,0 +1,15 @@
+class Form::Sales::Pages::StaircaseFirstTime < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super(id, hsh, subsection)
+    @id = "staircase_first_time"
+    @depends_on = [{
+      "staircase" => 1,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::StaircaseFirstTime.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,16 @@
+class Form::Sales::Pages::StaircaseInitialDate < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super(id, hsh, subsection)
+    @id = "staircase_initial_date"
+    @header = ""
+    @depends_on = [{
+      "is_firststair?" => true,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::StaircaseInitialDate.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,18 @@
+class Form::Sales::Pages::StaircasePrevious < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super(id, hsh, subsection)
+    @id = "staircase_previous"
+    @copy_key = "sales.sale_information.stairprevious"
+    @depends_on = [{
+      "is_firststair?" => false,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::StaircaseCount.new(nil, nil, self),
+      Form::Sales::Questions::StaircaseLastDate.new(nil, nil, self),
+      Form::Sales::Questions::StaircaseInitialDate.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,17 @@
+class Form::Sales::Pages::StaircaseSale < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super(id, hsh, subsection)
+    @id = "staircase_sale"
+    @copy_key = form.start_year_2025_or_later? ? "sales.sale_information.staircasesale" : "sales.sale_information.about_staircasing.staircasesale"
+    @depends_on = [{
+      "staircase" => 1,
+      "stairowned" => 100,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::StaircaseSale.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -1,7 +1,6 @@
 class Form::Sales::Pages::ValueSharedOwnership < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @id = "value_shared_ownership"
     @copy_key = "sales.sale_information.value"
   end
 

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::BuyerInterview < ::Form::Question
   def initialize(id, hsh, page, joint_purchase:)
     super(id, hsh, page)
     @id = "noint"
-    @copy_key = "sales.#{subsection.id}.noint.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
+    @copy_key = "sales.#{subsection.copy_key}.noint.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question
   def initialize(id, hsh, subsection, ownershipsch:, optional:)
     super(id, hsh, subsection)
     @id = "deposit"
-    @copy_key = "sales.sale_information.deposit"
     @type = "numeric"
     @min = 0
     @max = 999_999

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "cashdis"
-    @copy_key = "sales.sale_information.cashdis"
     @type = "numeric"
     @min = 0
     @max = 999_999

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

@@ -3,7 +3,6 @@ class Form::Sales::Questions::Discount < ::Form::Question
     super
     @id = "discount"
     @type = "numeric"
-    @copy_key = "sales.sale_information.discount"
     @min = 0
     @max = form.start_year_2024_or_later? ? 70 : 100
     @step = 0.1

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::Equity < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "equity"
-    @copy_key = "sales.sale_information.equity"
+    @copy_key = "sales.sale_information.equity.#{page.id}"
     @type = "numeric"
     @min = 0
     @max = 100

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @id = "extrabor"
-    @copy_key = "sales.sale_information.extrabor"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @page = page

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::Fromprop < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "fromprop"
-    @copy_key = "sales.sale_information.fromprop"
     @type = "radio"
     @page = page
     @answer_options = ANSWER_OPTIONS

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::Grant < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "grant"
-    @copy_key = "sales.sale_information.grant"
     @type = "numeric"
     @min = 0
     @max = 999_999

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

@@ -0,0 +1,24 @@
+class Form::Sales::Questions::HasManagementFee < ::Form::Question
+  def initialize(id, hsh, subsection)
+    super
+    @id = "has_management_fee"
+    @copy_key = "sales.sale_information.management_fee.has_management_fee"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @conditional_for = {
+      "management_fee" => [1],
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "has_management_fee" => 1,
+        },
+      ],
+    }
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "0" => { "value" => "No" },
+  }.freeze
+end

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

@@ -0,0 +1,12 @@
+class Form::Sales::Questions::ManagementFee < ::Form::Question
+  def initialize(id, hsh, subsection)
+    super
+    @id = "management_fee"
+    @copy_key = "sales.sale_information.management_fee.management_fee"
+    @type = "numeric"
+    @min = 1
+    @step = 0.01
+    @width = 5
+    @prefix = "£"
+  end
+end

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "mrent"
-    @copy_key = "sales.sale_information.mrent"
     @type = "numeric"
     @min = 0
     @step = 0.01

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

@@ -0,0 +1,15 @@
+class Form::Sales::Questions::MonthlyRentAfterStaircasing < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "mrent"
+    @copy_key = "sales.sale_information.mrent_staircasing.poststaircasing"
+    @type = "numeric"
+    @min = 0
+    @step = 0.01
+    @width = 5
+    @prefix = "£"
+    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+  end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2025 => 99 }.freeze
+end

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

@@ -0,0 +1,15 @@
+class Form::Sales::Questions::MonthlyRentBeforeStaircasing < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "mrentprestaircasing"
+    @copy_key = "sales.sale_information.mrent_staircasing.prestaircasing"
+    @type = "numeric"
+    @min = 0
+    @step = 0.01
+    @width = 5
+    @prefix = "£"
+    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+  end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2025 => 98 }.freeze
+end

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @id = "mortgage"
-    @copy_key = "sales.sale_information.mortgage"
     @type = "numeric"
     @min = 1
     @step = 1

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageLender < ::Form::Question
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @id = "mortgagelender"
-    @copy_key = "sales.sale_information.mortgagelender"
     @type = "select"
     @page = page
     @bottom_guidance_partial = "mortgage_lender"

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageLenderOther < ::Form::Question
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @id = "mortgagelenderother"
-    @copy_key = "sales.sale_information.mortgagelenderother"
     @type = "text"
     @page = page
     @ownershipsch = ownershipsch

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @id = "mortlen"
-    @copy_key = "sales.sale_information.mortlen"
     @type = "numeric"
     @min = 0
     @max = 60

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
   def initialize(id, hsh, subsection, ownershipsch:)
     super(id, hsh, subsection)
     @id = "mortgageused"
-    @copy_key = "sales.sale_information.mortgageused"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @ownershipsch = ownershipsch
@@ -13,7 +12,7 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
   def displayed_answer_options(log, _user = nil)
     if log.outright_sale? && log.saledate && !form.start_year_2024_or_later?
       answer_options_without_dont_know
-    elsif log.stairowned == 100 || log.outright_sale?
+    elsif log.stairowned_100? || log.outright_sale? || (log.is_staircase? && form.start_year_2025_or_later?)
       ANSWER_OPTIONS
     else
       answer_options_without_dont_know

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "frombeds"
-    @copy_key = "sales.sale_information.frombeds"
     @type = "numeric"
     @width = 5
     @min = 1

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "socprevten"
-    @copy_key = "sales.sale_information.socprevten"
     @type = "radio"
     @page = page
     @answer_options = ANSWER_OPTIONS

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::PrivacyNotice < ::Form::Question
   def initialize(id, hsh, page, joint_purchase:)
     super(id, hsh, page)
     @id = "privacynotice"
-    @copy_key = "sales.#{subsection.id}.privacynotice.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
+    @copy_key = "sales.#{subsection.copy_key}.privacynotice.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
     @type = "checkbox"
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
     @joint_purchase = joint_purchase

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::Resale < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "resale"
-    @copy_key = "sales.sale_information.resale"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]

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

@@ -0,0 +1,15 @@
+class Form::Sales::Questions::StaircaseCount < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "numstair"
+    @copy_key = "sales.sale_information.stairprevious.numstair"
+    @type = "numeric"
+    @width = 2
+    @min = 2
+    @max = 10
+    @step = 1
+    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+  end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2025 => 82 }.freeze
+end

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

@@ -0,0 +1,16 @@
+class Form::Sales::Questions::StaircaseFirstTime < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "firststair"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "2" => { "value" => "No" },
+  }.freeze
+
+  QUESTION_NUMBER_FROM_YEAR = { 2025 => 81 }.freeze
+end

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

@@ -0,0 +1,11 @@
+class Form::Sales::Questions::StaircaseInitialDate < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "initialpurchase"
+    @copy_key = "sales.sale_information.stairprevious.initialpurchase"
+    @type = "date"
+    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+  end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2025 => 83 }.freeze
+end

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

@@ -0,0 +1,11 @@
+class Form::Sales::Questions::StaircaseLastDate < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "lasttransaction"
+    @copy_key = "sales.sale_information.stairprevious.lasttransaction"
+    @type = "date"
+    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+  end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2025 => 83 }.freeze
+end

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::StaircaseSale < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "staircasesale"
-    @copy_key = "sales.sale_information.about_staircasing.staircasesale"
+    @copy_key = form.start_year_2025_or_later? ? "sales.sale_information.staircasesale" : "sales.sale_information.about_staircasing.staircasesale"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::Value < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "value"
-    @copy_key = "sales.sale_information.value"
+    @copy_key = "sales.sale_information.value.#{page.id}"
     @type = "numeric"
     @min = 0
     @step = 1

app/models/form/sales/sections/sale_information.rb

@@ -4,10 +4,20 @@ class Form::Sales::Sections::SaleInformation < ::Form::Section
     @id = "sale_information"
     @label = "Sale information"
     @description = ""
-    @subsections = [
+    @subsections = []
-      Form::Sales::Subsections::SharedOwnershipScheme.new(nil, nil, self),
+    @subsections.concat(shared_ownership_scheme_subsection)
-      Form::Sales::Subsections::DiscountedOwnershipScheme.new(nil, nil, self),
+    @subsections << Form::Sales::Subsections::DiscountedOwnershipScheme.new(nil, nil, self)
-      Form::Sales::Subsections::OutrightSale.new(nil, nil, self),
+    @subsections << Form::Sales::Subsections::OutrightSale.new(nil, nil, self)
-    ] || []
+  end
+
+  def shared_ownership_scheme_subsection
+    if form.start_year_2025_or_later?
+      [
+        Form::Sales::Subsections::SharedOwnershipInitialPurchase.new(nil, nil, self),
+        Form::Sales::Subsections::SharedOwnershipStaircasingTransaction.new(nil, nil, self),
+      ]
+    else
+      [Form::Sales::Subsections::SharedOwnershipScheme.new(nil, nil, self)]
+    end
   end
 end

app/models/form/sales/subsections/discounted_ownership_scheme.rb

@@ -4,6 +4,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection
     @id = "discounted_ownership_scheme"
     @label = "Discounted ownership scheme"
     @depends_on = [{ "ownershipsch" => 2, "setup_completed?" => true }]
+    @copy_key = "sale_information"
   end
 
   def pages

app/models/form/sales/subsections/household_characteristics.rb

@@ -35,7 +35,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer1WorkingSituation.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_1_retirement_value_check", nil, self, person_index: 1),
       (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_1_not_retired_value_check", nil, self, person_index: 1) if form.start_year_2024_or_later?),
-      Form::Sales::Pages::Buyer1IncomeMinValueCheck.new("working_situation_buyer_1_income_min_value_check", nil, self),
+      Form::Sales::Pages::Buyer1IncomeEcstatValueCheck.new("working_situation_buyer_1_income_value_check", nil, self),
       Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::BuyerLiveInValueCheck.new("buyer_1_live_in_property_value_check", nil, self, person_index: 1),
       (form.start_year_2025_or_later? ? Form::Sales::Pages::Buyer2RelationshipToBuyer1YesNo.new(nil, nil, self) : Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self)),
@@ -51,7 +51,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check_joint_purchase", nil, self, person_index: 2),
       (Form::Sales::Pages::NotRetiredValueCheck.new("working_situation_2_not_retired_value_check_joint_purchase", nil, self, person_index: 2) if form.start_year_2024_or_later?),
-      Form::Sales::Pages::Buyer2IncomeMinValueCheck.new("working_situation_buyer_2_income_min_value_check", nil, self),
+      Form::Sales::Pages::Buyer2IncomeEcstatValueCheck.new("working_situation_buyer_2_income_value_check", nil, self),
       Form::Sales::Pages::PersonStudentNotChildValueCheck.new("buyer_2_working_situation_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::BuyerLiveInValueCheck.new("buyer_2_live_in_property_value_check", nil, self, person_index: 2),

app/models/form/sales/subsections/income_benefits_and_savings.rb

@@ -16,16 +16,16 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
   def pages
     @pages ||= [
       Form::Sales::Pages::Buyer1Income.new(nil, nil, self),
-      Form::Sales::Pages::Buyer1IncomeMinValueCheck.new("buyer_1_income_min_value_check", nil, self),
+      Form::Sales::Pages::Buyer1IncomeEcstatValueCheck.new("buyer_1_income_ecstat_value_check", nil, self),
-      Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("buyer_1_income_max_value_check", nil, self, check_answers_card_number: 1),
+      Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("buyer_1_income_discounted_max_value_check", nil, self, check_answers_card_number: 1),
       Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_1_combined_income_max_value_check", nil, self, check_answers_card_number: 1),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_1_income_mortgage_value_check", nil, self, 1),
       Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_1_mortgage_value_check", nil, self, 1),
       Form::Sales::Pages::Buyer2Income.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self, 2),
-      Form::Sales::Pages::Buyer2IncomeMinValueCheck.new("buyer_2_income_min_value_check", nil, self),
+      Form::Sales::Pages::Buyer2IncomeEcstatValueCheck.new("buyer_2_income_ecstat_value_check", nil, self),
-      Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("buyer_2_income_max_value_check", nil, self, check_answers_card_number: 2),
+      Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck.new("buyer_2_income_discounted_max_value_check", nil, self, check_answers_card_number: 2),
       Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("buyer_2_combined_income_max_value_check", nil, self, check_answers_card_number: 2),
       Form::Sales::Pages::Buyer2Mortgage.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_mortgage_value_check", nil, self, 2),

app/models/form/sales/subsections/outright_sale.rb

@@ -4,6 +4,7 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection
     @id = "outright_sale"
     @label = "Outright sale"
     @depends_on = [{ "ownershipsch" => 3, "setup_completed?" => true }]
+    @copy_key = "sale_information"
   end
 
   def pages

app/models/form/sales/subsections/property_information.rb

@@ -31,8 +31,8 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
         Form::Sales::Pages::UprnSelection.new(nil, nil, self),
         Form::Sales::Pages::AddressFallback.new(nil, nil, self),
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
-        Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
       ]
@@ -42,8 +42,8 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
         Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
         Form::Sales::Pages::Address.new(nil, nil, self),
         Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
-        Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
+        Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
         Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
       ]

app/models/form/sales/subsections/shared_ownership_initial_purchase.rb

@@ -0,0 +1,49 @@
+class Form::Sales::Subsections::SharedOwnershipInitialPurchase < ::Form::Subsection
+  def initialize(id, hsh, section)
+    super
+    @id = "shared_ownership_initial_purchase"
+    @label = "Shared ownership - initial purchase"
+    @depends_on = [{ "ownershipsch" => 1, "setup_completed?" => true, "staircase" => 2 }]
+    @copy_key = "sale_information"
+  end
+
+  def pages
+    @pages ||= [
+      Form::Sales::Pages::Resale.new(nil, nil, self),
+      Form::Sales::Pages::LivingBeforePurchase.new("living_before_purchase_shared_ownership_joint_purchase", nil, self, ownershipsch: 1, joint_purchase: true),
+      Form::Sales::Pages::LivingBeforePurchase.new("living_before_purchase_shared_ownership", nil, self, ownershipsch: 1, joint_purchase: false),
+      Form::Sales::Pages::HandoverDate.new(nil, nil, self),
+      Form::Sales::Pages::HandoverDateCheck.new(nil, nil, self),
+      Form::Sales::Pages::BuyerPrevious.new("buyer_previous_joint_purchase", nil, self, joint_purchase: true),
+      Form::Sales::Pages::BuyerPrevious.new("buyer_previous_not_joint_purchase", nil, self, joint_purchase: false),
+      Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self),
+      Form::Sales::Pages::PreviousPropertyType.new(nil, nil, self),
+      Form::Sales::Pages::PreviousTenure.new(nil, nil, self),
+      Form::Sales::Pages::ValueSharedOwnership.new("value_shared_ownership", nil, self),
+      Form::Sales::Pages::AboutPriceValueCheck.new("about_price_shared_ownership_value_check", nil, self),
+      Form::Sales::Pages::Equity.new("initial_equity", nil, self),
+      Form::Sales::Pages::SharedOwnershipDepositValueCheck.new("shared_ownership_equity_value_check", nil, self),
+      Form::Sales::Pages::Mortgageused.new("mortgage_used_shared_ownership", nil, self, ownershipsch: 1),
+      Form::Sales::Pages::MortgageValueCheck.new("mortgage_used_mortgage_value_check", nil, self),
+      Form::Sales::Pages::MortgageAmount.new("mortgage_amount_shared_ownership", nil, self, ownershipsch: 1),
+      Form::Sales::Pages::SharedOwnershipDepositValueCheck.new("shared_ownership_mortgage_amount_value_check", nil, self),
+      Form::Sales::Pages::MortgageValueCheck.new("mortgage_amount_mortgage_value_check", nil, self),
+      Form::Sales::Pages::MortgageLength.new("mortgage_length_shared_ownership", nil, self, ownershipsch: 1),
+      Form::Sales::Pages::Deposit.new("deposit_shared_ownership", nil, self, ownershipsch: 1, optional: false),
+      Form::Sales::Pages::Deposit.new("deposit_shared_ownership_optional", nil, self, ownershipsch: 1, optional: true),
+      Form::Sales::Pages::DepositValueCheck.new("deposit_joint_purchase_value_check", nil, self, joint_purchase: true),
+      Form::Sales::Pages::DepositValueCheck.new("deposit_value_check", nil, self, joint_purchase: false),
+      Form::Sales::Pages::DepositDiscount.new("deposit_discount", nil, self, optional: false),
+      Form::Sales::Pages::DepositDiscount.new("deposit_discount_optional", nil, self, optional: true),
+      Form::Sales::Pages::SharedOwnershipDepositValueCheck.new("shared_ownership_deposit_value_check", nil, self),
+      Form::Sales::Pages::MonthlyRent.new(nil, nil, self),
+      Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_shared_ownership", nil, self, ownershipsch: 1),
+      Form::Sales::Pages::MonthlyChargesValueCheck.new("monthly_charges_shared_ownership_value_check", nil, self),
+      Form::Sales::Pages::EstateManagementFee.new("estate_management_fee", nil, self),
+    ].compact
+  end
+
+  def displayed_in_tasklist?(log)
+    log.staircase == 2 && (log.ownershipsch.nil? || log.ownershipsch == 1)
+  end
+end

app/models/form/sales/subsections/shared_ownership_scheme.rb

@@ -11,7 +11,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
     @pages ||= [
       Form::Sales::Pages::LivingBeforePurchase.new("living_before_purchase_shared_ownership_joint_purchase", nil, self, ownershipsch: 1, joint_purchase: true),
       Form::Sales::Pages::LivingBeforePurchase.new("living_before_purchase_shared_ownership", nil, self, ownershipsch: 1, joint_purchase: false),
-      (Form::Sales::Pages::Staircase.new(nil, nil, self) unless form.start_year_2025_or_later?),
+      Form::Sales::Pages::Staircase.new(nil, nil, self),
       Form::Sales::Pages::AboutStaircase.new("about_staircasing_joint_purchase", nil, self, joint_purchase: true),
       Form::Sales::Pages::AboutStaircase.new("about_staircasing_not_joint_purchase", nil, self, joint_purchase: false),
       Form::Sales::Pages::StaircaseBoughtValueCheck.new(nil, nil, self),
@@ -27,9 +27,9 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self),
       Form::Sales::Pages::PreviousPropertyType.new(nil, nil, self),
       Form::Sales::Pages::PreviousTenure.new(nil, nil, self),
-      Form::Sales::Pages::ValueSharedOwnership.new(nil, nil, self),
+      Form::Sales::Pages::ValueSharedOwnership.new("value_shared_ownership", nil, self),
       Form::Sales::Pages::AboutPriceValueCheck.new("about_price_shared_ownership_value_check", nil, self),
-      Form::Sales::Pages::Equity.new(nil, nil, self),
+      Form::Sales::Pages::Equity.new("equity", nil, self),
       Form::Sales::Pages::SharedOwnershipDepositValueCheck.new("shared_ownership_equity_value_check", nil, self),
       Form::Sales::Pages::Mortgageused.new("mortgage_used_shared_ownership", nil, self, ownershipsch: 1),
       Form::Sales::Pages::MortgageValueCheck.new("mortgage_used_mortgage_value_check", nil, self),

app/models/form/sales/subsections/shared_ownership_staircasing_transaction.rb

@@ -0,0 +1,35 @@
+class Form::Sales::Subsections::SharedOwnershipStaircasingTransaction < ::Form::Subsection
+  def initialize(id, hsh, section)
+    super
+    @id = "shared_ownership_staircasing_transaction"
+    @label = "Shared ownership - staircasing transaction"
+    @depends_on = [{ "ownershipsch" => 1, "setup_completed?" => true, "staircase" => 1 }]
+    @copy_key = "sale_information"
+  end
+
+  def pages
+    @pages ||= [
+      Form::Sales::Pages::AboutStaircase.new("about_staircasing_joint_purchase", nil, self, joint_purchase: true),
+      Form::Sales::Pages::AboutStaircase.new("about_staircasing_not_joint_purchase", nil, self, joint_purchase: false),
+      Form::Sales::Pages::StaircaseSale.new(nil, nil, self),
+      Form::Sales::Pages::StaircaseBoughtValueCheck.new(nil, nil, self),
+      Form::Sales::Pages::StaircaseOwnedValueCheck.new("staircase_owned_value_check_joint_purchase", nil, self, joint_purchase: true),
+      Form::Sales::Pages::StaircaseOwnedValueCheck.new("staircase_owned_value_check_not_joint_purchase", nil, self, joint_purchase: false),
+      Form::Sales::Pages::StaircaseFirstTime.new(nil, nil, self),
+      Form::Sales::Pages::StaircasePrevious.new(nil, nil, self),
+      Form::Sales::Pages::StaircaseInitialDate.new(nil, nil, self),
+      Form::Sales::Pages::ValueSharedOwnership.new("value_shared_ownership_staircase", nil, self),
+      Form::Sales::Pages::AboutPriceValueCheck.new("about_price_shared_ownership_value_check", nil, self),
+      Form::Sales::Pages::Equity.new("staircase_equity", nil, self),
+      Form::Sales::Pages::SharedOwnershipDepositValueCheck.new("shared_ownership_equity_value_check", nil, self),
+      Form::Sales::Pages::Mortgageused.new("staircase_mortgage_used_shared_ownership", nil, self, ownershipsch: 1),
+      Form::Sales::Pages::MonthlyRentStaircasingOwned.new(nil, nil, self),
+      Form::Sales::Pages::MonthlyRentStaircasing.new(nil, nil, self),
+      Form::Sales::Pages::MonthlyChargesValueCheck.new("monthly_charges_shared_ownership_value_check", nil, self),
+    ].compact
+  end
+
+  def displayed_in_tasklist?(log)
+    log.staircase == 1 && (log.ownershipsch.nil? || log.ownershipsch == 1)
+  end
+end

app/models/location.rb

@@ -2,7 +2,8 @@ class Location < ApplicationRecord
   validates :postcode, on: :postcode, presence: { message: I18n.t("validations.location.postcode_blank") }
   validate :validate_postcode, on: :postcode, if: proc { |model| model.postcode.presence }
   validates :location_admin_district, on: :location_admin_district, presence: { message: I18n.t("validations.location_admin_district") }
-  validates :units, on: :units, presence: { message: I18n.t("validations.location.units") }
+  validates :units, on: :units, presence: { message: I18n.t("validations.location.units.must_be_number") }
+  validates :units, on: :units, numericality: { greater_than_or_equal_to: 1, message: I18n.t("validations.location.units.must_be_one_or_more") }
   validates :type_of_unit, on: :type_of_unit, presence: { message: I18n.t("validations.location.type_of_unit") }
   validates :mobility_type, on: :mobility_type, presence: { message: I18n.t("validations.location.mobility_standards") }
   validates :startdate, on: :startdate, presence: { message: I18n.t("validations.location.startdate_invalid") }
@@ -54,13 +55,13 @@ class Location < ApplicationRecord
   }
 
   scope :deactivated, lambda { |date = Time.zone.now|
-    deactivated_by_organisation
+    deactivated_by_organisation(date)
       .or(deactivated_directly(date))
       .or(deactivated_by_scheme(date))
   }
 
-  scope :deactivated_by_organisation, lambda {
+  scope :deactivated_by_organisation, lambda { |date = Time.zone.now|
-    merge(Organisation.filter_by_inactive)
+    merge(Organisation.filter_by_inactive.or(Organisation.where("merge_date <= ?", date)))
   }
 
   scope :deactivated_by_scheme, lambda { |date = Time.zone.now|
@@ -144,6 +145,29 @@ class Location < ApplicationRecord
     scope.pluck("ARRAY_AGG(id)")
   }
 
+  scope :duplicate_active_sets, lambda {
+    scope = active
+    .group(*DUPLICATE_LOCATION_ATTRIBUTES)
+    .where.not(scheme_id: nil)
+    .where.not(postcode: nil)
+    .where.not(mobility_type: nil)
+    .having(
+      "COUNT(*) > 1",
+    )
+    scope.pluck("ARRAY_AGG(id)")
+  }
+
+  scope :duplicate_active_sets_within_given_schemes, lambda {
+    scope = active
+    .group(*DUPLICATE_LOCATION_ATTRIBUTES - %w[scheme_id])
+    .where.not(postcode: nil)
+    .where.not(mobility_type: nil)
+    .having(
+      "COUNT(*) > 1",
+    )
+    scope.pluck("ARRAY_AGG(id)")
+  }
+
   DUPLICATE_LOCATION_ATTRIBUTES = %w[scheme_id postcode mobility_type].freeze
   LOCAL_AUTHORITIES = LocalAuthority.all.map { |la| [la.name, la.code] }.to_h
 
@@ -206,7 +230,7 @@ class Location < ApplicationRecord
   def status_at(date)
     return :deleted if discarded_at.present?
     return :incomplete unless confirmed
-    return :deactivated if scheme.owning_organisation.status_at(date) == :deactivated ||
+    return :deactivated if scheme.owning_organisation.status_at(date) == :deactivated || scheme.owning_organisation.status_at(date) == :merged ||
       open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date || scheme.status_at(date) == :deactivated
     return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date || scheme.status_at(date) == :deactivating_soon
     return :activating_soon if startdate.present? && date < startdate

app/models/log.rb

@@ -111,6 +111,7 @@ class Log < ApplicationRecord
         self.town_or_city = nil
         self.county = nil
         self.postcode_full = postcode_full_input
+        process_postcode_changes!
       else
         self.uprn = uprn_selection
         self.uprn_confirmed = 1

app/models/merge_request_organisation.rb

@@ -29,5 +29,12 @@ private
     if merging_organisation_id.blank? || !Organisation.where(id: merging_organisation_id).exists?
       merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_not_selected"))
     end
+
+    existing_merges = MergeRequestOrganisation.with_merging_organisation(merging_organisation)
+    if existing_merges.count.positive?
+      existing_merge_request = existing_merges.first.merge_request
+      errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge"))
+      merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_incomplete_merge", organisation: merging_organisation.name, absorbing_organisation: existing_merge_request.absorbing_organisation&.name, merge_date: existing_merge_request.merge_date&.to_fs(:govuk_date)))
+    end
   end
 end

app/models/sales_log.rb

@@ -557,4 +557,8 @@ class SalesLog < Log
   def is_resale?
     resale == 1
   end
+
+  def is_firststair?
+    firststair == 1
+  end
 end

app/models/scheme.rb

@@ -57,8 +57,8 @@ class Scheme < ApplicationRecord
       .or(deactivated_directly)
   }
 
-  scope :deactivated_by_organisation, lambda {
+  scope :deactivated_by_organisation, lambda { |date = Time.zone.now|
-    merge(Organisation.filter_by_inactive)
+    merge(Organisation.filter_by_inactive.or(Organisation.where("merge_date <= ?", date)))
   }
 
   scope :deactivated_directly, lambda { |date = Time.zone.now|
@@ -96,7 +96,7 @@ class Scheme < ApplicationRecord
   scope :active, lambda { |date = Time.zone.now|
     where.not(id: joins(:scheme_deactivation_periods).reactivating_soon(date).pluck(:id))
     .where.not(id: incomplete.pluck(:id))
-      .where.not(id: joins(:owning_organisation).deactivated_by_organisation.pluck(:id))
+      .where.not(id: joins(:owning_organisation).deactivated_by_organisation(date).pluck(:id))
       .where.not(id: joins(:owning_organisation).joins(:scheme_deactivation_periods).deactivated_directly(date).pluck(:id))
       .where.not(id: activating_soon(date).pluck(:id))
   }
@@ -119,6 +119,22 @@ class Scheme < ApplicationRecord
     scope.pluck("ARRAY_AGG(id)")
   }
 
+  scope :duplicate_active_sets, lambda {
+    scope = active
+    .group(*DUPLICATE_SCHEME_ATTRIBUTES)
+    .where.not(scheme_type: nil)
+    .where.not(registered_under_care_act: nil)
+    .where.not(primary_client_group: nil)
+    .where.not(has_other_client_group: nil)
+    .where.not(secondary_client_group: nil).or(where(has_other_client_group: 0))
+    .where.not(support_type: nil)
+    .where.not(intended_stay: nil)
+    .having(
+      "COUNT(*) > 1",
+    )
+    scope.pluck("ARRAY_AGG(id)")
+  }
+
   validate :validate_confirmed
   validate :validate_owning_organisation
 
@@ -314,7 +330,7 @@ class Scheme < ApplicationRecord
   def status_at(date)
     return :deleted if discarded_at.present?
     return :incomplete unless confirmed && locations.confirmed.any?
-    return :deactivated if owning_organisation.status_at(date) == :deactivated ||
+    return :deactivated if owning_organisation.status_at(date) == :deactivated || owning_organisation.status_at(date) == :merged ||
       (open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date)
     return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
     return :reactivating_soon if last_deactivation_before(date)&.reactivation_date.present? && date < last_deactivation_before(date).reactivation_date

app/models/validations/sales/sale_information_validations.rb

@@ -35,6 +35,14 @@ module Validations::Sales::SaleInformationValidations
     end
   end
 
+  def validate_staircasing_initial_purchase_date(record)
+    return unless record.initialpurchase
+
+    if record.initialpurchase < Time.zone.local(1980, 1, 1)
+      record.errors.add :initialpurchase, I18n.t("validations.sales.sale_information.initialpurchase.must_be_after_1980")
+    end
+  end
+
   def validate_previous_property_unit_type(record)
     return unless record.fromprop && record.frombeds
 
@@ -351,6 +359,15 @@ module Validations::Sales::SaleInformationValidations
     end
   end
 
+  def validate_number_of_staircase_transactions(record)
+    return unless record.numstair
+
+    if record.firststair == 2 && record.numstair < 2
+      record.errors.add :numstair, I18n.t("validations.sales.sale_information.numstair.must_be_greater_than_one")
+      record.errors.add :firststair, I18n.t("validations.sales.sale_information.firststair.cannot_be_no")
+    end
+  end
+
   def over_tolerance?(expected, actual, tolerance, strict: false)
     if strict
       (expected - actual).abs > tolerance