Cldc 1540 fixes (#1130)

* Update order of pages and remove wrong id's

* Add spacing to the hint text

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

@@ -10,8 +10,8 @@ class Form::Sales::Questions::Discount < ::Form::Question
     @max = 100
     @width = 5
     @suffix = "%"
-    @hint_text = "For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)
-    If discount capped, enter capped %
+    @hint_text = "For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)</br></br>
+    If discount capped, enter capped %</br></br>
     If the property is being sold to an existing tenant under the RTB, PRTB, or VRTB schemes, enter the % discount from the full market value that is being given."
   end
 end

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

@@ -9,9 +9,9 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection
 
   def pages
     @pages ||= [
+      Form::Sales::Pages::AboutPriceRtb.new(nil, nil, self),
+      Form::Sales::Pages::AboutPriceNotRtb.new(nil, nil, self),
       Form::Sales::Pages::AboutDeposit.new("about_deposit_discounted_ownership", nil, self),
-      Form::Sales::Pages::AboutPriceRtb.new("about_deposit_discounted_ownership", nil, self),
-      Form::Sales::Pages::AboutPriceNotRtb.new("about_deposit_discounted_ownership", nil, self),
     ]
   end
 

spec/models/form/sales/questions/discount_spec.rb

@@ -32,8 +32,8 @@ RSpec.describe Form::Sales::Questions::Discount, type: :model do
   end
 
   it "has the correct hint" do
-    expect(question.hint_text).to eq("For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)
-    If discount capped, enter capped %
+    expect(question.hint_text).to eq("For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)</br></br>
+    If discount capped, enter capped %</br></br>
     If the property is being sold to an existing tenant under the RTB, PRTB, or VRTB schemes, enter the % discount from the full market value that is being given.")
   end
 

spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb

@@ -13,9 +13,9 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model
 
   it "has correct pages" do
     expect(discounted_ownership_scheme.pages.map(&:id)).to eq(
-      %w[about_deposit_discounted_ownership
-         about_price_rtb
-         about_price_not_rtb],
+      %w[about_price_rtb
+         about_price_not_rtb
+         about_deposit_discounted_ownership],
     )
   end