Updates after merge

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

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

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

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

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

@@ -2,7 +2,6 @@ class Form::Sales::Questions::StaircaseFirstTime < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "firststair"
-    @copy_key = "sales.sale_information.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]

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

@@ -4,19 +4,20 @@ class Form::Sales::Sections::SaleInformation < ::Form::Section
     @id = "sale_information"
     @label = "Sale information"
     @description = ""
-    @subsections = [
-      shared_ownership_scheme_subsection,
-      Form::Sales::Subsections::DiscountedOwnershipScheme.new(nil, nil, self),
-      Form::Sales::Subsections::OutrightSale.new(nil, nil, self),
-    ] || []
+    @subsections = []
+    @subsections.concat(shared_ownership_scheme_subsection)
+    @subsections << Form::Sales::Subsections::DiscountedOwnershipScheme.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)
+      [
+        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)
+      [Form::Sales::Subsections::SharedOwnershipScheme.new(nil, nil, self)]
     end
   end
 end

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

@@ -4,6 +4,7 @@ class Form::Sales::Subsections::SharedOwnershipInitialPurchase < ::Form::Subsect
     @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
@@ -18,9 +19,9 @@ class Form::Sales::Subsections::SharedOwnershipInitialPurchase < ::Form::Subsect
       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("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),

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

@@ -29,7 +29,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       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(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

@@ -4,6 +4,7 @@ class Form::Sales::Subsections::SharedOwnershipStaircasingTransaction < ::Form::
     @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
@@ -17,11 +18,11 @@ class Form::Sales::Subsections::SharedOwnershipStaircasingTransaction < ::Form::
       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_staircasing", 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(nil, 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("mortgage_used_shared_ownership", nil, self, ownershipsch: 1),
+      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),

config/locales/forms/2025/sales/sale_information.en.yml

@@ -122,26 +122,31 @@ en:
             hint_text: ""
             question_text: "What was the previous tenure of the buyer?"
 
-          value: #TODO rename non-staircasing and staircasing versions
+          value:
             page_header: "About the price of the property"
             value_shared_ownership:
               check_answer_label: "Full purchase price"
               hint_text: "Enter the full purchase price of the property before any discounts are applied. For shared ownership, enter the full purchase price paid for 100% equity (this is equal to the value of the share owned by the PRP plus the value bought by the purchaser)."
               question_text: "What was the full purchase price?"
-            value_shared_ownership_staircasing:
+            value_shared_ownership_staircase:
               check_answer_label: "Full purchase price"
               hint_text: "Enter the full purchase price paid for the equity bought in this staircasing transaction (this is equal to the value of the share bought by the purchaser)."
               question_text: "What was the full purchase price for this staircasing transaction?"
 
-          equity: #TODO split non-staircasing and staircasing versions
+          equity:
             page_header: "About the price of the property"
-            check_answer_label: "Initial percentage equity share"
-            hint_text: "Enter the amount of initial equity share held by the purchaser (for example, 25% or 50%)"
-            question_text: "What was the initial percentage share purchased?"
+            initial_equity:
+              check_answer_label: "Initial percentage equity share"
+              hint_text: "Enter the amount of initial equity share held by the purchaser (for example, 25% or 50%)"
+              question_text: "What was the initial percentage share purchased?"
+            staircase_equity:
+              check_answer_label: "Initial percentage equity share"
+              hint_text: "Enter the amount of initial equity share held by the purchaser (for example, 25% or 50%)"
+              question_text: "What was the percentage shared purchased in the initial transaction?"
 
           mortgageused:
             page_header: "Mortgage Amount"
-            check_answer_label: "Mortgage used"
+            check_answer_label: "Mortgage used?"
             hint_text: ""
             question_text: "Was a mortgage used for the purchase of this property?"