Merge branch 'main' into CLDC-1765-remove-managed-by-sales-log-text

# Conflicts:
#	app/components/log_summary_component.html.erb
#	app/models/sales_log.rb
#	db/schema.rb

app/components/bulk_upload_error_row_component.html.erb

@@ -0,0 +1,33 @@
+<div class="x-govuk-summary-card govuk-!-margin-bottom-6">
+  <div class="x-govuk-summary-card__header">
+    <% if lettings? %>
+      <h3 class="x-govuk-summary-card__title"><strong>Row <%= row %></strong> <span class="govuk-!-margin-left-3">Tenant code: <%= tenant_code %></span> <span class="govuk-!-margin-left-3">Property reference: <%= property_ref %></span></h3>
+    <% else %>
+      <h3 class="x-govuk-summary-card__title"><strong>Row <%= row %></strong> <span class="govuk-!-margin-left-3">Purchaser code: <%= purchaser_code %></span></h3>
+    <% end %>
+  </div>
+
+  <div class="x-govuk-summary-card__body">
+    <%= govuk_table do |table| %>
+      <% table.head do |head| %>
+        <% head.row do |row| %>
+          <% row.cell(header: true, text: "Cell") %>
+          <% row.cell(header: true, text: "Question") %>
+          <% row.cell(header: true, text: "Error") %>
+          <% row.cell(header: true, text: "Specification") %>
+        <% end %>
+
+        <% table.body do |body| %>
+          <% bulk_upload_errors.each do |error| %>
+            <% body.row do |row| %>
+              <% row.cell(header: true, text: error.cell) %>
+              <% row.cell(text: question_for_field(error.field)) %>
+              <% row.cell(text: error.error) %>
+              <% row.cell(text: error.field.humanize) %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

app/components/bulk_upload_error_row_component.rb

@@ -0,0 +1,54 @@
+class BulkUploadErrorRowComponent < ViewComponent::Base
+  attr_reader :bulk_upload_errors
+
+  def initialize(bulk_upload_errors:)
+    @bulk_upload_errors = sorted_errors(bulk_upload_errors)
+
+    super
+  end
+
+  def row
+    bulk_upload_errors.first.row
+  end
+
+  def tenant_code
+    bulk_upload_errors.first.tenant_code
+  end
+
+  def purchaser_code
+    bulk_upload_errors.first.purchaser_code
+  end
+
+  def property_ref
+    bulk_upload_errors.first.property_ref
+  end
+
+  def question_for_field(field)
+    case bulk_upload.log_type
+    when "lettings"
+      BulkUpload::Lettings::Validator.question_for_field(field.to_sym)
+    when "sales"
+      BulkUpload::Sales::Validator.question_for_field(field.to_sym)
+    else
+      "Unknown question"
+    end
+  end
+
+  def bulk_upload
+    bulk_upload_errors.first.bulk_upload
+  end
+
+  def lettings?
+    bulk_upload.log_type == "lettings"
+  end
+
+  def sales?
+    bulk_upload.log_type == "sales"
+  end
+
+private
+
+  def sorted_errors(errors)
+    errors.sort_by { |e| e.cell.rjust(3, "0") }
+  end
+end

app/components/log_summary_component.html.erb

@@ -36,7 +36,7 @@
         </p>
       <% end %>
 
-      <% if current_user.support? %>
+      <% if current_user.support? || current_user.organisation.has_managing_agents? %>
         <dl class="app-metadata">
           <% if log.owning_organisation %>
             <div class="app-metadata__item">

app/controllers/bulk_upload_lettings_results_controller.rb

@@ -0,0 +1,9 @@
+class BulkUploadLettingsResultsController < ApplicationController
+  before_action :authenticate_user!
+
+  rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+
+  def show
+    @bulk_upload = current_user.bulk_uploads.lettings.find(params[:id])
+  end
+end

app/controllers/bulk_upload_sales_results_controller.rb

@@ -0,0 +1,9 @@
+class BulkUploadSalesResultsController < ApplicationController
+  before_action :authenticate_user!
+
+  rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+
+  def show
+    @bulk_upload = current_user.bulk_uploads.sales.find(params[:id])
+  end
+end

app/controllers/organisations_controller.rb

@@ -6,8 +6,8 @@ class OrganisationsController < ApplicationController
   before_action :authenticate_user!
   before_action :find_resource, except: %i[index new create]
   before_action :authenticate_scope!, except: [:index]
-  before_action -> { session_filters(specific_org: true) }, if: -> { current_user.support? }
-  before_action :set_session_filters, if: -> { current_user.support? }
+  before_action -> { session_filters(specific_org: true) }, if: -> { current_user.support? || current_user.organisation.has_managing_agents? }
+  before_action :set_session_filters, if: -> { current_user.support? || current_user.organisation.has_managing_agents? }
 
   def index
     redirect_to organisation_path(current_user.organisation) unless current_user.support?

app/controllers/schemes_controller.rb

@@ -92,14 +92,12 @@ class SchemesController < ApplicationController
     validation_errors scheme_params
 
     if @scheme.errors.empty? && @scheme.save
-      if @scheme.arrangement_type_before_type_cast == "D"
-        redirect_to scheme_primary_client_group_path(@scheme)
-      else
-        redirect_to scheme_support_services_provider_path(@scheme)
-      end
+      redirect_to scheme_primary_client_group_path(@scheme)
     else
-      @scheme.errors.add(:owning_organisation_id, message: @scheme.errors[:organisation])
-      @scheme.errors.delete(:owning_organisation)
+      if @scheme.errors.any? { |error| error.attribute == :owning_organisation }
+        @scheme.errors.add(:owning_organisation_id, message: @scheme.errors[:organisation])
+        @scheme.errors.delete(:owning_organisation)
+      end
       render :new, status: :unprocessable_entity
     end
   end
@@ -182,12 +180,6 @@ class SchemesController < ApplicationController
     render "schemes/edit_name"
   end
 
-  def support_services_provider
-    render_not_found and return unless @scheme
-
-    render "schemes/support_services_provider"
-  end
-
 private
 
   def validation_errors(scheme_params)
@@ -196,10 +188,6 @@ private
         @scheme.errors.add(key.to_sym)
       end
     end
-
-    if @scheme.arrangement_type_same? && arrangement_type_value(scheme_params[:arrangement_type]) != "D"
-      @scheme.errors.delete(:managing_organisation_id)
-    end
   end
 
   def confirm_secondary_page?(page)
@@ -209,8 +197,6 @@ private
   def current_template(page)
     if page.include?("primary")
       "schemes/primary_client_group"
-    elsif page.include?("support-services-provider")
-      "schemes/support_services_provider"
     elsif page.include?("confirm")
       "schemes/confirm_secondary"
     elsif page.include?("secondary-client")
@@ -228,8 +214,6 @@ private
 
   def next_page_path(page)
     case page
-    when "support-services-provider"
-      scheme_primary_client_group_path(@scheme)
     when "primary-client-group"
       scheme_confirm_secondary_client_group_path(@scheme)
     when "confirm-secondary"
@@ -239,13 +223,7 @@ private
     when "support"
       scheme_check_answers_path(@scheme)
     when "details"
-      if @scheme.arrangement_type_before_type_cast == "D"
-        scheme_primary_client_group_path(@scheme)
-      elsif @scheme.arrangement_type.present? && @scheme.arrangement_type_before_type_cast != "D"
-        scheme_support_services_provider_path(@scheme)
-      else
-        scheme_details_path(@scheme)
-      end
+      scheme_primary_client_group_path(@scheme)
     when "edit-name"
       scheme_check_answers_path(@scheme)
     when "check-answers"
@@ -257,7 +235,6 @@ private
     required_params = params.require(:scheme).permit(:service_name,
                                                      :sensitive,
                                                      :owning_organisation_id,
-                                                     :managing_organisation_id,
                                                      :scheme_type,
                                                      :registered_under_care_act,
                                                      :id,
@@ -269,14 +246,6 @@ private
                                                      :intended_stay,
                                                      :confirmed)
 
-    if arrangement_type_changed_to_different_org?(required_params)
-      required_params[:managing_organisation_id] = nil
-    end
-
-    if arrangement_type_set_to_same_org?(required_params)
-      required_params[:managing_organisation_id] = required_params[:owning_organisation_id] || @scheme.owning_organisation_id
-    end
-
     required_params[:sensitive] = required_params[:sensitive].to_i if required_params[:sensitive]
 
     if current_user.data_coordinator?
@@ -285,22 +254,6 @@ private
     required_params
   end
 
-  def arrangement_type_set_to_same_org?(required_params)
-    return unless @scheme
-
-    arrangement_type_value(required_params[:arrangement_type]) == "D" || (required_params[:arrangement_type].blank? && @scheme.arrangement_type_same?)
-  end
-
-  def arrangement_type_changed_to_different_org?(required_params)
-    return unless @scheme
-
-    @scheme.arrangement_type_same? && arrangement_type_value(required_params[:arrangement_type]) != "D" && required_params[:managing_organisation_id].blank?
-  end
-
-  def arrangement_type_value(key)
-    key.present? ? Scheme::ARRANGEMENT_TYPE[key.to_sym] : nil
-  end
-
   def search_term
     params["search"]
   end

app/helpers/filters_helper.rb

@@ -22,4 +22,9 @@ module FiltersHelper
 
     JSON.parse(session[:logs_filters])[filter] || ""
   end
+
+  def organisations_filter_options(user)
+    organisation_options = user.support? ? Organisation.all : [user.organisation] + user.organisation.managing_agents
+    [OpenStruct.new(id: "", name: "Select an option")] + organisation_options.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+  end
 end

app/helpers/schemes_helper.rb

@@ -8,7 +8,6 @@ module SchemesHelper
       { name: "Registered under Care Standards Act 2000", value: scheme.registered_under_care_act },
       { name: "Housing stock owned by", value: scheme.owning_organisation.name, edit: true },
       { name: "Support services provided by", value: scheme.arrangement_type },
-      { name: "Organisation providing support", value: scheme.managing_organisation&.name },
       { name: "Primary client group", value: scheme.primary_client_group },
       { name: "Has another client group", value: scheme.has_other_client_group },
       { name: "Secondary client group", value: scheme.secondary_client_group },
@@ -25,9 +24,10 @@ module SchemesHelper
       base_attributes.delete_if { |item| item[:name] == "Housing stock owned by" }
     end
 
-    if scheme.arrangement_type_same?
-      base_attributes.delete_if { |item| item[:name] == "Organisation providing support" }
+    if scheme.has_other_client_group == "Yes"
+      base_attributes.append
     end
+
     base_attributes
   end
 

app/jobs/process_bulk_upload_job.rb

@@ -0,0 +1,7 @@
+class ProcessBulkUploadJob < ApplicationJob
+  queue_as :default
+
+  def perform(bulk_upload:)
+    BulkUpload::Processor.new(bulk_upload:).call
+  end
+end

app/models/bulk_upload.rb

@@ -2,9 +2,14 @@ class BulkUpload < ApplicationRecord
   enum log_type: { lettings: "lettings", sales: "sales" }
 
   belongs_to :user
+  has_many :bulk_upload_errors
 
   after_initialize :generate_identifier, unless: :identifier
 
+  def year_combo
+    "#{year}/#{year - 2000 + 1}"
+  end
+
 private
 
   def generate_identifier

app/models/bulk_upload_error.rb

@@ -0,0 +1,3 @@
+class BulkUploadError < ApplicationRecord
+  belongs_to :bulk_upload
+end

app/models/derived_variables/sales_log_variables.rb

@@ -15,5 +15,78 @@ module DerivedVariables::SalesLogVariables
     if mscharge_known.present? && mscharge_known.zero?
       self.mscharge = 0
     end
+    self.pcode1, self.pcode2 = postcode_full.split(" ") if postcode_full.present?
+    self.totchild = total_child
+    self.totadult = total_adult + total_elder
+    self.hhmemb = totchild + totadult
+    self.hhtype = household_type
+  end
+
+private
+
+  def total_elder
+    ages = [age1, age2, age3, age4, age5, age6]
+    ages.count { |age| age.present? && age >= 60 }
+  end
+
+  def total_child
+    (2..6).count do |i|
+      age = public_send("age#{i}")
+      relat = public_send("relat#{i}")
+      age.present? && (age < 20 && %w[C].include?(relat) || age < 18)
+    end
+  end
+
+  def total_adult
+    total = age1.present? && age1.between?(16, 59) ? 1 : 0
+    total + (2..6).count do |i|
+      age = public_send("age#{i}")
+      relat = public_send("relat#{i}")
+      age.present? && (age.between?(20, 59) || age.between?(18, 19) && relat != "C")
+    end
+  end
+
+  def household_type
+    return unless total_elder && total_adult && totchild
+
+    if only_one_elder?
+      1
+    elsif only_two_elders?
+      2
+    elsif only_one_adult?
+      3
+    elsif only_two_adults?
+      4
+    elsif one_adult_with_at_least_one_child?
+      5
+    elsif at_least_two_adults_with_at_least_one_child?
+      6
+    else
+      9
+    end
+  end
+
+  def at_least_two_adults_with_at_least_one_child?
+    total_elder.zero? && total_adult >= 2 && totchild >= 1
+  end
+
+  def one_adult_with_at_least_one_child?
+    total_elder.zero? && total_adult == 1 && totchild >= 1
+  end
+
+  def only_two_adults?
+    total_elder.zero? && total_adult == 2 && totchild.zero?
+  end
+
+  def only_one_adult?
+    total_elder.zero? && total_adult == 1 && totchild.zero?
+  end
+
+  def only_two_elders?
+    total_elder == 2 && total_adult.zero? && totchild.zero?
+  end
+
+  def only_one_elder?
+    total_elder == 1 && total_adult.zero? && totchild.zero?
   end
 end

app/models/form.rb

@@ -167,10 +167,12 @@ class Form
       if %w[radio checkbox].include?(question.type)
         enabled_answer_options = enabled_question_ids.include?(question.id) ? enabled_questions.find { |q| q.id == question.id }.answer_options : {}
         current_answer_option_valid = enabled_answer_options.present? ? enabled_answer_options.key?(log.public_send(question.id).to_s) : false
+
         if !current_answer_option_valid && log.respond_to?(question.id.to_s)
           Rails.logger.debug("Cleared #{question.id} value")
           log.public_send("#{question.id}=", nil)
         else
+
           (question.answer_options.keys - enabled_answer_options.keys).map do |invalid_answer_option|
             Rails.logger.debug("Cleared #{invalid_answer_option} value")
             log.public_send("#{invalid_answer_option}=", nil) if log.respond_to?(invalid_answer_option)

app/models/form/common/pages/created_by.rb

@@ -2,9 +2,6 @@ class Form::Common::Pages::CreatedBy < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "created_by"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/common/pages/organisation.rb

@@ -2,9 +2,6 @@ class Form::Common::Pages::Organisation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "organisation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/common/questions/created_by_id.rb

@@ -4,9 +4,7 @@ class Form::Common::Questions::CreatedById < ::Form::Question
     @id = "created_by_id"
     @check_answer_label = "User"
     @header = "Which user are you creating this log for?"
-    @hint_text = ""
     @type = "select"
-    @page = page
   end
 
   def answer_options

app/models/form/common/questions/owning_organisation_id.rb

@@ -4,9 +4,7 @@ class Form::Common::Questions::OwningOrganisationId < ::Form::Question
     @id = "owning_organisation_id"
     @check_answer_label = "Owning organisation"
     @header = "Which organisation owns this log?"
-    @hint_text = ""
     @type = "select"
-    @page = page
   end
 
   def answer_options

app/models/form/lettings/pages/created_by.rb

@@ -2,9 +2,6 @@ class Form::Lettings::Pages::CreatedBy < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "created_by"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/lettings/pages/location.rb

@@ -1,8 +1,6 @@
 class Form::Lettings::Pages::Location < ::Form::Page
   def initialize(_id, hsh, subsection)
     super("location", hsh, subsection)
-    @header = ""
-    @description = ""
     @depends_on = [{
       "needstype" => 2,
       "scheme_has_multiple_locations?" => true,

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

@@ -2,9 +2,6 @@ class Form::Lettings::Pages::ManagingOrganisation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "managing_organisation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/lettings/pages/needs_type.rb

@@ -2,9 +2,6 @@ class Form::Lettings::Pages::NeedsType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "needs_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/lettings/pages/property_reference.rb

@@ -2,9 +2,6 @@ class Form::Lettings::Pages::PropertyReference < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_reference"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/lettings/pages/renewal.rb

@@ -2,9 +2,6 @@ class Form::Lettings::Pages::Renewal < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "renewal"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/lettings/pages/rent_type.rb

@@ -1,8 +1,6 @@
 class Form::Lettings::Pages::RentType < ::Form::Page
   def initialize(_id, hsh, subsection)
     super("rent_type", hsh, subsection)
-    @header = ""
-    @description = ""
     @derived = true
   end
 

app/models/form/lettings/pages/scheme.rb

@@ -1,8 +1,6 @@
 class Form::Lettings::Pages::Scheme < ::Form::Page
   def initialize(_id, hsh, subsection)
     super("scheme", hsh, subsection)
-    @header = ""
-    @description = ""
     @depends_on = [{
       "needstype" => 2,
     }]

app/models/form/lettings/pages/stock_owner.rb

@@ -2,9 +2,6 @@ class Form::Lettings::Pages::StockOwner < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "stock_owner"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/lettings/pages/tenancy_start_date.rb

@@ -2,8 +2,6 @@ class Form::Lettings::Pages::TenancyStartDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenancy_start_date"
-    @description = ""
-    @subsection = subsection
     @next_unresolved_page_id = "scheme"
   end
 

app/models/form/lettings/pages/tenant_code.rb

@@ -2,9 +2,6 @@ class Form::Lettings::Pages::TenantCode < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "tenant_code"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

app/models/form/lettings/questions/created_by_id.rb

@@ -4,9 +4,7 @@ class Form::Lettings::Questions::CreatedById < ::Form::Question
     @id = "created_by_id"
     @check_answer_label = "Log owner"
     @header = "Which user are you creating this log for?"
-    @hint_text = ""
     @type = "select"
-    @page = page
   end
 
   def answer_options

app/models/form/lettings/questions/irproduct_other.rb

@@ -5,6 +5,5 @@ class Form::Lettings::Questions::IrproductOther < ::Form::Question
     @check_answer_label = "Product name"
     @header = "Name of rent product"
     @type = "text"
-    @page = page
   end
 end

app/models/form/lettings/questions/location_id.rb

@@ -3,7 +3,6 @@ class Form::Lettings::Questions::LocationId < ::Form::Question
     super("location_id", hsh, page)
     @check_answer_label = "Location"
     @header = "Which location is this log for?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = answer_options
     @inferred_answers = {

app/models/form/lettings/questions/managing_organisation.rb

@@ -8,7 +8,6 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
     @header = "Which organisation manages this letting?"
     @type = "select"
     @answer_options = answer_options
-    @page = page
   end
 
   def answer_options

app/models/form/lettings/questions/needs_type.rb

@@ -7,7 +7,6 @@ class Form::Lettings::Questions::NeedsType < ::Form::Question
     @hint_text = "General needs housing includes both self-contained and shared housing without support or specific adaptations. Supported housing can include direct access hostels, group homes, residential care and nursing homes."
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
   end
 
   ANSWER_OPTIONS = {

app/models/form/lettings/questions/property_reference.rb

@@ -7,6 +7,5 @@ class Form::Lettings::Questions::PropertyReference < ::Form::Question
     @hint_text = "This is how you usually refer to this property on your own systems."
     @type = "text"
     @width = 10
-    @page = page
   end
 end

app/models/form/lettings/questions/renewal.rb

@@ -4,10 +4,9 @@ class Form::Lettings::Questions::Renewal < ::Form::Question
     @id = "renewal"
     @check_answer_label = "Property renewal"
     @header = "Is this letting a renewal?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @page = page
+    @hint_text = "A renewal is a letting to the same tenant in the same property"
   end
 
   ANSWER_OPTIONS = {

app/models/form/lettings/questions/rent_type.rb

@@ -4,11 +4,9 @@ class Form::Lettings::Questions::RentType < ::Form::Question
     @id = "rent_type"
     @check_answer_label = "Rent type"
     @header = "What is the rent type?"
-    @hint_text = ""
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "irproduct_other" => [5] }
-    @page = page
   end
 
   ANSWER_OPTIONS = {

app/models/form/lettings/questions/stock_owner.rb

@@ -7,7 +7,6 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
     @check_answer_label = "Stock owner"
     @header = "Which organisation owns this property?"
     @type = "select"
-    @page = page
   end
 
   def answer_options

app/models/form/lettings/questions/tenancy_start_date.rb

@@ -6,6 +6,5 @@ class Form::Lettings::Questions::TenancyStartDate < ::Form::Question
     @header = "What is the tenancy start date?"
     @type = "date"
     @unresolved_hint_text = "Some scheme details have changed, and now this log needs updating. Check that the tenancy start date is correct."
-    @page = page
   end
 end

app/models/form/lettings/questions/tenant_code.rb

@@ -7,6 +7,5 @@ class Form::Lettings::Questions::TenantCode < ::Form::Question
     @hint_text = "This is how you usually refer to this tenancy on your own systems."
     @type = "text"
     @width = 10
-    @page = page
   end
 end

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

@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutDepositWithDiscount < ::Form::Page
     super
     @id = "about_deposit_with_discount"
     @header = "About the deposit"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{ "is_type_discount?" => true }]
   end
 

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

@@ -2,9 +2,9 @@ class Form::Sales::Pages::AboutDepositWithoutDiscount < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @header = "About the deposit"
-    @description = ""
-    @subsection = subsection
-    @depends_on = [{ "is_type_discount?" => false }]
+    @depends_on = [{ "is_type_discount?" => false, "ownershipsch" => 1 },
+                   { "ownershipsch" => 2 },
+                   { "ownershipsch" => 3, "mortgageused" => 1 }]
   end
 
   def questions

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

@@ -3,10 +3,9 @@ class Form::Sales::Pages::AboutPriceNotRtb < ::Form::Page
     super
     @id = "about_price_not_rtb"
     @header = "About the price of the property"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "right_to_buy?" => false,
+      "rent_to_buy_full_ownership?" => false,
     }]
   end
 

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

@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutPriceRtb < ::Form::Page
     super
     @id = "about_price_rtb"
     @header = "About the price of the property"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "right_to_buy?" => true,
     }]

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

@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutPriceSharedOwnership < ::Form::Page
     super
     @id = "about_price_shared_ownership"
     @header = "About the price of the property"
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -3,8 +3,6 @@ class Form::Sales::Pages::AboutStaircase < ::Form::Page
     super
     @id = "about_staircasing"
     @header = "About the staircasing transaction"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "staircase" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Age1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_age"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Age2 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_age"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::ArmedForces < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "armed_forces"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::ArmedForcesSpouse < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "armed_forces_spouse"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundArab < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_arab"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 4,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundAsian < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_asian"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 2,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundBlack < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_black"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 3,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundMixed < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_mixed"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicBackgroundWhite < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_background_white"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ethnic_group" => 0,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1EthnicGroup < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_group"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1Income < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_income"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -1,9 +1,6 @@
 class Form::Sales::Pages::Buyer1IncomeValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "income1_under_soft_min?" => true,

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1LiveInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_live_in_property"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1Mortgage < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_mortgage"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1PreviousTenure < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer1_previous_tenure"
-    @header = "What was buyer 1's previous tenure?"
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer1WorkingSituation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_working_situation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2Income < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_income"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2LiveInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_live_in_property"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2Mortgage < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_mortgage"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{ "jointpur" => 1 }]
   end
 

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2RelationshipToBuyer1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_relationship_to_buyer_1"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Buyer2WorkingSituation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_working_situation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerCompany < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_company"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 3,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerInterview < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_interview"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerLive < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_live"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "companybuy" => 2,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerPrevious < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_previous"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyerStillServing < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_still_serving"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "hhregres" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::BuyersOrganisations < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyers_organisations"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -1,9 +1,6 @@
 class Form::Sales::Pages::DepositValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "deposit_over_soft_max?" => true,

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::DiscountedOwnershipType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "discounted_ownership_type"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 2,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::ExchangeDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "exchange_contracts"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "resale" => 2,
     }]

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

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

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::GenderIdentity1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_gender_identity"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::GenderIdentity2 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_gender_identity"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::HandoverDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "handover_date"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "ownershipsch" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::HouseholdDisability < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "household_disability"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::HouseholdWheelchair < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "household_wheelchair"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -1,9 +1,6 @@
 class Form::Sales::Pages::HouseholdWheelchairCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "wheelchair_when_not_disabled?" => true,

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::HousingBenefits < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "housing_benefits"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::JointPurchase < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "joint_purchase"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       { "ownershipsch" => 1 },
       { "ownershipsch" => 2 },

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::LaNominations < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "la_nominations"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::LastAccommodation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "last_accommodation"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::LastAccommodationLa < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "last_accommodation_la"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "is_previous_la_inferred" => false,
     }]

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

@@ -1,11 +1,4 @@
 class Form::Sales::Pages::LeaseholdCharges < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @header = ""
-    @description = ""
-    @subsection = subsection
-  end
-
   def questions
     @questions ||= [
       Form::Sales::Questions::LeaseholdChargesKnown.new(nil, nil, self),

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

@@ -1,11 +1,4 @@
 class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @header = ""
-    @description = ""
-    @subsection = subsection
-  end
-
   def questions
     @questions ||= [
       Form::Sales::Questions::LivingBeforePurchase.new(nil, nil, self),

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::MonthlyRent < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "monthly_rent"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,8 +2,6 @@ class Form::Sales::Pages::MortgageAmount < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @header = "Mortgage Amount"
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "mortgageused" => 1,
     }]

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

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

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

@@ -0,0 +1,17 @@
+class Form::Sales::Pages::MortgageLenderOther < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [{
+      "mortgagelender" => 40,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::MortgageLenderOther.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -1,9 +1,9 @@
 class Form::Sales::Pages::MortgageLength < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
+    @depends_on = [{
+      "mortgageused" => 1,
+    }]
   end
 
   def questions

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

@@ -1,9 +1,6 @@
 class Form::Sales::Pages::MortgageValueCheck < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [
       {
         "mortgage_over_soft_max?" => true,

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

@@ -1,11 +1,4 @@
 class Form::Sales::Pages::Mortgageused < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @header = ""
-    @description = ""
-    @subsection = subsection
-  end
-
   def questions
     @questions ||= [
       Form::Sales::Questions::Mortgageused.new(nil, nil, self),

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::Nationality1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_nationality"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::NumberJointBuyers < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "number_joint_buyers"
-    @header = ""
-    @description = ""
-    @subsection = subsection
     @depends_on = [{
       "jointpur" => 1,
     }]

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

@@ -2,9 +2,6 @@ class Form::Sales::Pages::NumberOfOthersInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "number_of_others_in_property"
-    @header = ""
-    @description = ""
-    @subsection = subsection
   end
 
   def questions