From f1bd6bb8bbad8f2aff26c92efb085077fbe2d6c5 Mon Sep 17 00:00:00 2001 From: Kat <54268893+kosiakkatrina@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:02:25 +0100 Subject: [PATCH] Extract shared ownership copy --- .../form/sales/pages/about_staircase.rb | 2 +- app/models/form/sales/pages/buyer_previous.rb | 1 + app/models/form/sales/pages/deposit.rb | 2 +- .../form/sales/pages/deposit_discount.rb | 2 +- app/models/form/sales/pages/equity.rb | 2 +- app/models/form/sales/pages/exchange_date.rb | 1 + .../form/sales/pages/extra_borrowing.rb | 2 +- app/models/form/sales/pages/handover_date.rb | 1 + app/models/form/sales/pages/la_nominations.rb | 1 + .../form/sales/pages/leasehold_charges.rb | 1 + .../sales/pages/living_before_purchase.rb | 3 +- app/models/form/sales/pages/monthly_rent.rb | 1 + .../form/sales/pages/mortgage_amount.rb | 2 +- .../form/sales/pages/mortgage_lender.rb | 2 +- .../form/sales/pages/mortgage_lender_other.rb | 2 +- .../form/sales/pages/mortgage_length.rb | 1 + app/models/form/sales/pages/mortgageused.rb | 2 +- .../form/sales/pages/previous_bedrooms.rb | 2 +- .../sales/pages/previous_property_type.rb | 2 +- .../form/sales/pages/previous_tenure.rb | 1 + app/models/form/sales/pages/resale.rb | 1 + app/models/form/sales/pages/staircase.rb | 1 + .../sales/pages/value_shared_ownership.rb | 2 +- .../form/sales/questions/buyer_previous.rb | 3 +- .../form/sales/questions/deposit_amount.rb | 11 +- .../form/sales/questions/deposit_discount.rb | 4 +- app/models/form/sales/questions/equity.rb | 4 +- .../form/sales/questions/exchange_date.rb | 3 +- .../form/sales/questions/extra_borrowing.rb | 4 +- app/models/form/sales/questions/fromprop.rb | 4 +- .../form/sales/questions/handover_date.rb | 4 +- .../sales/questions/has_leasehold_charges.rb | 4 +- .../form/sales/questions/la_nominations.rb | 4 +- .../form/sales/questions/leasehold_charges.rb | 3 +- .../sales/questions/living_before_purchase.rb | 4 +- .../questions/living_before_purchase_years.rb | 22 +-- .../form/sales/questions/monthly_rent.rb | 4 +- .../form/sales/questions/mortgage_amount.rb | 4 +- .../form/sales/questions/mortgage_lender.rb | 4 +- .../sales/questions/mortgage_lender_other.rb | 3 +- .../form/sales/questions/mortgage_length.rb | 4 +- .../form/sales/questions/mortgageused.rb | 3 +- .../form/sales/questions/previous_bedrooms.rb | 4 +- .../form/sales/questions/previous_tenure.rb | 4 +- app/models/form/sales/questions/resale.rb | 4 +- app/models/form/sales/questions/staircase.rb | 4 +- .../form/sales/questions/staircase_bought.rb | 3 +- .../form/sales/questions/staircase_owned.rb | 3 +- app/models/form/sales/questions/value.rb | 4 +- config/locales/en.yml | 14 -- .../forms/2023/sales/sale_information.yml | 178 ++++++++++++++++++ .../forms/2024/sales/sale_information.yml | 178 ++++++++++++++++++ .../living_before_purchase_years_spec.rb | 2 +- 53 files changed, 408 insertions(+), 123 deletions(-) create mode 100644 config/locales/forms/2023/sales/sale_information.yml create mode 100644 config/locales/forms/2024/sales/sale_information.yml diff --git a/app/models/form/sales/pages/about_staircase.rb b/app/models/form/sales/pages/about_staircase.rb index 4d5882916..43089b084 100644 --- a/app/models/form/sales/pages/about_staircase.rb +++ b/app/models/form/sales/pages/about_staircase.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::AboutStaircase < ::Form::Page def initialize(id, hsh, subsection, joint_purchase:) super(id, hsh, subsection) @joint_purchase = joint_purchase - @header = "About the staircasing transaction" + @copy_key = "sales.sale_information.about_staircasing.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}" @depends_on = [{ "staircase" => 1, "joint_purchase?" => joint_purchase, diff --git a/app/models/form/sales/pages/buyer_previous.rb b/app/models/form/sales/pages/buyer_previous.rb index 87f87b66b..0d20207a3 100644 --- a/app/models/form/sales/pages/buyer_previous.rb +++ b/app/models/form/sales/pages/buyer_previous.rb @@ -2,6 +2,7 @@ class Form::Sales::Pages::BuyerPrevious < ::Form::Page def initialize(id, hsh, subsection, joint_purchase:) super(id, hsh, subsection) @joint_purchase = joint_purchase + @copy_key = "sales.sale_information.soctenant.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}" @depends_on = [{ "joint_purchase?" => joint_purchase, "soctenant_is_inferred?" => false }] end diff --git a/app/models/form/sales/pages/deposit.rb b/app/models/form/sales/pages/deposit.rb index 3e298e4f6..f0bbda05c 100644 --- a/app/models/form/sales/pages/deposit.rb +++ b/app/models/form/sales/pages/deposit.rb @@ -3,7 +3,7 @@ class Form::Sales::Pages::Deposit < ::Form::Page super(id, hsh, subsection) @ownershipsch = ownershipsch @optional = optional - @header = "About the deposit" + @copy_key = "sales.sale_information.deposit" end def questions diff --git a/app/models/form/sales/pages/deposit_discount.rb b/app/models/form/sales/pages/deposit_discount.rb index 6931a7510..caf726460 100644 --- a/app/models/form/sales/pages/deposit_discount.rb +++ b/app/models/form/sales/pages/deposit_discount.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::DepositDiscount < ::Form::Page def initialize(id, hsh, subsection, optional:) super(id, hsh, subsection) @optional = optional - @header = "About the deposit" + @copy_key = "sales.sale_information.cashdis" end def questions diff --git a/app/models/form/sales/pages/equity.rb b/app/models/form/sales/pages/equity.rb index 018ba6f79..9bf3050a0 100644 --- a/app/models/form/sales/pages/equity.rb +++ b/app/models/form/sales/pages/equity.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::Equity < ::Form::Page def initialize(id, hsh, subsection) super @id = "equity" - @header = "About the price of the property" + @copy_key = "sales.sale_information.equity" end def questions diff --git a/app/models/form/sales/pages/exchange_date.rb b/app/models/form/sales/pages/exchange_date.rb index ec71b0647..4317c39e0 100644 --- a/app/models/form/sales/pages/exchange_date.rb +++ b/app/models/form/sales/pages/exchange_date.rb @@ -2,6 +2,7 @@ class Form::Sales::Pages::ExchangeDate < ::Form::Page def initialize(id, hsh, subsection) super @id = "exchange_contracts" + @copy_key = "sales.sale_information.exchange_date" @depends_on = [{ "resale" => 2, }] diff --git a/app/models/form/sales/pages/extra_borrowing.rb b/app/models/form/sales/pages/extra_borrowing.rb index 4bb8d0530..c6ddb705a 100644 --- a/app/models/form/sales/pages/extra_borrowing.rb +++ b/app/models/form/sales/pages/extra_borrowing.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::ExtraBorrowing < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @header = "" + @copy_key = "sales.sale_information.extrabor" @description = "" @subsection = subsection @depends_on = [{ diff --git a/app/models/form/sales/pages/handover_date.rb b/app/models/form/sales/pages/handover_date.rb index 35fbe7822..c40effc8e 100644 --- a/app/models/form/sales/pages/handover_date.rb +++ b/app/models/form/sales/pages/handover_date.rb @@ -2,6 +2,7 @@ class Form::Sales::Pages::HandoverDate < ::Form::Page def initialize(id, hsh, subsection) super @id = "handover_date" + @copy_key = "sales.sale_information.handover_date" @depends_on = [ { "ownershipsch" => 1, "resale" => 2 }, ] diff --git a/app/models/form/sales/pages/la_nominations.rb b/app/models/form/sales/pages/la_nominations.rb index fc3f39f6a..6adda533d 100644 --- a/app/models/form/sales/pages/la_nominations.rb +++ b/app/models/form/sales/pages/la_nominations.rb @@ -2,6 +2,7 @@ class Form::Sales::Pages::LaNominations < ::Form::Page def initialize(id, hsh, subsection) super @id = "la_nominations" + @copy_key = "sales.sale_information.la_nominations" end def questions diff --git a/app/models/form/sales/pages/leasehold_charges.rb b/app/models/form/sales/pages/leasehold_charges.rb index a8ce52805..72b2eeea3 100644 --- a/app/models/form/sales/pages/leasehold_charges.rb +++ b/app/models/form/sales/pages/leasehold_charges.rb @@ -2,6 +2,7 @@ class Form::Sales::Pages::LeaseholdCharges < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch + @copy_key = "sales.sale_information.leaseholdcharges" end def questions diff --git a/app/models/form/sales/pages/living_before_purchase.rb b/app/models/form/sales/pages/living_before_purchase.rb index c5dd64330..3bb5510ce 100644 --- a/app/models/form/sales/pages/living_before_purchase.rb +++ b/app/models/form/sales/pages/living_before_purchase.rb @@ -3,12 +3,13 @@ class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page super(id, hsh, subsection) @ownershipsch = ownershipsch @joint_purchase = joint_purchase + @copy_key = "sales.sale_information.living_before_purchase.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}" end def questions @questions ||= [ living_before_purchase, - Form::Sales::Questions::LivingBeforePurchaseYears.new(nil, nil, self, ownershipsch: @ownershipsch), + Form::Sales::Questions::LivingBeforePurchaseYears.new(nil, nil, self, ownershipsch: @ownershipsch, joint_purchase: @joint_purchase), ].compact end diff --git a/app/models/form/sales/pages/monthly_rent.rb b/app/models/form/sales/pages/monthly_rent.rb index 29f0d895f..943e47cff 100644 --- a/app/models/form/sales/pages/monthly_rent.rb +++ b/app/models/form/sales/pages/monthly_rent.rb @@ -2,6 +2,7 @@ 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 diff --git a/app/models/form/sales/pages/mortgage_amount.rb b/app/models/form/sales/pages/mortgage_amount.rb index 73e306c2a..41fba167c 100644 --- a/app/models/form/sales/pages/mortgage_amount.rb +++ b/app/models/form/sales/pages/mortgage_amount.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::MortgageAmount < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @header = "Mortgage Amount" + @copy_key = "sales.sale_information.mortgage" @depends_on = [{ "mortgage_used?" => true }] end diff --git a/app/models/form/sales/pages/mortgage_lender.rb b/app/models/form/sales/pages/mortgage_lender.rb index f187815b1..87646a514 100644 --- a/app/models/form/sales/pages/mortgage_lender.rb +++ b/app/models/form/sales/pages/mortgage_lender.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::MortgageLender < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @header = "" + @copy_key = "sales.sale_information.mortgagelender" @description = "" @subsection = subsection @depends_on = [{ diff --git a/app/models/form/sales/pages/mortgage_lender_other.rb b/app/models/form/sales/pages/mortgage_lender_other.rb index 903a7dba8..903d6518f 100644 --- a/app/models/form/sales/pages/mortgage_lender_other.rb +++ b/app/models/form/sales/pages/mortgage_lender_other.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::MortgageLenderOther < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @header = "" + @copy_key = "sales.sale_information.mortgagelenderother" @description = "" @subsection = subsection @depends_on = [{ diff --git a/app/models/form/sales/pages/mortgage_length.rb b/app/models/form/sales/pages/mortgage_length.rb index dbc01a695..76c46694a 100644 --- a/app/models/form/sales/pages/mortgage_length.rb +++ b/app/models/form/sales/pages/mortgage_length.rb @@ -2,6 +2,7 @@ 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, }] diff --git a/app/models/form/sales/pages/mortgageused.rb b/app/models/form/sales/pages/mortgageused.rb index a4912b12d..ab48b0c2d 100644 --- a/app/models/form/sales/pages/mortgageused.rb +++ b/app/models/form/sales/pages/mortgageused.rb @@ -1,7 +1,7 @@ class Form::Sales::Pages::Mortgageused < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) - @header = "Mortgage Amount" + @copy_key = "sales.sale_information.mortgageused" @ownershipsch = ownershipsch end diff --git a/app/models/form/sales/pages/previous_bedrooms.rb b/app/models/form/sales/pages/previous_bedrooms.rb index 722822c2d..26b3ef050 100644 --- a/app/models/form/sales/pages/previous_bedrooms.rb +++ b/app/models/form/sales/pages/previous_bedrooms.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::PreviousBedrooms < ::Form::Page def initialize(id, hsh, subsection) super @id = "previous_bedrooms" - @header = "About the buyers’ previous property" + @copy_key = "sales.sale_information.frombeds" @depends_on = [ { "soctenant" => 1, diff --git a/app/models/form/sales/pages/previous_property_type.rb b/app/models/form/sales/pages/previous_property_type.rb index 8c46963d0..c5dd4f66a 100644 --- a/app/models/form/sales/pages/previous_property_type.rb +++ b/app/models/form/sales/pages/previous_property_type.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::PreviousPropertyType < ::Form::Page def initialize(id, hsh, subsection) super @id = "previous_property_type" - @header = "" + @copy_key = "sales.sale_information.fromprop" @description = "" @subsection = subsection @depends_on = [ diff --git a/app/models/form/sales/pages/previous_tenure.rb b/app/models/form/sales/pages/previous_tenure.rb index 0f4a4b250..c35b6bd67 100644 --- a/app/models/form/sales/pages/previous_tenure.rb +++ b/app/models/form/sales/pages/previous_tenure.rb @@ -2,6 +2,7 @@ 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 diff --git a/app/models/form/sales/pages/resale.rb b/app/models/form/sales/pages/resale.rb index ffdbbc046..6f4cd24e2 100644 --- a/app/models/form/sales/pages/resale.rb +++ b/app/models/form/sales/pages/resale.rb @@ -2,6 +2,7 @@ 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, diff --git a/app/models/form/sales/pages/staircase.rb b/app/models/form/sales/pages/staircase.rb index 6ab76e2bf..28b0d6b38 100644 --- a/app/models/form/sales/pages/staircase.rb +++ b/app/models/form/sales/pages/staircase.rb @@ -2,6 +2,7 @@ class Form::Sales::Pages::Staircase < ::Form::Page def initialize(id, hsh, subsection) super @id = "staircasing" + @copy_key = "sales.sale_information.staircasing" end def questions diff --git a/app/models/form/sales/pages/value_shared_ownership.rb b/app/models/form/sales/pages/value_shared_ownership.rb index a4f6dbe1c..c2212c787 100644 --- a/app/models/form/sales/pages/value_shared_ownership.rb +++ b/app/models/form/sales/pages/value_shared_ownership.rb @@ -2,7 +2,7 @@ class Form::Sales::Pages::ValueSharedOwnership < ::Form::Page def initialize(id, hsh, subsection) super @id = "value_shared_ownership" - @header = "About the price of the property" + @copy_key = "sales.sale_information.value" end def questions diff --git a/app/models/form/sales/questions/buyer_previous.rb b/app/models/form/sales/questions/buyer_previous.rb index b35a67c5e..dfc0c2fd2 100644 --- a/app/models/form/sales/questions/buyer_previous.rb +++ b/app/models/form/sales/questions/buyer_previous.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::BuyerPrevious < ::Form::Question def initialize(id, hsh, page, joint_purchase:) super(id, hsh, page) @id = "soctenant" - @check_answer_label = I18n.t("check_answer_labels.soctenant", count: joint_purchase ? 2 : 1) - @header = I18n.t("questions.soctenant", count: joint_purchase ? 2 : 1) + @copy_key = "sales.sale_information.soctenant.#{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] diff --git a/app/models/form/sales/questions/deposit_amount.rb b/app/models/form/sales/questions/deposit_amount.rb index c1d91cc12..41586cd94 100644 --- a/app/models/form/sales/questions/deposit_amount.rb +++ b/app/models/form/sales/questions/deposit_amount.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:, optional:) super(id, hsh, subsection) @id = "deposit" - @check_answer_label = "Cash deposit" - @header = "How much cash deposit was paid on the property?" + @copy_key = "sales.sale_information.deposit" @type = "numeric" @min = 0 @max = 999_999 @@ -25,14 +24,6 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question 2024 => { 1 => 96, 2 => 109, 3 => 116 }, }.freeze - def hint_text - if @optional - "Enter the total cash sum paid by the buyer towards the property that was not funded by the mortgage. This excludes any grant or loan. As this is a fully staircased sale this question is optional. If you do not have the information available click save and continue" - else - "Enter the total cash sum paid by the buyer towards the property that was not funded by the mortgage. This excludes any grant or loan" - end - end - def top_guidance_partial return "financial_calculations_shared_ownership" if @ownershipsch == 1 return "financial_calculations_discounted_ownership" if @ownershipsch == 2 diff --git a/app/models/form/sales/questions/deposit_discount.rb b/app/models/form/sales/questions/deposit_discount.rb index faf8d76f7..289e3962c 100644 --- a/app/models/form/sales/questions/deposit_discount.rb +++ b/app/models/form/sales/questions/deposit_discount.rb @@ -2,15 +2,13 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question def initialize(id, hsh, page) super @id = "cashdis" - @check_answer_label = "Cash discount through SocialHomeBuy" - @header = "How much cash discount was given through Social HomeBuy?" + @copy_key = "sales.sale_information.cashdis" @type = "numeric" @min = 0 @max = 999_999 @step = 1 @width = 5 @prefix = "£" - @hint_text = "Enter the total cash discount given on the property being purchased through the Social HomeBuy scheme" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] @top_guidance_partial = "financial_calculations_shared_ownership" end diff --git a/app/models/form/sales/questions/equity.rb b/app/models/form/sales/questions/equity.rb index 2e1ad4dee..dd1a14227 100644 --- a/app/models/form/sales/questions/equity.rb +++ b/app/models/form/sales/questions/equity.rb @@ -2,15 +2,13 @@ class Form::Sales::Questions::Equity < ::Form::Question def initialize(id, hsh, page) super @id = "equity" - @check_answer_label = "Initial percentage equity stake" - @header = "What was the initial percentage equity stake purchased?" + @copy_key = "sales.sale_information.equity" @type = "numeric" @min = 0 @max = 100 @step = 1 @width = 5 @suffix = "%" - @hint_text = "Enter the amount of initial equity held by the purchaser (for example, 25% or 50%)" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] @top_guidance_partial = "financial_calculations_shared_ownership" end diff --git a/app/models/form/sales/questions/exchange_date.rb b/app/models/form/sales/questions/exchange_date.rb index 8e9dd4691..a29a7a6c7 100644 --- a/app/models/form/sales/questions/exchange_date.rb +++ b/app/models/form/sales/questions/exchange_date.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::ExchangeDate < ::Form::Question def initialize(id, hsh, page) super @id = "exdate" - @check_answer_label = "Exchange of contracts date" - @header = "What is the exchange of contracts date?" + @copy_key = "sales.sale_information.exchange_date" @type = "date" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/models/form/sales/questions/extra_borrowing.rb b/app/models/form/sales/questions/extra_borrowing.rb index 2b4303423..e3cd0ff7e 100644 --- a/app/models/form/sales/questions/extra_borrowing.rb +++ b/app/models/form/sales/questions/extra_borrowing.rb @@ -2,12 +2,10 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "extrabor" - @check_answer_label = "Any other borrowing?" - @header = "Does this include any extra borrowing?" + @copy_key = "sales.sale_information.extrabor" @type = "radio" @answer_options = ANSWER_OPTIONS @page = page - @hint_text = "" @ownershipsch = ownershipsch @question_number = QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.max_by { |k, _v| k }.last)[ownershipsch] end diff --git a/app/models/form/sales/questions/fromprop.rb b/app/models/form/sales/questions/fromprop.rb index ec17e5939..1a3393b7a 100644 --- a/app/models/form/sales/questions/fromprop.rb +++ b/app/models/form/sales/questions/fromprop.rb @@ -2,10 +2,8 @@ class Form::Sales::Questions::Fromprop < ::Form::Question def initialize(id, hsh, page) super @id = "fromprop" - @check_answer_label = "Previous property type" - @header = "What was the previous property type?" + @copy_key = "sales.sale_information.fromprop" @type = "radio" - @hint_text = "" @page = page @answer_options = ANSWER_OPTIONS @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] diff --git a/app/models/form/sales/questions/handover_date.rb b/app/models/form/sales/questions/handover_date.rb index 5fb55e5c8..8994ecc40 100644 --- a/app/models/form/sales/questions/handover_date.rb +++ b/app/models/form/sales/questions/handover_date.rb @@ -2,10 +2,8 @@ class Form::Sales::Questions::HandoverDate < ::Form::Question def initialize(id, hsh, page) super @id = "hodate" - @check_answer_label = "Practical completion or handover date" - @header = "What is the practical completion or handover date?" + @copy_key = "sales.sale_information.handover_date" @type = "date" - @hint_text = "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/models/form/sales/questions/has_leasehold_charges.rb b/app/models/form/sales/questions/has_leasehold_charges.rb index 3e021daa0..fced1d3da 100644 --- a/app/models/form/sales/questions/has_leasehold_charges.rb +++ b/app/models/form/sales/questions/has_leasehold_charges.rb @@ -2,9 +2,7 @@ class Form::Sales::Questions::HasLeaseholdCharges < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "has_mscharge" - @check_answer_label = "Does the property have any monthly leasehold charges?" - @header = "Does the property have any monthly leasehold charges?" - @hint_text = "For example, service and management charges" + @copy_key = "sales.sale_information.leaseholdcharges.has_mscharge" @type = "radio" @answer_options = ANSWER_OPTIONS @conditional_for = { diff --git a/app/models/form/sales/questions/la_nominations.rb b/app/models/form/sales/questions/la_nominations.rb index 0d6e9e249..34540677f 100644 --- a/app/models/form/sales/questions/la_nominations.rb +++ b/app/models/form/sales/questions/la_nominations.rb @@ -2,11 +2,9 @@ class Form::Sales::Questions::LaNominations < ::Form::Question def initialize(id, hsh, page) super @id = "lanomagr" - @check_answer_label = "Household rehoused under a local authority nominations agreement?" - @header = "Was the household rehoused under a 'local authority nominations agreement'?" + @copy_key = "sales.sale_information.la_nominations" @type = "radio" @answer_options = ANSWER_OPTIONS - @hint_text = "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/models/form/sales/questions/leasehold_charges.rb b/app/models/form/sales/questions/leasehold_charges.rb index 2561ccc1d..73d57b1e4 100644 --- a/app/models/form/sales/questions/leasehold_charges.rb +++ b/app/models/form/sales/questions/leasehold_charges.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::LeaseholdCharges < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mscharge" - @check_answer_label = "Monthly leasehold charges" - @header = "Enter the total monthly charge" + @copy_key = "sales.sale_information.leaseholdcharges.mscharge" @type = "numeric" @min = 1 @step = 0.01 diff --git a/app/models/form/sales/questions/living_before_purchase.rb b/app/models/form/sales/questions/living_before_purchase.rb index 9f28d61ee..c4337e38d 100644 --- a/app/models/form/sales/questions/living_before_purchase.rb +++ b/app/models/form/sales/questions/living_before_purchase.rb @@ -2,9 +2,7 @@ class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question def initialize(id, hsh, page, ownershipsch:, joint_purchase:) super(id, hsh, page) @id = "proplen_asked" - @check_answer_label = "#{joint_purchase ? 'Buyers' : 'Buyer'} lived in the property before purchasing" - @header = "Did the #{joint_purchase ? 'buyers' : 'buyer'} live in the property before purchasing it?" - @hint_text = nil + @copy_key = "sales.sale_information.living_before_purchase.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}.proplen_asked" @type = "radio" @answer_options = ANSWER_OPTIONS @conditional_for = { diff --git a/app/models/form/sales/questions/living_before_purchase_years.rb b/app/models/form/sales/questions/living_before_purchase_years.rb index 4ef92a46c..465ba9877 100644 --- a/app/models/form/sales/questions/living_before_purchase_years.rb +++ b/app/models/form/sales/questions/living_before_purchase_years.rb @@ -1,10 +1,8 @@ class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question - def initialize(id, hsh, page, ownershipsch:) + def initialize(id, hsh, page, ownershipsch:, joint_purchase:) super(id, hsh, page) @id = "proplen" - @check_answer_label = "Number of years living in the property before purchase" - @header = header_text - @hint_text = hint_text + @copy_key = "sales.sale_information.living_before_purchase.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}.proplen" @type = "numeric" @min = 0 @max = 80 @@ -14,22 +12,6 @@ class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question @question_number = question_number end - def header_text - if form.start_date.year >= 2023 - "How long did they live there?" - else - "How long did the buyer(s) live in the property before purchase?" - end - end - - def hint_text - if form.start_date.year >= 2023 - "You should round up to the nearest year" - else - "You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'" - end - end - def suffix_label(log) " #{'year'.pluralize(log[id])}" end diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb index c53f1b7e6..7e64d8571 100644 --- a/app/models/form/sales/questions/monthly_rent.rb +++ b/app/models/form/sales/questions/monthly_rent.rb @@ -2,14 +2,12 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question def initialize(id, hsh, page) super @id = "mrent" - @check_answer_label = "Monthly rent" - @header = "What is the basic monthly rent?" + @copy_key = "sales.sale_information.mrent" @type = "numeric" @min = 0 @step = 0.01 @width = 5 @prefix = "£" - @hint_text = "Amount paid before any charges" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/models/form/sales/questions/mortgage_amount.rb b/app/models/form/sales/questions/mortgage_amount.rb index cfd031f27..a6ffcf26a 100644 --- a/app/models/form/sales/questions/mortgage_amount.rb +++ b/app/models/form/sales/questions/mortgage_amount.rb @@ -2,14 +2,12 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgage" - @check_answer_label = "Mortgage amount" - @header = "What is the mortgage amount?" + @copy_key = "sales.sale_information.mortgage" @type = "numeric" @min = 1 @step = 1 @width = 5 @prefix = "£" - @hint_text = "Enter the amount of mortgage agreed with the mortgage lender. Exclude any deposits or cash payments. Numeric in pounds. Rounded to the nearest pound." @ownershipsch = ownershipsch @question_number = QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.max_by { |k, _v| k }.last)[ownershipsch] @top_guidance_partial = top_guidance_partial diff --git a/app/models/form/sales/questions/mortgage_lender.rb b/app/models/form/sales/questions/mortgage_lender.rb index bf4c93b55..c5a10efb4 100644 --- a/app/models/form/sales/questions/mortgage_lender.rb +++ b/app/models/form/sales/questions/mortgage_lender.rb @@ -2,10 +2,8 @@ class Form::Sales::Questions::MortgageLender < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgagelender" - @check_answer_label = "Mortgage Lender" - @header = "What is the name of the mortgage lender?" + @copy_key = "sales.sale_information.mortgagelender" @type = "select" - @hint_text = "" @page = page @bottom_guidance_partial = "mortgage_lender" @ownershipsch = ownershipsch diff --git a/app/models/form/sales/questions/mortgage_lender_other.rb b/app/models/form/sales/questions/mortgage_lender_other.rb index 677b1c117..49876efb0 100644 --- a/app/models/form/sales/questions/mortgage_lender_other.rb +++ b/app/models/form/sales/questions/mortgage_lender_other.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::MortgageLenderOther < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgagelenderother" - @check_answer_label = "Other Mortgage Lender" - @header = "What is the other mortgage lender?" + @copy_key = "sales.sale_information.mortgagelenderother" @type = "text" @page = page @ownershipsch = ownershipsch diff --git a/app/models/form/sales/questions/mortgage_length.rb b/app/models/form/sales/questions/mortgage_length.rb index e1bda4ea0..877818b98 100644 --- a/app/models/form/sales/questions/mortgage_length.rb +++ b/app/models/form/sales/questions/mortgage_length.rb @@ -2,14 +2,12 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortlen" - @check_answer_label = "Length of mortgage" - @header = "What is the length of the mortgage?" + @copy_key = "sales.sale_information.mortlen" @type = "numeric" @min = 0 @max = 60 @step = 1 @width = 5 - @hint_text = "You should round up to the nearest year. Value should not exceed 60 years." @ownershipsch = ownershipsch @question_number = QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.max_by { |k, _v| k }.last)[ownershipsch] end diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb index 4ece2544e..341d3ff60 100644 --- a/app/models/form/sales/questions/mortgageused.rb +++ b/app/models/form/sales/questions/mortgageused.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgageused" - @check_answer_label = "Mortgage used" - @header = "Was a mortgage used for the purchase of this property?" + @copy_key = "sales.sale_information.mortgageused" @type = "radio" @answer_options = ANSWER_OPTIONS @ownershipsch = ownershipsch diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb index 50970bc89..d29da208a 100644 --- a/app/models/form/sales/questions/previous_bedrooms.rb +++ b/app/models/form/sales/questions/previous_bedrooms.rb @@ -2,14 +2,12 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question def initialize(id, hsh, page) super @id = "frombeds" - @check_answer_label = "Number of bedrooms in previous property" - @header = "How many bedrooms did the property have?" + @copy_key = "sales.sale_information.frombeds" @type = "numeric" @width = 5 @min = 1 @max = 6 @step = 1 - @hint_text = "For bedsits enter 1" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/models/form/sales/questions/previous_tenure.rb b/app/models/form/sales/questions/previous_tenure.rb index 7227fa00e..55b103f0d 100644 --- a/app/models/form/sales/questions/previous_tenure.rb +++ b/app/models/form/sales/questions/previous_tenure.rb @@ -2,10 +2,8 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question def initialize(id, hsh, page) super @id = "socprevten" - @check_answer_label = "Previous property tenure" - @header = "What was the previous tenure of the buyer?" + @copy_key = "sales.sale_information.socprevten" @type = "radio" - @hint_text = "" @page = page @answer_options = ANSWER_OPTIONS @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] diff --git a/app/models/form/sales/questions/resale.rb b/app/models/form/sales/questions/resale.rb index be4e5535d..0026adb48 100644 --- a/app/models/form/sales/questions/resale.rb +++ b/app/models/form/sales/questions/resale.rb @@ -2,11 +2,9 @@ class Form::Sales::Questions::Resale < ::Form::Question def initialize(id, hsh, page) super @id = "resale" - @check_answer_label = "Is this a resale?" - @header = "Is this a resale?" + @copy_key = "sales.sale_information.resale" @type = "radio" @answer_options = ANSWER_OPTIONS - @hint_text = "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'." @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/models/form/sales/questions/staircase.rb b/app/models/form/sales/questions/staircase.rb index 1eb84bfb5..9fc969735 100644 --- a/app/models/form/sales/questions/staircase.rb +++ b/app/models/form/sales/questions/staircase.rb @@ -2,11 +2,9 @@ class Form::Sales::Questions::Staircase < ::Form::Question def initialize(id, hsh, page) super @id = "staircase" - @check_answer_label = "Staircasing transaction" - @header = "Is this a staircasing transaction?" + @copy_key = "sales.sale_information.staircasing" @type = "radio" @answer_options = ANSWER_OPTIONS - @hint_text = "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/models/form/sales/questions/staircase_bought.rb b/app/models/form/sales/questions/staircase_bought.rb index 0a6343db4..8a3e88347 100644 --- a/app/models/form/sales/questions/staircase_bought.rb +++ b/app/models/form/sales/questions/staircase_bought.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::StaircaseBought < ::Form::Question def initialize(id, hsh, page) super @id = "stairbought" - @check_answer_label = "Percentage bought in this staircasing transaction" - @header = "What percentage of the property has been bought in this staircasing transaction?" + @copy_key = "sales.sale_information.about_staircasing.stairbought" @type = "numeric" @width = 5 @min = 0 diff --git a/app/models/form/sales/questions/staircase_owned.rb b/app/models/form/sales/questions/staircase_owned.rb index 64614e608..2dd83d941 100644 --- a/app/models/form/sales/questions/staircase_owned.rb +++ b/app/models/form/sales/questions/staircase_owned.rb @@ -2,8 +2,7 @@ class Form::Sales::Questions::StaircaseOwned < ::Form::Question def initialize(id, hsh, page, joint_purchase:) super(id, hsh, page) @id = "stairowned" - @check_answer_label = I18n.t("check_answer_labels.stairowned", count: joint_purchase ? 2 : 1) - @header = I18n.t("questions.stairowned", count: joint_purchase ? 2 : 1) + @copy_key = "sales.sale_information.about_staircasing.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}.stairowned" @type = "numeric" @width = 5 @min = 0 diff --git a/app/models/form/sales/questions/value.rb b/app/models/form/sales/questions/value.rb index 3ec96e76e..257344fa2 100644 --- a/app/models/form/sales/questions/value.rb +++ b/app/models/form/sales/questions/value.rb @@ -2,14 +2,12 @@ class Form::Sales::Questions::Value < ::Form::Question def initialize(id, hsh, page) super @id = "value" - @check_answer_label = "Full purchase price" - @header = "What was the full purchase price?" + @copy_key = "sales.sale_information.value" @type = "numeric" @min = 0 @step = 1 @width = 5 @prefix = "£" - @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_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] @top_guidance_partial = "financial_calculations_shared_ownership" end diff --git a/config/locales/en.yml b/config/locales/en.yml index 106ccb9fa..99bfd74f6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -701,12 +701,6 @@ Make sure these answers are correct." W: "Suitable for someone who uses a wheelchair and offers the full use of all rooms and facilities." A: "Fitted with stairlifts, ramps, level access showers or grab rails." N: "Not designed to wheelchair-user standards or fitted with any equipment or adaptations." - soctenant: - one: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" - other: "Were any of the buyers private registered providers, housing association or local authority tenants immediately before this sale?" - stairowned: - one: "What percentage of the property does the buyer now own in total?" - other: "What percentage of the property do the buyers now own in total?" hints: location: @@ -720,14 +714,6 @@ Make sure these answers are correct." bulk_upload: needstype: "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." - check_answer_labels: - soctenant: - one: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" - other: "Any buyers were registered providers, housing association or local authority tenants immediately before this sale?" - stairowned: - one: "Percentage the buyer now owns in total." - other: "Percentage the buyers now own in total." - warnings: organisation: deactivate: "All schemes and users at this organisation will be deactivated. All the organisation's relationships will be removed. It will no longer be possible to create logs for this organisation." diff --git a/config/locales/forms/2023/sales/sale_information.yml b/config/locales/forms/2023/sales/sale_information.yml new file mode 100644 index 000000000..20caf8f46 --- /dev/null +++ b/config/locales/forms/2023/sales/sale_information.yml @@ -0,0 +1,178 @@ +en: + forms: + 2023: + sales: + sale_information: + living_before_purchase: + joint_purchase: + page_header: "" + proplen: + check_answer_label: "Number of years living in the property before purchase" + hint_text: "You should round up to the nearest year" + question_text: "How long did they live there?" + proplen_asked: + check_answer_label: "Buyers lived in the property before purchasing" + hint_text: "" + question_text: "Did the buyers live in the property before purchasing it?" + not_joint_purchase: + page_header: "" + proplen: + check_answer_label: "Number of years living in the property before purchase" + hint_text: "You should round up to the nearest year" + question_text: "How long did they live there?" + proplen_asked: + check_answer_label: "Buyer lived in the property before purchasing" + hint_text: "" + question_text: "Did the buyer live in the property before purchasing it?" + + staircasing: + page_header: "" + check_answer_label: "Staircasing transaction" + hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" + question_text: "Is this a staircasing transaction?" + about_staircasing: + page_header: "About the staircasing transaction" + stairbought: + check_answer_label: "Percentage bought in this staircasing transaction" + hint_text: "" + question_text: "What percentage of the property has been bought in this staircasing transaction?" + stairowned: + joint_purchase: + check_answer_label: "Percentage the buyers now own in total." + hint_text: "" + question_text: "What percentage of the property do the buyers now own in total?" + not_joint_purchase: + check_answer_label: "Percentage the buyer now owns in total." + hint_text: "" + question_text: "What percentage of the property does the buyer now own in total?" + + resale: + page_header: "" + check_answer_label: "Is this a resale?" + hint_text: "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'." + question_text: "Is this a resale?" + + exchange_contracts": + page_header: "" + check_answer_label: "Exchange of contracts date" + hint_text: "" + question_text: "What is the exchange of contracts date?" + + handover_date: + page_header: "" + check_answer_label: "Practical completion or handover date" + hint_text: "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)" + question_text: "What is the practical completion or handover date?" + + la_nominations: + page_header: "" + check_answer_label: "Household rehoused under a local authority nominations agreement?" + hint_text: "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing" + question_text: "Was the household rehoused under a 'local authority nominations agreement'?" + + soctenant: + joint_purchase: + page_header: "" + check_answer_label: "Any buyers were registered providers, housing association or local authority tenants immediately before this sale?" + hint_text: "" + question_text: "Were any of the buyers private registered providers, housing association or local authority tenants immediately before this sale?" + not_joint_purchase: + page_header: "" + check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" + hint_text: "" + question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" + + frombeds: + page_header: "About the buyers’ previous property" + check_answer_label: "Number of bedrooms in previous property" + hint_text: "For bedsits enter 1" + question_text: "How many bedrooms did the property have?" + + fromprop: + page_header: "" + check_answer_label: "Previous property type" + hint_text: "" + question_text: "What was the previous property type?" + + socprevten: + page_header: "" + check_answer_label: "Previous property tenure" + hint_text: "" + question_text: "What was the previous tenure of the buyer?" + + value: + page_header: "About the price of the property" + 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?" + + equity: + page_header: "About the price of the property" + check_answer_label: "Initial percentage equity stake" + hint_text: "Enter the amount of initial equity held by the purchaser (for example, 25% or 50%)" + question_text: "What was the initial percentage equity stake purchased?" + + mortgageused: + page_header: "Mortgage Amount" + check_answer_label: "Mortgage used" + hint_text: "" + question_text: "Was a mortgage used for the purchase of this property?" + + mortgage: + page_header: "Mortgage Amount" + check_answer_label: "Mortgage amount" + hint_text: "Enter the amount of mortgage agreed with the mortgage lender. Exclude any deposits or cash payments. Numeric in pounds. Rounded to the nearest pound." + question_text: "What is the mortgage amount?" + + mortgagelender: + page_header: "" + check_answer_label: "Mortgage lender" + hint_text: "" + question_text: "What is the name of the mortgage lender?" + + mortgagelenderother: + page_header: "" + check_answer_label: "Other Mortgage Lender" + hint_text: "" + question_text: "What is the other mortgage lender?" + + mortlen: + page_header: "" + check_answer_label: "Length of mortgage" + hint_text: "You should round up to the nearest year. Value should not exceed 60 years." + question_text: "What is the length of the mortgage?" + + extrabor: + page_header: "" + check_answer_label: "Any other borrowing?" + hint_text: "" + question_text: "Does this include any extra borrowing?" + + deposit: + page_header: "About the deposit" + check_answer_label: "Deposit amount" + hint_text: "Enter the total cash sum paid by the buyer towards the property that was not funded by the mortgage. This excludes any grant or loan" + question_text: "How much cash deposit was paid on the property?" + + cashdis: + page_header: "About the deposit" + check_answer_label: "Cash discount through SocialHomeBuy" + hint_text: "Enter the total cash discount given on the property being purchased through the Social HomeBuy scheme" + question_text: "How much cash discount was given through Social HomeBuy?" + + mrent: + page_header: "" + check_answer_label: "Monthly rent" + hint_text: "Amount paid before any charges" + question_text: "What is the basic monthly rent?" + + leaseholdcharges: + page_header: "" + has_mscharge: + check_answer_label: "Does the property have any monthly leasehold charges?" + hint_text: "For example, service and management charges" + question_text: "Does the property have any monthly leasehold charges?" + mscharge: + check_answer_label: "Monthly leasehold charges" + hint_text: "" + question_text: "Enter the total monthly charge" \ No newline at end of file diff --git a/config/locales/forms/2024/sales/sale_information.yml b/config/locales/forms/2024/sales/sale_information.yml new file mode 100644 index 000000000..a69aaa678 --- /dev/null +++ b/config/locales/forms/2024/sales/sale_information.yml @@ -0,0 +1,178 @@ +en: + forms: + 2024: + sales: + sale_information: + living_before_purchase: + joint_purchase: + page_header: "" + proplen: + check_answer_label: "Number of years living in the property before purchase" + hint_text: "You should round up to the nearest year" + question_text: "How long did they live there?" + proplen_asked: + check_answer_label: "Buyers lived in the property before purchasing" + hint_text: "" + question_text: "Did the buyers live in the property before purchasing it?" + not_joint_purchase: + page_header: "" + proplen: + check_answer_label: "Number of years living in the property before purchase" + hint_text: "You should round up to the nearest year" + question_text: "How long did they live there?" + proplen_asked: + check_answer_label: "Buyer lived in the property before purchasing" + hint_text: "" + question_text: "Did the buyer live in the property before purchasing it?" + + staircasing: + page_header: "" + check_answer_label: "Staircasing transaction" + hint_text: "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" + question_text: "Is this a staircasing transaction?" + about_staircasing: + page_header: "About the staircasing transaction" + stairbought: + check_answer_label: "Percentage bought in this staircasing transaction" + hint_text: "" + question_text: "What percentage of the property has been bought in this staircasing transaction?" + stairowned: + joint_purchase: + check_answer_label: "Percentage the buyers now own in total." + hint_text: "" + question_text: "What percentage of the property do the buyers now own in total?" + not_joint_purchase: + check_answer_label: "Percentage the buyer now owns in total." + hint_text: "" + question_text: "What percentage of the property does the buyer now own in total?" + + resale: + page_header: "" + check_answer_label: "Is this a resale?" + hint_text: "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'." + question_text: "Is this a resale?" + + exchange_contracts": + page_header: "" + check_answer_label: "Exchange of contracts date" + hint_text: "" + question_text: "What is the exchange of contracts date?" + + handover_date: + page_header: "" + check_answer_label: "Practical completion or handover date" + hint_text: "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)" + question_text: "What is the practical completion or handover date?" + + la_nominations: + page_header: "" + check_answer_label: "Household rehoused under a local authority nominations agreement?" + hint_text: "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing" + question_text: "Was the household rehoused under a 'local authority nominations agreement'?" + + soctenant: + joint_purchase: + page_header: "" + check_answer_label: "Any buyers were registered providers, housing association or local authority tenants immediately before this sale?" + hint_text: "" + question_text: "Were any of the buyers private registered providers, housing association or local authority tenants immediately before this sale?" + not_joint_purchase: + page_header: "" + check_answer_label: "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?" + hint_text: "" + question_text: "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?" + + frombeds: + page_header: "About the buyers’ previous property" + check_answer_label: "Number of bedrooms in previous property" + hint_text: "For bedsits enter 1" + question_text: "How many bedrooms did the property have?" + + fromprop: + page_header: "" + check_answer_label: "Previous property type" + hint_text: "" + question_text: "What was the previous property type?" + + socprevten: + page_header: "" + check_answer_label: "Previous property tenure" + hint_text: "" + question_text: "What was the previous tenure of the buyer?" + + value: + page_header: "About the price of the property" + 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?" + + equity: + page_header: "About the price of the property" + check_answer_label: "Initial percentage equity stake" + hint_text: "Enter the amount of initial equity held by the purchaser (for example, 25% or 50%)" + question_text: "What was the initial percentage equity stake purchased?" + + mortgageused: + page_header: "Mortgage Amount" + check_answer_label: "Mortgage used" + hint_text: "" + question_text: "Was a mortgage used for the purchase of this property?" + + mortgage: + page_header: "Mortgage Amount" + check_answer_label: "Mortgage amount" + hint_text: "Enter the amount of mortgage agreed with the mortgage lender. Exclude any deposits or cash payments. Numeric in pounds. Rounded to the nearest pound." + question_text: "What is the mortgage amount?" + + mortgagelender: + page_header: "" + check_answer_label: "Mortgage lender" + hint_text: "" + question_text: "What is the name of the mortgage lender?" + + mortgagelenderother: + page_header: "" + check_answer_label: "Other Mortgage Lender" + hint_text: "" + question_text: "What is the other mortgage lender?" + + mortlen: + page_header: "" + check_answer_label: "Length of mortgage" + hint_text: "You should round up to the nearest year. Value should not exceed 60 years." + question_text: "What is the length of the mortgage?" + + extrabor: + page_header: "" + check_answer_label: "Any other borrowing?" + hint_text: "" + question_text: "Does this include any extra borrowing?" + + deposit: + page_header: "About the deposit" + check_answer_label: "Deposit amount" + hint_text: "Enter the total cash sum paid by the buyer towards the property that was not funded by the mortgage. This excludes any grant or loan. As this is a fully staircased sale this question is optional. If you do not have the information available click save and continue" + question_text: "How much cash deposit was paid on the property?" + + cashdis: + page_header: "About the deposit" + check_answer_label: "Cash discount through SocialHomeBuy" + hint_text: "Enter the total cash discount given on the property being purchased through the Social HomeBuy scheme" + question_text: "How much cash discount was given through Social HomeBuy?" + + mrent: + page_header: "" + check_answer_label: "Monthly rent" + hint_text: "Amount paid before any charges" + question_text: "What is the basic monthly rent?" + + leaseholdcharges: + page_header: "" + has_mscharge: + check_answer_label: "Does the property have any monthly leasehold charges?" + hint_text: "For example, service and management charges" + question_text: "Does the property have any monthly leasehold charges?" + mscharge: + check_answer_label: "Monthly leasehold charges" + hint_text: "" + question_text: "Enter the total monthly charge" \ No newline at end of file diff --git a/spec/models/form/sales/questions/living_before_purchase_years_spec.rb b/spec/models/form/sales/questions/living_before_purchase_years_spec.rb index c9893dece..ddf5abd8f 100644 --- a/spec/models/form/sales/questions/living_before_purchase_years_spec.rb +++ b/spec/models/form/sales/questions/living_before_purchase_years_spec.rb @@ -1,7 +1,7 @@ require "rails_helper" RSpec.describe Form::Sales::Questions::LivingBeforePurchaseYears, type: :model do - subject(:question) { described_class.new(question_id, question_definition, page, ownershipsch: 1) } + subject(:question) { described_class.new(question_id, question_definition, page, ownershipsch: 1, joint_purchase: true) } let(:question_id) { nil } let(:question_definition) { nil }