+ <% display_actions = current_user.data_coordinator? || current_user.support? %>
+
">
+ <% if display_actions %>
+ <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
+ <% end %>
+
<%= render SearchComponent.new(current_user:, search_label: "Search by name or email address", value: @searched) %>
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 6ebc090b6..ac615b0e2 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -7411,10 +7411,10 @@
}
],
"title_text": {
- "translation": "soft_validations.net_income.title_text"
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.title_text"
},
"informative_text": {
- "translation": "soft_validations.net_income.hint_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments": [
{
"key": "ecstat1",
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 54cd67fd4..7d6f44b20 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -7870,7 +7870,7 @@
}
],
"title_text": {
- "translation": "soft_validations.net_income.title_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.title_text",
"arguments": [
{
"key": "incfreq",
@@ -7885,7 +7885,7 @@
]
},
"informative_text": {
- "translation": "soft_validations.net_income.hint_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments": [
{
"key": "net_income_higher_or_lower_text",
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 103d91295..1c8f49dfb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -61,22 +61,6 @@ en:
<<: *bulk_upload__row_parser__base
bulk_upload/sales/year2023/row_parser:
<<: *bulk_upload__row_parser__base
- bulk_upload/lettings/validator:
- attributes:
- base:
- blank_file: "Template is blank - The template must be filled in for us to create the logs and check if data is correct."
- wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
- over_max_column_count: "Too many columns, please ensure you have used the correct template."
- wrong_template: "Incorrect start dates, please ensure you have used the correct template."
- no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
- bulk_upload/sales/validator:
- attributes:
- base:
- blank_file: "Template is blank - The template must be filled in for us to create the logs and check if data is correct."
- wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
- over_max_column_count: "Too many columns, please ensure you have used the correct template."
- wrong_template: "Incorrect sale dates, please ensure you have used the correct template."
- no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
forms/bulk_upload_lettings/year:
attributes:
year:
@@ -255,23 +239,12 @@ en:
merged: "That organisation has already been merged. Select a different organisation."
scheme_duplicates_not_resolved: "You must resolve all duplicates or indicate that there are no duplicates"
not_answered: "You must answer %{question}"
+ not_number: "%{field} must be a number."
invalid_option: "Enter a valid value for %{question}"
invalid_number: "Enter a number for %{question}"
no_address_found: "We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."
- other_field_missing: "If %{main_field_label} is other then %{other_field_label} must be provided."
- other_field_not_required: "%{other_field_label} must not be provided if %{main_field_label} was not other."
- numeric:
- within_range: "%{field} must be between %{min} and %{max}."
- above_min: "%{field} must be at least %{min}."
- whole_number: "%{field} must be a whole number."
- nearest_ten: "%{field} must be given to the nearest ten."
- nearest_hundredth: "%{field} must be given to the nearest hundredth."
- normal_format: "Enter a number."
- format: "%{field} must be a number."
-
date:
- invalid_date: "Enter a date in the correct format, for example 31 1 2024."
outside_collection_window: "Enter a date within the %{year_combo} collection year, which is between 1st April %{start_year} and 31st March %{end_year}."
postcode: "Enter a postcode in the correct format, for example AA1 1AA."
location_admin_district: "Select a local authority."
@@ -285,41 +258,10 @@ en:
setup:
saledate:
year_not_two_or_four_digits: "Sale completion year must be 2 or 4 digits."
-
startdate:
before_scheme_end_date: "The tenancy start date must be before the end date for this supported housing scheme."
- year_not_two_or_four_digits: "Tenancy start year must be 2 or 4 digits."
- location:
- deactivated:
- startdate: "The location %{postcode} is inactive on this date. Enter another date or choose another location."
- location_id: "This location is not active on the tenancy start date. Choose another location or edit the tenancy start date."
- activating_soon:
- startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
- location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
- reactivating_soon:
- startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
- location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
- scheme:
- deactivated:
- startdate: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
- scheme_id: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
- reactivating_soon:
- startdate: "The scheme %{name} is not available until %{date}. Enter a tenancy start date after %{date}."
- scheme_id: "The scheme %{name} is not available until %{date}. Select another scheme or edit the tenancy start date."
- locations_inactive:
- startdate: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."
- scheme_id: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."
owning_organisation:
data_sharing_agreement_not_signed: "The organisation must accept the Data Sharing Agreement before it can be selected as the owning organisation."
- lettype:
- general_needs_mismatch: "Lettings type must be a general needs type because you selected general needs when uploading the file."
- supported_housing_mismatch: "Lettings type must be a supported housing type because you selected supported housing when uploading the file."
- needstype_general_needs: "This needs type is general needs, but the letting type is supported housing. Change either the needs type or the letting type."
- needstype_supported_housing: "This needs type is supported housing, but the letting type is general needs. Change either the needs type or the letting type."
- needstype:
- lettype_not_general_needs: "This letting type is supported housing, but the needs type is general needs. Change either the needs type or the letting type."
- lettype_not_supported_housing: "This letting type is general needs, but the needs type is supported housing. Change either the needs type or the letting type."
-
property:
uprn:
invalid: "UPRN must be 12 digits or less."
@@ -341,77 +283,10 @@ en:
one_three_bedroom_single_tenant_shared: "A shared house with fewer than two tenants must have 1 to 3 bedrooms."
financial:
- tshortfall:
- outstanding_amount_not_expected: "You cannot answer the outstanding amount question if you don’t have outstanding rent or charges."
- more_than_total_charge: "Enter a value less than the total charge."
- more_than_carehome_charge: "Enter a value less than the care home charge."
- must_be_positive: "Enter a value over £0.01 as you told us there is an outstanding amount."
- hbrentshortfall:
- outstanding_amount_not_expected: "Answer must be ‘yes’ as you have answered the outstanding amount question."
- outstanding_no_benefits: "Answer cannot be ‘yes’ to outstanding amount for basic rent or charges if tenant does not receive housing benefit or Universal Credit or you‘re not sure."
- benefits:
- part_or_full_time: "Answer cannot be ‘all’ for income from Universal Credit, state pensions or benefits if the tenant or their partner works part-time or full-time."
- earnings:
- over_hard_max: "The household’s income cannot be greater than %{hard_max} per week given the household’s working situation."
- under_hard_min: "The household’s income cannot be less than %{hard_min} per week given the household’s working situation."
- freq_missing: "Select how often the household receives income."
- earnings_missing: "Enter how much income the household has in total."
- negative_currency: "Enter an amount above 0."
- rent:
- out_of_range: "Enter a value for the %{charge_name} between £0 and %{maximum_per_period} paid %{frequency}. %{maximum_per_period} is the max limit for rent and charges paid %{frequency} for %{letting_type} lettings owned by a %{provider_type}."
- ecstat:
- over_hard_max: "The household’s income of %{earnings} %{frequency} is too high given the household’s working situation."
- under_hard_min: "The household’s income of %{earnings} %{frequency} is too low given the household’s working situation."
- age:
- earnings_over_hard_max: "The household’s income of %{earnings} %{frequency} is too high for the number of adults. Change either the household income or the age of the tenants."
- hhmemb:
- earnings:
- over_hard_max: "The household’s income of %{earnings} %{frequency} is too high for this number of tenants. Change either the household income or number of tenants."
- under_hard_min: "The household’s income of %{earnings} %{frequency} is too low for this number of tenants. Change either the household income or number of tenants."
- brent:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period, local authority and (if general needs) number of bedrooms."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period, local authority and (if general needs) number of bedrooms."
- scheme_id:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period and local authority."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period and local authority."
- location_id:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period and local authority."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period and local authority."
- postcode_known:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period, local authority and number of bedrooms."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period, local authority and number of bedrooms."
- uprn:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this UPRN."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this UPRN."
- la:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this local authority."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this local authority."
- beds:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this number of bedrooms."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this number of bedrooms."
- needstype:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this lettings type."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this lettings type."
- rent_type:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this lettings type."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this lettings type."
- period:
- below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this period."
- above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this period."
charges:
- complete_1_of_3: "Answer either the ‘household rent and charges’ question or ‘is this accommodation a care home‘, or select ‘no’ for ‘does the household pay rent or charges for the accommodation?’"
missing_charges: "Please enter the %{sentence_fragment}. If there is no %{sentence_fragment}, please enter '0'."
- tcharge:
- under_10: "Enter a total charge that is at least £10.00 per week."
- less_than_shortfall: "The total charge must be more than the outstanding amount."
- rent_period:
- invalid_for_org:
- period: "%{org_name} does not use %{rent_period} as a rent period. Choose another rent period, or a data coordinator can add rent periods to your organisation."
- managing_org: "%{org_name} does not use %{rent_period} as a rent period. Set another rent period on this log, or a data coordinator can add rent periods to this organisation."
carehome:
- out_of_range: "Household rent and other charges must be between %{min_chcharge} and %{max_chcharge} if paying %{period}."
not_provided: "Enter how much rent and other charges the household pays %{period}."
- less_than_shortfall: "The care home charge must be more than the outstanding amount."
cash_discount_invalid: "Cash discount must be £0 - £999,999."
mortgage_used:
year: "You must answer either ‘yes’ or ‘no’ to the question ‘was a mortgage used’ for the selected year."
@@ -461,7 +336,6 @@ en:
cannot_be_student: "Person cannot be a student if they are aged 16-19 but are not a child."
relat:
child_under_16_lettings: "Answer cannot be ‘partner’ as you told us person %{person_num}'s age is under 16."
- one_partner: "Number of partners cannot be greater than 1."
not_student_16_19: "Answer cannot be ‘child’ as you told us the person %{person_num} is between 16 and 19 and is not a full-time student."
student_16_19:
cannot_be_child:
@@ -470,13 +344,8 @@ en:
child_over_19: "Answer cannot be child as you told us person %{person_num} is over 19."
housingneeds_a:
one_or_two_choices: "You can only select one option or ‘other disabled access needs’ plus ‘wheelchair-accessible housing’, ‘wheelchair access to essential rooms’ or ‘level access housing’."
- housingneeds_type:
- only_one_option_permitted: "Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected."
housingneeds:
invalid: "If somebody in the household has disabled access needs, they must have the access needs listed, or other access needs."
- no_disabled_needs_conjunction: "No disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs."
- dont_know_disabled_needs_conjunction: "Don’t know disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs."
- no_and_dont_know_disabled_needs_conjunction: "No disabled access needs and don’t know disabled access needs cannot be selected together."
prevten:
non_temp_accommodation: "Answer cannot be non-temporary accommodation as this is a re-let to a tenant who occupied the same property as temporary accommodation."
over_25_foster_care: "Answer cannot be a children’s home or foster care as the lead tenant is 26 or older."
@@ -491,10 +360,8 @@ en:
other_homeless: "Answer cannot be internal transfer as the tenant was considered homeless by their landlord."
prevten_invalid: "Answer cannot be internal transfer as the household situation immediately before this letting was %{prevten}."
reason_permanently_decanted: "Answer must be internal transfer as the tenant was permanently decanted from another property owned by this landlord."
- nominated_by_local_ha_but_la: "The source of the referral cannot be Nominated by local housing authority as your organisation is a local authority."
la_general_needs:
internal_transfer: "Answer cannot be internal transfer as it’s the same landlord on the tenancy agreement and the household had either a fixed-term or lifetime local authority general needs tenancy immediately before this letting."
- prp_referred_by_la: "The source of the referral cannot be referred by local authority housing department for a general needs log."
homeless:
assessed:
internal_transfer: "Answer cannot be 'assessed as homeless' as this tenancy is an internal transfer."
@@ -515,8 +382,6 @@ en:
retired_female: "Answer cannot be ‘female’ as tenant is under 60 and retired."
reason:
not_internal_transfer: "Answer cannot be ‘permanently decanted from another property owned by this landlord’ as you told us the source of referral for this tenancy was not an internal transfer."
- renewal_reason_needed: 'The reason for leaving must be "End of assured shorthold tenancy - no fault" or "End of fixed term tenancy - no fault" if the letting is a renewal.'
- renewal_reason_needed_2024: 'The reason for leaving must be "End of social or private sector tenancy - no fault", "End of social or private sector tenancy - evicted due to anti-social behaviour (ASB)", "End of social or private sector tenancy - evicted due to rent arrears" or "End of social or private sector tenancy - evicted for any other reason".'
other_not_settled: "Please give the reason for the tenant leaving their last settled home. This is where they were living before they became homeless, were living in temporary accommodation or sleeping rough."
condition_effects:
no_choices: "You cannot answer this question as you told us nobody in the household has a physical or mental health condition (or other illness) expected to last 12 months or more."
@@ -525,14 +390,8 @@ en:
nationality: "Select a valid nationality."
tenancy:
- length:
- fixed_term_not_required: "You must only answer the length of the tenancy if it's fixed-term."
- invalid_fixed: "Enter a tenancy length between %{min_tenancy_length} and 99 years for a tenancy of this type."
- invalid_periodic: "Enter a tenancy length between %{min_tenancy_length} and 99 years (or don't specify the length) for a tenancy of this type."
internal_transfer: "Answer must be secure tenancy as this tenancy is an internal transfer."
cannot_be_internal_transfer: "Answer cannot be internal transfer as this is not a secure tenancy."
- not_joint: "This cannot be a joint tenancy as you've told us there's only one person in the household."
- joint_more_than_one_member: "There must be more than one person in the household as you've told us this is a joint tenancy."
declaration:
missing:
@@ -578,23 +437,6 @@ en:
organisation_not_selected: "Select an organisation from the search list."
soft_validations:
- net_income:
- title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
- hint_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
- in_soft_min_range:
- message: "Net income is lower than expected based on the household’s working situation. Are you sure this is correct?"
- in_soft_max_range:
- message: "Net income is higher than expected based on the household’s working situation. Are you sure this is correct?"
- rent:
- outside_range_title: "You told us the rent is %{brent}."
- informative_text: "This is %{higher_or_lower} than we would expect."
- hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
- staircase_owned:
- title_text:
- one: "You told us that the buyer now owns %{stairowned} of the property."
- two: "You told us that the buyers now own %{stairowned} of the property."
- hint_text: "The maximum percentage that can be owned under the Older Persons Shared Ownership scheme is 75%, unless the property was funded outside the Affordable Homes Programme.
-Make sure these answers are correct."
retirement:
min:
title: "You told us this person is aged %{age} years and retired."
@@ -602,61 +444,6 @@ Make sure these answers are correct."
max:
title: "You told us this person is over 66 and not retired."
hint_text: "The minimum expected retirement age in England is 66."
- extra_borrowing:
- title_text: "You told us that the mortgage and deposit total is %{mortgage_and_deposit_total}."
- hint_text: "This is higher than the purchase price minus the discount."
- pregnancy:
- title: "You told us somebody in the household is pregnant."
- all_male_tenants: "You also told us that all the tenants living at the property are male."
- females_not_in_soft_age_range: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
- major_repairs_date:
- title_text: "You told us the property has been vacant for 2 years."
- hint_text: "This is higher than we would expect."
- void_date:
- title_text: "You told us that the property has been vacant for more than 2 years."
- hint_text: "This is higher than we would expect."
- shared_ownership_deposit:
- title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}."
- staircase_bought_seems_high:
- title_text: "You told us that %{percentage}% was bought in this staircasing transaction."
- hint_text: "Most staircasing transactions are less than 50%"
- discounted_sale_value:
- title_text: "Mortgage, deposit, and grant total must equal %{value_with_discount}."
- informative_text: "Your given mortgage, deposit and grant total is %{mortgage_deposit_and_grant_total}."
- care_home_charges:
- title_text: "Care home charges should be provided if this is a care home accommodation."
- grant:
- title_text: "You told us that the grant amount is %{grant}."
- hint_text: "Loans, grants and subsidies are usually between £9,000 and £16,000."
- referral:
- title_text: "Are you sure?"
- hint_text: "This is a general needs log, and this referral type is for supported housing."
- scharge:
- over_soft_max_title: "You told us the service charge is %{scharge}."
- pscharge:
- over_soft_max_title: "You told us the personal service charge is %{pscharge}."
- supcharg:
- over_soft_max_title: "You told us the support charge is %{supcharg}."
- charges:
- informative_text: "This is higher than we would expect."
- hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
- deposit_and_mortgage:
- title_text: "You told us the mortgage amount was %{mortgage}, the cash deposit was %{deposit} and the discount was %{discount}."
- hint_text: "We would expect the mortgage amount and the deposit added together to be the same as the purchase price minus the discount."
- reasonother:
- title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
- informative_text: "The reason you have entered looks very similar to one of the existing response categories.
- Please check the categories and select the appropriate one.
- If the existing categories are not suitable, please confirm here to move onto the next question."
- hodate:
- must_be_less_than_3_years_from_saledate: "You told us practical completion or handover date is more than 3 years before sale completion date."
- saledate:
- must_be_less_than_3_years_from_hodate: "You told us sale completion date is more than 3 years after practical completion or handover date."
- partner_under_16_lettings:
- title: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
- multiple_partners_lettings:
- title: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
-
devise:
two_factor_authentication:
success: "Two-factor authentication successful."
@@ -687,12 +474,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:
@@ -706,14 +487,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/lettings/income_and_benefits.en.yml b/config/locales/forms/2023/lettings/income_and_benefits.en.yml
new file mode 100644
index 000000000..bc19c7954
--- /dev/null
+++ b/config/locales/forms/2023/lettings/income_and_benefits.en.yml
@@ -0,0 +1,108 @@
+en:
+ forms:
+ 2023:
+ lettings:
+ income_and_benefits:
+ net_income_known:
+ page_header: "Household’s combined income after tax"
+ check_answer_label: "Do you know the household’s combined total income after tax?"
+ hint_text: ""
+ question_text: "Do you know the household’s combined income after tax?"
+
+ income_amount:
+ page_header: "Total household income"
+ incfreq:
+ check_answer_label: "How often does the household receive this amount?"
+ hint_text: ""
+ question_text: "How often does the household receive this amount?"
+ earnings:
+ check_answer_label: "Total household income"
+ hint_text: ""
+ question_text: "How much income does the household have in total?"
+
+ hb:
+ page_header: ""
+ check_answer_label: "Housing-related benefits received"
+ hint_text: ""
+ question_text: "Is the household likely to be receiving any of these housing-related benefits?"
+
+ benefits:
+ page_header: ""
+ check_answer_label: "Household income from Universal Credit, state pension or benefit"
+ hint_text: "This excludes child and housing benefit, council tax support and tax credits."
+ question_text: "How much of the household’s income is from Universal Credit, state pensions or benefits?"
+
+ household_charge:
+ page_header: ""
+ check_answer_label: "Does the household pay rent or charges"
+ hint_text: "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves."
+ question_text: "Does the household pay rent or other charges for the accommodation?"
+
+ period:
+ page_header: ""
+ check_answer_label: "Frequency of household rent and charges"
+ hint_text: "Select how often the household is charged. This may be different to how often they pay."
+ question_text: "How often does the household pay rent and other charges?"
+
+ care_home:
+ page_header: ""
+ is_carehome:
+ check_answer_label: "Care home accommodation"
+ hint_text: ""
+ question_text: "Is this accommodation a care home?"
+ chcharge_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every week?"
+ chcharge_bi_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every 2 weeks?"
+ chcharge_4_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every 4 weeks?"
+ chcharge_monthly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every month?"
+
+ rent_and_charges:
+ page_header: "Household rent and charges"
+ brent:
+ check_answer_label: "Basic rent"
+ hint_text: "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent."
+ question_text: "What is the basic rent?"
+ scharge:
+ check_answer_label: "Service charge"
+ hint_text: "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge."
+ question_text: "What is the service charge?"
+ pscharge:
+ check_answer_label: "Personal service charge"
+ hint_text: "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit."
+ question_text: "What is the personal service charge?"
+ supcharg:
+ check_answer_label: "Support charge"
+ hint_text: "Any charges made to fund support services included in tenancy agreement."
+ question_text: "What is the support charge?"
+ tcharge:
+ check_answer_label: "Household rent and charges"
+ hint_text: "This is the total for rent and all charges."
+ question_text: "Total charge"
+
+ hbrentshortfall:
+ page_header: ""
+ check_answer_label: "Any outstanding amount for basic rent and charges"
+ hint_text: "Also known as the ‘outstanding amount’."
+ question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?"
+
+ outstanding_amount:
+ page_header: ""
+ tshortfall_known:
+ check_answer_label: "Do you know the outstanding amount?"
+ hint_text: "You only need to give an approximate figure."
+ question_text: "Can you estimate the outstanding amount?"
+ tshortfall:
+ check_answer_label: "Estimated outstanding amountt"
+ hint_text: "Also known as the ‘outstanding amount’."
+ question_text: "Estimated outstanding amount"
diff --git a/config/locales/forms/2023/lettings/soft_validations.en.yml b/config/locales/forms/2023/lettings/soft_validations.en.yml
new file mode 100644
index 000000000..d0354f127
--- /dev/null
+++ b/config/locales/forms/2023/lettings/soft_validations.en.yml
@@ -0,0 +1,132 @@
+en:
+ forms:
+ 2023:
+ lettings:
+ soft_validations:
+ pregnancy_value_check:
+ no_females_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that all the tenants living at the property are male."
+ females_in_soft_age_range_in_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
+
+ no_retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is retired?"
+ title_text: "You told us this person is aged %{age} years and retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+
+ retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person isn’t retired?"
+ title_text: "You told us this person is over 66 and not retired."
+ informative_text: ""
+
+ partner_under_16_value_check:
+ page_header: ""
+ check_answer_label: "Partner under 16 confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ multiple_partners_value_check:
+ page_header: ""
+ check_answer_label: "Multiple partners confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ reasonother_value_check:
+ page_header: ""
+ check_answer_label: "Reason other confirmation"
+ hint_text: ""
+ question_text: "Are you sure this doesn’t fit an existing category?"
+ title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
+ informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question."
+
+ referral_value_check:
+ page_header: ""
+ check_answer_label: "Referral confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "Are you sure?"
+ informative_text: "This is a general needs log, and this referral type is for supported housing."
+
+ net_income_value_check:
+ page_header: ""
+ check_answer_label: "Net income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
+ informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
+
+ care_home_charges_value_check:
+ page_header: ""
+ check_answer_label: "Care home charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure there are no care home charges?"
+ title_text: "Care home charges should be provided if this is a care home accommodation."
+ informative_text: "Are you sure there are no care home charges?"
+
+ rent_value_check:
+ page_header: ""
+ check_answer_label: "Total rent confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us the rent is %{brent}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ scharge_value_check:
+ page_header: ""
+ check_answer_label: "Service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the service charge is %{scharge}."
+ informative_text: "This is higher than we would expect."
+
+ pscharge_value_check:
+ page_header: ""
+ check_answer_label: "Personal service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the personal service charge is %{pscharge}."
+ informative_text: "This is higher than we would expect."
+
+ supcharg_value_check:
+ page_header: ""
+ check_answer_label: "Support charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the support charge is %{supcharg}."
+ informative_text: "This is higher than we would expect."
+
+ void_date_value_check:
+ page_header: ""
+ check_answer_label: "Void date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us that the property has been vacant for more than 2 years."
+ informative_text: "This is higher than we would expect."
+
+ major_repairs_date_value_check:
+ page_header: ""
+ check_answer_label: "Major repairs date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us the property has been vacant for 2 years."
+ informative_text: "This is higher than we would expect."
diff --git a/config/locales/forms/2023/sales/sale_information.en.yml b/config/locales/forms/2023/sales/sale_information.en.yml
new file mode 100644
index 000000000..318d7c7db
--- /dev/null
+++ b/config/locales/forms/2023/sales/sale_information.en.yml
@@ -0,0 +1,208 @@
+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_date:
+ 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"
+
+ purchase_price:
+ shared_ownership:
+ page_header: "About the price of the property"
+ check_answer_label: "Purchase price"
+ hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount"
+ question_text: "What is the full purchase price?"
+ discounted_ownership:
+ page_header: "About the price of the property"
+ check_answer_label: "Purchase price"
+ hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount"
+ question_text: "What is the full purchase price?"
+ outright_sale:
+ page_header: "About the price of the property"
+ check_answer_label: "Purchase price"
+ hint_text: ""
+ question_text: "What is the full purchase price?"
+
+ discount:
+ page_header: "About the price of the property"
+ check_answer_label: "Percentage discount"
+ hint_text: "For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)If discount capped, enter capped %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."
+ question_text: "What was the percentage discount?"
+
+ grant:
+ page_header: "About the price of the property"
+ check_answer_label: "Amount of any loan, grant or subsidy"
+ hint_text: "For all schemes except Right to Buy (RTB), Preserved Right to Buy (PRTB), Voluntary Right to Buy (VRTB) and Rent to Buy"
+ question_text: "What was the amount of any loan, grant, discount or subsidy given?"
+
\ No newline at end of file
diff --git a/config/locales/forms/2023/sales/soft_validations.en.yml b/config/locales/forms/2023/sales/soft_validations.en.yml
index 1c3cd4955..20f131e90 100644
--- a/config/locales/forms/2023/sales/soft_validations.en.yml
+++ b/config/locales/forms/2023/sales/soft_validations.en.yml
@@ -40,7 +40,7 @@ en:
max:
page_header: ""
title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
-
+
income2_value_check:
check_answer_label: "Buyer 2 income confirmation"
hint_text: ""
@@ -60,14 +60,6 @@ en:
question_text: "Are you sure this is correct?"
title_text: "You told us the combined income of this household is %{combined_income}. This seems high. Are you sure this is correct?"
- value_value_check:
- page_header: ""
- check_answer_label: "Purchase price confirmation"
- hint_text: ""
- question_text: "Are you sure?"
- title_text: "You told us the purchase price is %{value}."
- informative_text: "This is %{higher_or_lower} than we would expect."
-
mortgage_value_check:
page_header: ""
check_answer_label: "Mortgage confirmation"
@@ -76,22 +68,6 @@ en:
title_text: "You told us that the mortgage amount is %{mortgage}."
informative_text: "This is more than 5 times the income, which is higher than we would expect."
- monthly_charges_value_check:
- page_header: ""
- check_answer_label: "Monthly charges confirmation"
- hint_text: ""
- question_text: "Are you sure this is correct?"
- title_text: "You told us that the monthly charges were %{mscharge}."
- informative_text: "This is higher than we would expect."
-
- percentage_discount_value_check:
- page_header: ""
- check_answer_label: "Percentage discount confirmation"
- hint_text: ""
- question_text: "Are you sure this is correct?"
- title_text: "You told us that the percentage discount is %{discount}."
- informative_text: "This is higher than we would expect."
-
savings_value_check:
page_header: ""
check_answer_label: "Savings confirmation"
@@ -104,15 +80,65 @@ en:
title_text: "You told us the buyer’s savings were %{savings}."
informative_text: "This is higher than we would expect."
- deposit_value_check:
+ staircase_bought_value_check:
page_header: ""
- check_answer_label: "Deposit confirmation"
+ check_answer_label: "Percentage bought confirmation"
hint_text: ""
- question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that %{percentage}% was bought in this staircasing transaction."
+ informative_text: "Most staircasing transactions are less than 50%"
+
+ stairowned_value_check:
joint_purchase:
+ page_header: ""
+ check_answer_label: "Percentage owned confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us that the buyers now own %{stairowned} of the property."
+ informative_text: "The maximum percentage that can be owned under the Older Persons Shared Ownership scheme is 75%, unless the property was funded outside the Affordable Homes Programme. Make sure these answers are correct."
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Percentage owned confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us that the buyer now owns %{stairowned} of the property."
+ informative_text: "The maximum percentage that can be owned under the Older Persons Shared Ownership scheme is 75%, unless the property was funded outside the Affordable Homes Programme. Make sure these answers are correct."
+
+ hodate_check:
+ page_header: ""
+ check_answer_label: "Practical completion or handover date check"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us practical completion or handover date is more than 3 years before sale completion date."
+
+ value_value_check:
+ page_header: ""
+ check_answer_label: "Purchase price confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us the purchase price is %{value}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ shared_ownership_deposit_value_check:
+ page_header: ""
+ check_answer_label: "Shared ownership deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}."
+
+ deposit_value_check:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
title_text: "You told us the buyers’ deposit was %{deposit} and their savings were %{savings}."
informative_text: "The deposit amount is higher than we would expect for the amount of savings they have."
not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
title_text: "You told us the buyer’s deposit was %{deposit} and their savings were %{savings}."
informative_text: "The deposit amount is higher than we would expect for the amount of savings they have."
@@ -162,3 +188,51 @@ en:
question_text: "Are you sure this is correct?"
title_text: "You told us there are more than 1 persons with 'Partner' relationship to buyer 1."
informative_text: "Are you sure this is correct?"
+
+ monthly_charges_value_check:
+ page_header: ""
+ check_answer_label: "Monthly charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the monthly charges were %{mscharge}."
+ informative_text: "This is higher than we would expect."
+
+ extra_borrowing_value_check:
+ page_header: ""
+ check_answer_label: "Extra borrowing confirmation"
+ hint_text: ""
+ question_text: "Are you sure there is no extra borrowing?"
+ title_text: "You told us that the mortgage and deposit total is %{mortgage_and_deposit_total}."
+ informative_text: "This is higher than the purchase price minus the discount."
+
+ percentage_discount_value_check:
+ page_header: ""
+ check_answer_label: "Percentage discount confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the percentage discount is %{discount}."
+ informative_text: "This is higher than we would expect."
+
+ grant_value_check:
+ page_header: ""
+ check_answer_label: "Grant value confirmation"
+ hint_text: ""
+ question_text: "Are you sure? Grants are usually £9,000 - £16,000"
+ title_text: "You told us that the grant amount is %{grant}."
+ informative_text: "Loans, grants and subsidies are usually between £9,000 and £16,000."
+
+ discounted_sale_value_check:
+ page_header: ""
+ check_answer_label: "Discounted sale value confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "Mortgage, deposit, and grant total must equal %{value_with_discount}."
+ informative_text: "Your given mortgage, deposit and grant total is %{mortgage_deposit_and_grant_total}."
+
+ deposit_and_mortgage_value_check:
+ page_header: ""
+ check_answer_label: "Deposit and mortgage against discount confirmation"
+ hint_text: ""
+ question_text: "Are you sure? Mortgage and deposit usually equal or are more than (value - discount)"
+ title_text: "You told us the mortgage amount was %{mortgage}, the cash deposit was %{deposit} and the discount was %{discount}."
+ informative_text: "We would expect the mortgage amount and the deposit added together to be the same as the purchase price minus the discount."
diff --git a/config/locales/forms/2024/sales/lettings/household_characteristics.en.yml b/config/locales/forms/2024/lettings/household_characteristics.en.yml
similarity index 100%
rename from config/locales/forms/2024/sales/lettings/household_characteristics.en.yml
rename to config/locales/forms/2024/lettings/household_characteristics.en.yml
diff --git a/config/locales/forms/2024/lettings/income_and_benefits.en.yml b/config/locales/forms/2024/lettings/income_and_benefits.en.yml
new file mode 100644
index 000000000..bb3cc320e
--- /dev/null
+++ b/config/locales/forms/2024/lettings/income_and_benefits.en.yml
@@ -0,0 +1,108 @@
+en:
+ forms:
+ 2024:
+ lettings:
+ income_and_benefits:
+ net_income_known:
+ page_header: "Household’s combined income after tax"
+ check_answer_label: "Do you know the household’s combined total income after tax?"
+ hint_text: ""
+ question_text: "Do you know the household’s combined income after tax?"
+
+ income_amount:
+ page_header: "Total household income"
+ incfreq:
+ check_answer_label: "How often does the household receive this amount?"
+ hint_text: ""
+ question_text: "How often does the household receive this amount?"
+ earnings:
+ check_answer_label: "Total household income"
+ hint_text: ""
+ question_text: "How much income does the household have in total?"
+
+ hb:
+ page_header: ""
+ check_answer_label: "Housing-related benefits received"
+ hint_text: "This is about when the tenant is in their new let. If they are unsure about the situation for their new let and their financial and working situation hasn’t changed significantly, answer based on what housing-related benefits they currently receive."
+ question_text: "Is the household likely to be receiving any of these housing-related benefits?"
+
+ benefits:
+ page_header: ""
+ check_answer_label: "Household income from Universal Credit, state pension or benefit"
+ hint_text: "This excludes child and housing benefit, council tax support and tax credits."
+ question_text: "How much of the household’s income is from Universal Credit, state pensions or benefits?"
+
+ household_charge:
+ page_header: ""
+ check_answer_label: "Does the household pay rent or charges"
+ hint_text: "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves."
+ question_text: "Does the household pay rent or other charges for the accommodation?"
+
+ period:
+ page_header: ""
+ check_answer_label: "Frequency of household rent and charges"
+ hint_text: "Select how often the household is charged. This may be different to how often they pay."
+ question_text: "How often does the household pay rent and other charges?"
+
+ care_home:
+ page_header: ""
+ is_carehome:
+ check_answer_label: "Care home accommodation"
+ hint_text: ""
+ question_text: "Is this accommodation a care home?"
+ chcharge_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every week?"
+ chcharge_bi_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every 2 weeks?"
+ chcharge_4_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every 4 weeks?"
+ chcharge_monthly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every month?"
+
+ rent_and_charges:
+ page_header: "Household rent and charges"
+ brent:
+ check_answer_label: "Basic rent"
+ hint_text: "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent."
+ question_text: "What is the basic rent?"
+ scharge:
+ check_answer_label: "Service charge"
+ hint_text: "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge."
+ question_text: "What is the service charge?"
+ pscharge:
+ check_answer_label: "Personal service charge"
+ hint_text: "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit."
+ question_text: "What is the personal service charge?"
+ supcharg:
+ check_answer_label: "Support charge"
+ hint_text: "Any charges made to fund support services included in tenancy agreement."
+ question_text: "What is the support charge?"
+ tcharge:
+ check_answer_label: "Household rent and charges"
+ hint_text: "This is the total for rent and all charges."
+ question_text: "Total charge"
+
+ hbrentshortfall:
+ page_header: ""
+ check_answer_label: "Any outstanding amount for basic rent and charges"
+ hint_text: "Also known as the ‘outstanding amount’."
+ question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?"
+
+ outstanding_amount:
+ page_header: ""
+ tshortfall_known:
+ check_answer_label: "Do you know the outstanding amount?"
+ hint_text: "You only need to give an approximate figure."
+ question_text: "Can you estimate the outstanding amount?"
+ tshortfall:
+ check_answer_label: "Estimated outstanding amountt"
+ hint_text: "Also known as the ‘outstanding amount’."
+ question_text: "Estimated outstanding amount"
diff --git a/config/locales/forms/2024/lettings/soft_validations.en.yml b/config/locales/forms/2024/lettings/soft_validations.en.yml
new file mode 100644
index 000000000..ada093d39
--- /dev/null
+++ b/config/locales/forms/2024/lettings/soft_validations.en.yml
@@ -0,0 +1,132 @@
+en:
+ forms:
+ 2024:
+ lettings:
+ soft_validations:
+ pregnancy_value_check:
+ no_females_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that all the tenants living at the property are male."
+ females_in_soft_age_range_in_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
+
+ no_retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is retired?"
+ title_text: "You told us this person is aged %{age} years and retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+
+ retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person isn’t retired?"
+ title_text: "You told us this person is over 66 and not retired."
+ informative_text: "Are you sure this person isn’t retired?"
+
+ partner_under_16_value_check:
+ page_header: ""
+ check_answer_label: "Partner under 16 confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ multiple_partners_value_check:
+ page_header: ""
+ check_answer_label: "Multiple partners confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ reasonother_value_check:
+ page_header: ""
+ check_answer_label: "Reason other confirmation"
+ hint_text: ""
+ question_text: "Are you sure this doesn’t fit an existing category?"
+ title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
+ informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question."
+
+ referral_value_check:
+ page_header: ""
+ check_answer_label: "Referral confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "Are you sure?"
+ informative_text: "This is a general needs log, and this referral type is for supported housing."
+
+ net_income_value_check:
+ page_header: ""
+ check_answer_label: "Net income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
+ informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
+
+ care_home_charges_value_check:
+ page_header: ""
+ check_answer_label: "Care home charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure there are no care home charges?"
+ title_text: "Care home charges should be provided if this is a care home accommodation."
+ informative_text: "Are you sure there are no care home charges?"
+
+ rent_value_check:
+ page_header: ""
+ check_answer_label: "Total rent confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us the rent is %{brent}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ scharge_value_check:
+ page_header: ""
+ check_answer_label: "Service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the service charge is %{scharge}."
+ informative_text: "This is higher than we would expect."
+
+ pscharge_value_check:
+ page_header: ""
+ check_answer_label: "Personal service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the personal service charge is %{pscharge}."
+ informative_text: "This is higher than we would expect."
+
+ supcharg_value_check:
+ page_header: ""
+ check_answer_label: "Support charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the support charge is %{supcharg}."
+ informative_text: "This is higher than we would expect."
+
+ void_date_value_check:
+ page_header: ""
+ check_answer_label: "Void date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us that the property has been vacant for more than 2 years."
+ informative_text: "This is longer than we would expect."
+
+ major_repairs_date_value_check:
+ page_header: ""
+ check_answer_label: "Major repairs date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us the property has been vacant for 2 years."
+ informative_text: "This is longer than we would expect."
diff --git a/config/locales/forms/2024/sales/sale_information.en.yml b/config/locales/forms/2024/sales/sale_information.en.yml
new file mode 100644
index 000000000..d0031416e
--- /dev/null
+++ b/config/locales/forms/2024/sales/sale_information.en.yml
@@ -0,0 +1,207 @@
+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?"
+ staircasesale:
+ check_answer_label: "Part of a back-to-back staircasing transaction"
+ hint_text: ""
+ question_text: "Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?"
+
+ 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_date:
+ 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"
+
+ purchase_price:
+ discounted_ownership:
+ page_header: "About the price of the property"
+ check_answer_label: "Purchase price"
+ hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount"
+ question_text: "What is the full purchase price?"
+ outright_sale:
+ page_header: "About the price of the property"
+ check_answer_label: "Purchase price"
+ hint_text: ""
+ question_text: "What is the full purchase price?"
+
+ discount:
+ page_header: "About the price of the property"
+ check_answer_label: "Percentage discount"
+ hint_text: "For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)If discount capped, enter capped %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."
+ question_text: "What was the percentage discount?"
+
+ grant:
+ page_header: "About the price of the property"
+ check_answer_label: "Amount of any loan, grant or subsidy"
+ hint_text: "For all schemes except Right to Buy (RTB), Preserved Right to Buy (PRTB), Voluntary Right to Buy (VRTB) and Rent to Buy"
+ question_text: "What was the amount of any loan, grant, discount or subsidy given?"
+
\ No newline at end of file
diff --git a/config/locales/forms/2024/sales/soft_validations.en.yml b/config/locales/forms/2024/sales/soft_validations.en.yml
index 872db4679..b9b1ad479 100644
--- a/config/locales/forms/2024/sales/soft_validations.en.yml
+++ b/config/locales/forms/2024/sales/soft_validations.en.yml
@@ -57,15 +57,6 @@ en:
hint_text: ""
question_text: "Are you sure this is correct?"
title_text: "You told us the combined income of this household is %{combined_income}. This seems high. Are you sure this is correct?"
- informative_text: ""
-
- value_value_check:
- page_header: ""
- check_answer_label: "Purchase price confirmation"
- hint_text: ""
- question_text: "Are you sure?"
- title_text: "You told us the purchase price is %{value}."
- informative_text: "This is %{higher_or_lower} than we would expect."
mortgage_value_check:
page_header: ""
@@ -75,22 +66,6 @@ en:
title_text: "You told us that the mortgage amount is %{mortgage}."
informative_text: "This is more than 5 times the income, which is higher than we would expect."
- monthly_charges_value_check:
- page_header: ""
- check_answer_label: "Monthly charges confirmation"
- hint_text: ""
- question_text: "Are you sure this is correct?"
- title_text: "You told us that the monthly charges were %{mscharge}."
- informative_text: "This is higher than we would expect."
-
- percentage_discount_value_check:
- page_header: ""
- check_answer_label: "Percentage discount confirmation"
- hint_text: ""
- question_text: "Are you sure this is correct?"
- title_text: "You told us that the percentage discount is %{discount}."
- informative_text: "This is higher than we would expect."
-
savings_value_check:
page_header: ""
check_answer_label: "Savings confirmation"
@@ -103,15 +78,65 @@ en:
title_text: "You told us the buyer’s savings were %{savings}."
informative_text: "This is higher than we would expect."
- deposit_value_check:
+ staircase_bought_value_check:
page_header: ""
- check_answer_label: "Deposit confirmation"
+ check_answer_label: "Percentage bought confirmation"
hint_text: ""
- question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that %{percentage}% was bought in this staircasing transaction."
+ informative_text: "Most staircasing transactions are less than 50%"
+
+ stairowned_value_check:
joint_purchase:
+ page_header: ""
+ check_answer_label: "Percentage owned confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us that the buyers now own %{stairowned} of the property."
+ informative_text: "The maximum percentage that can be owned under the Older Persons Shared Ownership scheme is 75%, unless the property was funded outside the Affordable Homes Programme. Make sure these answers are correct."
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Percentage owned confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us that the buyer now owns %{stairowned} of the property."
+ informative_text: "The maximum percentage that can be owned under the Older Persons Shared Ownership scheme is 75%, unless the property was funded outside the Affordable Homes Programme. Make sure these answers are correct."
+
+ hodate_check:
+ page_header: ""
+ check_answer_label: "Practical completion or handover date check"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us practical completion or handover date is more than 3 years before sale completion date."
+
+ value_value_check:
+ page_header: ""
+ check_answer_label: "Purchase price confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us the purchase price is %{value}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ shared_ownership_deposit_value_check:
+ page_header: ""
+ check_answer_label: "Shared ownership deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}."
+
+ deposit_value_check:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
title_text: "You told us the buyers’ deposit was %{deposit} and their savings were %{savings}."
informative_text: "The deposit amount is higher than we would expect for the amount of savings they have."
not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
title_text: "You told us the buyer’s deposit was %{deposit} and their savings were %{savings}."
informative_text: "The deposit amount is higher than we would expect for the amount of savings they have."
@@ -129,6 +154,7 @@ en:
hint_text: ""
question_text: "You told us that someone in the household uses a wheelchair."
title_text: "You told us that someone in the household uses a wheelchair."
+
buyer_livein_value_check:
buyer1:
page_header: ""
@@ -144,6 +170,7 @@ en:
question_text: "Are you sure this is correct?"
title_text: "You told us that buyer 2 will not live in the property."
informative_text: "For %{ownership_scheme} types, the buyer usually lives in the property."
+
student_not_child_value_check:
page_header: ""
check_answer_label: "Student not a child confirmation"
@@ -151,6 +178,7 @@ en:
question_text: "Are you sure this person is not a child?"
title_text: "You told us this person is a student aged between 16 and 19."
informative_text: "Are you sure this person is not a child?"
+
partner_under_16_value_check:
page_header: ""
check_answer_label: "Partner under 16 confirmation"
@@ -158,6 +186,7 @@ en:
question_text: "Are you sure this is correct?"
title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to buyer 1."
informative_text: "Are you sure this is correct?"
+
multiple_partners_value_check:
page_header: ""
check_answer_label: "Multiple partners confirmation"
@@ -165,3 +194,51 @@ en:
question_text: "Are you sure this is correct?"
title_text: "You told us there are more than 1 persons with 'Partner' relationship to buyer 1."
informative_text: "Are you sure this is correct?"
+
+ monthly_charges_value_check:
+ page_header: ""
+ check_answer_label: "Monthly charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the monthly charges were %{mscharge}."
+ informative_text: "This is higher than we would expect."
+
+ extra_borrowing_value_check:
+ page_header: ""
+ check_answer_label: "Extra borrowing confirmation"
+ hint_text: ""
+ question_text: "Are you sure there is no extra borrowing?"
+ title_text: "You told us that the mortgage and deposit total is %{mortgage_and_deposit_total}."
+ informative_text: "This is higher than the purchase price minus the discount."
+
+ percentage_discount_value_check:
+ page_header: ""
+ check_answer_label: "Percentage discount confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the percentage discount is %{discount}."
+ informative_text: "This is higher than we would expect."
+
+ grant_value_check:
+ page_header: ""
+ check_answer_label: "Grant value confirmation"
+ hint_text: ""
+ question_text: "Are you sure? Grants are usually £9,000 - £16,000"
+ title_text: "You told us that the grant amount is %{grant}."
+ informative_text: "Loans, grants and subsidies are usually between £9,000 and £16,000."
+
+ discounted_sale_value_check:
+ page_header: ""
+ check_answer_label: "Discounted sale value confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "Mortgage, deposit, and grant total must equal %{value_with_discount}."
+ informative_text: "Your given mortgage, deposit and grant total is %{mortgage_deposit_and_grant_total}."
+
+ deposit_and_mortgage_value_check:
+ page_header: ""
+ check_answer_label: "Deposit and mortgage against discount confirmation"
+ hint_text: ""
+ question_text: "Are you sure? Mortgage and deposit usually equal or are more than (value - discount)"
+ title_text: "You told us the mortgage amount was %{mortgage}, the cash deposit was %{deposit} and the discount was %{discount}."
+ informative_text: "We would expect the mortgage amount and the deposit added together to be the same as the purchase price minus the discount."
diff --git a/config/locales/forms/2025/lettings/guidance.en.yml b/config/locales/forms/2025/lettings/guidance.en.yml
new file mode 100644
index 000000000..340eb11d5
--- /dev/null
+++ b/config/locales/forms/2025/lettings/guidance.en.yml
@@ -0,0 +1,63 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ guidance:
+ finding_location:
+ title: "What is a location?"
+ content: "A location is a postcode area where supported housing is provided under a scheme. A scheme can have multiple locations, and a location can have multiple units at the same postcode."
+ scheme_changes_link_text: "Read more about schemes and locations"
+
+ finding_scheme:
+ title: "Can’t find your scheme?"
+ content: "
Schemes are attached to the organisation that owns the property. Check you have correctly answered question 1 \"Which organisation owns this property?\"
+
If your organisation’s schemes were migrated from old CORE, they may have new names and codes. Search by postcode to find your scheme.
"
+ scheme_changes_link_text: "Read more about how schemes have changed"
+ view_schemes_link_text: "View your organisation’s schemes"
+
+ privacy_notice_tenant:
+ content: "Make sure the lead tenant has seen or been given access to %{privacy_notice_link} before completing this log. This is a legal requirement under data protection legislation."
+ privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"
+
+ rent_type_definitions:
+ title: "Rent type definitions"
+ content: "
Social Rent: where target rents are determined through the national rent regime. This is sometimes also known as 'formula rent'.
+
Affordable Rent: where up to 80% of market rent can be charged. A new supply agreement is signed with Homes England or the Greater London Authority (GLA).
+
London Affordable Rent: a tenure of affordable housing available in London by the GLA. It is an affordable rent which must be set in accordance with the Regulator of Social Housing’s Affordable Rent guidance. The landlord of these homes must be registered with the Regulator of Social Housing. These are a type of Affordable Rent lettings.
+
Rent to Buy: a discount of up to 20% market rent is charged for a single rental period for a minimum of 5 years. After that period, the tenant is offered first chance to purchase the property (either shared ownership or outright) at full market value. These are a type of Intermediate Rent lettings.
+
London Living Rent: a tenure of affordable housing available in London by the GLA. It was introduced in Affordable Homes Programme 2016 to 2021. These are a type of Intermediate Rent lettings.
+
Other intermediate rent: any other specific scheme where up to 80% of market rent can be charged. This includes schemes with reduced rent so tenants can save towards a house purchasing deposit and schemes with an in-built future opportunity to buy the property being rented.
"
+
+ scheme_selection:
+ data_provider:
+ content: "If you’re not sure which scheme to choose, ask a data coordinator. Find your data coordinators on the %{users_page_link}."
+ users_page_link_text: "users page"
+ data_coordinator:
+ create_scheme_link_text: "Create a new supported housing scheme"
+
+ void_date:
+ title: "What is a void date?"
+ content: "
Date the property was (legally or contractually) available to let, or for:
+
+ - re-lets: the day after the previous tenant's contract ended
+ - new builds: the day the landlord legally first owned the property (‘completion date’)
+ - new conversions or acquisitions: completion date, or the day after rehabilitation work ended
+ - new leases: the day the landlord got contractual property rights and could let it out to tenants
+
"
+
+ what_counts_as_income:
+ title: "What counts as income?"
+ content: "
You should include any income after tax from:
+
+ - employment
+ - pensions
+ - Universal Credit
+
+
+
Don’t include:
+
+ - National Insurance (NI) contributions and tax
+ - housing benefit
+ - child benefit
+ - council tax support
+
"
diff --git a/config/locales/forms/2025/lettings/household_characteristics.en.yml b/config/locales/forms/2025/lettings/household_characteristics.en.yml
new file mode 100644
index 000000000..1aef9297a
--- /dev/null
+++ b/config/locales/forms/2025/lettings/household_characteristics.en.yml
@@ -0,0 +1,322 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ household_characteristics:
+ hhmemb:
+ page_header: ""
+ check_answer_label: "Number of household members"
+ hint_text: "You can provide details for a maximum of 8 people."
+ question_text: "How many people live in the household for this letting?"
+
+ age1:
+ page_header: ""
+ age1_known:
+ check_answer_label: ""
+ hint_text: "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same amount of paid work, the lead tenant is whoever is the oldest."
+ question_text: "Do you know the lead tenant’s age?"
+ age1:
+ check_answer_label: "Lead tenant’s age"
+ hint_text: ""
+ question_text: "Age"
+
+ sex1:
+ page_header: ""
+ check_answer_label: "Lead tenant’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes the lead tenant’s gender identity?"
+
+ ethnic_group:
+ page_header: ""
+ check_answer_label: "Lead tenant’s ethnic group"
+ hint_text: ""
+ question_text: "What is the lead tenant’s ethnic group?"
+
+ ethnic:
+ ethnic_background_black:
+ page_header: ""
+ check_answer_label: "Lead tenant’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes lead tenant’s Black, African, Caribbean or Black British background?"
+ ethnic_background_asian:
+ page_header: ""
+ check_answer_label: "Lead tenant’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes lead tenant’s Asian or Asian British background?"
+ ethnic_background_arab:
+ page_header: ""
+ check_answer_label: "Lead tenant’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes the lead tenant’s Arab background?"
+ ethnic_background_mixed:
+ page_header: ""
+ check_answer_label: "Lead tenant’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes lead tenant’s Mixed or Multiple ethnic groups background?"
+ ethnic_background_white:
+ page_header: ""
+ check_answer_label: "Lead tenant’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes lead tenant’s White background?"
+
+ nationality_all:
+ page_header: ""
+ nationality_all:
+ check_answer_label: "Lead tenant’s nationality"
+ hint_text: ""
+ question_text: "Enter a nationality"
+ nationality_all_group:
+ check_answer_label: "Lead tenant’s nationality"
+ hint_text: "If the lead tenant is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the tenant should decide which country to enter."
+ question_text: "What is the nationality of the lead tenant?"
+
+ ecstat1:
+ page_header: ""
+ check_answer_label: "Lead tenant’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes the lead tenant’s working situation?"
+
+ details_known_2:
+ page_header: "You’ve given us the details for 1 person in the household"
+ check_answer_label: "Details known for person 2"
+ hint_text: "You must provide details for everyone in the household if you know them."
+ question_text: "Do you know details for person 2?"
+
+ relat2:
+ page_header: ""
+ check_answer_label: "Person 2’s relationship to the lead tenant"
+ hint_text: ""
+ question_text: "What is person 2’s relationship to the lead tenant?"
+
+ age2:
+ page_header: ""
+ age2_known:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Do you know person 2’s age?"
+ age2:
+ check_answer_label: "Person 2’s age"
+ hint_text: "Answer 1 for children aged under 1 year old"
+ question_text: "Age"
+
+ sex2:
+ page_header: ""
+ check_answer_label: "Person 2’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes person 2’s gender identity?"
+
+ ecstat2:
+ page_header: ""
+ check_answer_label: "Person 2’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes person 2’s working situation?"
+
+ details_known_3:
+ page_header: "You’ve given us the details for 2 people in the household"
+ check_answer_label: "Details known for person 3"
+ hint_text: "You must provide details for everyone in the household if you know them."
+ question_text: "Do you know details for person 3?"
+
+ relat3:
+ page_header: ""
+ check_answer_label: "Person 3’s relationship to the lead tenant"
+ hint_text: ""
+ question_text: "What is person 3’s relationship to the lead tenant?"
+
+ age3:
+ page_header: ""
+ age3_known:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Do you know person 3’s age?"
+ age3:
+ check_answer_label: "Person 3’s age"
+ hint_text: "Answer 1 for children aged under 1 year old"
+ question_text: "Age"
+
+ sex3:
+ page_header: ""
+ check_answer_label: "Person 3’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes person 3’s gender identity?"
+
+ ecstat3:
+ page_header: ""
+ check_answer_label: "Person 3’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes person 3’s working situation?"
+
+ details_known_4:
+ page_header: "You’ve given us the details for 3 people in the household"
+ check_answer_label: "Details known for person 4"
+ hint_text: "You must provide details for everyone in the household if you know them."
+ question_text: "Do you know details for person 4?"
+
+ relat4:
+ page_header: ""
+ check_answer_label: "Person 4’s relationship to the lead tenant"
+ hint_text: ""
+ question_text: "What is person 4’s relationship to the lead tenant?"
+
+ age4:
+ page_header: ""
+ age4_known:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Do you know person 4’s age?"
+ age4:
+ check_answer_label: "Person 4’s age"
+ hint_text: "Answer 1 for children aged under 1 year old"
+ question_text: "Age"
+
+ sex4:
+ page_header: ""
+ check_answer_label: "Person 4’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes person 4’s gender identity?"
+
+ ecstat4:
+ page_header: ""
+ check_answer_label: "Person 4’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes person 4’s working situation?"
+
+ details_known_5:
+ page_header: "You’ve given us the details for 4 people in the household"
+ check_answer_label: "Details known for person 5"
+ hint_text: "You must provide details for everyone in the household if you know them."
+ question_text: "Do you know details for person 5?"
+
+ relat5:
+ page_header: ""
+ check_answer_label: "Person 5’s relationship to the lead tenant"
+ hint_text: ""
+ question_text: "What is person 5’s relationship to the lead tenant?"
+
+ age5:
+ page_header: ""
+ age5_known:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Do you know person 5’s age?"
+ age5:
+ check_answer_label: "Person 5’s age"
+ hint_text: "Answer 1 for children aged under 1 year old"
+ question_text: "Age"
+
+ sex5:
+ page_header: ""
+ check_answer_label: "Person 5’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes person 5’s gender identity?"
+
+ ecstat5:
+ page_header: ""
+ check_answer_label: "Person 5’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes person 5’s working situation?"
+
+ details_known_6:
+ page_header: "You’ve given us the details for 5 people in the household"
+ check_answer_label: "Details known for person 6"
+ hint_text: "You must provide details for everyone in the household if you know them."
+ question_text: "Do you know details for person 6?"
+
+ relat6:
+ page_header: ""
+ check_answer_label: "Person 6’s relationship to the lead tenant"
+ hint_text: ""
+ question_text: "What is person 6’s relationship to the lead tenant?"
+
+ age6:
+ page_header: ""
+ age6_known:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Do you know person 6’s age?"
+ age6:
+ check_answer_label: "Person 6’s age"
+ hint_text: "Answer 1 for children aged under 1 year old"
+ question_text: "Age"
+
+ sex6:
+ page_header: ""
+ check_answer_label: "Person 6’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes person 6’s gender identity?"
+
+ ecstat6:
+ page_header: ""
+ check_answer_label: "Person 6’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes person 6’s working situation?"
+
+ details_known_7:
+ page_header: "You’ve given us the details for 6 people in the household"
+ check_answer_label: "Details known for person 7"
+ hint_text: "You must provide details for everyone in the household if you know them."
+ question_text: "Do you know details for person 7?"
+
+ relat7:
+ page_header: ""
+ check_answer_label: "Person 7’s relationship to the lead tenant"
+ hint_text: ""
+ question_text: "What is person 7’s relationship to the lead tenant?"
+
+ age7:
+ page_header: ""
+ age7_known:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Do you know person 7’s age?"
+ age7:
+ check_answer_label: "Person 7’s age"
+ hint_text: "Answer 1 for children aged under 1 year old"
+ question_text: "Age"
+
+ sex7:
+ page_header: ""
+ check_answer_label: "Person 7’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes person 7’s gender identity?"
+
+ ecstat7:
+ page_header: ""
+ check_answer_label: "Person 7’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes person 7’s working situation?"
+
+ details_known_8:
+ page_header: "You’ve given us the details for 7 people in the household"
+ check_answer_label: "Details known for person 8"
+ hint_text: "You must provide details for everyone in the household if you know them."
+ question_text: "Do you know details for person 8?"
+
+ relat8:
+ page_header: ""
+ check_answer_label: "Person 8’s relationship to the lead tenant"
+ hint_text: ""
+ question_text: "What is person 8’s relationship to the lead tenant?"
+
+ age8:
+ page_header: ""
+ age8_known:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Do you know person 8’s age?"
+ age8:
+ check_answer_label: "Person 8’s age"
+ hint_text: "Answer 1 for children aged under 1 year old"
+ question_text: "Age"
+
+ sex8:
+ page_header: ""
+ check_answer_label: "Person 8’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes person 8’s gender identity?"
+
+ ecstat8:
+ page_header: ""
+ check_answer_label: "Person 8’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes person 8’s working situation?"
diff --git a/config/locales/forms/2025/lettings/household_needs.en.yml b/config/locales/forms/2025/lettings/household_needs.en.yml
new file mode 100644
index 000000000..ba63f2031
--- /dev/null
+++ b/config/locales/forms/2025/lettings/household_needs.en.yml
@@ -0,0 +1,57 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ household_needs:
+ armedforces:
+ page_header: ""
+ check_answer_label: "Household links to UK armed forces"
+ hint_text: "This excludes national service.
If there are several people in the household with links to the UK armed forces, you should answer for the regular. If there’s no regular, answer for the reserve. If there’s no reserve, answer for the spouse or civil partner."
+ question_text: "Does anybody in the household have any links to the UK armed forces?"
+
+ leftreg:
+ page_header: ""
+ check_answer_label: "Person still serving in UK armed forces"
+ hint_text: ""
+ question_text: "Is the person still serving in the UK armed forces?"
+
+ reservist:
+ page_header: ""
+ check_answer_label: "Person seriously injured or ill as result of serving in UK armed forces"
+ hint_text: ""
+ question_text: "Was the person seriously injured or ill as a result of serving in the UK armed forces?"
+
+ preg_occ:
+ page_header: ""
+ check_answer_label: "Anybody in household pregnant"
+ hint_text: ""
+ question_text: "Is anybody in the household pregnant?"
+
+ housingneeds:
+ page_header: ""
+ check_answer_label: "Anybody with disabled access needs"
+ hint_text: ""
+ question_text: "Does anybody in the household have any disabled access needs?"
+
+ housingneeds_type:
+ page_header: "Disabled access needs"
+ housingneeds_type:
+ check_answer_label: "Disabled access needs"
+ hint_text: ""
+ question_text: "What type of access needs do they have?"
+ housingneeds_other:
+ check_answer_label: "Other disabled access needs"
+ hint_text: ""
+ question_text: "Do they have any other disabled access needs?"
+
+ illness:
+ page_header: ""
+ check_answer_label: "Anybody in household with physical or mental health condition"
+ hint_text: ""
+ question_text: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?"
+
+ condition_effects:
+ page_header: ""
+ check_answer_label: "How is person affected by condition or illness"
+ hint_text: "Select all that apply."
+ question_text: "How is the person affected by their condition or illness?"
diff --git a/config/locales/forms/2025/lettings/household_situation.en.yml b/config/locales/forms/2025/lettings/household_situation.en.yml
new file mode 100644
index 000000000..2b72c45d0
--- /dev/null
+++ b/config/locales/forms/2025/lettings/household_situation.en.yml
@@ -0,0 +1,120 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ household_situation:
+ layear:
+ page_header: ""
+ check_answer_label: "Length of time in local authority area"
+ hint_text: ""
+ question_text: "How long has the household continuously lived in the local authority area of the new letting?"
+
+ waityear:
+ page_header: ""
+ check_answer_label: "Length of time on local authority waiting list"
+ hint_text: ""
+ question_text: "How long has the household been on the local authority waiting list for the area of the new letting?"
+
+ reason:
+ reason_for_leaving_last_settled_home_renewal:
+ page_header: ""
+ reason:
+ check_answer_label: "Reason for leaving last settled home"
+ hint_text: "You told us this letting is a renewal. We have removed some options because of this."
+ question_text: "What is the tenant’s main reason for the household leaving their last settled home?"
+ reasonother:
+ check_answer_label: "Length of time on local authority waiting list"
+ hint_text: ""
+ question_text: "How long has the household been on the local authority waiting list for the area of the new letting?"
+ reason_for_leaving_last_settled_home:
+ page_header: ""
+ reason:
+ check_answer_label: "Reason for leaving last settled home"
+ hint_text: "The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation, sleeping rough or otherwise homeless, their last settled home is where they were living previously."
+ question_text: "What is the tenant’s main reason for the household leaving their last settled home?"
+ reasonother:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "What is the reason?"
+
+ prevten:
+ renewal:
+ page_header: ""
+ check_answer_label: "Where was the household immediately before this letting?"
+ hint_text: "You told us this letting is a renewal. We have removed some options because of this.
This is where the household was the night before they moved into this new let."
+ question_text: "Where was the household immediately before this letting?"
+ not_renewal:
+ page_header: ""
+ check_answer_label: "Where was the household immediately before this letting?"
+ hint_text: "This is where the household was the night before they moved into this new let."
+ question_text: "Where was the household immediately before this letting?"
+
+ homeless:
+ page_header: ""
+ check_answer_label: "Household homeless immediately before letting"
+ hint_text: ""
+ question_text: "Did the household experience homelessness immediately before this letting?"
+
+ previous_postcode:
+ page_header: ""
+ ppcodenk:
+ check_answer_label: ""
+ hint_text: "This is the tenant’s last long-standing home. It is where the tenant was living before any period in temporary accommodation, sleeping rough or otherwise homeless."
+ question_text: "Do you know the postcode of the household’s last settled accommodation?"
+ ppostcode_full:
+ check_answer_label: "Postcode of household’s last settled accommodation"
+ hint_text: ""
+ question_text: "Postcode for the previous accommodation"
+
+ previous_local_authority:
+ page_header: ""
+ previous_la_known:
+ check_answer_label: ""
+ hint_text: "This is the tenant’s last long-standing home. It is where the tenant was living before any period in temporary accommodation, sleeping rough or otherwise homeless."
+ question_text: "Do you know the local authority of the household’s last settled accommodation?"
+ prevloc:
+ check_answer_label: "Location of household’s last settled accommodation"
+ hint_text: "Select ‘Northern Ireland’, ‘Scotland’, ‘Wales’ or ‘Outside the UK’ if the household’s last settled home was outside England."
+ question_text: "Select a local authority"
+
+ reasonpref:
+ page_header: ""
+ check_answer_label: "Household given reasonable preference"
+ hint_text: "Households may be given ‘reasonable preference’ for social housing under one or more specific categories by the local authority. This is also known as ‘priority need’."
+ question_text: "Was the household given ‘reasonable preference’ by the local authority?"
+
+ reasonable_preference_reason:
+ page_header: ""
+ check_answer_label: "Reason for reasonable preference"
+ hint_text: "Select all that apply."
+ question_text: "Why was the household given ‘reasonable preference’?"
+
+ letting_allocation:
+ page_header: ""
+ check_answer_label: "Allocation system"
+ hint_text: "Select all that apply."
+ question_text: "How was this letting allocated?"
+
+ referral:
+ supported_housing:
+ prp:
+ page_header: ""
+ check_answer_label: "Source of referral for letting"
+ hint_text: ""
+ question_text: "What was the source of referral for this letting?"
+ la:
+ page_header: ""
+ check_answer_label: "Source of referral for letting"
+ hint_text: "You told us that you are a local authority. We have removed some options because of this."
+ question_text: "What was the source of referral for this letting?"
+ general_needs:
+ prp:
+ page_header: ""
+ check_answer_label: "Source of referral for letting"
+ hint_text: "You told us that the needs type is general needs. We have removed some options because of this."
+ question_text: "What was the source of referral for this letting?"
+ la:
+ page_header: ""
+ check_answer_label: "Source of referral for letting"
+ hint_text: "You told us that you are a local authority and that the needs type is general needs. We have removed some options because of this."
+ question_text: "What was the source of referral for this letting?"
diff --git a/config/locales/forms/2025/lettings/income_and_benefits.en.yml b/config/locales/forms/2025/lettings/income_and_benefits.en.yml
new file mode 100644
index 000000000..55e193ff7
--- /dev/null
+++ b/config/locales/forms/2025/lettings/income_and_benefits.en.yml
@@ -0,0 +1,108 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ income_and_benefits:
+ net_income_known:
+ page_header: "Household’s combined income after tax"
+ check_answer_label: "Do you know the household’s combined total income after tax?"
+ hint_text: ""
+ question_text: "Do you know the household’s combined income after tax?"
+
+ income_amount:
+ page_header: "Total household income"
+ incfreq:
+ check_answer_label: "How often does the household receive this amount?"
+ hint_text: ""
+ question_text: "How often does the household receive this amount?"
+ earnings:
+ check_answer_label: "Total household income"
+ hint_text: ""
+ question_text: "How much income does the household have in total?"
+
+ hb:
+ page_header: ""
+ check_answer_label: "Housing-related benefits received"
+ hint_text: "This is about when the tenant is in their new let. If they are unsure about the situation for their new let and their financial and working situation hasn’t changed significantly, answer based on what housing-related benefits they currently receive."
+ question_text: "Is the household likely to be receiving any of these housing-related benefits?"
+
+ benefits:
+ page_header: ""
+ check_answer_label: "Household income from Universal Credit, state pension or benefit"
+ hint_text: "This excludes child and housing benefit, council tax support and tax credits."
+ question_text: "How much of the household’s income is from Universal Credit, state pensions or benefits?"
+
+ household_charge:
+ page_header: ""
+ check_answer_label: "Does the household pay rent or charges"
+ hint_text: "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves."
+ question_text: "Does the household pay rent or other charges for the accommodation?"
+
+ period:
+ page_header: ""
+ check_answer_label: "Frequency of household rent and charges"
+ hint_text: "Select how often the household is charged. This may be different to how often they pay."
+ question_text: "How often does the household pay rent and other charges?"
+
+ care_home:
+ page_header: ""
+ is_carehome:
+ check_answer_label: "Care home accommodation"
+ hint_text: ""
+ question_text: "Is this accommodation a care home?"
+ chcharge_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every week?"
+ chcharge_bi_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every 2 weeks?"
+ chcharge_4_weekly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every 4 weeks?"
+ chcharge_monthly:
+ check_answer_label: "Care home charges"
+ hint_text: ""
+ question_text: "How much does the household pay every month?"
+
+ rent_and_charges:
+ page_header: "Household rent and charges"
+ brent:
+ check_answer_label: "Basic rent"
+ hint_text: "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent."
+ question_text: "What is the basic rent?"
+ scharge:
+ check_answer_label: "Service charge"
+ hint_text: "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge."
+ question_text: "What is the service charge?"
+ pscharge:
+ check_answer_label: "Personal service charge"
+ hint_text: "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit."
+ question_text: "What is the personal service charge?"
+ supcharg:
+ check_answer_label: "Support charge"
+ hint_text: "Any charges made to fund support services included in tenancy agreement."
+ question_text: "What is the support charge?"
+ tcharge:
+ check_answer_label: "Household rent and charges"
+ hint_text: "This is the total for rent and all charges."
+ question_text: "Total charge"
+
+ hbrentshortfall:
+ page_header: ""
+ check_answer_label: "Any outstanding amount for basic rent and charges"
+ hint_text: "Also known as the ‘outstanding amount’."
+ question_text: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?"
+
+ outstanding_amount:
+ page_header: ""
+ tshortfall_known:
+ check_answer_label: "Do you know the outstanding amount?"
+ hint_text: "You only need to give an approximate figure."
+ question_text: "Can you estimate the outstanding amount?"
+ tshortfall:
+ check_answer_label: "Estimated outstanding amountt"
+ hint_text: "Also known as the ‘outstanding amount’."
+ question_text: "Estimated outstanding amount"
diff --git a/config/locales/forms/2025/lettings/property_information.en.yml b/config/locales/forms/2025/lettings/property_information.en.yml
new file mode 100644
index 000000000..bf3f3532c
--- /dev/null
+++ b/config/locales/forms/2025/lettings/property_information.en.yml
@@ -0,0 +1,127 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ property_information:
+ first_time_property_let_as_social_housing:
+ page_header: ""
+ check_answer_label: "First time being let as social-housing?"
+ hint_text: ""
+ question_text: "Is this the first time the property has been let as social housing?"
+
+ uprn:
+ page_header: ""
+ uprn_known:
+ check_answer_label: "UPRN known?"
+ hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.
The UPRN may not be the same as the property reference assigned by your organisation.
If you don’t know the UPRN you can enter the address of the property instead on the next screen."
+ question_text: "Do you know the property's UPRN?"
+ uprn:
+ check_answer_label: "UPRN"
+ hint_text: ""
+ question_text: "What is the property's UPRN?"
+
+ uprn_confirmed:
+ page_header: "We found an address that might be this property"
+ check_answer_label: "Is this the right address?"
+ hint_text: ""
+ question_text: "Is this the property address?"
+
+ address_matcher:
+ page_header: "Find an address"
+ address_line1_input:
+ check_answer_label: "Find address"
+ hint_text: ""
+ question_text: "Address line 1"
+ postcode_full_input:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Postcode"
+
+ uprn_selection:
+ page_header: "We found an address that might be this property"
+ check_answer_label: "Select the correct address"
+ hint_text: ""
+ question_text: "Select the correct address"
+
+ address:
+ page_header: "Q12 - What is the property's address?"
+ address_line1:
+ check_answer_label: "Address lines 1 and 2"
+ hint_text: ""
+ question_text: "Address line 1"
+ address_line2:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Address line 2 (optional)"
+ town_or_city:
+ check_answer_label: "Town or city"
+ hint_text: ""
+ question_text: "Town or city"
+ county:
+ check_answer_label: "County"
+ hint_text: ""
+ question_text: "County (optional)"
+ postcode_full:
+ check_answer_label: "Postcode"
+ hint_text: ""
+ question_text: "Postcode"
+
+ la:
+ page_header: ""
+ check_answer_label: "Local authority"
+ hint_text: ""
+ question_text: "What is the property’s local authority?"
+
+
+ unitletas:
+ page_header: ""
+ check_answer_label: "Most recent let type"
+ hint_text: "This is the rent type of the previous tenancy in this property."
+ question_text: "What type was the property most recently let as?"
+
+ rsnvac:
+ page_header: ""
+ check_answer_label: "Vacancy reason"
+ hint_text: ""
+ question_text: "What is the reason for the property being vacant?"
+
+ unittype_gn:
+ page_header: ""
+ check_answer_label: "Type of unit"
+ hint_text: ""
+ question_text: "What type of unit is the property?"
+
+ builtype:
+ page_header: ""
+ check_answer_label: "Type of building"
+ hint_text: ""
+ question_text: "What type of building is the property?"
+
+ wchair:
+ page_header: ""
+ check_answer_label: "Property built or adapted to wheelchair-user standards"
+ hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property."
+ question_text: "Is the property built or adapted to wheelchair-user standards?"
+
+ beds:
+ page_header: ""
+ check_answer_label: "Number of bedrooms"
+ hint_text: "If shared accommodation, enter the number of bedrooms occupied by this household."
+ question_text: "How many bedrooms does the property have?"
+
+ voiddate:
+ page_header: "Void date"
+ check_answer_label: "Void date"
+ hint_text: ""
+ question_text: "What is the void date?"
+
+ property_major_repairs:
+ page_header: ""
+ majorrepairs:
+ check_answer_label: "Major repairs carried out during void period"
+ hint_text: "Major repairs are works that could not be reasonably carried out with a tenant living at the property. For example, structural repairs."
+ question_text: "Were any major repairs carried out during the void period?"
+ mrcdate:
+ check_answer_label: "Completion date of repairs"
+ hint_text: ""
+ question_text: "When were the repairs completed?"
diff --git a/config/locales/forms/2025/lettings/setup.en.yml b/config/locales/forms/2025/lettings/setup.en.yml
new file mode 100644
index 000000000..029b5e91e
--- /dev/null
+++ b/config/locales/forms/2025/lettings/setup.en.yml
@@ -0,0 +1,87 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ setup:
+ owning_organisation_id:
+ page_header: ""
+ check_answer_label: "Stock owner"
+ hint_text: ""
+ question_text: "Which organisation owns this property?"
+
+ managing_organisation_id:
+ page_header: ""
+ check_answer_label: "Managing agent"
+ hint_text: ""
+ question_text: "Which organisation manages this letting?"
+
+ assigned_to_id:
+ page_header: ""
+ check_answer_label: "Log owner"
+ hint_text: ""
+ question_text: "Which user are you creating this log for?"
+
+ needstype:
+ page_header: ""
+ check_answer_label: "Needs type"
+ 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."
+ question_text: "What is the needs type?"
+
+ scheme_id:
+ page_header: "Scheme"
+ check_answer_label: "Scheme name"
+ hint_text: "Enter postcode or scheme name.
A supported housing scheme provides shared or self-contained housing for a particular client group, for example younger or vulnerable people."
+ question_text: "What scheme is this log for?"
+
+ location_id:
+ less_than_twenty:
+ page_header: "Location"
+ check_answer_label: "Location"
+ hint_text: ""
+ question_text: "Which location is this letting for?"
+ twenty_or_more:
+ page_header: "Location"
+ check_answer_label: "Location"
+ hint_text: '
This scheme has 20 or more locations.
Enter postcode or address.'
+ question_text: "Which location is this letting for?"
+
+ renewal:
+ page_header: ""
+ check_answer_label: "Property renewal"
+ hint_text: "If the property was previously being used as temporary accommodation, then answer 'no'."
+ question_text: "Is this letting a renewal of social housing to the same tenant in the same property?"
+
+ startdate:
+ page_header: ""
+ check_answer_label: "Tenancy start date"
+ hint_text: ""
+ question_text: "What is the tenancy start date?"
+
+ rent_type:
+ page_header: "Rent Type"
+ rent_type:
+ check_answer_label: "Rent type"
+ hint_text: ""
+ question_text: "What is the rent type?"
+ irproduct_other:
+ check_answer_label: "Product name"
+ hint_text: ""
+ question_text: "Name of rent product"
+
+ tenancycode:
+ page_header: ""
+ check_answer_label: "Tenant code"
+ hint_text: "This is how you usually refer to this tenancy on your own systems."
+ question_text: "What is the tenant code?"
+
+ propcode:
+ page_header: ""
+ check_answer_label: "Property reference"
+ hint_text: "This is how you usually refer to this property on your own systems."
+ question_text: "What is the property reference?"
+
+ declaration:
+ page_header: "Ministry of Housing, Communities and Local Government privacy notice"
+ check_answer_label: "Tenant has seen the privacy notice"
+ hint_text: ""
+ question_text: "Declaration"
diff --git a/config/locales/forms/2025/lettings/soft_validations.en.yml b/config/locales/forms/2025/lettings/soft_validations.en.yml
new file mode 100644
index 000000000..03a3cbb3d
--- /dev/null
+++ b/config/locales/forms/2025/lettings/soft_validations.en.yml
@@ -0,0 +1,132 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ soft_validations:
+ pregnancy_value_check:
+ no_females_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that all the tenants living at the property are male."
+ females_in_soft_age_range_in_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
+
+ no_retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is retired?"
+ title_text: "You told us this person is aged %{age} years and retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+
+ retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person isn’t retired?"
+ title_text: "You told us this person is over 66 and not retired."
+ informative_text: "Are you sure this person isn’t retired?"
+
+ partner_under_16_value_check:
+ page_header: ""
+ check_answer_label: "Partner under 16 confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ multiple_partners_value_check:
+ page_header: ""
+ check_answer_label: "Multiple partners confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ reasonother_value_check:
+ page_header: ""
+ check_answer_label: "Reason other confirmation"
+ hint_text: ""
+ question_text: "Are you sure this doesn’t fit an existing category?"
+ title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
+ informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question."
+
+ referral_value_check:
+ page_header: ""
+ check_answer_label: "Referral confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "Are you sure?"
+ informative_text: "This is a general needs log, and this referral type is for supported housing."
+
+ net_income_value_check:
+ page_header: ""
+ check_answer_label: "Net income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
+ informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
+
+ care_home_charges_value_check:
+ page_header: ""
+ check_answer_label: "Care home charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure there are no care home charges?"
+ title_text: "Care home charges should be provided if this is a care home accommodation."
+ informative_text: "Are you sure there are no care home charges?"
+
+ rent_value_check:
+ page_header: ""
+ check_answer_label: "Total rent confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us the rent is %{brent}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ scharge_value_check:
+ page_header: ""
+ check_answer_label: "Service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the service charge is %{scharge}."
+ informative_text: "This is higher than we would expect."
+
+ pscharge_value_check:
+ page_header: ""
+ check_answer_label: "Personal service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the personal service charge is %{pscharge}."
+ informative_text: "This is higher than we would expect."
+
+ supcharg_value_check:
+ page_header: ""
+ check_answer_label: "Support charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the support charge is %{supcharg}."
+ informative_text: "This is higher than we would expect."
+
+ void_date_value_check:
+ page_header: ""
+ check_answer_label: "Void date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us that the property has been vacant for more than 2 years."
+ informative_text: "This is longer than we would expect."
+
+ major_repairs_date_value_check:
+ page_header: ""
+ check_answer_label: "Major repairs date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us the property has been vacant for 2 years."
+ informative_text: "This is longer than we would expect."
diff --git a/config/locales/forms/2025/lettings/tenancy_information.en.yml b/config/locales/forms/2025/lettings/tenancy_information.en.yml
new file mode 100644
index 000000000..3276d1b3d
--- /dev/null
+++ b/config/locales/forms/2025/lettings/tenancy_information.en.yml
@@ -0,0 +1,66 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ tenancy_information:
+ joint:
+ page_header: ""
+ check_answer_label: "Is this a joint tenancy?"
+ hint_text: "This is where two or more people are named on the tenancy agreement"
+ question_text: "Is this a joint tenancy?"
+
+ startertenancy:
+ page_header: ""
+ check_answer_label: "Is this a starter or introductory tenancy?"
+ hint_text: "If the tenancy has an ‘introductory period’ answer ‘yes’.
You should submit a CORE log at the beginning of the starter tenancy or introductory period, with the best information you have at the time. You do not need to submit a log when a tenant later rolls onto the main tenancy."
+ question_text: "Is this a starter tenancy?"
+
+ tenancy:
+ tenancy_type:
+ page_header: ""
+ tenancy:
+ check_answer_label: "Type of main tenancy"
+ hint_text: ""
+ question_text: "What is the type of tenancy?"
+ tenancyother:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Please state the tenancy type"
+ starter_tenancy_type:
+ page_header: ""
+ tenancy:
+ check_answer_label: "Type of main tenancy after the starter or introductory period has ended"
+ hint_text: ""
+ question_text: "What is the type of tenancy after the starter or introductory period has ended?"
+ tenancyother:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Please state the tenancy type"
+
+ tenancylength:
+ tenancy_length:
+ page_header: ""
+ check_answer_label: "Length of fixed-term tenancy"
+ hint_text: "Do not include the starter or introductory period."
+ question_text: "What is the length of the fixed-term tenancy to the nearest year?"
+ tenancy_length_affordable_rent:
+ page_header: ""
+ check_answer_label: "Length of fixed-term tenancy"
+ hint_text: "Do not include the starter or introductory period.The minimum period is 2 years for social or affordable rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 2 years."
+ question_text: "What is the length of the fixed-term tenancy to the nearest year?"
+ tenancy_length_intermediate_rent:
+ page_header: ""
+ check_answer_label: "Length of fixed-term tenancy"
+ hint_text: "Do not include the starter or introductory period.The minimum period is 1 year for intermediate rent general needs logs. You do not need to submit CORE logs for these types of tenancies if they are shorter than 1 year."
+ question_text: "What is the length of the fixed-term tenancy to the nearest year?"
+ tenancy_length_periodic:
+ page_header: ""
+ check_answer_label: "Length of periodic tenancy"
+ hint_text: "As this is a periodic tenancy, this question is optional. If you do not have the information available click save and continue"
+ question_text: "What is the length of the periodic tenancy to the nearest year?"
+
+ sheltered:
+ page_header: ""
+ check_answer_label: "Is this letting in sheltered accommodation?"
+ hint_text: "Sheltered housing and special retirement housing are for tenants with low-level care and support needs. This typically provides some limited support to enable independent living, such as alarm-based assistance or a scheme manager.Extra care housing is for tenants with medium to high care and support needs, often with 24 hour access to support staff provided by an agency registered with the Care Quality Commission."
+ question_text: "Is this letting in sheltered accommodation?"
diff --git a/config/locales/forms/2025/sales/guidance.en.yml b/config/locales/forms/2025/sales/guidance.en.yml
new file mode 100644
index 000000000..4ed6796b3
--- /dev/null
+++ b/config/locales/forms/2025/sales/guidance.en.yml
@@ -0,0 +1,46 @@
+en:
+ forms:
+ 2025:
+ sales:
+ guidance:
+ shared_ownership_type_definitions:
+ title: "Shared Ownership Type Definitions"
+ content: "
Shared Ownership (old model lease): Cannot be used for homes funded through the Affordable Homes Programme 2021 to 2026. Use the new model lease for these properties.
+
Shared Ownership (new model lease): Homes bought using the Affordable Homes Programme 2021 to 2026.
+
Social HomeBuy — shared ownership purchase: Tenants of private registered providers purchase their home at discount on Shared Ownership terms.
+
Home Ownership for people with Long-Term Disabilities (HOLD): A shared ownership sale for those with long term disabilities.
+
Older Persons Shared Ownership: A type of shared ownership for those 55 years and over.
+
Rent to Buy — Shared Ownership: A sale following a period of discounted rent.
+
Right to Shared Ownership (RtSO): A sale of a share of a rented home to a tenant using this scheme.
+
London Living Rent — Shared Ownership: A shared ownership sale following a period of discounted rent as part of the London Living Rent scheme.
"
+
+ discounted_ownership_type_definitions:
+ title: "Discounted Ownership Type Definitions"
+ content: "
Right to Acquire (RTA): a discounted sale of a property built or purchased after 31 March 1997 to tenants of a private registered provider.
+
Preserved Right to Buy (PRTB): a discounted sale of a property that used to be owned by a council to tenants of a private registered provider.
+
Voluntary Right to Buy (VRTB): a discounted sale to tenants in this PRP owned property, as part of a pilot scheme.
+
Right to Buy (RTB): a discounted sale to tenants in this council owned property.
+
Rent to Buy full ownership: a sale on full ownership terms following a period of discounted rent.
+
Social HomeBuy for outright purchase: a discounted sale to tenants of a private registered provider on full ownership terms.
+
Any other equity loan scheme: any scheme, not covered elsewhere, in which a loan is used to purchase equity.
"
+
+ mortgage_lender:
+ title: "Can’t find the mortgage lender you’re looking for?"
+ content: "
+ - Double check the spelling and try again
+ - Type the first few letters to see the suggestions
+ - Type Other and continue - we’ll ask you to type in your answer in the next question
+
"
+
+ outright_sale_type_definitions:
+ title: "Outright sale type definitions"
+ content: "
Outright sale: the full purchase of a property, usually with a mortgage or cash.
+
Other sale: any sale which does not fit the criteria of any of the remaining options.
"
+
+ privacy_notice_buyer_joint_purchase:
+ content: "Make sure the buyers have seen or been given access to %{privacy_notice_link} before completing this log. This is a legal requirement under data protection legislation."
+ privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"
+
+ privacy_notice_buyer:
+ content: "Make sure the buyer has seen or been given access to %{privacy_notice_link} before completing this log. This is a legal requirement under data protection legislation."
+ privacy_notice_link_text: "the Ministry of Housing, Communities and Local Government (MHCLG) privacy notice"
diff --git a/config/locales/forms/2025/sales/household_characteristics.en.yml b/config/locales/forms/2025/sales/household_characteristics.en.yml
new file mode 100644
index 000000000..b92cba2de
--- /dev/null
+++ b/config/locales/forms/2025/sales/household_characteristics.en.yml
@@ -0,0 +1,345 @@
+en:
+ forms:
+ 2025:
+ sales:
+ household_characteristics:
+ age1:
+ page_header: ""
+ age1_known:
+ check_answer_label: "Buyer 1’s age"
+ hint_text: "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
+ question_text: "Do you know buyer 1’s age?"
+ age1:
+ check_answer_label: "Buyer 1’s age"
+ hint_text: ""
+ question_text: "Age"
+
+ sex1:
+ page_header: ""
+ check_answer_label: "Buyer 1’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes buyer 1’s gender identity?"
+
+ ethnic_group:
+ page_header: ""
+ check_answer_label: "Buyer 1’s ethnic group"
+ hint_text: ""
+ question_text: "What is buyer 1’s ethnic group?"
+
+ ethnic:
+ ethnic_background_black:
+ page_header: ""
+ check_answer_label: "Buyer 1’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 1’s Black, African, Caribbean or Black British background?"
+ ethnic_background_asian:
+ page_header: ""
+ check_answer_label: "Buyer 1’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 1’s Asian or Asian British background?"
+ ethnic_background_arab:
+ page_header: ""
+ check_answer_label: "Buyer 1’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 1’s Arab background?"
+ ethnic_background_mixed:
+ page_header: ""
+ check_answer_label: "Buyer 1’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 1’s Mixed or Multiple ethnic groups background?"
+ ethnic_background_white:
+ page_header: ""
+ check_answer_label: "Buyer 1’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 1’s White background?"
+
+ nationality_all_group:
+ page_header: ""
+ check_answer_label: "Buyer 1’s nationality"
+ hint_text: "If buyer 1 is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the buyer should decide which country to enter."
+ question_text: "What is buyer 1’s nationality?"
+
+ nationality_all:
+ page_header: ""
+ check_answer_label: "Buyer 1’s nationality"
+ hint_text: ""
+ question_text: "Enter a nationality"
+
+ ecstat1:
+ page_header: ""
+ check_answer_label: "Buyer 1's working situation"
+ hint_text: ""
+ question_text: "Which of these best describes buyer 1's working situation?"
+
+ buy1livein:
+ page_header: ""
+ check_answer_label: "Will buyer 1 live in the property?"
+ hint_text: ""
+ question_text: "Will buyer 1 live in the property?"
+
+ relat2:
+ buyer:
+ page_header: ""
+ check_answer_label: "Buyer 2's relationship to buyer 1"
+ hint_text: ""
+ question_text: "What is buyer 2's relationship to buyer 1?"
+ person:
+ page_header: ""
+ check_answer_label: "Person 2’s relationship to Buyer 1"
+ hint_text: ""
+ question_text: "What is Person 2’s relationship to Buyer 1?"
+
+ age2:
+ buyer:
+ page_header: ""
+ age2_known:
+ check_answer_label: "Buyer 2’s age"
+ hint_text: ""
+ question_text: "Do you know buyer 2’s age?"
+ age2:
+ check_answer_label: "Buyer 2’s age"
+ hint_text: ""
+ question_text: "Age"
+ person:
+ page_header: ""
+ age2_known:
+ check_answer_label: "Person 2’s age known?"
+ hint_text: ""
+ question_text: "Do you know person 2’s age?"
+ age2:
+ check_answer_label: "Person 2’s age"
+ hint_text: ""
+ question_text: "Age"
+
+ sex2:
+ buyer:
+ page_header: ""
+ check_answer_label: "Buyer 2’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes buyer 2’s gender identity?"
+ person:
+ page_header: ""
+ check_answer_label: "Person 2’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes Person 2’s gender identity?"
+
+ ethnic_group2:
+ page_header: ""
+ check_answer_label: "Buyer 2’s ethnic group"
+ hint_text: ""
+ question_text: "What is buyer 2’s ethnic group?"
+
+ ethnicbuy2:
+ ethnic_background_black:
+ page_header: ""
+ check_answer_label: "Buyer 2’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 2’s Black, African, Caribbean or Black British background?"
+ ethnic_background_asian:
+ page_header: ""
+ check_answer_label: "Buyer 2’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 2’s Asian or Asian British background?"
+ ethnic_background_arab:
+ page_header: ""
+ check_answer_label: "Buyer 2’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 2’s Arab background?"
+ ethnic_background_mixed:
+ page_header: ""
+ check_answer_label: "Buyer 2’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 2’s Mixed or Multiple ethnic groups background?"
+ ethnic_background_white:
+ page_header: ""
+ check_answer_label: "Buyer 2’s ethnic background"
+ hint_text: ""
+ question_text: "Which of the following best describes buyer 2’s White background?"
+
+ nationality_all_buyer2_group:
+ page_header: ""
+ check_answer_label: "Buyer 2’s nationality"
+ hint_text: "If buyer 1 is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the buyer should decide which country to enter."
+ question_text: "What is buyer 2’s nationality?"
+
+ nationality_all_buyer2:
+ page_header: ""
+ check_answer_label: "Buyer 2’s nationality"
+ hint_text: ""
+ question_text: "Enter a nationality"
+
+ ecstat2:
+ buyer:
+ page_header: ""
+ check_answer_label: "Buyer 2's working situation"
+ hint_text: ""
+ question_text: "Which of these best describes buyer 2's working situation?"
+ person:
+ page_header: ""
+ check_answer_label: "Person 2’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes Person 2’s working situation?"
+
+ buy2livein:
+ page_header: ""
+ check_answer_label: "Will buyer 2 live in the property?"
+ hint_text: ""
+ question_text: "Will buyer 2 live in the property?"
+
+ hholdcount:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Number of other people living in the property"
+ hint_text: "You can provide details for a maximum of 4 other people for a joint purchase."
+ question_text: "Besides the buyers, how many other people live or will live in the property?"
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Number of other people living in the property"
+ hint_text: "You can provide details for a maximum of 5 other people if there is only one buyer."
+ question_text: "Besides the buyer, how many other people live or will live in the property?"
+
+ details_known_2:
+ page_header: ""
+ check_answer_label: "Details known for person 2?"
+ hint_text: ""
+ question_text: "Do you know the details for person 2?"
+
+ details_known_3:
+ page_header: ""
+ check_answer_label: "Details known for person 3?"
+ hint_text: ""
+ question_text: "Do you know the details for person 3?"
+
+ relat3:
+ page_header: ""
+ check_answer_label: "Person 3’s relationship to Buyer 1"
+ hint_text: ""
+ question_text: "What is Person 3’s relationship to Buyer 1?"
+
+ age3:
+ page_header: ""
+ age3_known:
+ check_answer_label: "Person 3’s age known?"
+ hint_text: ""
+ question_text: "Do you know person 3’s age?"
+ age3:
+ check_answer_label: "Person 3’s age"
+ hint_text: ""
+ question_text: "Age"
+
+ sex3:
+ page_header: ""
+ check_answer_label: "Person 3’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes Person 3’s gender identity?"
+
+ ecstat3:
+ page_header: ""
+ check_answer_label: "Person 3’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes Person 3’s working situation?"
+
+ details_known_4:
+ page_header: ""
+ check_answer_label: "Details known for person 4?"
+ hint_text: ""
+ question_text: "Do you know the details for person 4?"
+
+ relat4:
+ page_header: ""
+ check_answer_label: "Person 4’s relationship to Buyer 1"
+ hint_text: ""
+ question_text: "What is Person 4’s relationship to Buyer 1?"
+
+ age4:
+ page_header: ""
+ age4_known:
+ check_answer_label: "Person 4’s age known?"
+ hint_text: ""
+ question_text: "Do you know person 4’s age?"
+ age4:
+ check_answer_label: "Person 4’s age"
+ hint_text: ""
+ question_text: "Age"
+
+ sex4:
+ page_header: ""
+ check_answer_label: "Person 4’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes Person 4’s gender identity?"
+
+ ecstat4:
+ page_header: ""
+ check_answer_label: "Person 4’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes Person 4’s working situation?"
+
+ details_known_5:
+ page_header: ""
+ check_answer_label: "Details known for person 5?"
+ hint_text: ""
+ question_text: "Do you know the details for person 5?"
+
+ relat5:
+ page_header: ""
+ check_answer_label: "Person 5’s relationship to Buyer 1"
+ hint_text: ""
+ question_text: "What is Person 5’s relationship to Buyer 1?"
+
+ age5:
+ page_header: ""
+ age5_known:
+ check_answer_label: "Person 5’s age known?"
+ hint_text: ""
+ question_text: "Do you know person 5’s age?"
+ age5:
+ check_answer_label: "Person 5’s age"
+ hint_text: ""
+ question_text: "Age"
+
+ sex5:
+ page_header: ""
+ check_answer_label: "Person 5’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes Person 5’s gender identity?"
+
+ ecstat5:
+ page_header: ""
+ check_answer_label: "Person 5’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes Person 5’s working situation?"
+
+ details_known_6:
+ page_header: ""
+ check_answer_label: "Details known for person 6?"
+ hint_text: ""
+ question_text: "Do you know the details for person 6?"
+
+ relat6:
+ page_header: ""
+ check_answer_label: "Person 6’s relationship to Buyer 1"
+ hint_text: ""
+ question_text: "What is Person 6’s relationship to Buyer 1?"
+
+ age6:
+ page_header: ""
+ age6_known:
+ check_answer_label: "Person 6’s age known?"
+ hint_text: ""
+ question_text: "Do you know person 6’s age?"
+ age6:
+ check_answer_label: "Person 6’s age"
+ hint_text: ""
+ question_text: "Age"
+
+ sex6:
+ page_header: ""
+ check_answer_label: "Person 6’s gender identity"
+ hint_text: "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ question_text: "Which of these best describes Person 6’s gender identity?"
+
+ ecstat6:
+ page_header: ""
+ check_answer_label: "Person 6’s working situation"
+ hint_text: ""
+ question_text: "Which of these best describes Person 6’s working situation?"
diff --git a/config/locales/forms/2025/sales/household_needs.en.yml b/config/locales/forms/2025/sales/household_needs.en.yml
new file mode 100644
index 000000000..1908ba6ca
--- /dev/null
+++ b/config/locales/forms/2025/sales/household_needs.en.yml
@@ -0,0 +1,34 @@
+en:
+ forms:
+ 2025:
+ sales:
+ household_needs:
+ hhregres:
+ page_header: ""
+ check_answer_label: "Have any of the buyers ever served as a regular in the UK armed forces?"
+ hint_text: "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces"
+ question_text: "Have any of the buyers ever served as a regular in the UK armed forces?"
+
+ hhregresstill:
+ page_header: ""
+ check_answer_label: "Are they still serving in the UK armed forces?"
+ hint_text: ""
+ question_text: "Is the buyer still serving in the UK armed forces?"
+
+ armedforcesspouse:
+ page_header: ""
+ check_answer_label: "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
+ hint_text: ""
+ question_text: "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
+
+ disabled:
+ page_header: ""
+ check_answer_label: "Does anyone in the household have a disability?"
+ hint_text: "This includes any long-term health condition that has an impact on the person's day-to-day life"
+ question_text: "Does anyone in the household consider themselves to have a disability?"
+
+ wheel:
+ page_header: ""
+ check_answer_label: "Does anyone in the household use a wheelchair?"
+ hint_text: "This can be inside or outside the home"
+ question_text: "Does anyone in the household use a wheelchair?"
diff --git a/config/locales/forms/2025/sales/household_situation.en.yml b/config/locales/forms/2025/sales/household_situation.en.yml
new file mode 100644
index 000000000..6b49a7d37
--- /dev/null
+++ b/config/locales/forms/2025/sales/household_situation.en.yml
@@ -0,0 +1,44 @@
+en:
+ forms:
+ 2025:
+ sales:
+ household_situation:
+ prevten:
+ page_header: ""
+ check_answer_label: "Buyer 1’s previous tenure"
+ hint_text: ""
+ question_text: "What was buyer 1’s previous tenure?"
+
+ last_accommodation:
+ page_header: ""
+ ppcodenk:
+ check_answer_label: "Buyer 1’s last settled accommodation"
+ hint_text: "This is also known as the household’s 'last settled home'"
+ question_text: "Do you know the postcode of buyer 1’s last settled accommodation?"
+ ppostcode_full:
+ check_answer_label: "Postcode of buyer 1’s last settled accommodation"
+ hint_text: ""
+ question_text: "Postcode"
+
+ last_accommodation_la:
+ page_header: ""
+ previous_la_known:
+ check_answer_label: "Local authority of buyer 1’s last settled accommodation"
+ hint_text: "This is also known as the household’s 'last settled home'"
+ question_text: "Do you know the local authority of buyer 1’s last settled accommodation?"
+ prevloc:
+ check_answer_label: "Local authority of buyer 1’s last settled accommodation"
+ hint_text: ""
+ question_text: "Select a local authority"
+
+ buy2living:
+ page_header: ""
+ check_answer_label: "Buyer 2 living at the same address"
+ hint_text: ""
+ question_text: "At the time of purchase, was buyer 2 living at the same address as buyer 1?"
+
+ prevtenbuy2:
+ page_header: ""
+ check_answer_label: "Buyer 2’s previous tenure"
+ hint_text: ""
+ question_text: "What was buyer 2’s previous tenure?"
diff --git a/config/locales/forms/2025/sales/income_benefits_and_savings.en.yml b/config/locales/forms/2025/sales/income_benefits_and_savings.en.yml
new file mode 100644
index 000000000..20beb0b85
--- /dev/null
+++ b/config/locales/forms/2025/sales/income_benefits_and_savings.en.yml
@@ -0,0 +1,90 @@
+en:
+ forms:
+ 2025:
+ sales:
+ income_benefits_and_savings:
+ buyer_1_income:
+ page_header: ""
+ income1nk:
+ check_answer_label: "Buyer 1’s gross annual income known?"
+ hint_text: ""
+ question_text: "Do you know buyer 1’s annual income?"
+ income1:
+ check_answer_label: "Buyer 1’s gross annual income"
+ hint_text: "Provide the gross annual income (i.e. salary before tax) plus the annual amount of benefits, Universal Credit or pensions, and income from investments."
+ question_text: "Buyer 1’s gross annual income"
+
+ inc1mort:
+ page_header: ""
+ check_answer_label: "Buyer 1’s income used for mortgage application"
+ hint_text: ""
+ question_text: "Was buyer 1’s income used for a mortgage application?"
+
+ buyer_2_income:
+ page_header: ""
+ income2nk:
+ check_answer_label: "Buyer 2’s gross annual income known?"
+ hint_text: ""
+ question_text: "Do you know buyer 2’s annual income?"
+ income2:
+ check_answer_label: "Buyer 2’s gross annual income"
+ hint_text: "Provide the gross annual income (i.e. salary before tax) plus the annual amount of benefits, Universal Credit or pensions, and income from investments."
+ question_text: "Buyer 2’s gross annual income"
+
+ inc2mort:
+ page_header: ""
+ check_answer_label: "Buyer 2’s income used for mortgage application"
+ hint_text: ""
+ question_text: "Was buyer 2’s income used for a mortgage application?"
+
+ housing_benefits:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Housing-related benefits buyers received before buying this property"
+ hint_text: ""
+ question_text: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?"
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Housing-related benefits buyer received before buying this property"
+ hint_text: ""
+ question_text: "Was the buyer receiving any of these housing-related benefits immediately before buying this property?"
+
+ savings:
+ joint_purchase:
+ page_header: ""
+ savingsnk:
+ check_answer_label: "Buyers’ total savings known?"
+ hint_text: ""
+ question_text: "Do you know how much the 'buyers' had in savings before they paid any deposit for the property?"
+ savings:
+ check_answer_label: "Buyers’ total savings before any deposit paid"
+ hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account."
+ question_text: "Enter their total savings to the nearest £10"
+ not_joint_purchase:
+ page_header: ""
+ savingsnk:
+ check_answer_label: "Buyer’s total savings known?"
+ hint_text: ""
+ question_text: "Do you know how much the buyer had in savings before they paid any deposit for the property?"
+ savings:
+ check_answer_label: "Buyer’s total savings before any deposit paid"
+ hint_text: "Include any savings, investments, ISAs, premium bonds, shares, or money held in a bank or building society account."
+ question_text: "Enter their total savings to the nearest £10"
+
+ prevown:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Buyers previously owned a property."
+ hint_text: ""
+ question_text: "Have any of the buyers previously owned a property?"
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Buyer previously owned a property."
+ hint_text: ""
+ question_text: "Has the buyer previously owned a property?"
+
+ prevshared:
+ page_header: ""
+ check_answer_label: "Previous property shared ownership?"
+ hint_text: "For any buyer"
+ question_text: "Was the previous property under shared ownership?"
diff --git a/config/locales/forms/2025/sales/property_information.en.yml b/config/locales/forms/2025/sales/property_information.en.yml
new file mode 100644
index 000000000..d658362ea
--- /dev/null
+++ b/config/locales/forms/2025/sales/property_information.en.yml
@@ -0,0 +1,91 @@
+en:
+ forms:
+ 2025:
+ sales:
+ property_information:
+ uprn:
+ page_header: ""
+ uprn_known:
+ check_answer_label: "UPRN known?"
+ hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.
The UPRN may not be the same as the property reference assigned by your organisation.
If you don’t know the UPRN you can enter the address of the property instead on the next screen."
+ question_text: "Do you know the property's UPRN?"
+ uprn:
+ check_answer_label: "UPRN"
+ hint_text: ""
+ question_text: "What is the property's UPRN?"
+
+ uprn_confirmed:
+ page_header: "We found an address that might be this property"
+ check_answer_label: "Is this the right address?"
+ hint_text: ""
+ question_text: "Is this the property address?"
+
+ address_matcher:
+ page_header: "Find an address"
+ address_line1_input:
+ check_answer_label: "Find address"
+ hint_text: ""
+ question_text: "Address line 1"
+ postcode_full_input:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Postcode"
+
+ uprn_selection:
+ page_header: "We found an address that might be this property"
+ check_answer_label: "Select the correct address"
+ hint_text: ""
+ question_text: "Select the correct address"
+
+ address:
+ page_header: "Q12 - What is the property's address?"
+ address_line1:
+ check_answer_label: "Address lines 1 and 2"
+ hint_text: ""
+ question_text: "Address line 1"
+ address_line2:
+ check_answer_label: ""
+ hint_text: ""
+ question_text: "Address line 2 (optional)"
+ town_or_city:
+ check_answer_label: "Town or city"
+ hint_text: ""
+ question_text: "Town or city"
+ county:
+ check_answer_label: "County"
+ hint_text: ""
+ question_text: "County (optional)"
+ postcode_full:
+ check_answer_label: "Postcode"
+ hint_text: ""
+ question_text: "Postcode"
+
+ la:
+ page_header: ""
+ check_answer_label: "Local authority"
+ hint_text: ""
+ question_text: "What is the property’s local authority?"
+
+ beds:
+ page_header: ""
+ check_answer_label: "Number of bedrooms"
+ hint_text: ""
+ question_text: "How many bedrooms does the property have?"
+
+ proptype:
+ page_header: ""
+ check_answer_label: "Type of unit"
+ hint_text: ""
+ question_text: "What type of unit is the property?"
+
+ builtype:
+ page_header: ""
+ check_answer_label: "Type of building"
+ hint_text: ""
+ question_text: "What type of building is the property?"
+
+ wchair:
+ page_header: ""
+ check_answer_label: "Property built or adapted to wheelchair-user standards"
+ hint_text: "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property."
+ question_text: "Is the property built or adapted to wheelchair-user standards?"
diff --git a/config/locales/forms/2025/sales/sale_information.en.yml b/config/locales/forms/2025/sales/sale_information.en.yml
new file mode 100644
index 000000000..33826e58b
--- /dev/null
+++ b/config/locales/forms/2025/sales/sale_information.en.yml
@@ -0,0 +1,201 @@
+en:
+ forms:
+ 2025:
+ 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?"
+
+ 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?"
+ staircasesale:
+ check_answer_label: "Part of a back-to-back staircasing transaction"
+ hint_text: ""
+ question_text: "Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?"
+
+ 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_date:
+ 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"
+
+ purchase_price:
+ discounted_ownership:
+ page_header: "About the price of the property"
+ check_answer_label: "Purchase price"
+ hint_text: "For all schemes, including Right to Acquire (RTA), Right to Buy (RTB), Voluntary Right to Buy (VRTB) or Preserved Right to Buy (PRTB) sales, enter the full price of the property without any discount"
+ question_text: "What is the full purchase price?"
+ outright_sale:
+ page_header: "About the price of the property"
+ check_answer_label: "Purchase price"
+ hint_text: ""
+ question_text: "What is the full purchase price?"
+
+ discount:
+ page_header: "About the price of the property"
+ check_answer_label: "Percentage discount"
+ hint_text: "For Right to Buy (RTB), Preserved Right to Buy (PRTB), and Voluntary Right to Buy (VRTB)If discount capped, enter capped %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."
+ question_text: "What was the percentage discount?"
+
+ grant:
+ page_header: "About the price of the property"
+ check_answer_label: "Amount of any loan, grant or subsidy"
+ hint_text: "For all schemes except Right to Buy (RTB), Preserved Right to Buy (PRTB), Voluntary Right to Buy (VRTB) and Rent to Buy"
+ question_text: "What was the amount of any loan, grant, discount or subsidy given?"
diff --git a/config/locales/forms/2025/sales/setup.en.yml b/config/locales/forms/2025/sales/setup.en.yml
new file mode 100644
index 000000000..6f7c5da98
--- /dev/null
+++ b/config/locales/forms/2025/sales/setup.en.yml
@@ -0,0 +1,94 @@
+en:
+ forms:
+ 2025:
+ sales:
+ setup:
+ owning_organisation_id:
+ page_header: ""
+ check_answer_label: "Owning organisation"
+ hint_text: ""
+ question_text: "Which organisation owns this log?"
+
+ managing_organisation_id:
+ page_header: ""
+ check_answer_label: "Reported by"
+ hint_text: ""
+ question_text: "Which organisation is reporting this sale?"
+
+ assigned_to_id:
+ page_header: ""
+ check_answer_label: "Log owner"
+ hint_text: ""
+ question_text: "Which user are you creating this log for?"
+
+ saledate:
+ page_header: ""
+ check_answer_label: "Sale completion date"
+ hint_text: ""
+ question_text: "What is the sale completion date?"
+
+ purchid:
+ page_header: ""
+ check_answer_label: "Purchaser code"
+ hint_text: "This is how you usually refer to the purchaser on your own systems."
+ question_text: "What is the purchaser code?"
+
+ ownershipsch:
+ page_header: ""
+ check_answer_label: "Purchase made under ownership scheme"
+ hint_text: ""
+ question_text: "Was this purchase made through an ownership scheme?"
+
+ 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?"
+
+ type:
+ shared_ownership:
+ page_header: "Type of shared ownership sale"
+ check_answer_label: "Type of shared ownership sale"
+ hint_text: "When the purchaser buys an initial share of up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion, or a subsequent staircasing transaction"
+ question_text: "What is the type of shared ownership sale?"
+ discounted_ownership:
+ page_header: "Type of discounted ownership sale"
+ check_answer_label: "Type of discounted ownership sale"
+ hint_text: ""
+ question_text: "What is the type of discounted ownership sale?"
+
+ jointpur:
+ page_header: ""
+ check_answer_label: "Joint purchase"
+ hint_text: "This is where two or more people are named as legal owners of the property after the purchase"
+ question_text: "Is this a joint purchase?"
+
+ jointmore:
+ page_header: ""
+ check_answer_label: "More than 2 joint buyers"
+ hint_text: ""
+ question_text: "Are there more than 2 joint buyers of this property?"
+
+ noint:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Buyers interviewed in person?"
+ hint_text: "You should still try to answer all questions even if the buyers weren’t interviewed in person"
+ question_text: "Were the buyers interviewed for any of the answers you will provide on this log?"
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Buyer interviewed in person?"
+ hint_text: "You should still try to answer all questions even if the buyer wasn’t interviewed in person"
+ question_text: "Was the buyer interviewed for any of the answers you will provide on this log?"
+
+ privacynotice:
+ joint_purchase:
+ page_header: "Ministry of Housing, Communities and Local Government privacy notice"
+ check_answer_label: "Buyers have seen the privacy notice?"
+ hint_text: ""
+ question_text: "Declaration"
+ not_joint_purchase:
+ page_header: "Ministry of Housing, Communities and Local Government privacy notice"
+ check_answer_label: "Buyer has seen the privacy notice?"
+ hint_text: ""
+ question_text: "Declaration"
diff --git a/config/locales/forms/2025/sales/soft_validations.en.yml b/config/locales/forms/2025/sales/soft_validations.en.yml
new file mode 100644
index 000000000..c8f0990ba
--- /dev/null
+++ b/config/locales/forms/2025/sales/soft_validations.en.yml
@@ -0,0 +1,244 @@
+en:
+ forms:
+ 2025:
+ sales:
+ soft_validations:
+ retirement_value_check:
+ max:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person isn't retired?"
+ title_text: "You told us this person is over 66 and not retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+ min:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is retired?"
+ title_text: "You told us this person is aged %{age} years and retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+ old_persons_shared_ownership_value_check:
+ page_header: ""
+ check_answer_label: "Shared ownership confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text:
+ joint_purchase: "You told us the buyers are using the Older Persons Shared Ownership scheme."
+ not_joint_purchase: "You told us the buyer is using the Older Persons Shared Ownership scheme."
+ informative_text: "At least one buyer must be aged 65 years and over to use this scheme."
+ income1_value_check:
+ check_answer_label: "Buyer 1 income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ min:
+ page_header: ""
+ title_text: "You told us income was %{income}."
+ informative_text: "This is less than we would expect for someone in this working situation."
+ max:
+ page_header: ""
+ title_text: "You told us the income of buyer 1 is %{income}. This seems high. Are you sure this is correct?"
+
+ income2_value_check:
+ check_answer_label: "Buyer 2 income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ min:
+ page_header: ""
+ title_text: "You told us income was %{income}."
+ informative_text: "This is less than we would expect for someone in this working situation."
+ max:
+ page_header: ""
+ title_text: "You told us the income of buyer 2 is %{income}. This seems high. Are you sure this is correct?"
+
+ combined_income_value_check:
+ page_header: ""
+ check_answer_label: "Combined income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us the combined income of this household is %{combined_income}. This seems high. Are you sure this is correct?"
+
+ mortgage_value_check:
+ page_header: ""
+ check_answer_label: "Mortgage confirmation"
+ hint_text: ""
+ question_text: "Are you sure that the mortgage is more than 5 times the income used for the mortgage application?"
+ title_text: "You told us that the mortgage amount is %{mortgage}."
+ informative_text: "This is more than 5 times the income, which is higher than we would expect."
+
+ savings_value_check:
+ page_header: ""
+ check_answer_label: "Savings confirmation"
+ hint_text: ""
+ question_text: "Are you sure the savings are higher than £100,000?"
+ joint_purchase:
+ title_text: "You told us the buyers’ savings were %{savings}."
+ informative_text: "This is higher than we would expect."
+ not_joint_purchase:
+ title_text: "You told us the buyer’s savings were %{savings}."
+ informative_text: "This is higher than we would expect."
+
+ staircase_bought_value_check:
+ page_header: ""
+ check_answer_label: "Percentage bought confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that %{percentage}% was bought in this staircasing transaction."
+ informative_text: "Most staircasing transactions are less than 50%"
+
+ stairowned_value_check:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Percentage owned confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us that the buyers now own %{stairowned} of the property."
+ informative_text: "The maximum percentage that can be owned under the Older Persons Shared Ownership scheme is 75%, unless the property was funded outside the Affordable Homes Programme. Make sure these answers are correct."
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Percentage owned confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us that the buyer now owns %{stairowned} of the property."
+ informative_text: "The maximum percentage that can be owned under the Older Persons Shared Ownership scheme is 75%, unless the property was funded outside the Affordable Homes Programme. Make sure these answers are correct."
+
+ hodate_check:
+ page_header: ""
+ check_answer_label: "Practical completion or handover date check"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us practical completion or handover date is more than 3 years before sale completion date."
+
+ value_value_check:
+ page_header: ""
+ check_answer_label: "Purchase price confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "You told us the purchase price is %{value}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ shared_ownership_deposit_value_check:
+ page_header: ""
+ check_answer_label: "Shared ownership deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the %{mortgage_deposit_and_discount_error_fields} add up to %{mortgage_deposit_and_discount_total}."
+
+ deposit_value_check:
+ joint_purchase:
+ page_header: ""
+ check_answer_label: "Deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
+ title_text: "You told us the buyers’ deposit was %{deposit} and their savings were %{savings}."
+ informative_text: "The deposit amount is higher than we would expect for the amount of savings they have."
+ not_joint_purchase:
+ page_header: ""
+ check_answer_label: "Deposit confirmation"
+ hint_text: ""
+ question_text: "Are you sure that the deposit is this much higher than the buyer's savings?"
+ title_text: "You told us the buyer’s deposit was %{deposit} and their savings were %{savings}."
+ informative_text: "The deposit amount is higher than we would expect for the amount of savings they have."
+
+ address_search_value_check:
+ page_header: ""
+ check_answer_label: ""
+ hint_text: ""
+ question_text: ""
+ title_text: "No address found."
+ informative_text: "We could not find an address that matches your search. You can search again or continue to enter the address manually."
+
+ wheel_value_check:
+ page_header: ""
+ check_answer_label: "Does anyone in the household use a wheelchair?"
+ hint_text: ""
+ question_text: "You told us that someone in the household uses a wheelchair."
+ title_text: "You told us that someone in the household uses a wheelchair."
+
+ buyer_livein_value_check:
+ buyer1:
+ page_header: ""
+ check_answer_label: "Buyer live in confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that buyer 1 will not live in the property."
+ informative_text: "For %{ownership_scheme} types, the buyer usually lives in the property."
+ buyer2:
+ page_header: ""
+ check_answer_label: "Buyer live in confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that buyer 2 will not live in the property."
+ informative_text: "For %{ownership_scheme} types, the buyer usually lives in the property."
+
+ student_not_child_value_check:
+ page_header: ""
+ check_answer_label: "Student not a child confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is not a child?"
+ title_text: "You told us this person is a student aged between 16 and 19."
+ informative_text: "Are you sure this person is not a child?"
+
+ partner_under_16_value_check:
+ page_header: ""
+ check_answer_label: "Partner under 16 confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to buyer 1."
+ informative_text: "Are you sure this is correct?"
+
+ multiple_partners_value_check:
+ page_header: ""
+ check_answer_label: "Multiple partners confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us there are more than 1 persons with 'Partner' relationship to buyer 1."
+ informative_text: "Are you sure this is correct?"
+
+ monthly_charges_value_check:
+ page_header: ""
+ check_answer_label: "Monthly charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the monthly charges were %{mscharge}."
+ informative_text: "This is higher than we would expect."
+
+ extra_borrowing_value_check:
+ page_header: ""
+ check_answer_label: "Extra borrowing confirmation"
+ hint_text: ""
+ question_text: "Are you sure there is no extra borrowing?"
+ title_text: "You told us that the mortgage and deposit total is %{mortgage_and_deposit_total}."
+ informative_text: "This is higher than the purchase price minus the discount."
+
+ percentage_discount_value_check:
+ page_header: ""
+ check_answer_label: "Percentage discount confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the percentage discount is %{discount}."
+ informative_text: "This is higher than we would expect."
+
+ grant_value_check:
+ page_header: ""
+ check_answer_label: "Grant value confirmation"
+ hint_text: ""
+ question_text: "Are you sure? Grants are usually £9,000 - £16,000"
+ title_text: "You told us that the grant amount is %{grant}."
+ informative_text: "Loans, grants and subsidies are usually between £9,000 and £16,000."
+
+ discounted_sale_value_check:
+ page_header: ""
+ check_answer_label: "Discounted sale value confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "Mortgage, deposit, and grant total must equal %{value_with_discount}."
+ informative_text: "Your given mortgage, deposit and grant total is %{mortgage_deposit_and_grant_total}."
+
+ deposit_and_mortgage_value_check:
+ page_header: ""
+ check_answer_label: "Deposit and mortgage against discount confirmation"
+ hint_text: ""
+ question_text: "Are you sure? Mortgage and deposit usually equal or are more than (value - discount)"
+ title_text: "You told us the mortgage amount was %{mortgage}, the cash deposit was %{deposit} and the discount was %{discount}."
+ informative_text: "We would expect the mortgage amount and the deposit added together to be the same as the purchase price minus the discount."
diff --git a/config/locales/validations/lettings/2023/bulk_upload.en.yml b/config/locales/validations/lettings/2023/bulk_upload.en.yml
new file mode 100644
index 000000000..e61dbe4a1
--- /dev/null
+++ b/config/locales/validations/lettings/2023/bulk_upload.en.yml
@@ -0,0 +1,56 @@
+en:
+ validations:
+ lettings:
+ 2023:
+ bulk_upload:
+ not_answered: "You must answer %{question}"
+ invalid_option: "Enter a valid value for %{question}"
+ invalid_number: "Enter a number for %{question}"
+ spreadsheet_dupe: "This is a duplicate of a log in your file."
+ duplicate: "This is a duplicate log."
+ blank_file: "Template is blank - The template must be filled in for us to create the logs and check if data is correct."
+ wrong_template:
+ wrong_template: "Incorrect start dates, please ensure you have used the correct template."
+ no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
+ wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+ over_max_column_count: "Too many columns, please ensure you have used the correct template."
+ owning_organisation:
+ not_found: "The owning organisation code is incorrect."
+ not_stock_owner: "The owning organisation code provided is for an organisation that does not own stock."
+ not_permitted: "You do not have permission to add logs for this owning organisation."
+ managing_organisation:
+ no_relationship: "This managing organisation does not have a relationship with the owning organisation."
+ not_found: "The managing organisation code is incorrect."
+ not_answered: "The managing organisation code is incorrect."
+ assigned_to:
+ not_found: "User with the specified email could not be found."
+ organisation_not_related: "User must be related to owning organisation or managing organisation."
+ startdate:
+ outside_collection_window: "Enter a date within the %{year_combo} collection year, which is between 1st April %{start_year} and 31st March %{end_year}."
+ year_not_two_or_four_digits: "Tenancy start year must be 2 or 4 digits."
+ housingneeds:
+ no_and_dont_know_disabled_needs_conjunction: "No disabled access needs and don’t know disabled access needs cannot be selected together."
+ dont_know_disabled_needs_conjunction: "Don’t know disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs."
+ no_disabled_needs_conjunction: "No disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs."
+ housingneeds_type:
+ only_one_option_permitted: "Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected."
+ condition_effects:
+ no_choices: "You cannot answer this question as you told us nobody in the household has a physical or mental health condition (or other illness) expected to last 12 months or more."
+ lettype:
+ needstype_general_needs: "This needs type is general needs, but the letting type is supported housing. Change either the needs type or the letting type."
+ needstype_supported_housing: "This needs type is supported housing, but the letting type is general needs. Change either the needs type or the letting type."
+ needstype:
+ lettype_not_general_needs: "This letting type is supported housing, but the needs type is general needs. Change either the needs type or the letting type."
+ lettype_not_supported_housing: "This letting type is general needs, but the needs type is supported housing. Change either the needs type or the letting type."
+ reason:
+ renewal_reason_needed: "The reason for leaving must be \"End of assured shorthold tenancy - no fault\" or \"End of fixed term tenancy - no fault\" if the letting is a renewal."
+ referral:
+ general_needs_prp_referred_by_la: "The source of the referral cannot be referred by local authority housing department for a general needs log."
+ nominated_by_local_ha_but_la: "The source of the referral cannot be Nominated by local housing authority as your organisation is a local authority."
+ scheme:
+ must_relate_to_org: "%{capitalised_location_or_scheme} code must relate to a %{location_or_scheme} that is owned by the owning organisation or managing organisation."
+ does_not_belong_to_org: "This %{scheme_or_management_group} code does not belong to the owning organisation or managing organisation."
+ declaration:
+ missing: "You must show the MHCLG privacy notice to the tenant before you can submit this log."
+ age:
+ invalid: "Age of person %{person_num} must be a number or the letter R"
\ No newline at end of file
diff --git a/config/locales/validations/lettings/2024/bulk_upload.en.yml b/config/locales/validations/lettings/2024/bulk_upload.en.yml
new file mode 100644
index 000000000..76985ee32
--- /dev/null
+++ b/config/locales/validations/lettings/2024/bulk_upload.en.yml
@@ -0,0 +1,56 @@
+en:
+ validations:
+ lettings:
+ 2024:
+ bulk_upload:
+ not_answered: "You must answer %{question}"
+ invalid_option: "Enter a valid value for %{question}"
+ invalid_number: "Enter a number for %{question}"
+ spreadsheet_dupe: "This is a duplicate of a log in your file."
+ duplicate: "This is a duplicate log."
+ blank_file: "Template is blank - The template must be filled in for us to create the logs and check if data is correct."
+ wrong_template:
+ wrong_template: "Incorrect start dates, please ensure you have used the correct template."
+ no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
+ wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+ over_max_column_count: "Too many columns, please ensure you have used the correct template."
+ owning_organisation:
+ not_found: "The owning organisation code is incorrect."
+ not_stock_owner: "The owning organisation code provided is for an organisation that does not own stock."
+ not_permitted:
+ not_support: "You do not have permission to add logs for this owning organisation."
+ support: "This owning organisation is not affiliated with %{org_name}."
+ managing_organisation:
+ no_relationship: "This managing organisation does not have a relationship with the owning organisation."
+ not_found: "The managing organisation code is incorrect."
+ assigned_to:
+ not_found: "User with the specified email could not be found."
+ organisation_not_related: "User must be related to owning organisation or managing organisation."
+ startdate:
+ outside_collection_window: "Enter a date within the %{year_combo} collection year, which is between 1st April %{start_year} and 31st March %{end_year}."
+ year_not_two_or_four_digits: "Tenancy start year must be 2 or 4 digits."
+ housingneeds:
+ no_and_dont_know_disabled_needs_conjunction: "No disabled access needs and don’t know disabled access needs cannot be selected together."
+ dont_know_disabled_needs_conjunction: "Don’t know disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs."
+ no_disabled_needs_conjunction: "No disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs."
+ housingneeds_type:
+ only_one_option_permitted: "Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected."
+ condition_effects:
+ no_choices: "You cannot answer this question as you told us nobody in the household has a physical or mental health condition (or other illness) expected to last 12 months or more."
+ reason:
+ renewal_reason_needed: "The reason for leaving must be \"End of social or private sector tenancy - no fault\", \"End of social or private sector tenancy - evicted due to anti-social behaviour (ASB)\", \"End of social or private sector tenancy - evicted due to rent arrears\" or \"End of social or private sector tenancy - evicted for any other reason\"."
+ referral:
+ general_needs_prp_referred_by_la: "The source of the referral cannot be referred by local authority housing department for a general needs log."
+ nominated_by_local_ha_but_la: "The source of the referral cannot be Nominated by local housing authority as your organisation is a local authority."
+ scheme:
+ must_relate_to_org: "This scheme code does not belong to the owning organisation or managing organisation."
+ location:
+ must_relate_to_org: "Location code must relate to a location that is owned by the owning organisation or managing organisation."
+ age:
+ invalid: "Age of person %{person_num} must be a number or the letter R"
+ address:
+ not_found: "We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."
+ nationality:
+ invalid: "Select a valid nationality."
+ charges:
+ missing_charges: "Please enter the %{sentence_fragment}. If there is no %{sentence_fragment}, please enter '0'."
\ No newline at end of file
diff --git a/config/locales/validations/lettings/financial.yml b/config/locales/validations/lettings/financial.yml
new file mode 100644
index 000000000..f77e23e17
--- /dev/null
+++ b/config/locales/validations/lettings/financial.yml
@@ -0,0 +1,86 @@
+en:
+ validations:
+ lettings:
+ financial:
+ tshortfall:
+ outstanding_amount_not_expected: "You cannot answer the outstanding amount question if you don’t have outstanding rent or charges."
+ more_than_total_charge: "Enter a value less than the total charge."
+ more_than_carehome_charge: "Enter a value less than the care home charge."
+ must_be_positive: "Enter a value over £0.01 as you told us there is an outstanding amount."
+ outstanding_no_benefits: "Answer cannot be ‘yes’ to outstanding amount for basic rent or charges if tenant does not receive housing benefit or Universal Credit or you‘re not sure."
+ hbrentshortfall:
+ outstanding_amount_not_expected: "Answer must be ‘yes’ as you have answered the outstanding amount question."
+ benefits:
+ part_or_full_time: "Answer cannot be ‘all’ for income from Universal Credit, state pensions or benefits if the tenant or their partner works part-time or full-time."
+ earnings:
+ over_hard_max: "The household’s income cannot be greater than %{hard_max} per week given the household’s working situation."
+ under_hard_min: "The household’s income cannot be less than %{hard_min} per week given the household’s working situation."
+ incfreq_missing: "Select how often the household receives income."
+ earnings_missing: "Enter how much income the household has in total."
+ negative_currency: "Enter an amount above 0."
+ hhmemb:
+ earnings_over_hard_max: "The household’s income of %{earnings} %{frequency} is too high for this number of tenants. Change either the household income or number of tenants."
+ earnings_under_hard_min: "The household’s income of %{earnings} %{frequency} is too low for this number of tenants. Change either the household income or number of tenants."
+ ecstat:
+ earnings_over_hard_max: "The household’s income of %{earnings} %{frequency} is too high given the household’s working situation."
+ earnings_under_hard_min: "The household’s income of %{earnings} %{frequency} is too low given the household’s working situation."
+ age:
+ earnings_over_hard_max: "The household’s income of %{earnings} %{frequency} is too high for the number of adults. Change either the household income or the age of the tenants."
+ incfreq:
+ incfreq_missing: "Select how often the household receives income."
+ earnings_missing: "Enter how much income the household has in total."
+ brent:
+ negative_currency: "Enter an amount above 0."
+ below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period, local authority and (if general needs) number of bedrooms."
+ above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period, local authority and (if general needs) number of bedrooms."
+ scharge:
+ negative_currency: "Enter an amount above 0."
+ rent_out_of_range: "Enter a value for the %{charge_name} between £0 and %{maximum_per_period} paid %{frequency}. %{maximum_per_period} is the max limit for rent and charges paid %{frequency} for %{letting_type} lettings owned by a %{provider_type}."
+ pscharge:
+ negative_currency: "Enter an amount above 0."
+ rent_out_of_range: "Enter a value for the %{charge_name} between £0 and %{maximum_per_period} paid %{frequency}. %{maximum_per_period} is the max limit for rent and charges paid %{frequency} for %{letting_type} lettings owned by a %{provider_type}."
+ supcharg:
+ negative_currency: "Enter an amount above 0."
+ rent_out_of_range: "Enter a value for the %{charge_name} between £0 and %{maximum_per_period} paid %{frequency}. %{maximum_per_period} is the max limit for rent and charges paid %{frequency} for %{letting_type} lettings owned by a %{provider_type}."
+ chcharge:
+ less_than_shortfall: "The care home charge must be more than the outstanding amount."
+ complete_1_of_3: "Answer either the ‘household rent and charges’ question or ‘is this accommodation a care home‘, or select ‘no’ for ‘does the household pay rent or charges for the accommodation?’"
+ out_of_range: "Household rent and other charges must be between %{min_chcharge} and %{max_chcharge} if paying %{period}."
+ tcharge:
+ under_10: "Enter a total charge that is at least £10.00 per week."
+ less_than_shortfall: "The total charge must be more than the outstanding amount."
+ complete_1_of_3: "Answer either the ‘household rent and charges’ question or ‘is this accommodation a care home‘, or select ‘no’ for ‘does the household pay rent or charges for the accommodation?’"
+ household_charge:
+ complete_1_of_3: "Answer either the ‘household rent and charges’ question or ‘is this accommodation a care home‘, or select ‘no’ for ‘does the household pay rent or charges for the accommodation?’"
+ period:
+ invalid_period_for_org: "%{org_name} does not use %{rent_period} as a rent period. Choose another rent period, or a data coordinator can add rent periods to your organisation."
+ chcharge_out_of_range: "Household rent and other charges must be between %{min_chcharge} and %{max_chcharge} if paying %{period}."
+ rent_out_of_range: "Enter a value for the %{charge_name} between £0 and %{maximum_per_period} paid %{frequency}. %{maximum_per_period} is the max limit for rent and charges paid %{frequency} for %{letting_type} lettings owned by a %{provider_type}."
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this period."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this period."
+ managing_organisation_id:
+ invalid_period_for_org: "%{org_name} does not use %{rent_period} as a rent period. Set another rent period on this log, or a data coordinator can add rent periods to this organisation."
+ beds:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this number of bedrooms."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this number of bedrooms."
+ uprn:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this UPRN."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this UPRN."
+ la:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this local authority."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this local authority."
+ postcode_known:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period, local authority and number of bedrooms."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period, local authority and number of bedrooms."
+ scheme_id:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period and local authority."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period and local authority."
+ location_id:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type. Please check the rent, rent period and local authority."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type. Please check the rent, rent period and local authority."
+ rent_type:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this lettings type."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this lettings type."
+ needstype:
+ rent_below_hard_min: "Rent is below the absolute minimum expected for a property of this type based on this lettings type."
+ rent_above_hard_max: "Rent is higher than the absolute maximum expected for a property of this type based on this lettings type."
diff --git a/config/locales/validations/lettings/household.en.yml b/config/locales/validations/lettings/household.en.yml
new file mode 100644
index 000000000..b9573f4d2
--- /dev/null
+++ b/config/locales/validations/lettings/household.en.yml
@@ -0,0 +1,7 @@
+en:
+ validations:
+ lettings:
+ household:
+ relat:
+ one_partner: "Number of partners cannot be greater than 1."
+
diff --git a/config/locales/validations/lettings/property_information.en.yml b/config/locales/validations/lettings/property_information.en.yml
new file mode 100644
index 000000000..ed42acb4c
--- /dev/null
+++ b/config/locales/validations/lettings/property_information.en.yml
@@ -0,0 +1,6 @@
+en:
+ validations:
+ lettings:
+ property_information:
+ postcode_full:
+ invalid: "Enter a postcode in the correct format, for example AA1 1AA."
diff --git a/config/locales/validations/lettings/setup.en.yml b/config/locales/validations/lettings/setup.en.yml
index d2ee9bf0f..96b5af04b 100644
--- a/config/locales/validations/lettings/setup.en.yml
+++ b/config/locales/validations/lettings/setup.en.yml
@@ -21,12 +21,40 @@ en:
owning_organisation: "Enter a date when the owning organisation was active. %{owning_organisation} became active on %{available_from}."
managing_organisation: "Enter a date when the managing organisation was active. %{managing_organisation} became active on %{available_from}."
different_organisations: "Enter a date when the owning and managing organisations were active. %{owning_organisation} became active on %{owning_organisation_active_from}, and %{managing_organisation} became active on %{managing_organisation_active_from}."
+ location:
+ deactivated:
+ startdate: "The location %{postcode} is inactive on this date. Enter another date or choose another location."
+ location_id: "This location is not active on the tenancy start date. Choose another location or edit the tenancy start date."
+ activating_soon:
+ startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
+ location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
+ reactivating_soon:
+ startdate: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}."
+ location_id: "The location %{postcode} is not available until %{date}. Select another location or edit the tenancy start date."
+ scheme:
+ deactivated:
+ startdate: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
+ scheme_id: "The scheme %{name} was deactivated on %{date} and was not available on the day you entered. Select another scheme or edit the tenancy start date."
+ reactivating_soon:
+ startdate: "The scheme %{name} is not available until %{date}. Enter a tenancy start date after %{date}."
+ scheme_id: "The scheme %{name} is not available until %{date}. Select another scheme or edit the tenancy start date."
+ locations_inactive:
+ startdate: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."
+ scheme_id: "The scheme %{name} has no locations that are active on this date. Enter another date or choose another scheme."
+
+ scheme:
+ incomplete: "This scheme is incomplete. Select another scheme or update this one."
+ no_completed_locations: "This scheme cannot be chosen as it has no completed locations."
+
+ location:
+ incomplete: "This location is incomplete. Select another location or update this one."
assigned_to:
invalid: "Please select the owning organisation or managing organisation that you belong to."
owning_organisation:
invalid: "Please select the owning organisation or managing organisation that you belong to."
+ data_sharing_agreement_not_signed: "The organisation must accept the Data Sharing Agreement before it can be selected as the owning organisation."
inactive:
merged_organisation:
"The owning organisation must be active on the tenancy start date. %{owning_organisation} became inactive on %{merge_date} and was replaced by %{absorbing_organisation}."
@@ -44,10 +72,3 @@ en:
intermediate_rent_product_name:
blank: "Enter name of other intermediate rent product."
-
- scheme:
- incomplete: "This scheme is incomplete. Select another scheme or update this one."
- no_completed_locations: "This scheme cannot be chosen as it has no completed locations."
-
- location:
- incomplete: "This location is incomplete. Select another location or update this one."
diff --git a/config/locales/validations/lettings/tenancy.en.yml b/config/locales/validations/lettings/tenancy.en.yml
new file mode 100644
index 000000000..4c053e9ae
--- /dev/null
+++ b/config/locales/validations/lettings/tenancy.en.yml
@@ -0,0 +1,25 @@
+en:
+ validations:
+ lettings:
+ tenancy:
+ needstype:
+ invalid_fixed_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years for a tenancy of this type."
+ invalid_periodic_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years (or don't specify the length) for a tenancy of this type."
+
+ tenancylength:
+ invalid_fixed_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years for a tenancy of this type."
+ invalid_periodic_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years (or don't specify the length) for a tenancy of this type."
+ fixed_term_not_required: "You must only answer the length of the tenancy if it's fixed-term."
+
+ tenancy:
+ invalid_fixed_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years for a tenancy of this type."
+ invalid_periodic_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years (or don't specify the length) for a tenancy of this type."
+ fixed_term_not_required: "You must only answer the length of the tenancy if it's fixed-term."
+
+ rent_type:
+ invalid_fixed_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years for a tenancy of this type."
+ invalid_periodic_tenancylength: "Enter a tenancy length between %{min_tenancy_length} and 99 years (or don't specify the length) for a tenancy of this type."
+
+ joint:
+ sole_tenancy: "This cannot be a joint tenancy as you've told us there's only one person in the household."
+ multiple_members_required: "There must be more than one person in the household as you've told us this is a joint tenancy."
diff --git a/config/locales/validations/sales/2023/bulk_upload.en.yml b/config/locales/validations/sales/2023/bulk_upload.en.yml
new file mode 100644
index 000000000..517f56858
--- /dev/null
+++ b/config/locales/validations/sales/2023/bulk_upload.en.yml
@@ -0,0 +1,29 @@
+en:
+ validations:
+ sales:
+ 2023:
+ bulk_upload:
+ not_answered: "You must answer %{question}"
+ invalid_option: "Enter a valid value for %{question}"
+ spreadsheet_dupe: "This is a duplicate of a log in your file."
+ duplicate: "This is a duplicate log."
+ blank_file: "Template is blank - The template must be filled in for us to create the logs and check if data is correct."
+ wrong_template:
+ wrong_template: "Incorrect sale dates, please ensure you have used the correct template."
+ no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
+ wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+ over_max_column_count: "Too many columns, please ensure you have used the correct template."
+ owning_organisation:
+ not_answered: "The owning organisation code is incorrect."
+ not_found: "The owning organisation code is incorrect."
+ not_stock_owner: "The owning organisation code provided is for an organisation that does not own stock."
+ not_permitted: "You do not have permission to add logs for this owning organisation."
+ assigned_to:
+ not_found: "User with the specified email could not be found."
+ organisation_not_related: "User must be related to owning organisation or managing organisation."
+ managing_organisation_not_related: "This user belongs to an organisation that does not have a relationship with the owning organisation."
+ saledate:
+ outside_collection_window: "Enter a date within the %{year_combo} collection year, which is between 1st April %{start_year} and 31st March %{end_year}."
+ year_not_two_or_four_digits: "Sale completion year must be 2 or 4 digits."
+ ecstat1:
+ child_under_16: "Buyer 1 cannot be a child under 16."
diff --git a/config/locales/validations/sales/2024/bulk_upload.en.yml b/config/locales/validations/sales/2024/bulk_upload.en.yml
new file mode 100644
index 000000000..fc68662d1
--- /dev/null
+++ b/config/locales/validations/sales/2024/bulk_upload.en.yml
@@ -0,0 +1,44 @@
+en:
+ validations:
+ sales:
+ 2024:
+ bulk_upload:
+ not_answered: "You must answer %{question}"
+ invalid_option: "Enter a valid value for %{question}"
+ spreadsheet_dupe: "This is a duplicate of a log in your file."
+ duplicate: "This is a duplicate log."
+ blank_file: "Template is blank - The template must be filled in for us to create the logs and check if data is correct."
+ wrong_template:
+ over_max_column_count: "Too many columns, please ensure you have used the correct template."
+ no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})."
+ wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template."
+ wrong_template: "Incorrect sale dates, please ensure you have used the correct template."
+ numeric:
+ within_range: "%{field} must be between %{min} and %{max}."
+ owning_organisation:
+ not_found: "The owning organisation code is incorrect."
+ not_stock_owner: "The owning organisation code provided is for an organisation that does not own stock."
+ not_permitted:
+ support: "This owning organisation is not affiliated with %(name)."
+ not_support: "You do not have permission to add logs for this owning organisation."
+ assigned_to:
+ not_found: "User with the specified email could not be found."
+ organisation_not_related: "User must be related to owning organisation or managing organisation."
+ managing_organisation_not_related: "This organisation does not have a relationship with the owning organisation."
+ saledate:
+ outside_collection_window: "Enter a date within the %{year_combo} collection year, which is between 1st April %{start_year} and 31st March %{end_year}."
+ year_not_two_or_four_digits: "Sale completion year must be 2 or 4 digits."
+ ecstat1:
+ buyer_cannot_be_over_16_and_child: "Buyer 1's age cannot be 16 or over if their working situation is child under 16."
+ buyer_cannot_be_child: "Buyer 1 cannot have a working situation of child under 16."
+ age1:
+ buyer_cannot_be_over_16_and_child: "Buyer 1's age cannot be 16 or over if their working situation is child under 16."
+ ecstat2:
+ buyer_cannot_be_over_16_and_child: "Buyer 2's age cannot be 16 or over if their working situation is child under 16."
+ buyer_cannot_be_child: "Buyer 2 cannot have a working situation of child under 16."
+ age2:
+ buyer_cannot_be_over_16_and_child: "Buyer 2's age cannot be 16 or over if their working situation is child under 16."
+ address:
+ not_found: "We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."
+ nationality:
+ invalid: "Select a valid nationality."
diff --git a/config/locales/validations/sales/property_information.en.yml b/config/locales/validations/sales/property_information.en.yml
index e69f90edf..a91e47849 100644
--- a/config/locales/validations/sales/property_information.en.yml
+++ b/config/locales/validations/sales/property_information.en.yml
@@ -3,11 +3,12 @@ en:
sales:
property_information:
postcode_full:
- postcode_must_match_previous:
+ postcode_must_match_previous:
joint_purchase: "Buyers’ last accommodation and discounted ownership postcodes must match."
not_joint_purchase: "Buyer’s last accommodation and discounted ownership postcodes must match."
+ invalid: "Enter a postcode in the correct format, for example AA1 1AA."
ppostcode_full:
- postcode_must_match_previous:
+ postcode_must_match_previous:
joint_purchase: "Buyers’ last accommodation and discounted ownership postcodes must match."
not_joint_purchase: "Buyer’s last accommodation and discounted ownership postcodes must match."
ownershipsch:
@@ -15,7 +16,7 @@ en:
joint_purchase: "Buyers’ last accommodation and discounted ownership postcodes must match."
not_joint_purchase: "Buyer’s last accommodation and discounted ownership postcodes must match."
uprn:
- postcode_must_match_previous:
+ postcode_must_match_previous:
joint_purchase: "Buyers’ last accommodation and discounted ownership postcodes must match."
not_joint_purchase: "Buyer’s last accommodation and discounted ownership postcodes must match."
invalid: "UPRN must be 12 digits or less."
diff --git a/config/locales/validations/sales/setup.en.yml b/config/locales/validations/sales/setup.en.yml
index 9dd13b525..62819a029 100644
--- a/config/locales/validations/sales/setup.en.yml
+++ b/config/locales/validations/sales/setup.en.yml
@@ -17,6 +17,7 @@ en:
"Enter a date when the owning organisation was active. %{owning_organisation} became active on %{available_from}."
owning_organisation:
+ data_sharing_agreement_not_signed: "The organisation must accept the Data Sharing Agreement before it can be selected as the owning organisation."
inactive:
merged_organisation:
"The owning organisation must be active on the sale completion date. %{owning_organisation} became inactive on %{merge_date} and was replaced by %{absorbing_organisation}."
diff --git a/config/locales/validations/shared.en.yml b/config/locales/validations/shared.en.yml
new file mode 100644
index 000000000..a29d2bd74
--- /dev/null
+++ b/config/locales/validations/shared.en.yml
@@ -0,0 +1,19 @@
+en:
+ validations:
+ shared:
+ other_field_missing: "If %{main_field_label} is other then %{other_field_label} must be provided."
+ other_field_not_required: "%{other_field_label} must not be provided if %{main_field_label} was not other."
+
+ numeric:
+ within_range: "%{field} must be between %{min} and %{max}."
+ above_min: "%{field} must be at least %{min}."
+ whole_number: "%{field} must be a whole number."
+ nearest_ten: "%{field} must be given to the nearest ten."
+ nearest_hundredth: "%{field} must be given to the nearest hundredth."
+ normal_format: "Enter a number."
+ format: "%{field} must be a number."
+
+ postcode: "Enter a postcode in the correct format, for example AA1 1AA."
+
+ date:
+ invalid_date: "Enter a date in the correct format, for example 31 1 2024."
diff --git a/lib/tasks/generate_lettings_documentation.rake b/lib/tasks/generate_lettings_documentation.rake
index 8b11e3ff5..3dc8e71b4 100644
--- a/lib/tasks/generate_lettings_documentation.rake
+++ b/lib/tasks/generate_lettings_documentation.rake
@@ -60,13 +60,13 @@ namespace :generate_lettings_documentation do
min = [question.prefix, question.min].join("") if question.min
max = [question.prefix, question.max].join("") if question.max
- error_message = I18n.t("validations.numeric.above_min", field:, min:)
+ error_message = I18n.t("validations.shared.numeric.above_min", field:, min:)
validation_name = "minimum"
validation_description = "Field value is lower than the minimum value"
if min && max
validation_name = "range"
- error_message = I18n.t("validations.numeric.within_range", field:, min:, max:)
+ error_message = I18n.t("validations.shared.numeric.within_range", field:, min:, max:)
validation_description = "Field value is lower than the minimum value or higher than the maximum value"
end
diff --git a/lib/tasks/generate_sales_documentation.rake b/lib/tasks/generate_sales_documentation.rake
index 62272f6f8..c595c4f18 100644
--- a/lib/tasks/generate_sales_documentation.rake
+++ b/lib/tasks/generate_sales_documentation.rake
@@ -59,13 +59,13 @@ namespace :generate_sales_documentation do
min = [question.prefix, question.min].join("") if question.min
max = [question.prefix, question.max].join("") if question.max
- error_message = I18n.t("validations.numeric.above_min", field:, min:)
+ error_message = I18n.t("validations.shared.numeric.above_min", field:, min:)
validation_name = "minimum"
validation_description = "Field value is lower than the minimum value"
if min && max
validation_name = "range"
- error_message = I18n.t("validations.numeric.within_range", field:, min:, max:)
+ error_message = I18n.t("validations.shared.numeric.within_range", field:, min:, max:)
validation_description = "Field value is lower than the minimum value or higher than the maximum value"
end
diff --git a/spec/factories/scheme.rb b/spec/factories/scheme.rb
index 5f4ad30bc..77d74b70a 100644
--- a/spec/factories/scheme.rb
+++ b/spec/factories/scheme.rb
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :scheme do
- service_name { Faker::Name.name }
+ service_name { "#{Faker::Name.name}'s Housing & Co." }
sensitive { Faker::Number.within(range: 0..1) }
registered_under_care_act { 1 }
support_type { [0, 2, 3, 4, 5].sample }
diff --git a/spec/fixtures/files/sales_logs_csv_export_codes_23.csv b/spec/fixtures/files/sales_logs_csv_export_codes_23.csv
index 198f89e20..68d7de56b 100644
--- a/spec/fixtures/files/sales_logs_csv_export_codes_23.csv
+++ b/spec/fixtures/files/sales_logs_csv_export_codes_23.csv
@@ -1,3 +1,3 @@
-Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,The ID on the old service,Year collection period opened,Was the log submitted in-service or via bulk upload?,Is the user in the created_by column the data protection officer?,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,Day of sale completion date,Month of sale completion date,Year of sale completion date,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,What is the UPRN of the property?,We found an address that might be this property. Is this the property address?,Address line 1,Address line 2,Town/City,County,Part 1 of the property's postcode,Part 2 of the property's postcode,LA code,LA name,Is the property built or adapted to wheelchair-user standards?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
-ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,FORM,COLLECTIONYEAR,CREATIONMETHOD,DATAPROTECT,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,DAY,MONTH,YEAR,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,BEDS,PROPTYPE,BUILTYPE,UPRN,UPRNCONFIRMED,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,PCODE1,PCODE2,LA,LANAME,WCHAIR,NOINT,PRIVACYNOTICE,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONAL,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONAL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
-,completed,,2023-12-08T00:00:00+00:00,2024-01-01T00:00:00+00:00,,2023,1,false,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,8,12,2023,,2,8,,,,1,1,2,1,1,,,Address line 1,,Town or city,,SW1A,1AA,E09000033,Westminster,1,2,1,30,X,17,17,18,1,1,P,35,X,17,,13,1,1,3,C,14,X,,X,-9,X,3,R,-9,R,10,,,,,1,1,,,0,,,1,1,1,1,,3,,1,4,5,1,1,0,10000,1,0,10000,1,4,1,,1,2,10,,,,,,,,,,,,,,,,,110000.0,,,1,20000.0,5,,10,1,80000.0,,,1,100.0,,,10000.0
+Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,The ID on the old service,Year collection period opened,Was the log submitted in-service or via bulk upload?,Is the user in the created_by column the data protection officer?,Day of sale completion date,Month of sale completion date,Year of sale completion date,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,What is the UPRN of the property?,We found an address that might be this property. Is this the property address?,Address line 1,Address line 2,Town/City,County,Part 1 of the property's postcode,Part 2 of the property's postcode,LA code,LA name,Is the property built or adapted to wheelchair-user standards?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
+ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,FORM,COLLECTIONYEAR,CREATIONMETHOD,DATAPROTECT,DAY,MONTH,YEAR,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,BEDS,PROPTYPE,BUILTYPE,UPRN,UPRNCONFIRMED,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,PCODE1,PCODE2,LA,LANAME,WCHAIR,NOINT,PRIVACYNOTICE,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONAL,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONAL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
+,completed,,2023-12-08T00:00:00+00:00,2024-01-01T00:00:00+00:00,,2023,1,false,8,12,2023,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,,2,8,,,,1,1,2,1,1,,,Address line 1,,Town or city,,SW1A,1AA,E09000033,Westminster,1,2,1,30,X,17,17,18,1,1,P,35,X,17,,13,1,1,3,C,14,X,,X,-9,X,3,R,-9,R,10,,,,,1,1,,,0,,,1,1,1,1,,3,,1,4,5,1,1,0,10000,1,0,10000,1,4,1,,1,2,10,,,,,,,,,,,,,,,,,110000.0,,,1,20000.0,5,,10,1,80000.0,,,1,100.0,,,10000.0
diff --git a/spec/fixtures/files/sales_logs_csv_export_codes_24.csv b/spec/fixtures/files/sales_logs_csv_export_codes_24.csv
index 6cacd2ef2..a93f0521f 100644
--- a/spec/fixtures/files/sales_logs_csv_export_codes_24.csv
+++ b/spec/fixtures/files/sales_logs_csv_export_codes_24.csv
@@ -1,3 +1,3 @@
-Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,Year collection period opened,Was the log submitted in-service or via bulk upload?,ID of a set of bulk uploaded logs,Is the user in the created_by column the data protection officer?,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,Day of sale completion date,Month of sale completion date,Year of sale completion date,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is the UPRN of the property?,Address line 1,Address line 2,Town/City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,LA name,LA code,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,Is the property built or adapted to wheelchair-user standards?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
-ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,COLLECTIONYEAR,CREATIONMETHOD,BULKUPLOADID,DATAPROTECT,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,DAY,MONTH,YEAR,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,NOINT,PRIVACYNOTICE,UPRN,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,POSTCODE,ISLAINFERRED,LANAME,LA,UPRNSELECTED,ADDRESS_SEARCH_VALUE_CHECK,ADDRESS1INPUT,POSTCODEINPUT,BULKADDRESS1,BULKADDRESS2,BULKTOWNCITY,BULKCOUNTY,BULKPOSTCODE,BULKLA,BEDS,PROPTYPE,BUILTYPE,WCHAIR,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONALITYALL1,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONALITYALL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
-,completed,,2024-05-01T00:00:00+01:00,2024-05-01T00:00:00+01:00,2024,1,,false,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,1,5,2024,,2,8,,,,1,1,2,1,1,"1, Test Street",,Test Town,,AA1 1AA,true,Westminster,E09000033,,,Address line 1,SW1A 1AA,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,2,1,1,1,30,X,17,17,826,1,1,P,35,X,17,,826,1,1,3,C,14,X,9,X,-9,X,3,R,-9,R,10,,,,,1,0,SW1A,1AA,1,E09000033,Westminster,1,1,1,1,,3,,1,4,5,1,1,0,10000,1,0,10000,1,4,1,,1,2,10,,,,,,,,,,,,,,,,,110000.0,,,1,20000.0,5,,10,1,80000.0,,,1,100.0,,,10000.0
+Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,Year collection period opened,Was the log submitted in-service or via bulk upload?,ID of a set of bulk uploaded logs,Is the user in the created_by column the data protection officer?,Day of sale completion date,Month of sale completion date,Year of sale completion date,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is the UPRN of the property?,Address line 1,Address line 2,Town/City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,LA name,LA code,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,Is the property built or adapted to wheelchair-user standards?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
+ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,COLLECTIONYEAR,CREATIONMETHOD,BULKUPLOADID,DATAPROTECT,DAY,MONTH,YEAR,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,NOINT,PRIVACYNOTICE,UPRN,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,POSTCODE,ISLAINFERRED,LANAME,LA,UPRNSELECTED,ADDRESS_SEARCH_VALUE_CHECK,ADDRESS1INPUT,POSTCODEINPUT,BULKADDRESS1,BULKADDRESS2,BULKTOWNCITY,BULKCOUNTY,BULKPOSTCODE,BULKLA,BEDS,PROPTYPE,BUILTYPE,WCHAIR,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONALITYALL1,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONALITYALL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
+,completed,,2024-05-01T00:00:00+01:00,2024-05-01T00:00:00+01:00,2024,1,,false,1,5,2024,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,,2,8,,,,1,1,2,1,1,"1, Test Street",,Test Town,,AA1 1AA,true,Westminster,E09000033,,,Address line 1,SW1A 1AA,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,2,1,1,1,30,X,17,17,826,1,1,P,35,X,17,,826,1,1,3,C,14,X,9,X,-9,X,3,R,-9,R,10,,,,,1,0,SW1A,1AA,1,E09000033,Westminster,1,1,1,1,,3,,1,4,5,1,1,0,10000,1,0,10000,1,4,1,,1,2,10,,,,,,,,,,,,,,,,,110000.0,,,1,20000.0,5,,10,1,80000.0,,,1,100.0,,,10000.0
diff --git a/spec/fixtures/files/sales_logs_csv_export_labels_23.csv b/spec/fixtures/files/sales_logs_csv_export_labels_23.csv
index 10850a9db..349ea54ea 100644
--- a/spec/fixtures/files/sales_logs_csv_export_labels_23.csv
+++ b/spec/fixtures/files/sales_logs_csv_export_labels_23.csv
@@ -1,3 +1,3 @@
-Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,The ID on the old service,Year collection period opened,Was the log submitted in-service or via bulk upload?,Is the user in the created_by column the data protection officer?,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,Day of sale completion date,Month of sale completion date,Year of sale completion date,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,What is the UPRN of the property?,We found an address that might be this property. Is this the property address?,Address line 1,Address line 2,Town/City,County,Part 1 of the property's postcode,Part 2 of the property's postcode,LA code,LA name,Is the property built or adapted to wheelchair-user standards?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
-ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,FORM,COLLECTIONYEAR,CREATIONMETHOD,DATAPROTECT,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,DAY,MONTH,YEAR,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,BEDS,PROPTYPE,BUILTYPE,UPRN,UPRNCONFIRMED,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,PCODE1,PCODE2,LA,LANAME,WCHAIR,NOINT,PRIVACYNOTICE,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONAL,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONAL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
-,completed,,2023-12-08T00:00:00+00:00,2024-01-01T00:00:00+00:00,,2023,single log,false,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,8,12,2023,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,2,Flat or maisonette,Purpose built,,,Address line 1,,Town or city,,SW1A,1AA,E09000033,Westminster,Yes,Yes,1,30,Non-binary,Buyer prefers not to say,17,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,Buyer prefers not to say,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,,Other,Not known,Non-binary,In government training into work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,Don’t know ,No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,,10000.0
+Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,The ID on the old service,Year collection period opened,Was the log submitted in-service or via bulk upload?,Is the user in the created_by column the data protection officer?,Day of sale completion date,Month of sale completion date,Year of sale completion date,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,What is the UPRN of the property?,We found an address that might be this property. Is this the property address?,Address line 1,Address line 2,Town/City,County,Part 1 of the property's postcode,Part 2 of the property's postcode,LA code,LA name,Is the property built or adapted to wheelchair-user standards?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
+ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,FORM,COLLECTIONYEAR,CREATIONMETHOD,DATAPROTECT,DAY,MONTH,YEAR,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,BEDS,PROPTYPE,BUILTYPE,UPRN,UPRNCONFIRMED,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,PCODE1,PCODE2,LA,LANAME,WCHAIR,NOINT,PRIVACYNOTICE,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONAL,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONAL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
+,completed,,2023-12-08T00:00:00+00:00,2024-01-01T00:00:00+00:00,,2023,single log,false,8,12,2023,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,2,Flat or maisonette,Purpose built,,,Address line 1,,Town or city,,SW1A,1AA,E09000033,Westminster,Yes,Yes,1,30,Non-binary,Buyer prefers not to say,17,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,Buyer prefers not to say,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,,Other,Not known,Non-binary,In government training into work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,Don’t know ,No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,,10000.0
diff --git a/spec/fixtures/files/sales_logs_csv_export_labels_24.csv b/spec/fixtures/files/sales_logs_csv_export_labels_24.csv
index 3fc32f421..cd16ee79c 100644
--- a/spec/fixtures/files/sales_logs_csv_export_labels_24.csv
+++ b/spec/fixtures/files/sales_logs_csv_export_labels_24.csv
@@ -1,3 +1,3 @@
-Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,Year collection period opened,Was the log submitted in-service or via bulk upload?,ID of a set of bulk uploaded logs,Is the user in the created_by column the data protection officer?,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,Day of sale completion date,Month of sale completion date,Year of sale completion date,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,"What is the UPRN of the property?",Address line 1,Address line 2,Town/City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,LA name,LA code,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,Is the property built or adapted to wheelchair-user standards?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
-ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,COLLECTIONYEAR,CREATIONMETHOD,BULKUPLOADID,DATAPROTECT,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,DAY,MONTH,YEAR,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,NOINT,PRIVACYNOTICE,UPRN,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,POSTCODE,ISLAINFERRED,LANAME,LA,UPRNSELECTED,ADDRESS_SEARCH_VALUE_CHECK,ADDRESS1INPUT,POSTCODEINPUT,BULKADDRESS1,BULKADDRESS2,BULKTOWNCITY,BULKCOUNTY,BULKPOSTCODE,BULKLA,BEDS,PROPTYPE,BUILTYPE,WCHAIR,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONALITYALL1,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONALITYALL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
-,completed,,2024-05-01T00:00:00+01:00,2024-05-01T00:00:00+01:00,2024,single log,,false,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,1,5,2024,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,1,1,"1, Test Street",,Test Town,,AA1 1AA,Yes,Westminster,E09000033,,,Address line 1,SW1A 1AA,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,2,Flat or maisonette,Purpose built,Yes,30,Non-binary,Buyer prefers not to say,17,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,United Kingdom,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,In government training into work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,Yes,AA1,1AA,Yes,E09000033,Westminster,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,Don’t know ,No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,,10000.0
+Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,Year collection period opened,Was the log submitted in-service or via bulk upload?,ID of a set of bulk uploaded logs,Is the user in the created_by column the data protection officer?,Day of sale completion date,Month of sale completion date,Year of sale completion date,Which organisation owned this property before the sale?,Which organisation reported the sale?,User that created the log,User the log is assigned to,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,"What is the UPRN of the property?",Address line 1,Address line 2,Town/City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,LA name,LA code,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,Is the property built or adapted to wheelchair-user standards?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 1's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,Populated if a soft validation is confirmed.,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,Populated if a soft validation is confirmed.,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
+ID,STATUS,DUPLICATESET,CREATEDDATE,UPLOADDATE,COLLECTIONYEAR,CREATIONMETHOD,BULKUPLOADID,DATAPROTECT,DAY,MONTH,YEAR,OWNINGORGNAME,MANINGORGNAME,CREATEDBY,USERNAME,PURCHID,OWNERSHIP,TYPE,OTHTYPE,COMPANY,LIVEINBUYER,JOINT,JOINTMORE,NOINT,PRIVACYNOTICE,UPRN,ADDRESS1,ADDRESS2,TOWNCITY,COUNTY,POSTCODE,ISLAINFERRED,LANAME,LA,UPRNSELECTED,ADDRESS_SEARCH_VALUE_CHECK,ADDRESS1INPUT,POSTCODEINPUT,BULKADDRESS1,BULKADDRESS2,BULKTOWNCITY,BULKCOUNTY,BULKPOSTCODE,BULKLA,BEDS,PROPTYPE,BUILTYPE,WCHAIR,AGE1,SEX1,ETHNICGROUP1,ETHNIC,NATIONALITYALL1,ECSTAT1,LIVEINBUYER1,RELAT2,AGE2,SEX2,ETHNICGROUP2,ETHNIC2,NATIONALITYALL2,ECSTAT2,LIVEINBUYER2,HHTYPE,RELAT3,AGE3,SEX3,ECSTAT3,RELAT4,AGE4,SEX4,ECSTAT4,RELAT5,AGE5,SEX5,ECSTAT5,RELAT6,AGE6,SEX6,ECSTAT6,PREVTEN,PPCODENK,PPOSTC1,PPOSTC2,PREVIOUSLAKNOWN,PREVLOC,PREVLOCNAME,PREGYRHA,PREGOTHER,PREGLA,PREGGHB,PREGBLANK,BUY2LIVING,PREVTEN2,HHREGRES,HHREGRESSTILL,ARMEDFORCESSPOUSE,DISABLED,WHEEL,INC1NK,INCOME1,INC1MORT,INC2NK,INCOME2,INC2MORT,HB,SAVINGSNK,SAVINGS,PREVOWN,PREVSHARED,PROPLEN,STAIRCASE,STAIRBOUGHT,STAIROWNED,STAIRCASETOSALE,RESALE,EXDAY,EXMONTH,EXYEAR,HODAY,HOMONTH,HOYEAR,LANOMAGR,SOCTEN,FROMBEDS,FROMPROP,SOCPREVTEN,VALUE,VALUE_VALUE_CHECK,EQUITY,MORTGAGEUSED,MORTGAGE,MORTGAGELENDER,MORTGAGELENDEROTHER,MORTLEN1,EXTRABOR,DEPOSIT,CASHDIS,MRENT,HASMSCHARGE,MSCHARGE,MSCHARGE_VALUE_CHECK,DISCOUNT,GRANT
+,completed,,2024-05-01T00:00:00+01:00,2024-05-01T00:00:00+01:00,2024,single log,,false,1,5,2024,MHCLG,MHCLG,billyboy@eyeklaud.com,billyboy@eyeklaud.com,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,1,1,"1, Test Street",,Test Town,,AA1 1AA,Yes,Westminster,E09000033,,,Address line 1,SW1A 1AA,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,2,Flat or maisonette,Purpose built,Yes,30,Non-binary,Buyer prefers not to say,17,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,United Kingdom,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,In government training into work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,Yes,AA1,1AA,Yes,E09000033,Westminster,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,Don’t know ,No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,,10000.0
diff --git a/spec/fixtures/files/sales_logs_csv_export_non_support_labels_24.csv b/spec/fixtures/files/sales_logs_csv_export_non_support_labels_24.csv
index 8c5943c21..05e18a415 100644
--- a/spec/fixtures/files/sales_logs_csv_export_non_support_labels_24.csv
+++ b/spec/fixtures/files/sales_logs_csv_export_non_support_labels_24.csv
@@ -1,3 +1,3 @@
-Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,Year collection period opened,Was the log submitted in-service or via bulk upload?,,Is the user in the assigned_to column the data protection officer?,Which organisation owned this property before the sale?,Which organisation reported the sale?,User the log is assigned to,Day of sale completion date,Month of sale completion date,Year of sale completion date,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is the UPRN of the property?,We found an address that might be this property. Is this the property address?,Address line 1 input from address matching feature,Postcode input from address matching feature,UPRN of the address selected,Address line 1,Address line 2,Town/City,County,Part 1 of the property's postcode,Part 2 of the property's postcode,LA code,LA name,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,Is the property built or adapted to wheelchair-user standards?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 2's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
-id,status,duplicate_set_id,created_at,updated_at,collection_start_year,creation_method,bulk_upload_id,is_dpo,owning_organisation_name,managing_organisation_name,assigned_to,day,month,year,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,noint,privacynotice,uprn,uprn_confirmed,address_line1_input,postcode_full_input,uprn_selection,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la,la_label,beds,proptype,builtype,wchair,age1,sex1,ethnic_group,ethnic,nationality_all,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationality_all_buyer2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
-,completed,,2024-05-01T00:00:00+01:00,2024-05-01T00:00:00+01:00,2024,single log,,false,MHCLG,MHCLG,billyboy@eyeklaud.com,1,5,2024,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,1,1,Yes,Address line 1,SW1A 1AA,,"1, Test Street",,Test Town,,AA1,1AA,E09000033,Westminster,2,Flat or maisonette,Purpose built,Yes,30,Non-binary,Buyer prefers not to say,17,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,United Kingdom,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,In government training into work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,Yes,AA1,1AA,Yes,E09000033,Westminster,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,Don’t know ,No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0
+Log ID,Status of log,ID of a set of duplicate logs,Time and date the log was created,Time and date the log was last updated,Year collection period opened,Was the log submitted in-service or via bulk upload?,,Is the user in the assigned_to column the data protection officer?,Day of sale completion date,Month of sale completion date,Year of sale completion date,Which organisation owned this property before the sale?,Which organisation reported the sale?,User the log is assigned to,What is the purchaser code?,Was this purchase made through an ownership scheme?,What is the type of shared ownership/discounted ownership/outright sale?,"If type = 'Other', what is the type of outright sale?",Is the buyer a company?,Will the buyer(s) live in the property?,Is this a joint purchase?,Are there more than 2 joint buyers of this property?,Did you interview the buyer to answer these questions?,Has the buyer seen the MHCLG privacy notice?,What is the UPRN of the property?,We found an address that might be this property. Is this the property address?,Address line 1 input from address matching feature,Postcode input from address matching feature,UPRN of the address selected,Address line 1,Address line 2,Town/City,County,Part 1 of the property's postcode,Part 2 of the property's postcode,LA code,LA name,How many bedrooms does the property have?,What type of unit is the property?,Which type of building is the property?,Is the property built or adapted to wheelchair-user standards?,What is buyer 1's age?,Which of these best describes buyer 1's gender identity?,What is buyer 1's ethnic group?,Which of the following best describes buyer 1's ethnic background?,What is buyer 1's nationality?,Which of these best describes buyer 1's working situation?,Will buyer 1 live in the property?,What is buyer 2 or person 2's relationship to buyer 1?,What is buyer 2 or person 2's age?,Which of these best describes buyer 2 or person 2's gender identity?,What is buyer 2's ethnic group?,Which of the following best describes buyer 2's ethnic background?,What is buyer 2's nationality?,What is buyer 2 or person 2's working situation?,Will buyer 2 live in the property?,"Besides the buyer(s), how many other people live or will live in the property?",What is person 3's relationship to buyer 1?,What is person 3's age?,What is person 3's gender identity?,What is person 3's working situation?,What is person 4's relationship to buyer 1?,What is person 4's age?,What is person 4's gender identity?,What is person 4's working situation?,What is person 5's relationship to buyer 1?,What is person 5's age?,What is person 5's gender identity?,What is person 5's working situation?,What is person 6's relationship to buyer 1?,What is person 6's age?,What is person 6's gender identity?,What is person 6's working situation?,What was buyer 1's previous tenure?,Do you know the postcode of buyer 1's last settled accommodation?,Part 1 of postcode of buyer 1's last settled accommodation,Part 2 of postcode of buyer 1's last settled accommodation,Do you know the local authority of buyer 1's last settled accommodation?,The local authority code of buyer 1's last settled accommodation,The local authority name of buyer 1's last settled accommodation,Was the buyer registered with their PRP (HA)?,Was the buyer registered with another PRP (HA)?,Was the buyer registered with the local authority?,Was the buyer registered with a Help to Buy agent?,"Populated if pregyrha, pregother, pregla and pregghb are blank","At the time of purchase, was buyer 2 living at the same address as buyer 1?",What was buyer 2's previous tenure?,Have any of the buyers ever served as a regular in the UK armed forces?,Is the buyer still serving in the UK armed forces?,Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?,Does anyone in the household consider themselves to have a disability?,Does anyone in the household use a wheelchair?,Is buyer 1's annual income known?,What is buyer 1's annual income?,Was buyer 1's income used for a mortgage application?,Is buyer 2's annual income known?,What is buyer 2's annual income?,Was buyer 2's income used for a mortgage application?,Were the buyers receiving any of these housing-related benefits immediately before buying this property?,Is the the total amount the buyers had in savings known?,What is the total amount the buyers had in savings before they paid any deposit for the property?,Have any of the buyers previously owned a property?,Was the previous property under shared ownership?,How long did the buyer(s) live in the property before purchasing it?,Is this a staircasing transaction?,What percentage of the property has been bought in this staircasing transaction?,What percentage of the property do the buyers now own in total?,Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?,Is this a resale?,Day of the exchange of contracts,Month of the exchange of contracts,Year of the exchange of contracts,Day of the practical completion or handover date,Month of the practical completion or handover date,Year of the practical completion or handover date,Was the household rehoused under a local authority nominations agreement?,"Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?",How many bedrooms did the buyer's previous property have?,What was the previous property type?,What was the rent type of buyer's previous tenure?,What is the full purchase price?,What was the initial percentage equity stake purchased?,Was a mortgage used to buy this property?,What is the mortgage amount?,What is the name of the mortgage lender?,"If mortgagelender = 'Other', what is the name of the mortgage lender?",What is the length of the mortgage in years?,Does this include any extra borrowing?,How much was the cash deposit paid on the property?,How much cash discount was given through Social Homebuy?,What is the basic monthly rent?,Does the property have any monthly leasehold charges?,What are the total monthly leasehold charges for the property?,What was the percentage discount?,"What was the amount of any loan, grant, discount or subsidy given?"
+id,status,duplicate_set_id,created_at,updated_at,collection_start_year,creation_method,bulk_upload_id,is_dpo,day,month,year,owning_organisation_name,managing_organisation_name,assigned_to,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,noint,privacynotice,uprn,uprn_confirmed,address_line1_input,postcode_full_input,uprn_selection,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la,la_label,beds,proptype,builtype,wchair,age1,sex1,ethnic_group,ethnic,nationality_all,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationality_all_buyer2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
+,completed,,2024-05-01T00:00:00+01:00,2024-05-01T00:00:00+01:00,2024,single log,,false,1,5,2024,MHCLG,MHCLG,billyboy@eyeklaud.com,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,1,1,Yes,Address line 1,SW1A 1AA,,"1, Test Street",,Test Town,,AA1,1AA,E09000033,Westminster,2,Flat or maisonette,Purpose built,Yes,30,Non-binary,Buyer prefers not to say,17,United Kingdom,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer prefers not to say,,United Kingdom,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,In government training into work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,Yes,AA1,1AA,Yes,E09000033,Westminster,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,Don’t know ,No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0
diff --git a/spec/fixtures/forms/2021_2022.json b/spec/fixtures/forms/2021_2022.json
index 3159459ad..cb0aaf06e 100644
--- a/spec/fixtures/forms/2021_2022.json
+++ b/spec/fixtures/forms/2021_2022.json
@@ -740,7 +740,7 @@
}
],
"title_text": {
- "translation": "soft_validations.net_income.title_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.title_text",
"arguments": [
{
"key": "incfreq",
@@ -755,7 +755,7 @@
]
},
"informative_text": {
- "translation": "soft_validations.net_income.hint_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments": [
{
"key": "net_income_higher_or_lower_text",
diff --git a/spec/helpers/filters_helper_spec.rb b/spec/helpers/filters_helper_spec.rb
index b709a16ac..ce60d07f7 100644
--- a/spec/helpers/filters_helper_spec.rb
+++ b/spec/helpers/filters_helper_spec.rb
@@ -517,12 +517,46 @@ RSpec.describe FiltersHelper do
allow(Time).to receive(:now).and_return(Time.zone.local(2024, 5, 1))
end
- it "has the correct options" do
- expect(collection_year_options).to eq(
- {
- "2024" => "2024 to 2025", "2023" => "2023 to 2024", "2022" => "2022 to 2023"
- },
- )
+ context "and in crossover period" do
+ before do
+ allow(FormHandler.instance).to receive(:in_crossover_period?).and_return(true)
+ end
+
+ it "has the correct options" do
+ expect(collection_year_options).to eq(
+ {
+ "2024" => "2024 to 2025", "2023" => "2023 to 2024", "2022" => "2022 to 2023"
+ },
+ )
+ end
+ end
+
+ context "and not in crossover period" do
+ before do
+ allow(FormHandler.instance).to receive(:in_crossover_period?).and_return(false)
+ end
+
+ it "has the correct options" do
+ expect(collection_year_options).to eq(
+ {
+ "2024" => "2024 to 2025", "2023" => "2023 to 2024"
+ },
+ )
+ end
+
+ context "with future form use turned on" do
+ before do
+ allow(FeatureToggle).to receive(:allow_future_form_use?).and_return(true)
+ end
+
+ it "includes next year in the options" do
+ expect(collection_year_options).to eq(
+ {
+ "2025" => "2025 to 2026", "2024" => "2024 to 2025", "2023" => "2023 to 2024"
+ },
+ )
+ end
+ end
end
end
end
diff --git a/spec/helpers/interruption_screen_helper_spec.rb b/spec/helpers/interruption_screen_helper_spec.rb
index 60cd71131..0d4456f2a 100644
--- a/spec/helpers/interruption_screen_helper_spec.rb
+++ b/spec/helpers/interruption_screen_helper_spec.rb
@@ -93,7 +93,7 @@ RSpec.describe InterruptionScreenHelper do
context "when 1 out of 2 arguments are given" do
it "returns an empty string" do
informative_text = {
- "translation" => "soft_validations.net_income.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments" => [
{
"key" => "ecstat1",
diff --git a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
index 0530cf445..e9c1d5879 100644
--- a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
@@ -30,12 +30,12 @@ RSpec.describe Form::Lettings::Pages::CareHomeChargesValueCheck, type: :model do
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.care_home_charges.title_text",
+ "translation" => "forms.2024.lettings.soft_validations.care_home_charges_value_check.title_text",
})
end
it "has the correct informative_text" do
- expect(page.informative_text).to eq("")
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.care_home_charges_value_check.informative_text" })
end
it "has the correct interruption_screen_question_ids" do
diff --git a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
index 0b3d770b3..865fc6fd2 100644
--- a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
index f380a5cb9..8ce2e5451 100644
--- a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/first_time_property_let_as_social_housing_spec.rb b/spec/models/form/lettings/pages/first_time_property_let_as_social_housing_spec.rb
index b095af406..43dc70378 100644
--- a/spec/models/form/lettings/pages/first_time_property_let_as_social_housing_spec.rb
+++ b/spec/models/form/lettings/pages/first_time_property_let_as_social_housing_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Pages::FirstTimePropertyLetAsSocialHousing, type:
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/pages/lead_tenant_ethnic_background_white_spec.rb b/spec/models/form/lettings/pages/lead_tenant_ethnic_background_white_spec.rb
index 1f2986064..b75e57674 100644
--- a/spec/models/form/lettings/pages/lead_tenant_ethnic_background_white_spec.rb
+++ b/spec/models/form/lettings/pages/lead_tenant_ethnic_background_white_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Pages::LeadTenantEthnicBackgroundWhite, type: :mo
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb b/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
index 551a3b070..f116cb601 100644
--- a/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
@@ -4,7 +4,8 @@ RSpec.describe Form::Lettings::Pages::MultiplePartnersValueCheck, type: :model d
subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
let(:person_index) { 1 }
let(:page_id) { "multiple_partners_value_check" }
@@ -39,13 +40,13 @@ RSpec.describe Form::Lettings::Pages::MultiplePartnersValueCheck, type: :model d
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.multiple_partners_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.title_text",
"arguments" => [],
})
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -71,13 +72,13 @@ RSpec.describe Form::Lettings::Pages::MultiplePartnersValueCheck, type: :model d
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.multiple_partners_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.title_text",
"arguments" => [],
})
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/lettings/pages/net_income_value_check_spec.rb b/spec/models/form/lettings/pages/net_income_value_check_spec.rb
index 523e02c8b..fe98919ae 100644
--- a/spec/models/form/lettings/pages/net_income_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/net_income_value_check_spec.rb
@@ -24,13 +24,13 @@ RSpec.describe Form::Lettings::Pages::NetIncomeValueCheck, type: :model do
end
it "has the correct title_text" do
- expect(page.title_text).to eq({ "translation" => "soft_validations.net_income.title_text", "arguments" => [{ "i18n_template" => "incfreq", "key" => "incfreq", "label" => true }, { "arguments_for_key" => "earnings", "i18n_template" => "earnings", "key" => "field_formatted_as_currency" }] })
+ expect(page.title_text).to eq({ "translation" => "forms.2024.lettings.soft_validations.net_income_value_check.title_text", "arguments" => [{ "i18n_template" => "incfreq", "key" => "incfreq", "label" => true }, { "arguments_for_key" => "earnings", "i18n_template" => "earnings", "key" => "field_formatted_as_currency" }] })
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
"arguments" => [{ "i18n_template" => "net_income_higher_or_lower_text", "key" => "net_income_higher_or_lower_text", "label" => false }],
- "translation" => "soft_validations.net_income.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
})
end
end
diff --git a/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb b/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
index 286ac6183..6cf6302f8 100644
--- a/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCh
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCh
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb b/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
index 205f19ae1..f986f17d2 100644
--- a/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb b/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
index a769f95cc..168f4ca91 100644
--- a/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
@@ -4,7 +4,8 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
let(:person_index) { 1 }
let(:page_id) { "partner_under_16_value_check" }
@@ -39,7 +40,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age1",
@@ -51,7 +52,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -77,7 +78,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age2",
@@ -89,7 +90,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -115,7 +116,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age3",
@@ -127,7 +128,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -153,7 +154,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age4",
@@ -165,7 +166,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -191,7 +192,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age5",
@@ -203,7 +204,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -229,7 +230,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age6",
@@ -241,7 +242,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/lettings/pages/person_age_spec.rb b/spec/models/form/lettings/pages/person_age_spec.rb
index dfcc82406..2043052fd 100644
--- a/spec/models/form/lettings/pages/person_age_spec.rb
+++ b/spec/models/form/lettings/pages/person_age_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Pages::PersonAge, type: :model do
subject(:page) { described_class.new(nil, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: false)) }
let(:person_index) { 2 }
it "has correct subsection" do
diff --git a/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb b/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
index ec00f0d75..c8a482ee4 100644
--- a/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
@@ -28,13 +28,14 @@ RSpec.describe Form::Lettings::Pages::PersonOverRetirementValueCheck, type: :mod
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.max.title",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.title_text",
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.retirement.max.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -50,13 +51,14 @@ RSpec.describe Form::Lettings::Pages::PersonOverRetirementValueCheck, type: :mod
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.max.title",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.title_text",
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.retirement.max.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb b/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb
index a0ebb9cbc..829d55ad0 100644
--- a/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb
+++ b/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Pages::PersonRelationshipToLead, type: :model do
subject(:page) { described_class.new(nil, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: false)) }
let(:person_index) { 2 }
it "has correct subsection" do
diff --git a/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb b/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
index 37ca94f9e..6226e0309 100644
--- a/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.min.title",
+ "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.title_text",
"arguments" => [
{
"key" => "age2",
@@ -40,7 +40,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
end
it "has the correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.informative_text" })
end
end
@@ -55,7 +55,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.min.title",
+ "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.title_text",
"arguments" => [
{
"key" => "age3",
@@ -67,7 +67,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
end
it "has the correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.informative_text" })
end
end
end
diff --git a/spec/models/form/lettings/pages/previous_local_authority_spec.rb b/spec/models/form/lettings/pages/previous_local_authority_spec.rb
index 9e6d91be3..37ae11133 100644
--- a/spec/models/form/lettings/pages/previous_local_authority_spec.rb
+++ b/spec/models/form/lettings/pages/previous_local_authority_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Lettings::Pages::PreviousLocalAuthority, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1))) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1))) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/lettings/pages/previous_postcode_spec.rb b/spec/models/form/lettings/pages/previous_postcode_spec.rb
index eba9af065..354f78a98 100644
--- a/spec/models/form/lettings/pages/previous_postcode_spec.rb
+++ b/spec/models/form/lettings/pages/previous_postcode_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Lettings::Pages::PreviousPostcode, type: :model do
let(:page_id) { "previous_postcode" }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1))) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1))) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/lettings/pages/property_local_authority_spec.rb b/spec/models/form/lettings/pages/property_local_authority_spec.rb
index fe5363d97..75d680ddd 100644
--- a/spec/models/form/lettings/pages/property_local_authority_spec.rb
+++ b/spec/models/form/lettings/pages/property_local_authority_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe Form::Lettings::Pages::PropertyLocalAuthority, type: :model do
context "with form before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "is routed to when la is not inferred and it is general needs log" do
@@ -61,7 +61,7 @@ RSpec.describe Form::Lettings::Pages::PropertyLocalAuthority, type: :model do
context "with form after 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "is routed to when la is not inferred, it is general needs log and address search has been given" do
diff --git a/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb b/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb
index 90da08fb6..8090c6ed4 100644
--- a/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Lettings::Pages::PropertyWheelchairAccessible, type: :model
let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1))) }
before do
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct subsection" do
diff --git a/spec/models/form/lettings/pages/renewal_spec.rb b/spec/models/form/lettings/pages/renewal_spec.rb
index edeeaff1b..77ba3aec8 100644
--- a/spec/models/form/lettings/pages/renewal_spec.rb
+++ b/spec/models/form/lettings/pages/renewal_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Pages::Renewal, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/pages/rent_type_spec.rb b/spec/models/form/lettings/pages/rent_type_spec.rb
index 41dc0a1a9..3cec8e01e 100644
--- a/spec/models/form/lettings/pages/rent_type_spec.rb
+++ b/spec/models/form/lettings/pages/rent_type_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Pages::RentType, type: :model do
before do
allow(subsection).to receive(:form).and_return(form)
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct subsection" do
diff --git a/spec/models/form/lettings/pages/starter_tenancy_type_spec.rb b/spec/models/form/lettings/pages/starter_tenancy_type_spec.rb
index 6842f7d3e..005b546a8 100644
--- a/spec/models/form/lettings/pages/starter_tenancy_type_spec.rb
+++ b/spec/models/form/lettings/pages/starter_tenancy_type_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Lettings::Pages::StarterTenancyType, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/pages/uprn_spec.rb b/spec/models/form/lettings/pages/uprn_spec.rb
index 2ab83c76a..81f1aec40 100644
--- a/spec/models/form/lettings/pages/uprn_spec.rb
+++ b/spec/models/form/lettings/pages/uprn_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Pages::Uprn, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(subsection).to receive(:form).and_return(form)
end
@@ -57,7 +57,7 @@ RSpec.describe Form::Lettings::Pages::Uprn, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "points to address search page" do
diff --git a/spec/models/form/lettings/questions/age1_known_spec.rb b/spec/models/form/lettings/questions/age1_known_spec.rb
index 6ec594359..94c36d3d5 100644
--- a/spec/models/form/lettings/questions/age1_known_spec.rb
+++ b/spec/models/form/lettings/questions/age1_known_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Questions::Age1Known, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/age_spec.rb b/spec/models/form/lettings/questions/age_spec.rb
index e456007f7..639f695fd 100644
--- a/spec/models/form/lettings/questions/age_spec.rb
+++ b/spec/models/form/lettings/questions/age_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Questions::Age, type: :model do
subject(:question) { described_class.new(nil, question_definition, page, person_index:) }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4), start_year_2024_or_later?: false))) }
let(:person_index) { 2 }
it "has correct page" do
diff --git a/spec/models/form/lettings/questions/declaration_spec.rb b/spec/models/form/lettings/questions/declaration_spec.rb
index fe1ae882d..25705414c 100644
--- a/spec/models/form/lettings/questions/declaration_spec.rb
+++ b/spec/models/form/lettings/questions/declaration_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?)
+ allow(form).to receive(:start_year_2024_or_later?)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
context "when the form year is before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has the correct answer_options" do
@@ -57,7 +57,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
context "when the form year is >= 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/ethnic_white_spec.rb b/spec/models/form/lettings/questions/ethnic_white_spec.rb
index 7857893a1..ab20dd8ca 100644
--- a/spec/models/form/lettings/questions/ethnic_white_spec.rb
+++ b/spec/models/form/lettings/questions/ethnic_white_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::EthnicWhite, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -44,7 +44,7 @@ RSpec.describe Form::Lettings::Questions::EthnicWhite, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/first_time_property_let_as_social_housing_spec.rb b/spec/models/form/lettings/questions/first_time_property_let_as_social_housing_spec.rb
index 7f38f0108..756f5e84e 100644
--- a/spec/models/form/lettings/questions/first_time_property_let_as_social_housing_spec.rb
+++ b/spec/models/form/lettings/questions/first_time_property_let_as_social_housing_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing, t
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing, t
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/gender_identity1_spec.rb b/spec/models/form/lettings/questions/gender_identity1_spec.rb
index 2a943cbe0..19503ea33 100644
--- a/spec/models/form/lettings/questions/gender_identity1_spec.rb
+++ b/spec/models/form/lettings/questions/gender_identity1_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Lettings::Questions::GenderIdentity1, type: :model do
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
let(:subsection) { instance_double(Form::Subsection) }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false) }
before do
allow(page).to receive(:subsection).and_return(subsection)
diff --git a/spec/models/form/lettings/questions/hb_spec.rb b/spec/models/form/lettings/questions/hb_spec.rb
index ed8f19cd5..9a1477954 100644
--- a/spec/models/form/lettings/questions/hb_spec.rb
+++ b/spec/models/form/lettings/questions/hb_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Hb, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/housingneeds_other_spec.rb b/spec/models/form/lettings/questions/housingneeds_other_spec.rb
index f7be373e1..ead58bb35 100644
--- a/spec/models/form/lettings/questions/housingneeds_other_spec.rb
+++ b/spec/models/form/lettings/questions/housingneeds_other_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::HousingneedsOther, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -42,7 +42,7 @@ RSpec.describe Form::Lettings::Questions::HousingneedsOther, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/is_carehome_spec.rb b/spec/models/form/lettings/questions/is_carehome_spec.rb
index 958873599..b82ddeaeb 100644
--- a/spec/models/form/lettings/questions/is_carehome_spec.rb
+++ b/spec/models/form/lettings/questions/is_carehome_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::IsCarehome, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -42,7 +42,7 @@ RSpec.describe Form::Lettings::Questions::IsCarehome, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options in the correct order" do
diff --git a/spec/models/form/lettings/questions/joint_spec.rb b/spec/models/form/lettings/questions/joint_spec.rb
index 1207d97d4..d856e9c18 100644
--- a/spec/models/form/lettings/questions/joint_spec.rb
+++ b/spec/models/form/lettings/questions/joint_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Joint, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/layear_spec.rb b/spec/models/form/lettings/questions/layear_spec.rb
index 04296beae..5ea537514 100644
--- a/spec/models/form/lettings/questions/layear_spec.rb
+++ b/spec/models/form/lettings/questions/layear_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Layear, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -49,7 +49,7 @@ RSpec.describe Form::Lettings::Questions::Layear, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/letting_allocation_spec.rb b/spec/models/form/lettings/questions/letting_allocation_spec.rb
index 63c750e5d..980c8fea5 100644
--- a/spec/models/form/lettings/questions/letting_allocation_spec.rb
+++ b/spec/models/form/lettings/questions/letting_allocation_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::LettingAllocation, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -45,7 +45,7 @@ RSpec.describe Form::Lettings::Questions::LettingAllocation, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/person_relationship_spec.rb b/spec/models/form/lettings/questions/person_relationship_spec.rb
index 20d05e316..0023c60ef 100644
--- a/spec/models/form/lettings/questions/person_relationship_spec.rb
+++ b/spec/models/form/lettings/questions/person_relationship_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Questions::PersonRelationship, type: :model do
subject(:question) { described_class.new(nil, question_definition, page, person_index:) }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4), start_year_2024_or_later?: false))) }
let(:person_index) { 2 }
it "has correct page" do
diff --git a/spec/models/form/lettings/questions/ppcodenk_spec.rb b/spec/models/form/lettings/questions/ppcodenk_spec.rb
index 8a29b032d..7186875d3 100644
--- a/spec/models/form/lettings/questions/ppcodenk_spec.rb
+++ b/spec/models/form/lettings/questions/ppcodenk_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Questions::Ppcodenk, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/previous_la_known_spec.rb b/spec/models/form/lettings/questions/previous_la_known_spec.rb
index defb56bdf..f05d376ab 100644
--- a/spec/models/form/lettings/questions/previous_la_known_spec.rb
+++ b/spec/models/form/lettings/questions/previous_la_known_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLaKnown, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/previous_let_type_spec.rb b/spec/models/form/lettings/questions/previous_let_type_spec.rb
index 0739fe386..95c1451cd 100644
--- a/spec/models/form/lettings/questions/previous_let_type_spec.rb
+++ b/spec/models/form/lettings/questions/previous_let_type_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLetType, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -44,7 +44,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLetType, type: :model do
context "with collection year on or after 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer options" do
diff --git a/spec/models/form/lettings/questions/reason_renewal_spec.rb b/spec/models/form/lettings/questions/reason_renewal_spec.rb
index 3cdff75e7..e58a33a21 100644
--- a/spec/models/form/lettings/questions/reason_renewal_spec.rb
+++ b/spec/models/form/lettings/questions/reason_renewal_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::ReasonRenewal, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -54,7 +54,7 @@ RSpec.describe Form::Lettings::Questions::ReasonRenewal, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/reason_spec.rb b/spec/models/form/lettings/questions/reason_spec.rb
index 0b82eca42..4b71ee176 100644
--- a/spec/models/form/lettings/questions/reason_spec.rb
+++ b/spec/models/form/lettings/questions/reason_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Reason, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -84,7 +84,7 @@ RSpec.describe Form::Lettings::Questions::Reason, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/reasonpref_spec.rb b/spec/models/form/lettings/questions/reasonpref_spec.rb
index 5957d4979..43326b7c0 100644
--- a/spec/models/form/lettings/questions/reasonpref_spec.rb
+++ b/spec/models/form/lettings/questions/reasonpref_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Questions::Reasonpref, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/referral_prp_spec.rb b/spec/models/form/lettings/questions/referral_prp_spec.rb
index e11bf250c..a10b6d383 100644
--- a/spec/models/form/lettings/questions/referral_prp_spec.rb
+++ b/spec/models/form/lettings/questions/referral_prp_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::ReferralPrp, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -64,7 +64,7 @@ RSpec.describe Form::Lettings::Questions::ReferralPrp, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/referral_spec.rb b/spec/models/form/lettings/questions/referral_spec.rb
index b3f526697..75e6c2f42 100644
--- a/spec/models/form/lettings/questions/referral_spec.rb
+++ b/spec/models/form/lettings/questions/referral_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Referral, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -62,7 +62,7 @@ RSpec.describe Form::Lettings::Questions::Referral, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/referral_supported_housing_prp_spec.rb b/spec/models/form/lettings/questions/referral_supported_housing_prp_spec.rb
index ab13acd26..3059c122d 100644
--- a/spec/models/form/lettings/questions/referral_supported_housing_prp_spec.rb
+++ b/spec/models/form/lettings/questions/referral_supported_housing_prp_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::ReferralSupportedHousingPrp, type: :mo
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -64,7 +64,7 @@ RSpec.describe Form::Lettings::Questions::ReferralSupportedHousingPrp, type: :mo
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/referral_supported_housing_spec.rb b/spec/models/form/lettings/questions/referral_supported_housing_spec.rb
index 5e05bf65b..5a4af55e5 100644
--- a/spec/models/form/lettings/questions/referral_supported_housing_spec.rb
+++ b/spec/models/form/lettings/questions/referral_supported_housing_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::ReferralSupportedHousing, type: :model
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -62,7 +62,7 @@ RSpec.describe Form::Lettings::Questions::ReferralSupportedHousing, type: :model
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/renewal_spec.rb b/spec/models/form/lettings/questions/renewal_spec.rb
index 27fe1bf86..af2c22c15 100644
--- a/spec/models/form/lettings/questions/renewal_spec.rb
+++ b/spec/models/form/lettings/questions/renewal_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Renewal, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/rent_type_spec.rb b/spec/models/form/lettings/questions/rent_type_spec.rb
index 0716cdbf7..7d45320ad 100644
--- a/spec/models/form/lettings/questions/rent_type_spec.rb
+++ b/spec/models/form/lettings/questions/rent_type_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Questions::RentType, type: :model do
before do
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct page" do
@@ -37,7 +37,7 @@ RSpec.describe Form::Lettings::Questions::RentType, type: :model do
context "when 2023" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has the correct answer_options" do
@@ -58,7 +58,7 @@ RSpec.describe Form::Lettings::Questions::RentType, type: :model do
context "when 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/rsnvac_spec.rb b/spec/models/form/lettings/questions/rsnvac_spec.rb
index 45469cebb..5eb37ddb5 100644
--- a/spec/models/form/lettings/questions/rsnvac_spec.rb
+++ b/spec/models/form/lettings/questions/rsnvac_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::Rsnvac, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -78,7 +78,7 @@ RSpec.describe Form::Lettings::Questions::Rsnvac, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/scheme_id_spec.rb b/spec/models/form/lettings/questions/scheme_id_spec.rb
index c490cded4..ba5734b3b 100644
--- a/spec/models/form/lettings/questions/scheme_id_spec.rb
+++ b/spec/models/form/lettings/questions/scheme_id_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Questions::SchemeId, type: :model do
before do
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct page" do
diff --git a/spec/models/form/lettings/questions/sheltered_spec.rb b/spec/models/form/lettings/questions/sheltered_spec.rb
index 33b1007d2..1f21a92eb 100644
--- a/spec/models/form/lettings/questions/sheltered_spec.rb
+++ b/spec/models/form/lettings/questions/sheltered_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Lettings::Questions::Sheltered, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -40,7 +40,7 @@ RSpec.describe Form::Lettings::Questions::Sheltered, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/starter_tenancy_type_spec.rb b/spec/models/form/lettings/questions/starter_tenancy_type_spec.rb
index d3022dfcf..1100796c8 100644
--- a/spec/models/form/lettings/questions/starter_tenancy_type_spec.rb
+++ b/spec/models/form/lettings/questions/starter_tenancy_type_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::StarterTenancyType, type: :model do
context "with 2023/24 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has the correct answer options" do
@@ -50,7 +50,7 @@ RSpec.describe Form::Lettings::Questions::StarterTenancyType, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer options" do
diff --git a/spec/models/form/lettings/questions/tenancy_length_affordable_rent_spec.rb b/spec/models/form/lettings/questions/tenancy_length_affordable_rent_spec.rb
index 4bab9187a..ba9a72001 100644
--- a/spec/models/form/lettings/questions/tenancy_length_affordable_rent_spec.rb
+++ b/spec/models/form/lettings/questions/tenancy_length_affordable_rent_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::TenancyLengthAffordableRent, type: :mo
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/tenancy_length_intermediate_rent_spec.rb b/spec/models/form/lettings/questions/tenancy_length_intermediate_rent_spec.rb
index a3f9c80e2..55b51ccfa 100644
--- a/spec/models/form/lettings/questions/tenancy_length_intermediate_rent_spec.rb
+++ b/spec/models/form/lettings/questions/tenancy_length_intermediate_rent_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Lettings::Questions::TenancyLengthIntermediateRent, type: :
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/lettings/questions/tenancy_type_spec.rb b/spec/models/form/lettings/questions/tenancy_type_spec.rb
index 08818d3ea..82a5ae3e7 100644
--- a/spec/models/form/lettings/questions/tenancy_type_spec.rb
+++ b/spec/models/form/lettings/questions/tenancy_type_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Lettings::Questions::TenancyType, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -31,7 +31,7 @@ RSpec.describe Form::Lettings::Questions::TenancyType, type: :model do
context "with 2023/24 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has the correct answer options" do
@@ -65,7 +65,7 @@ RSpec.describe Form::Lettings::Questions::TenancyType, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer options" do
diff --git a/spec/models/form/lettings/questions/waityear_spec.rb b/spec/models/form/lettings/questions/waityear_spec.rb
index 5f1f344b9..5d9a5b3a9 100644
--- a/spec/models/form/lettings/questions/waityear_spec.rb
+++ b/spec/models/form/lettings/questions/waityear_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Lettings::Questions::Waityear, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -59,7 +59,7 @@ RSpec.describe Form::Lettings::Questions::Waityear, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/wheelchair_spec.rb b/spec/models/form/lettings/questions/wheelchair_spec.rb
index 984a2209f..0a9226ada 100644
--- a/spec/models/form/lettings/questions/wheelchair_spec.rb
+++ b/spec/models/form/lettings/questions/wheelchair_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Lettings::Questions::Wheelchair, type: :model do
before do
allow(page).to receive(:subsection).and_return(subsection)
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct page" do
diff --git a/spec/models/form/lettings/subsections/household_characteristics_spec.rb b/spec/models/form/lettings/subsections/household_characteristics_spec.rb
index e199f55d3..b45f86fce 100644
--- a/spec/models/form/lettings/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/lettings/subsections/household_characteristics_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
let(:section) { instance_double(Form::Lettings::Sections::Household) }
- let(:form) { instance_double(Form) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
allow(section).to receive(:form).and_return(form)
@@ -18,7 +18,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
context "with start year before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct pages" do
@@ -152,7 +152,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
context "with start year >= 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/household_needs_spec.rb b/spec/models/form/lettings/subsections/household_needs_spec.rb
index 6e4dd25f1..dcd957601 100644
--- a/spec/models/form/lettings/subsections/household_needs_spec.rb
+++ b/spec/models/form/lettings/subsections/household_needs_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdNeeds, type: :model do
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
- let(:section) { instance_double(Form::Lettings::Sections::Household) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:section) { instance_double(Form::Lettings::Sections::Household, form:) }
it "has correct section" do
expect(household_needs.section).to eq(section)
diff --git a/spec/models/form/lettings/subsections/household_situation_spec.rb b/spec/models/form/lettings/subsections/household_situation_spec.rb
index dd6f20d89..d672b3ccc 100644
--- a/spec/models/form/lettings/subsections/household_situation_spec.rb
+++ b/spec/models/form/lettings/subsections/household_situation_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdSituation, type: :model do
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
let(:section) { instance_double(Form::Lettings::Sections::Household) }
- let(:form) { instance_double(Form) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
allow(section).to receive(:form).and_return(form)
@@ -18,7 +18,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdSituation, type: :model do
context "with form year before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct pages" do
@@ -48,7 +48,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdSituation, type: :model do
context "with form year >= 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/income_and_benefits_spec.rb b/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
index 4c92faaf6..7bdc26bfa 100644
--- a/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
+++ b/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Lettings::Subsections::IncomeAndBenefits, type: :model do
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
- let(:section) { instance_double(Form::Lettings::Sections::RentAndCharges) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:section) { instance_double(Form::Lettings::Sections::RentAndCharges, form:) }
it "has correct section" do
expect(income_and_benefits.section).to eq(section)
diff --git a/spec/models/form/lettings/subsections/property_information_spec.rb b/spec/models/form/lettings/subsections/property_information_spec.rb
index d333ff669..cc12f621a 100644
--- a/spec/models/form/lettings/subsections/property_information_spec.rb
+++ b/spec/models/form/lettings/subsections/property_information_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
let(:form) { instance_double(Form, start_date:) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
context "when 2023" do
@@ -51,7 +51,7 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
let(:start_date) { Time.utc(2024, 2, 8) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/setup_spec.rb b/spec/models/form/lettings/subsections/setup_spec.rb
index 074f7ae5e..997f4d08e 100644
--- a/spec/models/form/lettings/subsections/setup_spec.rb
+++ b/spec/models/form/lettings/subsections/setup_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Form::Lettings::Subsections::Setup, type: :model do
context "with start year before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct pages" do
@@ -43,7 +43,7 @@ RSpec.describe Form::Lettings::Subsections::Setup, type: :model do
context "with start year >= 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/tenancy_information_spec.rb b/spec/models/form/lettings/subsections/tenancy_information_spec.rb
index 96770ea78..fce8e57fb 100644
--- a/spec/models/form/lettings/subsections/tenancy_information_spec.rb
+++ b/spec/models/form/lettings/subsections/tenancy_information_spec.rb
@@ -12,11 +12,11 @@ RSpec.describe Form::Lettings::Subsections::TenancyInformation, type: :model do
end
describe "pages" do
- let(:section) { instance_double(Form::Sales::Sections::Household, form:) }
+ let(:section) { instance_double(Form::Lettings::Sections::TenancyAndProperty, form:) }
let(:form) { instance_double(Form, start_date:) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
context "when 2023" do
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Subsections::TenancyInformation, type: :model do
let(:start_date) { Time.utc(2024, 2, 8) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct pages" do
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb
index 68328a5db..a5cf4dd07 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_arab_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundArab, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb
index b4c8a198d..c0eb8a108 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_asian_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundAsian, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb
index 7650f49fa..0a04ff806 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_black_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundBlack, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb
index 42420774f..e7cae6445 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_mixed_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundMixed, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb
index 79dddc53a..ff45cd2c3 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_background_white_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicBackgroundWhite, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
index dcc90fe51..9a94fc0fd 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
index 2f3c92aa7..edc53bd79 100644
--- a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer1_nationality_spec.rb b/spec/models/form/sales/pages/buyer1_nationality_spec.rb
index a9cb1e381..a84a44009 100644
--- a/spec/models/form/sales/pages/buyer1_nationality_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_nationality_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Sales::Pages::Buyer1Nationality, type: :model do
before do
allow(subsection).to receive(:form).and_return(form)
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct subsection" do
@@ -33,7 +33,7 @@ RSpec.describe Form::Sales::Pages::Buyer1Nationality, type: :model do
context "with year 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct questions" do
diff --git a/spec/models/form/sales/pages/buyer1_working_situation_spec.rb b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
index 2ae7f0f1e..182da0a82 100644
--- a/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer1WorkingSituation, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: true, start_year_2025_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer2_nationality_spec.rb b/spec/models/form/sales/pages/buyer2_nationality_spec.rb
index 97b5f7caf..e01215d21 100644
--- a/spec/models/form/sales/pages/buyer2_nationality_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_nationality_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
before do
allow(subsection).to receive(:form).and_return(form)
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct subsection" do
@@ -42,7 +42,7 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
context "with year 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct questions" do
diff --git a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
index 96a67f5bf..6fbd835c5 100644
--- a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer2RelationshipToBuyer1, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
index 0b7708303..6c9915903 100644
--- a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2025_or_later?: false)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/buyer_interview_spec.rb b/spec/models/form/sales/pages/buyer_interview_spec.rb
index 24704526d..f7c6bbb70 100644
--- a/spec/models/form/sales/pages/buyer_interview_spec.rb
+++ b/spec/models/form/sales/pages/buyer_interview_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::BuyerInterview, type: :model do
let(:page_id) { "buyer_interview" }
let(:page_definition) { nil }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false) }
let(:subsection) { instance_double(Form::Subsection, form:, id: "setup") }
it "has correct subsection" do
@@ -45,7 +45,7 @@ RSpec.describe Form::Sales::Pages::BuyerInterview, type: :model do
end
context "when form is after 2024" do
- let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: true) }
context "when there are joint buyers" do
subject(:page) { described_class.new(page_id, page_definition, subsection, joint_purchase: true) }
diff --git a/spec/models/form/sales/pages/buyer_live_spec.rb b/spec/models/form/sales/pages/buyer_live_spec.rb
index dd237214c..1880c37e3 100644
--- a/spec/models/form/sales/pages/buyer_live_spec.rb
+++ b/spec/models/form/sales/pages/buyer_live_spec.rb
@@ -8,32 +8,50 @@ RSpec.describe Form::Sales::Pages::BuyerLive, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection) }
- let(:form) { instance_double(Form, start_date: current_collection_start_date) }
- before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
- allow(subsection).to receive(:form).and_return(form)
- end
+ context "when start year is 2024" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
- it "has correct subsection" do
- expect(page.subsection).to eq(subsection)
- end
+ before do
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+ allow(subsection).to receive(:form).and_return(form)
+ end
- it "has correct questions" do
- expect(page.questions.map(&:id)).to eq(%w[buylivein])
- end
+ it "has correct subsection" do
+ expect(page.subsection).to eq(subsection)
+ end
- it "has the correct id" do
- expect(page.id).to eq("buyer_live")
- end
+ it "has correct questions" do
+ expect(page.questions.map(&:id)).to eq(%w[buylivein])
+ end
- it "has the correct description" do
- expect(page.description).to be_nil
+ it "has the correct id" do
+ expect(page.id).to eq("buyer_live")
+ end
+
+ it "has the correct description" do
+ expect(page.description).to be_nil
+ end
+
+ it "has correct depends_on" do
+ expect(page.depends_on).to eq([{
+ "companybuy" => 2,
+ }])
+ end
end
- it "has correct depends_on" do
- expect(page.depends_on).to eq([{
- "companybuy" => 2,
- }])
+ context "when start year is 2025" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1)) }
+
+ before do
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+ allow(subsection).to receive(:form).and_return(form)
+ end
+
+ it "has correct depends_on" do
+ expect(page.depends_on).to be_nil
+ end
end
end
diff --git a/spec/models/form/sales/pages/buyer_previous_spec.rb b/spec/models/form/sales/pages/buyer_previous_spec.rb
index d55243dec..8e1486ee6 100644
--- a/spec/models/form/sales/pages/buyer_previous_spec.rb
+++ b/spec/models/form/sales/pages/buyer_previous_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Sales::Pages::BuyerPrevious, type: :model do
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection, depends_on: nil, enabled?: true, form:) }
let(:start_date_after_2024) { false }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: start_date_after_2024, depends_on_met: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: start_date_after_2024, depends_on_met: true) }
let(:joint_purchase) { false }
it "has correct subsection" do
diff --git a/spec/models/form/sales/pages/deposit_discount_spec.rb b/spec/models/form/sales/pages/deposit_discount_spec.rb
index d183e379b..f94c46707 100644
--- a/spec/models/form/sales/pages/deposit_discount_spec.rb
+++ b/spec/models/form/sales/pages/deposit_discount_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Sales::Pages::DepositDiscount, type: :model do
let(:subsection) { instance_double(Form::Subsection) }
before do
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct subsection" do
@@ -45,7 +45,7 @@ RSpec.describe Form::Sales::Pages::DepositDiscount, type: :model do
context "when it's a 2024 form" do
before do
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true, start_date: Time.zone.local(2024, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: true, start_date: Time.zone.local(2024, 4, 1)))
end
it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/deposit_spec.rb b/spec/models/form/sales/pages/deposit_spec.rb
index b33604176..ea309bffc 100644
--- a/spec/models/form/sales/pages/deposit_spec.rb
+++ b/spec/models/form/sales/pages/deposit_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Sales::Pages::Deposit, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection, enabled?: true, depends_on: true) }
- let(:form) { instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1), depends_on_met: true) }
+ let(:form) { instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1), depends_on_met: true) }
let(:optional) { false }
before do
@@ -31,7 +31,7 @@ RSpec.describe Form::Sales::Pages::Deposit, type: :model do
context "when routing with start year after 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
context "and optional is false" do
@@ -131,7 +131,7 @@ RSpec.describe Form::Sales::Pages::Deposit, type: :model do
context "when routing with start year before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
context "and optional is false" do
diff --git a/spec/models/form/sales/pages/discount_spec.rb b/spec/models/form/sales/pages/discount_spec.rb
index 4585b7f19..c9fb16095 100644
--- a/spec/models/form/sales/pages/discount_spec.rb
+++ b/spec/models/form/sales/pages/discount_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Sales::Pages::Discount, type: :model do
let(:subsection) { instance_double(Form::Subsection) }
before do
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct subsection" do
diff --git a/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb b/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
index 38a5f69ae..3b51ec744 100644
--- a/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
+++ b/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
@@ -6,7 +6,8 @@ RSpec.describe Form::Sales::Pages::DiscountedSaleValueCheck, type: :model do
let(:page_id) { "discounted_sale_value_check" }
let(:page_definition) { nil }
let(:index) { 1 }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
@@ -22,14 +23,14 @@ RSpec.describe Form::Sales::Pages::DiscountedSaleValueCheck, type: :model do
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.discounted_sale_value.title_text",
+ "translation" => "forms.2024.sales.soft_validations.discounted_sale_value_check.title_text",
"arguments" => [{ "arguments_for_key" => "value_with_discount", "i18n_template" => "value_with_discount", "key" => "field_formatted_as_currency" }],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.discounted_sale_value.informative_text",
+ "translation" => "forms.2024.sales.soft_validations.discounted_sale_value_check.informative_text",
"arguments" => [{ "arguments_for_key" => "mortgage_deposit_and_grant_total", "i18n_template" => "mortgage_deposit_and_grant_total", "key" => "field_formatted_as_currency" }],
})
end
diff --git a/spec/models/form/sales/pages/handover_date_check_spec.rb b/spec/models/form/sales/pages/handover_date_check_spec.rb
index f245675d5..ae465da16 100644
--- a/spec/models/form/sales/pages/handover_date_check_spec.rb
+++ b/spec/models/form/sales/pages/handover_date_check_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Pages::HandoverDateCheck, type: :model do
let(:page_id) { "" }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
@@ -21,7 +22,7 @@ RSpec.describe Form::Sales::Pages::HandoverDateCheck, type: :model do
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.hodate.must_be_less_than_3_years_from_saledate",
+ "translation" => "forms.2024.sales.soft_validations.hodate_check.title_text",
"arguments" => [],
})
end
diff --git a/spec/models/form/sales/pages/joint_purchase_spec.rb b/spec/models/form/sales/pages/joint_purchase_spec.rb
index 4ccefd03d..bba9384ad 100644
--- a/spec/models/form/sales/pages/joint_purchase_spec.rb
+++ b/spec/models/form/sales/pages/joint_purchase_spec.rb
@@ -5,29 +5,53 @@ RSpec.describe Form::Sales::Pages::JointPurchase, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
- it "has correct subsection" do
- expect(page.subsection).to eq(subsection)
- end
+ context "when start year is 2024" do
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1))) }
- it "has correct questions" do
- expect(page.questions.map(&:id)).to eq(%w[jointpur])
- end
+ before do
+ allow(subsection.form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(false)
+ end
- it "has the correct id" do
- expect(page.id).to eq("joint_purchase")
- end
+ it "has correct subsection" do
+ expect(page.subsection).to eq(subsection)
+ end
+
+ it "has correct questions" do
+ expect(page.questions.map(&:id)).to eq(%w[jointpur])
+ end
- it "has the correct description" do
- expect(page.description).to be_nil
+ it "has the correct id" do
+ expect(page.id).to eq("joint_purchase")
+ end
+
+ it "has the correct description" do
+ expect(page.description).to be_nil
+ end
+
+ it "has correct depends_on" do
+ expect(page.depends_on).to eq([
+ { "ownershipsch" => 1 },
+ { "ownershipsch" => 2 },
+ { "companybuy" => 2 },
+ ])
+ end
end
- it "has correct depends_on" do
- expect(page.depends_on).to eq([
- { "ownershipsch" => 1 },
- { "ownershipsch" => 2 },
- { "companybuy" => 2 },
- ])
+ context "when start year is 2025" do
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
+
+ before do
+ allow(subsection.form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+ end
+
+ it "has correct depends_on" do
+ expect(page.depends_on).to eq([
+ { "ownershipsch" => 1 },
+ { "ownershipsch" => 2 },
+ ])
+ end
end
end
diff --git a/spec/models/form/sales/pages/la_nominations_spec.rb b/spec/models/form/sales/pages/la_nominations_spec.rb
index b69f88f1f..190afaa86 100644
--- a/spec/models/form/sales/pages/la_nominations_spec.rb
+++ b/spec/models/form/sales/pages/la_nominations_spec.rb
@@ -7,8 +7,8 @@ RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:start_year_after_2024) { false }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: start_year_after_2024) }
+ let(:start_year_2024_or_later) { false }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: start_year_2024_or_later) }
let(:subsection) { instance_double(Form::Subsection, form:) }
before do
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
end
context "with 23/24 log" do
- let(:start_year_after_2024) { false }
+ let(:start_year_2024_or_later) { false }
it "has correct routed to" do
log.staircase = 1
@@ -41,7 +41,7 @@ RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
end
context "with 24/25 log" do
- let(:start_year_after_2024) { true }
+ let(:start_year_2024_or_later) { true }
it "has correct routed to when staircase is yes" do
log.staircase = 1
diff --git a/spec/models/form/sales/pages/last_accommodation_la_spec.rb b/spec/models/form/sales/pages/last_accommodation_la_spec.rb
index b73cf07f0..7689e7dfd 100644
--- a/spec/models/form/sales/pages/last_accommodation_la_spec.rb
+++ b/spec/models/form/sales/pages/last_accommodation_la_spec.rb
@@ -5,8 +5,8 @@ RSpec.describe Form::Sales::Pages::LastAccommodationLa, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:start_year_after_2024) { false }
- let(:form) { instance_double(Form, depends_on_met: true, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: start_year_after_2024) }
+ let(:start_year_2024_or_later) { false }
+ let(:form) { instance_double(Form, depends_on_met: true, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: start_year_2024_or_later) }
let(:subsection) { instance_double(Form::Subsection, form:, depends_on: nil, enabled?: true) }
let(:log) { build(:sales_log, :completed) }
@@ -38,7 +38,7 @@ RSpec.describe Form::Sales::Pages::LastAccommodationLa, type: :model do
end
context "with 2024 form" do
- let(:start_year_after_2024) { true }
+ let(:start_year_2024_or_later) { true }
it "is routed to for 2024 non discounted sale logs" do
log.update!(ownershipsch: 1)
diff --git a/spec/models/form/sales/pages/last_accommodation_spec.rb b/spec/models/form/sales/pages/last_accommodation_spec.rb
index 8c3dbdbbf..1b2d1ee0a 100644
--- a/spec/models/form/sales/pages/last_accommodation_spec.rb
+++ b/spec/models/form/sales/pages/last_accommodation_spec.rb
@@ -7,8 +7,8 @@ RSpec.describe Form::Sales::Pages::LastAccommodation, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:start_year_after_2024) { false }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: start_year_after_2024) }
+ let(:start_year_2024_or_later) { false }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: start_year_2024_or_later) }
let(:subsection) { instance_double(Form::Subsection, form:, depends_on: nil) }
it "has correct subsection" do
@@ -37,7 +37,7 @@ RSpec.describe Form::Sales::Pages::LastAccommodation, type: :model do
end
context "with 2024 form" do
- let(:start_year_after_2024) { true }
+ let(:start_year_2024_or_later) { true }
it "is routed to for 2024 non discounted sale logs" do
log.update!(ownershipsch: 1)
diff --git a/spec/models/form/sales/pages/managing_organisation_spec.rb b/spec/models/form/sales/pages/managing_organisation_spec.rb
index ea90add64..30383a1f5 100644
--- a/spec/models/form/sales/pages/managing_organisation_spec.rb
+++ b/spec/models/form/sales/pages/managing_organisation_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection, form:) }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
@@ -103,7 +103,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
describe "#routed_to? with 2024 logs" do
let(:log) { create(:sales_log) }
let(:organisation) { create(:organisation) }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: true) }
context "when user nil" do
it "is not shown" do
diff --git a/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb b/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
index 126f2f0b5..aeb196337 100644
--- a/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Sales::Pages::PersonRelationshipToBuyer1, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false)) }
let(:person_index) { 1 }
let(:page_id) { "person_1_relationship_to_buyer_1" }
diff --git a/spec/models/form/sales/pages/person_working_situation_spec.rb b/spec/models/form/sales/pages/person_working_situation_spec.rb
index 53c127e16..91d23f34f 100644
--- a/spec/models/form/sales/pages/person_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/person_working_situation_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Sales::Pages::PersonWorkingSituation, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2025_or_later?: false)) }
let(:person_index) { 2 }
let(:page_id) { "person_2_working_situation" }
diff --git a/spec/models/form/sales/pages/privacy_notice_spec.rb b/spec/models/form/sales/pages/privacy_notice_spec.rb
index 7510e60d9..80be7ae66 100644
--- a/spec/models/form/sales/pages/privacy_notice_spec.rb
+++ b/spec/models/form/sales/pages/privacy_notice_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Sales::Pages::PrivacyNotice, type: :model do
let(:page_id) { "privacy_notice" }
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection, id: "setup") }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false) }
before do
allow(subsection).to receive(:form).and_return(form)
@@ -40,7 +40,7 @@ RSpec.describe Form::Sales::Pages::PrivacyNotice, type: :model do
end
context "when the form start year is after 2024" do
- let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: true) }
it "has the expected copy_key" do
expect(page.copy_key).to eq("sales.setup.privacynotice.joint_purchase")
@@ -64,7 +64,7 @@ RSpec.describe Form::Sales::Pages::PrivacyNotice, type: :model do
end
context "when the form start year is after 2024" do
- let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: true) }
it "has the expected copy_key" do
expect(page.copy_key).to eq("sales.setup.privacynotice.not_joint_purchase")
diff --git a/spec/models/form/sales/pages/property_building_type_spec.rb b/spec/models/form/sales/pages/property_building_type_spec.rb
index aac8fbf24..b9c6bddca 100644
--- a/spec/models/form/sales/pages/property_building_type_spec.rb
+++ b/spec/models/form/sales/pages/property_building_type_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Pages::PropertyBuildingType, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, enabled?: true, form:) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
@@ -22,4 +23,46 @@ RSpec.describe Form::Sales::Pages::PropertyBuildingType, type: :model do
it "has the correct description" do
expect(page.description).to be_nil
end
+
+ context "with form year 2024" do
+ let(:form) { Form.new(nil, 2024, [], "sales") }
+ let(:saledate) { Time.zone.local(2024, 4, 1) }
+
+ context "with a staircasing log" do
+ let(:log) { build(:sales_log, :shared_ownership_setup_complete, staircase: 1, saledate:) }
+
+ it "is routed to" do
+ expect(page.routed_to?(log, nil)).to be true
+ end
+ end
+
+ context "with a non-staircasing log" do
+ let(:log) { build(:sales_log, staircase: nil, saledate:) }
+
+ it "is routed to" do
+ expect(page.routed_to?(log, nil)).to be true
+ end
+ end
+ end
+
+ context "with form year 2025" do
+ let(:form) { Form.new(nil, 2025, [], "sales") }
+ let(:saledate) { Time.zone.local(2025, 4, 1) }
+
+ context "with a staircasing log" do
+ let(:log) { build(:sales_log, :shared_ownership_setup_complete, staircase: 1, saledate:) }
+
+ it "is not routed to" do
+ expect(page.routed_to?(log, nil)).to be false
+ end
+ end
+
+ context "with a non-staircasing log" do
+ let(:log) { build(:sales_log, staircase: nil, saledate:) }
+
+ it "is routed to" do
+ expect(page.routed_to?(log, nil)).to be true
+ end
+ end
+ end
end
diff --git a/spec/models/form/sales/pages/property_local_authority_spec.rb b/spec/models/form/sales/pages/property_local_authority_spec.rb
index faba75665..88d049bce 100644
--- a/spec/models/form/sales/pages/property_local_authority_spec.rb
+++ b/spec/models/form/sales/pages/property_local_authority_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::PropertyLocalAuthority, type: :model do
context "with form before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "is routed to when la is not inferred" do
@@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Pages::PropertyLocalAuthority, type: :model do
context "with form after 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "is routed to when la is not inferred and address search has been given" do
diff --git a/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb b/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
index 9d60c5f3c..bf0493a6d 100644
--- a/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
@@ -5,11 +5,8 @@ RSpec.describe Form::Sales::Pages::PropertyWheelchairAccessible, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
-
- before do
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
- end
+ let(:form) { instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, enabled?: true, form:) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
@@ -26,4 +23,46 @@ RSpec.describe Form::Sales::Pages::PropertyWheelchairAccessible, type: :model do
it "has the correct description" do
expect(page.description).to be_nil
end
+
+ context "with form year 2024" do
+ let(:form) { Form.new(nil, 2024, [], "sales") }
+ let(:saledate) { Time.zone.local(2024, 4, 1) }
+
+ context "with a staircasing log" do
+ let(:log) { build(:sales_log, :shared_ownership_setup_complete, staircase: 1, saledate:) }
+
+ it "is routed to" do
+ expect(page.routed_to?(log, nil)).to be true
+ end
+ end
+
+ context "with a non-staircasing log" do
+ let(:log) { build(:sales_log, :shared_ownership_setup_complete, staircase: 2, saledate:) }
+
+ it "is routed to" do
+ expect(page.routed_to?(log, nil)).to be true
+ end
+ end
+ end
+
+ context "with form year 2025" do
+ let(:form) { Form.new(nil, 2025, [], "sales") }
+ let(:saledate) { Time.zone.local(2025, 4, 1) }
+
+ context "with a staircasing log" do
+ let(:log) { build(:sales_log, :shared_ownership_setup_complete, staircase: 1, saledate:) }
+
+ it "is not routed to" do
+ expect(page.routed_to?(log, nil)).to be false
+ end
+ end
+
+ context "with a non-staircasing log" do
+ let(:log) { build(:sales_log, :shared_ownership_setup_complete, staircase: 2, saledate:) }
+
+ it "is routed to" do
+ expect(page.routed_to?(log, nil)).to be true
+ end
+ end
+ end
end
diff --git a/spec/models/form/sales/pages/purchase_price_spec.rb b/spec/models/form/sales/pages/purchase_price_spec.rb
index e5bfb176a..ad857ee9f 100644
--- a/spec/models/form/sales/pages/purchase_price_spec.rb
+++ b/spec/models/form/sales/pages/purchase_price_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Sales::Pages::PurchasePrice, type: :model do
let(:subsection) { instance_double(Form::Subsection) }
before do
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct subsection" do
diff --git a/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb b/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb
index 3a1c22f24..bca971fe5 100644
--- a/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb
+++ b/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Pages::SharedOwnershipDepositValueCheck, type: :mode
let(:page_id) { "shared_ownership_deposit_value_check" }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
@@ -29,7 +30,7 @@ RSpec.describe Form::Sales::Pages::SharedOwnershipDepositValueCheck, type: :mode
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.shared_ownership_deposit.title_text",
+ "translation" => "forms.2024.sales.soft_validations.shared_ownership_deposit_value_check.title_text",
"arguments" => [
{ "i18n_template" => "mortgage_deposit_and_discount_error_fields", "key" => "mortgage_deposit_and_discount_error_fields" },
{ "arguments_for_key" => "mortgage_deposit_and_discount_total", "i18n_template" => "mortgage_deposit_and_discount_total", "key" => "field_formatted_as_currency" },
@@ -37,10 +38,6 @@ RSpec.describe Form::Sales::Pages::SharedOwnershipDepositValueCheck, type: :mode
})
end
- it "has the correct informative_text" do
- expect(page.informative_text).to eq({})
- end
-
it "has the correct interruption_screen_question_ids" do
expect(page.interruption_screen_question_ids).to eq(%w[mortgage mortgageused cashdis type deposit value equity])
end
diff --git a/spec/models/form/sales/pages/shared_ownership_type_spec.rb b/spec/models/form/sales/pages/shared_ownership_type_spec.rb
index d12c49b57..e6ae7d55d 100644
--- a/spec/models/form/sales/pages/shared_ownership_type_spec.rb
+++ b/spec/models/form/sales/pages/shared_ownership_type_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Pages::SharedOwnershipType, type: :model do
let(:page_id) { nil }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: current_collection_start_date, start_year_after_2024?: true)) }
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: current_collection_start_date, start_year_2024_or_later?: true)) }
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb b/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb
index 95e59ea4e..5fa65fd8d 100644
--- a/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb
+++ b/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Pages::StaircaseOwnedValueCheck, type: :model do
let(:page_id) { "an_id" }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
let(:joint_purchase) { false }
it "has correct subsection" do
@@ -33,7 +34,7 @@ RSpec.describe Form::Sales::Pages::StaircaseOwnedValueCheck, type: :model do
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.staircase_owned.hint_text",
+ "translation" => "forms.2024.sales.soft_validations.stairowned_value_check.not_joint_purchase.informative_text",
"arguments" => [],
})
end
@@ -45,7 +46,7 @@ RSpec.describe Form::Sales::Pages::StaircaseOwnedValueCheck, type: :model do
context "when not a joint purchase" do
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.staircase_owned.title_text.one",
+ "translation" => "forms.2024.sales.soft_validations.stairowned_value_check.not_joint_purchase.title_text",
"arguments" => [
{
"key" => "stairowned",
@@ -62,7 +63,7 @@ RSpec.describe Form::Sales::Pages::StaircaseOwnedValueCheck, type: :model do
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.staircase_owned.title_text.two",
+ "translation" => "forms.2024.sales.soft_validations.stairowned_value_check.joint_purchase.title_text",
"arguments" => [
{
"key" => "stairowned",
diff --git a/spec/models/form/sales/pages/staircase_spec.rb b/spec/models/form/sales/pages/staircase_spec.rb
index 6f17e7e89..3c26181c2 100644
--- a/spec/models/form/sales/pages/staircase_spec.rb
+++ b/spec/models/form/sales/pages/staircase_spec.rb
@@ -7,19 +7,39 @@ RSpec.describe Form::Sales::Pages::Staircase, type: :model do
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
- it "has correct subsection" do
- expect(page.subsection).to eq(subsection)
- end
+ context "when start year is 2024" do
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)), id: "sale_information") }
- it "has correct questions" do
- expect(page.questions.map(&:id)).to eq(%w[staircase])
- end
+ before do
+ allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(false)
+ end
+
+ it "has correct subsection" do
+ expect(page.subsection).to eq(subsection)
+ end
+
+ it "has correct questions" do
+ expect(page.questions.map(&:id)).to eq(%w[staircase])
+ end
- it "has the correct id" do
- expect(page.id).to eq("staircasing")
+ it "has the correct id" do
+ expect(page.id).to eq("staircasing")
+ end
+
+ it "has the correct description" do
+ expect(page.description).to be_nil
+ end
end
- it "has the correct description" do
- expect(page.description).to be_nil
+ context "when start year is >= 2025" do
+ let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)), id: "setup") }
+
+ before do
+ allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+ end
+
+ it "has correct subsection" do
+ expect(page.subsection).to eq(subsection)
+ end
end
end
diff --git a/spec/models/form/sales/pages/uprn_spec.rb b/spec/models/form/sales/pages/uprn_spec.rb
index 17ef3179b..03e1197bc 100644
--- a/spec/models/form/sales/pages/uprn_spec.rb
+++ b/spec/models/form/sales/pages/uprn_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Form::Sales::Pages::Uprn, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(subsection).to receive(:form).and_return(form)
end
@@ -57,7 +57,7 @@ RSpec.describe Form::Sales::Pages::Uprn, type: :model do
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "points to address search page" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
index 593a525d2..c5f243745 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundArab, type: :model
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
index f49d64437..6cf9306b2 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundAsian, type: :model
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
index 6afe4eaf5..cb040ffbd 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundBlack, type: :model
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
index d6e51de58..aced8cb58 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundMixed, type: :model
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
index d08ece820..6aa547e8b 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundWhite, type: :model
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundWhite, type: :model
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
index 0bdc6d9c0..8a859100d 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicGroup, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
index eccb172f7..038e0ce5d 100644
--- a/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1LiveInProperty, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
index c99e64527..0e1b02257 100644
--- a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Questions::Buyer1WorkingSituation, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form:)) }
it "has correct page" do
expect(question.page).to eq(page)
@@ -38,6 +39,22 @@ RSpec.describe Form::Sales::Questions::Buyer1WorkingSituation, type: :model do
})
end
+ context "with start year before 2025" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false) }
+
+ it "uses the old ordering for answer options" do
+ expect(question.answer_options.keys).to eq(%w[1 2 3 4 6 8 5 0 10 7])
+ end
+ end
+
+ context "with start year from 2025" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1), start_year_2025_or_later?: true) }
+
+ it "uses the new ordering for answer options" do
+ expect(question.answer_options.keys).to eq(%w[1 2 3 4 5 6 7 8 0 10])
+ end
+ end
+
it "has the correct check_answers_card_number" do
expect(question.check_answers_card_number).to eq(1)
end
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
index 8d81e8897..6cab95147 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model
context "with 2024/25 form" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
index 1d478faa9..99185a592 100644
--- a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2RelationshipToBuyer1, type: :model
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
index 81d1e052f..7b825185c 100644
--- a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form:)) }
it "has correct page" do
expect(question.page).to eq(page)
@@ -38,6 +39,22 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do
})
end
+ context "with start year before 2025" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false) }
+
+ it "uses the old ordering for answer options" do
+ expect(question.answer_options.keys).to eq(%w[1 2 3 4 6 8 5 0 10 7])
+ end
+ end
+
+ context "with start year from 2025" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1), start_year_2025_or_later?: true) }
+
+ it "uses the new ordering for answer options" do
+ expect(question.answer_options.keys).to eq(%w[1 2 3 4 5 6 7 8 0 10])
+ end
+ end
+
it "has the correct check_answers_card_number" do
expect(question.check_answers_card_number).to eq(2)
end
diff --git a/spec/models/form/sales/questions/buyer_interview_spec.rb b/spec/models/form/sales/questions/buyer_interview_spec.rb
index e2b39c50f..0db43407f 100644
--- a/spec/models/form/sales/questions/buyer_interview_spec.rb
+++ b/spec/models/form/sales/questions/buyer_interview_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::BuyerInterview, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: true) }
let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form:, id: "setup")) }
it "has correct page" do
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Questions::BuyerInterview, type: :model do
context "when the form start year is before 2024" do
let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form:, id: "household_characteristics")) }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 3, 1), start_year_after_2024?: false) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 3, 1), start_year_2024_or_later?: false) }
it "has the expected copy_key" do
expect(question.copy_key).to eq("sales.household_characteristics.noint.joint_purchase")
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Questions::BuyerInterview, type: :model do
end
context "when the form start year is after 2024" do
- let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: true) }
it "has the expected copy_key" do
expect(question.copy_key).to eq("sales.setup.noint.joint_purchase")
@@ -57,7 +57,7 @@ RSpec.describe Form::Sales::Questions::BuyerInterview, type: :model do
context "when the form start year is before 2024" do
let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form:, id: "household_characteristics")) }
- let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false) }
it "has the expected copy_key" do
expect(question.copy_key).to eq("sales.household_characteristics.noint.not_joint_purchase")
@@ -65,7 +65,7 @@ RSpec.describe Form::Sales::Questions::BuyerInterview, type: :model do
end
context "when the form start year is after 2024" do
- let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_after_2024?: true) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: true) }
it "has the expected copy_key" do
expect(question.copy_key).to eq("sales.setup.noint.not_joint_purchase")
diff --git a/spec/models/form/sales/questions/buyer_live_spec.rb b/spec/models/form/sales/questions/buyer_live_spec.rb
index 12dfc8be6..4356db5dd 100644
--- a/spec/models/form/sales/questions/buyer_live_spec.rb
+++ b/spec/models/form/sales/questions/buyer_live_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Sales::Questions::BuyerLive, type: :model do
let(:form) { instance_double(Form, start_date: current_collection_start_date) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
diff --git a/spec/models/form/sales/questions/buyer_previous_spec.rb b/spec/models/form/sales/questions/buyer_previous_spec.rb
index 8c37c2ff2..88204ad1a 100644
--- a/spec/models/form/sales/questions/buyer_previous_spec.rb
+++ b/spec/models/form/sales/questions/buyer_previous_spec.rb
@@ -48,7 +48,7 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
context "when form year is before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "is not marked as derived" do
@@ -58,7 +58,7 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
context "when form year is >= 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "is marked as derived" do
diff --git a/spec/models/form/sales/questions/deposit_value_check_spec.rb b/spec/models/form/sales/questions/deposit_value_check_spec.rb
index 2e861110a..077c2e6a6 100644
--- a/spec/models/form/sales/questions/deposit_value_check_spec.rb
+++ b/spec/models/form/sales/questions/deposit_value_check_spec.rb
@@ -1,7 +1,7 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::DepositValueCheck, type: :model do
- subject(:question) { described_class.new(question_id, question_definition, page) }
+ subject(:question) { described_class.new(question_id, question_definition, page, joint_purchase: true) }
let(:question_id) { nil }
let(:question_definition) { nil }
diff --git a/spec/models/form/sales/questions/discount_spec.rb b/spec/models/form/sales/questions/discount_spec.rb
index 5037e2b4e..09c2fa076 100644
--- a/spec/models/form/sales/questions/discount_spec.rb
+++ b/spec/models/form/sales/questions/discount_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::Discount, type: :model do
before do
allow(page).to receive(:subsection).and_return(subsection)
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct page" do
@@ -47,7 +47,7 @@ RSpec.describe Form::Sales::Questions::Discount, type: :model do
context "with form start year after 2024" do
before do
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true, start_date: Time.zone.local(2024, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: true, start_date: Time.zone.local(2024, 4, 1)))
end
it "has correct max" do
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 }
diff --git a/spec/models/form/sales/questions/mortgage_lender_spec.rb b/spec/models/form/sales/questions/mortgage_lender_spec.rb
index a7abd4c16..b4ce1bf86 100644
--- a/spec/models/form/sales/questions/mortgage_lender_spec.rb
+++ b/spec/models/form/sales/questions/mortgage_lender_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::MortgageLender, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?)
+ allow(form).to receive(:start_year_2024_or_later?)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -46,7 +46,7 @@ RSpec.describe Form::Sales::Questions::MortgageLender, type: :model do
context "when form year is before 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has the correct answer_options" do
@@ -145,7 +145,7 @@ RSpec.describe Form::Sales::Questions::MortgageLender, type: :model do
context "when form year is >= 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/mortgageused_spec.rb b/spec/models/form/sales/questions/mortgageused_spec.rb
index 7c37cbd78..e85238a4d 100644
--- a/spec/models/form/sales/questions/mortgageused_spec.rb
+++ b/spec/models/form/sales/questions/mortgageused_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
context "and the saledate is before 24/25" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return false
+ allow(form).to receive(:start_year_2024_or_later?).and_return false
end
it "does not show the don't know option" do
@@ -45,7 +45,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
context "and the saledate is 24/25 or after" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return true
+ allow(form).to receive(:start_year_2024_or_later?).and_return true
end
it "shows the don't know option" do
diff --git a/spec/models/form/sales/questions/nationality_all_group_spec.rb b/spec/models/form/sales/questions/nationality_all_group_spec.rb
index a88bf1867..4c2b2a39e 100644
--- a/spec/models/form/sales/questions/nationality_all_group_spec.rb
+++ b/spec/models/form/sales/questions/nationality_all_group_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::NationalityAllGroup, type: :model do
let(:buyer_index) { 1 }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
it "has correct page" do
expect(question.page).to be page
diff --git a/spec/models/form/sales/questions/number_joint_buyers_spec.rb b/spec/models/form/sales/questions/number_joint_buyers_spec.rb
index 9529b3aac..bf53d7d88 100644
--- a/spec/models/form/sales/questions/number_joint_buyers_spec.rb
+++ b/spec/models/form/sales/questions/number_joint_buyers_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::NumberJointBuyers, type: :model do
before do
allow(page).to receive(:subsection).and_return(subsection)
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct page" do
diff --git a/spec/models/form/sales/questions/ownership_scheme_spec.rb b/spec/models/form/sales/questions/ownership_scheme_spec.rb
index 99ec32684..647de9621 100644
--- a/spec/models/form/sales/questions/ownership_scheme_spec.rb
+++ b/spec/models/form/sales/questions/ownership_scheme_spec.rb
@@ -10,7 +10,8 @@ RSpec.describe Form::Sales::Questions::OwnershipScheme, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
+ allow(form).to receive(:start_year_2025_or_later?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -39,9 +40,9 @@ RSpec.describe Form::Sales::Questions::OwnershipScheme, type: :model do
})
end
- context "with collection year on or after 2024" do
+ context "with collection year in 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has the correct answer_options" do
@@ -52,4 +53,18 @@ RSpec.describe Form::Sales::Questions::OwnershipScheme, type: :model do
})
end
end
+
+ context "with collection year on or after 2025" do
+ before do
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+ end
+
+ it "has the correct answer_options" do
+ expect(question.answer_options).to eq({
+ "1" => { "value" => "Yes - a shared ownership scheme", "hint" => "When the purchaser buys an initial share of up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion, or a subsequent staircasing transaction" },
+ "2" => { "value" => "Yes - a discounted ownership scheme" },
+ })
+ end
+ end
end
diff --git a/spec/models/form/sales/questions/person_age_spec.rb b/spec/models/form/sales/questions/person_age_spec.rb
index 5faa046bb..772ee20e0 100644
--- a/spec/models/form/sales/questions/person_age_spec.rb
+++ b/spec/models/form/sales/questions/person_age_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PersonAge, type: :model do
let(:question_id) { "age3" }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
let(:person_index) { 2 }
it "has correct page" do
diff --git a/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb b/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
index 32fb055cd..0bc00c179 100644
--- a/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PersonRelationshipToBuyer1, type: :model
let(:question_id) { "relat2" }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_after_2024?: false))) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false))) }
let(:person_index) { 2 }
it "has correct page" do
diff --git a/spec/models/form/sales/questions/person_working_situation_spec.rb b/spec/models/form/sales/questions/person_working_situation_spec.rb
index a9f5316cd..b09c0bf69 100644
--- a/spec/models/form/sales/questions/person_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/person_working_situation_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Questions::PersonWorkingSituation, type: :model do
let(:question_id) { "ecstat2" }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false) }
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form:)) }
let(:person_index) { 2 }
it "has correct page" do
@@ -41,6 +42,22 @@ RSpec.describe Form::Sales::Questions::PersonWorkingSituation, type: :model do
})
end
+ context "with start year before 2025" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false) }
+
+ it "uses the old ordering for answer options" do
+ expect(question.answer_options.keys).to eq(%w[1 2 3 4 6 8 5 0 10 7 9])
+ end
+ end
+
+ context "with start year from 2025" do
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1), start_year_2025_or_later?: true) }
+
+ it "uses the new ordering for answer options" do
+ expect(question.answer_options.keys).to eq(%w[1 2 3 4 5 6 7 8 9 0 10])
+ end
+ end
+
context "when person 2" do
let(:question_id) { "ecstat2" }
let(:person_index) { 2 }
diff --git a/spec/models/form/sales/questions/privacy_notice_spec.rb b/spec/models/form/sales/questions/privacy_notice_spec.rb
index 3f8c030b0..5f764c7af 100644
--- a/spec/models/form/sales/questions/privacy_notice_spec.rb
+++ b/spec/models/form/sales/questions/privacy_notice_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
before do
- allow(form).to receive(:start_year_after_2024?)
+ allow(form).to receive(:start_year_2024_or_later?)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
let(:subsection) { instance_double(Form::Subsection, id: "household_characteristics") }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
context "and there is a single buyer" do
@@ -83,7 +83,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
context "when the form year is >= 2024" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
context "and there is a single buyer" do
diff --git a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
index 6b89deff2..a08a6d0f8 100644
--- a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
before do
allow(page).to receive(:subsection).and_return(subsection)
- allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct page" do
diff --git a/spec/models/form/sales/questions/shared_ownership_type_spec.rb b/spec/models/form/sales/questions/shared_ownership_type_spec.rb
index 91cf6da9e..aa75b381a 100644
--- a/spec/models/form/sales/questions/shared_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/shared_ownership_type_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Questions::SharedOwnershipType, type: :model do
let(:page) { instance_double(Form::Page, subsection:) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct page" do
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Questions::SharedOwnershipType, type: :model do
let(:start_date) { Time.zone.local(2023, 4, 2) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has the correct answer_options" do
@@ -59,7 +59,7 @@ RSpec.describe Form::Sales::Questions::SharedOwnershipType, type: :model do
context "when form start date is on or after 2024/25" do
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "shows shows correct top_guidance_partial" do
diff --git a/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb b/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb
index 4298e40b8..cbff9cec1 100644
--- a/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb
+++ b/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb
@@ -1,7 +1,7 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::StaircaseOwnedValueCheck, type: :model do
- subject(:question) { described_class.new(question_id, question_definition, page) }
+ subject(:question) { described_class.new(question_id, question_definition, page, joint_purchase: true) }
let(:question_id) { nil }
let(:question_definition) { nil }
diff --git a/spec/models/form/sales/questions/staircase_spec.rb b/spec/models/form/sales/questions/staircase_spec.rb
index 7b45891da..29ba34d31 100644
--- a/spec/models/form/sales/questions/staircase_spec.rb
+++ b/spec/models/form/sales/questions/staircase_spec.rb
@@ -5,33 +5,55 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
- let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
- it "has correct page" do
- expect(question.page).to eq(page)
- end
+ context "when start year is 2024" do
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1)), id: "sale_information")) }
- it "has the correct id" do
- expect(question.id).to eq("staircase")
- end
+ before do
+ allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(false)
+ end
- it "has the correct type" do
- expect(question.type).to eq("radio")
- end
+ it "has correct page" do
+ expect(question.page).to eq(page)
+ end
- it "is not marked as derived" do
- expect(question.derived?(nil)).to be false
- end
+ it "has the correct id" do
+ expect(question.id).to eq("staircase")
+ end
+
+ it "has the correct type" do
+ expect(question.type).to eq("radio")
+ end
- it "has the correct answer_options" do
- expect(question.answer_options).to eq({
- "1" => { "value" => "Yes" },
- "2" => { "value" => "No" },
- "3" => { "value" => "Don’t know" },
- })
+ it "is not marked as derived" do
+ expect(question.derived?(nil)).to be false
+ end
+
+ it "has the correct answer_options" do
+ expect(question.answer_options).to eq({
+ "1" => { "value" => "Yes" },
+ "2" => { "value" => "No" },
+ "3" => { "value" => "Don’t know" },
+ })
+ end
+
+ it "has correct conditional for" do
+ expect(question.conditional_for).to eq(nil)
+ end
end
- it "has correct conditional for" do
- expect(question.conditional_for).to eq(nil)
+ context "when start year is 2025" do
+ let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)), id: "setup")) }
+
+ before do
+ allow(page.subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+ end
+
+ it "has the correct answer_options" do
+ expect(question.answer_options).to eq({
+ "1" => { "value" => "Yes" },
+ "2" => { "value" => "No" },
+ })
+ end
end
end
diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb
index 7c6546d79..3eb5042d8 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
context "with 2022/23 form" do
before do
allow(form).to receive(:start_date).and_return(Time.zone.local(2022, 4, 1))
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct pages" do
@@ -120,7 +120,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
context "with 2023/24 form" do
before do
allow(form).to receive(:start_date).and_return(Time.zone.local(2023, 4, 1))
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct pages" do
@@ -228,7 +228,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
context "with 2024/25 form" do
before do
allow(form).to receive(:start_date).and_return(Time.zone.local(2024, 4, 1))
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct pages" do
diff --git a/spec/models/form/sales/subsections/household_situation_spec.rb b/spec/models/form/sales/subsections/household_situation_spec.rb
index 10898b27c..903960a8d 100644
--- a/spec/models/form/sales/subsections/household_situation_spec.rb
+++ b/spec/models/form/sales/subsections/household_situation_spec.rb
@@ -3,16 +3,15 @@ require "rails_helper"
RSpec.describe Form::Sales::Subsections::HouseholdSituation, type: :model do
subject(:household_characteristics) { described_class.new(nil, nil, section) }
- let(:start_date) { Time.utc(2023, 4, 1) }
- let(:form) { instance_double(Form, start_date:) }
+ let(:form) { instance_double(Form, start_year_2024_or_later?: true, start_year_2025_or_later?: false) }
let(:section) { instance_double(Form::Sales::Sections::Household, form:) }
it "has correct section" do
expect(household_characteristics.section).to eq(section)
end
- context "when the log belongs to the 22/23 collection" do
- let(:start_date) { Time.utc(2022, 4, 1) }
+ context "when the start year is 2024" do
+ let(:form) { instance_double(Form, start_year_2024_or_later?: true, start_year_2025_or_later?: false) }
it "has correct pages" do
expect(household_characteristics.pages.map(&:id)).to eq(
@@ -21,19 +20,22 @@ RSpec.describe Form::Sales::Subsections::HouseholdSituation, type: :model do
last_accommodation
last_accommodation_la
buyers_organisations
+ buyer_2_living_in
+ buyer_2_previous_housing_situation
],
)
end
end
- context "when the log belongs to the 23/24 collection" do
+ context "when the start year is 2025" do
+ let(:form) { instance_double(Form, start_year_2024_or_later?: true, start_year_2025_or_later?: true) }
+
it "has correct pages" do
expect(household_characteristics.pages.map(&:id)).to eq(
%w[
buyer1_previous_tenure
last_accommodation
last_accommodation_la
- buyers_organisations
buyer_2_living_in
buyer_2_previous_housing_situation
],
diff --git a/spec/models/form/sales/subsections/outright_sale_spec.rb b/spec/models/form/sales/subsections/outright_sale_spec.rb
index 0d28330f2..52941d0a9 100644
--- a/spec/models/form/sales/subsections/outright_sale_spec.rb
+++ b/spec/models/form/sales/subsections/outright_sale_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
context "when 2022" do
before do
allow(form).to receive(:start_date).and_return(Time.zone.local(2022, 2, 8))
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct pages" do
@@ -51,7 +51,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
before do
allow(form).to receive(:start_date).and_return(Time.zone.local(2023, 2, 8))
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
end
it "has correct pages" do
@@ -80,7 +80,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
context "when 2024" do
before do
allow(form).to receive(:start_date).and_return(Time.zone.local(2024, 2, 8))
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
end
it "has correct pages" do
diff --git a/spec/models/form/sales/subsections/property_information_spec.rb b/spec/models/form/sales/subsections/property_information_spec.rb
index 6e181f738..ccfeb8e3a 100644
--- a/spec/models/form/sales/subsections/property_information_spec.rb
+++ b/spec/models/form/sales/subsections/property_information_spec.rb
@@ -14,7 +14,8 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
let(:form) { instance_double(Form, start_date:) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(false)
+ allow(form).to receive(:start_year_2025_or_later?).and_return(false)
end
context "when 2023" do
@@ -47,7 +48,8 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
let(:start_date) { Time.utc(2024, 2, 8) }
before do
- allow(form).to receive(:start_year_after_2024?).and_return(true)
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(form).to receive(:start_year_2025_or_later?).and_return(false)
end
it "has correct pages" do
@@ -75,6 +77,40 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
)
end
end
+
+ context "when 2025" do
+ let(:start_date) { Time.utc(2025, 2, 8) }
+
+ before do
+ allow(form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+ end
+
+ it "has correct pages" do
+ expect(property_information.pages.map(&:id)).to eq(
+ %w[
+ uprn
+ uprn_confirmation
+ address_matcher
+ no_address_found
+ uprn_selection
+ address
+ property_local_authority
+ local_authority_buyer_1_income_max_value_check
+ local_authority_buyer_2_income_max_value_check
+ local_authority_combined_income_max_value_check
+ about_price_la_value_check
+ property_unit_type
+ property_number_of_bedrooms
+ about_price_bedrooms_value_check
+ monthly_charges_property_type_value_check
+ percentage_discount_proptype_value_check
+ property_building_type
+ property_wheelchair_accessible
+ ],
+ )
+ end
+ end
end
it "has the correct id" do
diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb
index 2d6612663..ad01ccd41 100644
--- a/spec/models/form/sales/subsections/setup_spec.rb
+++ b/spec/models/form/sales/subsections/setup_spec.rb
@@ -22,16 +22,17 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
context "when start year is before 2024" do
before do
- allow(section.form).to receive(:start_year_after_2024?).and_return(false)
+ allow(section.form).to receive(:start_year_2024_or_later?).and_return(false)
+ allow(section.form).to receive(:start_year_2025_or_later?).and_return(false)
end
it "has correct pages" do
expect(setup.pages.map(&:id)).to eq(
%w[
+ completion_date
owning_organisation
managing_organisation
assigned_to
- completion_date
purchaser_code
ownership_scheme
shared_ownership_type
@@ -46,18 +47,19 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
end
end
- context "when start year is >= 2024" do
+ context "when start year is 2024" do
before do
- allow(section.form).to receive(:start_year_after_2024?).and_return(true)
+ allow(section.form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(section.form).to receive(:start_year_2025_or_later?).and_return(false)
end
it "has correct pages" do
expect(setup.pages.map(&:id)).to eq(
%w[
+ completion_date
owning_organisation
managing_organisation
assigned_to
- completion_date
purchaser_code
ownership_scheme
shared_ownership_type
@@ -75,4 +77,33 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
)
end
end
+
+ context "when start year is >= 2025" do
+ before do
+ allow(section.form).to receive(:start_year_2024_or_later?).and_return(true)
+ allow(section.form).to receive(:start_year_2025_or_later?).and_return(true)
+ end
+
+ it "has correct pages" do
+ expect(setup.pages.map(&:id)).to eq(
+ %w[
+ completion_date
+ owning_organisation
+ managing_organisation
+ assigned_to
+ purchaser_code
+ ownership_scheme
+ staircasing
+ shared_ownership_type
+ discounted_ownership_type
+ joint_purchase
+ number_joint_buyers
+ buyer_interview_joint_purchase
+ buyer_interview
+ privacy_notice_joint_purchase
+ privacy_notice
+ ],
+ )
+ end
+ end
end
diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
index 922281fd0..4c546d58c 100644
--- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
+++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
let(:section) { instance_double(Form::Sales::Sections::SaleInformation) }
before do
- allow(section).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
+ allow(section).to receive(:form).and_return(instance_double(Form, start_year_2024_or_later?: false, start_year_2025_or_later?: false, start_date: Time.zone.local(2023, 4, 1)))
end
it "has correct section" do
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
index 0d32f3913..d3dc7e21f 100644
--- a/spec/models/form_spec.rb
+++ b/spec/models/form_spec.rb
@@ -387,10 +387,6 @@ RSpec.describe Form, type: :model do
expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup)
expect(form.subsections.count).to eq(1)
expect(form.subsections.first.id).to eq("setup")
- expect(form.pages.count).to eq(13)
- expect(form.pages.first.id).to eq("owning_organisation")
- expect(form.questions.count).to eq(14)
- expect(form.questions.first.id).to eq("owning_organisation_id")
expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
expect(form.new_logs_end_date).to eq(Time.zone.parse("2023-11-20"))
expect(form.edit_end_date).to eq(Time.zone.parse("2023-11-20"))
diff --git a/spec/models/validations/date_validations_spec.rb b/spec/models/validations/date_validations_spec.rb
index f6c81a088..3ca259b16 100644
--- a/spec/models/validations/date_validations_spec.rb
+++ b/spec/models/validations/date_validations_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Validations::DateValidations do
it "must be a valid date" do
record.startdate = Time.zone.local(0, 7, 1)
date_validator.validate_startdate(record)
- expect(record.errors["startdate"]).to include(match I18n.t("validations.date.invalid_date"))
+ expect(record.errors["startdate"]).to include(match I18n.t("validations.shared.date.invalid_date"))
end
it "does not raise an error when valid" do
diff --git a/spec/models/validations/financial_validations_spec.rb b/spec/models/validations/financial_validations_spec.rb
index f35cdd097..a2d51f7f9 100644
--- a/spec/models/validations/financial_validations_spec.rb
+++ b/spec/models/validations/financial_validations_spec.rb
@@ -17,9 +17,9 @@ RSpec.describe Validations::FinancialValidations do
record.incfreq = nil
financial_validator.validate_net_income(record)
expect(record.errors["incfreq"])
- .to include(match I18n.t("validations.financial.earnings.freq_missing"))
+ .to include(match I18n.t("validations.lettings.financial.incfreq.incfreq_missing"))
expect(record.errors["earnings"])
- .to include(match I18n.t("validations.financial.earnings.freq_missing"))
+ .to include(match I18n.t("validations.lettings.financial.earnings.incfreq_missing"))
end
it "when income frequency is provided it validates that earnings must be provided" do
@@ -27,9 +27,9 @@ RSpec.describe Validations::FinancialValidations do
record.incfreq = 1
financial_validator.validate_net_income(record)
expect(record.errors["earnings"])
- .to include(match I18n.t("validations.financial.earnings.earnings_missing"))
+ .to include(match I18n.t("validations.lettings.financial.earnings.earnings_missing"))
expect(record.errors["incfreq"])
- .to include(match I18n.t("validations.financial.earnings.earnings_missing"))
+ .to include(match I18n.t("validations.lettings.financial.earnings.earnings_missing"))
end
end
@@ -39,14 +39,14 @@ RSpec.describe Validations::FinancialValidations do
record.benefits = 0
record.ecstat1 = 1
financial_validator.validate_net_income_uc_proportion(record)
- expect(record.errors["benefits"]).to include(match I18n.t("validations.financial.benefits.part_or_full_time"))
+ expect(record.errors["benefits"]).to include(match I18n.t("validations.lettings.financial.benefits.part_or_full_time"))
end
it "validates that the lead tenant is not in part time employment" do
record.benefits = 0
record.ecstat1 = 0
financial_validator.validate_net_income_uc_proportion(record)
- expect(record.errors["benefits"]).to include(match I18n.t("validations.financial.benefits.part_or_full_time"))
+ expect(record.errors["benefits"]).to include(match I18n.t("validations.lettings.financial.benefits.part_or_full_time"))
end
it "expects that the lead tenant is not in full-time or part-time employment" do
@@ -61,7 +61,7 @@ RSpec.describe Validations::FinancialValidations do
record.ecstat2 = 0
record.relat2 = "P"
financial_validator.validate_net_income_uc_proportion(record)
- expect(record.errors["benefits"]).to include(match I18n.t("validations.financial.benefits.part_or_full_time"))
+ expect(record.errors["benefits"]).to include(match I18n.t("validations.lettings.financial.benefits.part_or_full_time"))
end
it "expects that the tenant’s partner is not in full-time or part-time employment" do
@@ -81,7 +81,7 @@ RSpec.describe Validations::FinancialValidations do
record.tshortfall = 99
financial_validator.validate_outstanding_rent_amount(record)
expect(record.errors["tshortfall"])
- .to include(match I18n.t("validations.financial.tshortfall.outstanding_amount_not_expected"))
+ .to include(match I18n.t("validations.lettings.financial.tshortfall.outstanding_amount_not_expected"))
end
end
@@ -104,7 +104,7 @@ RSpec.describe Validations::FinancialValidations do
record.set_derived_fields!
financial_validator.validate_rent_amount(record)
expect(record.errors["tshortfall"])
- .to include(match I18n.t("validations.financial.tshortfall.must_be_positive"))
+ .to include(match I18n.t("validations.lettings.financial.tshortfall.must_be_positive"))
end
it "validates that total charge is no less than the shortfall" do
@@ -118,9 +118,9 @@ RSpec.describe Validations::FinancialValidations do
record.set_derived_fields!
financial_validator.validate_rent_amount(record)
expect(record.errors["tcharge"])
- .to include(match I18n.t("validations.financial.tcharge.less_than_shortfall"))
+ .to include(match I18n.t("validations.lettings.financial.tcharge.less_than_shortfall"))
expect(record.errors["tshortfall"])
- .to include(match I18n.t("validations.financial.tshortfall.more_than_total_charge"))
+ .to include(match I18n.t("validations.lettings.financial.tshortfall.more_than_total_charge"))
end
it "validates that carehome charge is no less than the shortfall" do
@@ -134,9 +134,9 @@ RSpec.describe Validations::FinancialValidations do
record.set_derived_fields!
financial_validator.validate_rent_amount(record)
expect(record.errors["chcharge"])
- .to include(match I18n.t("validations.financial.carehome.less_than_shortfall"))
+ .to include(match I18n.t("validations.lettings.financial.chcharge.less_than_shortfall"))
expect(record.errors["tshortfall"])
- .to include(match I18n.t("validations.financial.tshortfall.more_than_carehome_charge"))
+ .to include(match I18n.t("validations.lettings.financial.tshortfall.more_than_carehome_charge"))
end
it "expects that rent can be less than the shortfall if total charge is higher" do
@@ -181,13 +181,13 @@ RSpec.describe Validations::FinancialValidations do
financial_validator.validate_rent_period(record)
expect(record.errors["period"])
.to include(match I18n.t(
- "validations.financial.rent_period.invalid_for_org.period",
+ "validations.lettings.financial.period.invalid_period_for_org",
org_name: user.organisation.name,
rent_period: "every 4 weeks",
))
expect(record.errors["managing_organisation_id"])
.to include(match I18n.t(
- "validations.financial.rent_period.invalid_for_org.managing_org",
+ "validations.lettings.financial.managing_organisation_id.invalid_period_for_org",
org_name: user.organisation.name,
rent_period: "every 4 weeks",
))
@@ -204,7 +204,7 @@ RSpec.describe Validations::FinancialValidations do
record.hb = 9
financial_validator.validate_tshortfall(record)
expect(record.errors["tshortfall"])
- .to include(match I18n.t("validations.financial.hbrentshortfall.outstanding_no_benefits"))
+ .to include(match I18n.t("validations.lettings.financial.tshortfall.outstanding_no_benefits"))
end
it "validates that housing benefit is not don't know" do
@@ -212,16 +212,7 @@ RSpec.describe Validations::FinancialValidations do
record.hb = 3
financial_validator.validate_tshortfall(record)
expect(record.errors["tshortfall"])
- .to include(match I18n.t("validations.financial.hbrentshortfall.outstanding_no_benefits"))
- end
-
- it "validates that housing benefit is not Universal Credit without housing benefit (prior to 22/23)" do
- record.startdate = Time.zone.local(2022, 3, 1)
- record.hbrentshortfall = 1
- record.hb = 7
- financial_validator.validate_tshortfall(record)
- expect(record.errors["tshortfall"])
- .to include(match I18n.t("validations.financial.hbrentshortfall.outstanding_no_benefits"))
+ .to include(match I18n.t("validations.lettings.financial.tshortfall.outstanding_no_benefits"))
end
it "validates that housing benefit is provided" do
@@ -375,15 +366,15 @@ RSpec.describe Validations::FinancialValidations do
financial_validator.validate_negative_currency(record)
expect(record.errors["earnings"])
- .to include(match I18n.t("validations.financial.negative_currency"))
+ .to include(match I18n.t("validations.lettings.financial.earnings.negative_currency"))
expect(record.errors["brent"])
- .to include(match I18n.t("validations.financial.negative_currency"))
+ .to include(match I18n.t("validations.lettings.financial.brent.negative_currency"))
expect(record.errors["scharge"])
- .to include(match I18n.t("validations.financial.negative_currency"))
+ .to include(match I18n.t("validations.lettings.financial.scharge.negative_currency"))
expect(record.errors["pscharge"])
- .to include(match I18n.t("validations.financial.negative_currency"))
+ .to include(match I18n.t("validations.lettings.financial.pscharge.negative_currency"))
expect(record.errors["supcharg"])
- .to include(match I18n.t("validations.financial.negative_currency"))
+ .to include(match I18n.t("validations.lettings.financial.supcharg.negative_currency"))
end
end
@@ -466,7 +457,7 @@ RSpec.describe Validations::FinancialValidations do
record[test_case[:charge][:field]] = test_case[:charge][:value]
financial_validator.validate_rent_amount(record)
expect(record.errors[test_case[:charge][:field]])
- .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "general needs", provider_type: "private registered provider"))
+ .to include(match I18n.t("validations.lettings.financial.#{test_case[:charge][:field]}.rent_out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "general needs", provider_type: "private registered provider"))
end
end
@@ -578,7 +569,7 @@ RSpec.describe Validations::FinancialValidations do
record[test_case[:charge][:field]] = test_case[:charge][:value]
financial_validator.validate_rent_amount(record)
expect(record.errors[test_case[:charge][:field]])
- .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "supported housing", provider_type: "private registered provider"))
+ .to include(match I18n.t("validations.lettings.financial.#{test_case[:charge][:field]}.rent_out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "supported housing", provider_type: "private registered provider"))
end
end
@@ -694,7 +685,7 @@ RSpec.describe Validations::FinancialValidations do
record[test_case[:charge][:field]] = test_case[:charge][:value]
financial_validator.validate_rent_amount(record)
expect(record.errors[test_case[:charge][:field]])
- .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "general needs", provider_type: "local authority"))
+ .to include(match I18n.t("validations.lettings.financial.#{test_case[:charge][:field]}.rent_out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "general needs", provider_type: "local authority"))
end
end
@@ -806,7 +797,7 @@ RSpec.describe Validations::FinancialValidations do
record[test_case[:charge][:field]] = test_case[:charge][:value]
financial_validator.validate_rent_amount(record)
expect(record.errors[test_case[:charge][:field]])
- .to include(match I18n.t("validations.financial.rent.out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "supported housing", provider_type: "local authority"))
+ .to include(match I18n.t("validations.lettings.financial.#{test_case[:charge][:field]}.rent_out_of_range", charge_name: test_case[:charge_name], maximum_per_period: test_case[:maximum_per_period], frequency: test_case[:period][:label], letting_type: "supported housing", provider_type: "local authority"))
end
end
@@ -885,7 +876,7 @@ RSpec.describe Validations::FinancialValidations do
record.tcharge = 9
financial_validator.validate_rent_amount(record)
expect(record.errors["tcharge"])
- .to include(match I18n.t("validations.financial.tcharge.under_10"))
+ .to include(match I18n.t("validations.lettings.financial.tcharge.under_10"))
end
it "allows the total charge to be over 10 per week" do
@@ -903,7 +894,7 @@ RSpec.describe Validations::FinancialValidations do
record.tcharge = 19.99
financial_validator.validate_rent_amount(record)
expect(record.errors["tcharge"])
- .to include(match I18n.t("validations.financial.tcharge.under_10"))
+ .to include(match I18n.t("validations.lettings.financial.tcharge.under_10"))
end
it "allows the total charge to be over 10 per week" do
@@ -922,11 +913,11 @@ RSpec.describe Validations::FinancialValidations do
record.household_charge = 1
financial_validator.validate_rent_amount(record)
expect(record.errors["tcharge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.tcharge.complete_1_of_3"))
expect(record.errors["chcharge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.chcharge.complete_1_of_3"))
expect(record.errors["household_charge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.household_charge.complete_1_of_3"))
end
it "returns an error for tcharge and chcharge types selected" do
@@ -936,9 +927,9 @@ RSpec.describe Validations::FinancialValidations do
expect(record.errors["household_charge"])
.to be_empty
expect(record.errors["tcharge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.tcharge.complete_1_of_3"))
expect(record.errors["chcharge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.chcharge.complete_1_of_3"))
end
it "returns an error for tcharge type and household_charge not paid selected" do
@@ -948,9 +939,9 @@ RSpec.describe Validations::FinancialValidations do
expect(record.errors["chcharge"])
.to be_empty
expect(record.errors["tcharge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.tcharge.complete_1_of_3"))
expect(record.errors["household_charge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.household_charge.complete_1_of_3"))
end
it "returns an error for chcharge type and household_charge not paid selected" do
@@ -960,9 +951,9 @@ RSpec.describe Validations::FinancialValidations do
expect(record.errors["tcharge"])
.to be_empty
expect(record.errors["chcharge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.chcharge.complete_1_of_3"))
expect(record.errors["household_charge"])
- .to include(match I18n.t("validations.financial.charges.complete_1_of_3"))
+ .to include(match I18n.t("validations.lettings.financial.household_charge.complete_1_of_3"))
end
end
@@ -1038,7 +1029,7 @@ RSpec.describe Validations::FinancialValidations do
financial_validator.validate_rent_amount(record)
expect(record.errors["brent"])
- .to include(match I18n.t("validations.financial.brent.below_hard_min"))
+ .to include(match I18n.t("validations.lettings.financial.brent.below_hard_min"))
end
it "validates hard minimum for supported housing" do
@@ -1051,11 +1042,11 @@ RSpec.describe Validations::FinancialValidations do
financial_validator.validate_rent_amount(record)
expect(record.errors["brent"])
- .to include(match I18n.t("validations.financial.brent.below_hard_min"))
+ .to include(match I18n.t("validations.lettings.financial.brent.below_hard_min"))
%w[beds la postcode_known scheme_id location_id rent_type needstype period].each do |field|
expect(record.errors[field])
- .to include(match I18n.t("validations.financial.brent.#{field}.below_hard_min"))
+ .to include(match I18n.t("validations.lettings.financial.#{field}.rent_below_hard_min"))
end
end
@@ -1070,11 +1061,11 @@ RSpec.describe Validations::FinancialValidations do
financial_validator.validate_rent_amount(record)
expect(record.errors["brent"])
- .to include(match I18n.t("validations.financial.brent.above_hard_max"))
+ .to include(match I18n.t("validations.lettings.financial.brent.above_hard_max"))
%w[beds la postcode_known scheme_id location_id rent_type needstype period].each do |field|
expect(record.errors[field])
- .to include(match I18n.t("validations.financial.brent.#{field}.above_hard_max"))
+ .to include(match I18n.t("validations.lettings.financial.#{field}.rent_above_hard_max"))
end
end
@@ -1088,11 +1079,11 @@ RSpec.describe Validations::FinancialValidations do
financial_validator.validate_rent_amount(record)
expect(record.errors["brent"])
- .to include(match I18n.t("validations.financial.brent.above_hard_max"))
+ .to include(match I18n.t("validations.lettings.financial.brent.above_hard_max"))
%w[beds la postcode_known scheme_id location_id rent_type needstype period].each do |field|
expect(record.errors[field])
- .to include(match I18n.t("validations.financial.brent.#{field}.above_hard_max"))
+ .to include(match I18n.t("validations.lettings.financial.#{field}.rent_above_hard_max"))
end
end
@@ -1106,11 +1097,11 @@ RSpec.describe Validations::FinancialValidations do
financial_validator.validate_rent_amount(record)
expect(record.errors["brent"])
- .to include(match I18n.t("validations.financial.brent.above_hard_max"))
+ .to include(match I18n.t("validations.lettings.financial.brent.above_hard_max"))
%w[beds la postcode_known scheme_id location_id rent_type needstype period].each do |field|
expect(record.errors[field])
- .to include(match I18n.t("validations.financial.brent.#{field}.above_hard_max"))
+ .to include(match I18n.t("validations.lettings.financial.#{field}.rent_above_hard_max"))
end
end
@@ -1213,9 +1204,9 @@ RSpec.describe Validations::FinancialValidations do
record.chcharge = nil
financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"])
- .to include(match I18n.t("validations.financial.carehome.not_provided", period: "every 4 weeks"))
+ .to include(match I18n.t("validations.lettings.financial.carehome.not_provided", period: "every 4 weeks"))
expect(record.errors["is_carehome"])
- .to include(match I18n.t("validations.financial.carehome.not_provided", period: "every 4 weeks"))
+ .to include(match I18n.t("validations.lettings.financial.carehome.not_provided", period: "every 4 weeks"))
end
end
diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb
index b240b7b2a..ea472f618 100644
--- a/spec/models/validations/household_validations_spec.rb
+++ b/spec/models/validations/household_validations_spec.rb
@@ -27,13 +27,13 @@ RSpec.describe Validations::HouseholdValidations do
end
describe "reason for leaving last settled home validations" do
- let(:field) { "validations.other_field_not_required" }
+ let(:field) { "validations.shared.other_field_not_required" }
let(:main_field_label) { "reason" }
let(:other_field_label) { "reasonother" }
let(:expected_error) { I18n.t(field, main_field_label:, other_field_label:) }
context "when reason is other" do
- let(:field) { "validations.other_field_missing" }
+ let(:field) { "validations.shared.other_field_missing" }
it "validates that a reason is provided" do
record.reason = 20
@@ -251,14 +251,14 @@ RSpec.describe Validations::HouseholdValidations do
record.hhmemb = 0
household_validator.validate_numeric_min_max(record)
expect(record.errors["hhmemb"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Number of household members", min: 1, max: 8))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Number of household members", min: 1, max: 8))
end
it "validates that the number of household members cannot be more than 8" do
record.hhmemb = 9
household_validator.validate_numeric_min_max(record)
expect(record.errors["hhmemb"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Number of household members", min: 1, max: 8))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Number of household members", min: 1, max: 8))
end
it "expects that the number of other household members is between the min and max" do
@@ -276,11 +276,11 @@ RSpec.describe Validations::HouseholdValidations do
record.relat3 = "P"
household_validator.validate_partner_count(record)
expect(record.errors["relat2"])
- .to include(match I18n.t("validations.household.relat.one_partner"))
+ .to include(match I18n.t("validations.lettings.household.relat.one_partner"))
expect(record.errors["relat3"])
- .to include(match I18n.t("validations.household.relat.one_partner"))
+ .to include(match I18n.t("validations.lettings.household.relat.one_partner"))
expect(record.errors["relat4"])
- .not_to include(match I18n.t("validations.household.relat.one_partner"))
+ .not_to include(match I18n.t("validations.lettings.household.relat.one_partner"))
end
it "expects that a tenant can have a partner" do
diff --git a/spec/models/validations/property_validations_spec.rb b/spec/models/validations/property_validations_spec.rb
index 3f6f9877c..8cf484f91 100644
--- a/spec/models/validations/property_validations_spec.rb
+++ b/spec/models/validations/property_validations_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe Validations::PropertyValidations do
context "and the log is from before 24/25" do
it "adds an error" do
- allow(log.form).to receive(:start_year_after_2024?).and_return false
+ allow(log.form).to receive(:start_year_2024_or_later?).and_return false
property_validator.validate_shared_housing_rooms(log)
@@ -76,7 +76,7 @@ RSpec.describe Validations::PropertyValidations do
context "and the log is from before 24/25" do
it "adds an error" do
- allow(log.form).to receive(:start_year_after_2024?).and_return false
+ allow(log.form).to receive(:start_year_2024_or_later?).and_return false
property_validator.validate_shared_housing_rooms(log)
diff --git a/spec/models/validations/setup_validations_spec.rb b/spec/models/validations/setup_validations_spec.rb
index 0c99d3628..5b4f03365 100644
--- a/spec/models/validations/setup_validations_spec.rb
+++ b/spec/models/validations/setup_validations_spec.rb
@@ -436,9 +436,9 @@ RSpec.describe Validations::SetupValidations do
record.scheme = scheme
setup_validator.validate_scheme(record)
expect(record.errors["startdate"])
- .to include(match I18n.t("validations.setup.startdate.scheme.deactivated.startdate", name: scheme.service_name, date: "4 June 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.scheme.deactivated.startdate", name: scheme.service_name, date: "4 June 2022"))
expect(record.errors["scheme_id"])
- .to include(match I18n.t("validations.setup.startdate.scheme.deactivated.scheme_id", name: scheme.service_name, date: "4 June 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.scheme.deactivated.scheme_id", name: scheme.service_name, date: "4 June 2022"))
end
it "produces no error when tenancy start date is during an active scheme period" do
@@ -465,9 +465,9 @@ RSpec.describe Validations::SetupValidations do
record.scheme = scheme
setup_validator.validate_scheme(record)
expect(record.errors["startdate"])
- .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon.startdate", name: scheme.service_name, date: "4 August 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.scheme.reactivating_soon.startdate", name: scheme.service_name, date: "4 August 2022"))
expect(record.errors["scheme_id"])
- .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon.scheme_id", name: scheme.service_name, date: "4 August 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.scheme.reactivating_soon.scheme_id", name: scheme.service_name, date: "4 August 2022"))
end
it "produces no error when tenancy start date is during an active scheme period" do
@@ -498,9 +498,9 @@ RSpec.describe Validations::SetupValidations do
record.scheme = scheme
setup_validator.validate_scheme(record)
expect(record.errors["startdate"])
- .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon.startdate", name: scheme.service_name, date: "4 September 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.scheme.reactivating_soon.startdate", name: scheme.service_name, date: "4 September 2022"))
expect(record.errors["scheme_id"])
- .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon.scheme_id", name: scheme.service_name, date: "4 September 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.scheme.reactivating_soon.scheme_id", name: scheme.service_name, date: "4 September 2022"))
end
it "produces no error when tenancy start date is during an active scheme period" do
@@ -526,8 +526,8 @@ RSpec.describe Validations::SetupValidations do
record.startdate = Time.zone.local(2022, 7, 5)
record.scheme = scheme
setup_validator.validate_scheme(record)
- expect(record.errors["startdate"]).to include(match I18n.t("validations.setup.startdate.scheme.locations_inactive.startdate", name: scheme.service_name))
- expect(record.errors["scheme_id"]).to include(match I18n.t("validations.setup.startdate.scheme.locations_inactive.startdate", name: scheme.service_name))
+ expect(record.errors["startdate"]).to include(match I18n.t("validations.lettings.setup.startdate.scheme.locations_inactive.startdate", name: scheme.service_name))
+ expect(record.errors["scheme_id"]).to include(match I18n.t("validations.lettings.setup.startdate.scheme.locations_inactive.startdate", name: scheme.service_name))
end
it "produces no error when scheme has active locations on the tenancy start date" do
@@ -553,8 +553,8 @@ RSpec.describe Validations::SetupValidations do
record.scheme = scheme
record.location = location
setup_validator.validate_scheme(record)
- expect(record.errors["startdate"]).to include(match I18n.t("validations.setup.startdate.scheme.locations_inactive.startdate", name: scheme.service_name))
- expect(record.errors["startdate"]).not_to include(match I18n.t("validations.setup.startdate.location.deactivated.startdate", postcode: location.postcode))
+ expect(record.errors["startdate"]).to include(match I18n.t("validations.lettings.setup.startdate.scheme.locations_inactive.startdate", name: scheme.service_name))
+ expect(record.errors["startdate"]).not_to include(match I18n.t("validations.lettings.setup.startdate.location.deactivated.startdate", postcode: location.postcode))
end
it "produces no error when scheme has active locations on the tenancy start date" do
@@ -593,9 +593,9 @@ RSpec.describe Validations::SetupValidations do
record.location = location
setup_validator.validate_location(record)
expect(record.errors["startdate"])
- .to include(match I18n.t("validations.setup.startdate.location.deactivated.startdate", postcode: location.postcode, date: "4 June 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.deactivated.startdate", postcode: location.postcode, date: "4 June 2022"))
expect(record.errors["location_id"])
- .to include(match I18n.t("validations.setup.startdate.location.deactivated.location_id", postcode: location.postcode, date: "4 June 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.deactivated.location_id", postcode: location.postcode, date: "4 June 2022"))
end
it "produces no error when tenancy start date is during an active location period" do
@@ -622,9 +622,9 @@ RSpec.describe Validations::SetupValidations do
record.location = location
setup_validator.validate_location(record)
expect(record.errors["startdate"])
- .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon.startdate", postcode: location.postcode, date: "4 August 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.reactivating_soon.startdate", postcode: location.postcode, date: "4 August 2022"))
expect(record.errors["location_id"])
- .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon.location_id", postcode: location.postcode, date: "4 August 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.reactivating_soon.location_id", postcode: location.postcode, date: "4 August 2022"))
end
it "produces no error when tenancy start date is during an active location period" do
@@ -655,9 +655,9 @@ RSpec.describe Validations::SetupValidations do
record.location = location
setup_validator.validate_location(record)
expect(record.errors["startdate"])
- .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon.startdate", postcode: location.postcode, date: "4 September 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.reactivating_soon.startdate", postcode: location.postcode, date: "4 September 2022"))
expect(record.errors["location_id"])
- .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon.location_id", postcode: location.postcode, date: "4 September 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.reactivating_soon.location_id", postcode: location.postcode, date: "4 September 2022"))
end
it "produces no error when tenancy start date is during an active location period" do
@@ -686,9 +686,9 @@ RSpec.describe Validations::SetupValidations do
record.location = location
setup_validator.validate_location(record)
expect(record.errors["startdate"])
- .to include(match I18n.t("validations.setup.startdate.location.activating_soon.startdate", postcode: location.postcode, date: "15 September 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.activating_soon.startdate", postcode: location.postcode, date: "15 September 2022"))
expect(record.errors["location_id"])
- .to include(match I18n.t("validations.setup.startdate.location.activating_soon.location_id", postcode: location.postcode, date: "15 September 2022"))
+ .to include(match I18n.t("validations.lettings.setup.startdate.location.activating_soon.location_id", postcode: location.postcode, date: "15 September 2022"))
end
end
@@ -726,7 +726,7 @@ RSpec.describe Validations::SetupValidations do
record.startdate = Time.zone.local(2022, 7, 5)
record.location = location
setup_validator.validate_location(record)
- expect(record.errors["startdate"]).to include(match I18n.t("validations.setup.startdate.location.deactivated.startdate", postcode: location.postcode))
+ expect(record.errors["startdate"]).to include(match I18n.t("validations.lettings.setup.startdate.location.deactivated.startdate", postcode: location.postcode))
end
it "produces no error when the chosen location is active on the tenancy start date" do
@@ -900,7 +900,7 @@ RSpec.describe Validations::SetupValidations do
it "produces an error" do
record.scheme = scheme
- setup_validator.validate_scheme_has_confirmed_locations_validation(record)
+ setup_validator.validate_scheme(record)
expect(record.errors["scheme_id"])
.to include(match I18n.t("validations.lettings.setup.scheme.no_completed_locations"))
end
@@ -914,7 +914,7 @@ RSpec.describe Validations::SetupValidations do
it "does not produce an error" do
record.scheme = scheme
- setup_validator.validate_scheme_has_confirmed_locations_validation(record)
+ setup_validator.validate_scheme(record)
expect(record.errors["scheme_id"])
.to be_empty
end
diff --git a/spec/models/validations/shared_validations_spec.rb b/spec/models/validations/shared_validations_spec.rb
index b4d7fb0b8..53efc6675 100644
--- a/spec/models/validations/shared_validations_spec.rb
+++ b/spec/models/validations/shared_validations_spec.rb
@@ -18,42 +18,42 @@ RSpec.describe Validations::SharedValidations do
lettings_log.age1 = "random"
shared_validator.validate_numeric_min_max(lettings_log)
expect(lettings_log.errors["age1"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120))
end
it "validates that other household member ages are a number" do
lettings_log.age2 = "random"
shared_validator.validate_numeric_min_max(lettings_log)
expect(lettings_log.errors["age2"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Person 2’s age", min: 1, max: 120))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Person 2’s age", min: 1, max: 120))
end
it "validates that person 1's age is greater than 16" do
lettings_log.age1 = 15
shared_validator.validate_numeric_min_max(lettings_log)
expect(lettings_log.errors["age1"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120))
end
it "validates that other household member ages are greater than 1" do
lettings_log.age2 = 0
shared_validator.validate_numeric_min_max(lettings_log)
expect(lettings_log.errors["age2"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Person 2’s age", min: 1, max: 120))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Person 2’s age", min: 1, max: 120))
end
it "validates that person 1's age is less than 121" do
lettings_log.age1 = 121
shared_validator.validate_numeric_min_max(lettings_log)
expect(lettings_log.errors["age1"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120))
end
it "validates that other household member ages are greater than 121" do
lettings_log.age2 = 123
shared_validator.validate_numeric_min_max(lettings_log)
expect(lettings_log.errors["age2"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Person 2’s age", min: 1, max: 120))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Person 2’s age", min: 1, max: 120))
end
it "validates that person 1's age is between 16 and 120" do
@@ -91,7 +91,7 @@ RSpec.describe Validations::SharedValidations do
sales_log.savings = -10
sales_log.jointpur = 1
shared_validator.validate_numeric_min_max(sales_log)
- expect(sales_log.errors["savings"]).to include(match I18n.t("validations.numeric.above_min", field: "Buyers’ total savings before any deposit paid", min: "£0"))
+ expect(sales_log.errors["savings"]).to include(match I18n.t("validations.shared.numeric.above_min", field: "Buyers’ total savings before any deposit paid", min: "£0"))
end
context "when validating percent" do
@@ -101,7 +101,7 @@ RSpec.describe Validations::SharedValidations do
sales_log.stairbought = 150
shared_validator.validate_numeric_min_max(sales_log)
expect(sales_log.errors["stairbought"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Percentage bought in this staircasing transaction", min: "0%", max: "100%"))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Percentage bought in this staircasing transaction", min: "0%", max: "100%"))
end
end
@@ -110,7 +110,7 @@ RSpec.describe Validations::SharedValidations do
sales_log.income1 = -5
shared_validator.validate_numeric_min_max(sales_log)
expect(sales_log.errors["income1"])
- .to include(match I18n.t("validations.numeric.within_range", field: "Buyer 1’s gross annual income", min: "£0", max: "£999,999"))
+ .to include(match I18n.t("validations.shared.numeric.within_range", field: "Buyer 1’s gross annual income", min: "£0", max: "£999,999"))
end
end
end
@@ -120,13 +120,13 @@ RSpec.describe Validations::SharedValidations do
it "adds an error if input is a decimal" do
sales_log.income1 = 30_000.5
shared_validator.validate_numeric_step(sales_log)
- expect(sales_log.errors[:income1]).to include I18n.t("validations.numeric.whole_number", field: "Buyer 1’s gross annual income")
+ expect(sales_log.errors[:income1]).to include I18n.t("validations.shared.numeric.whole_number", field: "Buyer 1’s gross annual income")
end
it "adds an error if the user attempts to input a number in exponent format" do
sales_log.income1 = "3e5"
shared_validator.validate_numeric_step(sales_log)
- expect(sales_log.errors[:income1]).to include I18n.t("validations.numeric.whole_number", field: "Buyer 1’s gross annual income")
+ expect(sales_log.errors[:income1]).to include I18n.t("validations.shared.numeric.whole_number", field: "Buyer 1’s gross annual income")
end
it "does not add an error if input is an integer" do
@@ -141,14 +141,14 @@ RSpec.describe Validations::SharedValidations do
sales_log.savings = 30_005
sales_log.jointpur = 1
shared_validator.validate_numeric_step(sales_log)
- expect(sales_log.errors[:savings]).to include I18n.t("validations.numeric.nearest_ten", field: "Buyers’ total savings before any deposit paid")
+ expect(sales_log.errors[:savings]).to include I18n.t("validations.shared.numeric.nearest_ten", field: "Buyers’ total savings before any deposit paid")
end
it "adds an error if the user attempts to input a number in exponent format" do
sales_log.savings = "3e5"
sales_log.jointpur = 1
shared_validator.validate_numeric_step(sales_log)
- expect(sales_log.errors[:savings]).to include I18n.t("validations.numeric.nearest_ten", field: "Buyers’ total savings before any deposit paid")
+ expect(sales_log.errors[:savings]).to include I18n.t("validations.shared.numeric.nearest_ten", field: "Buyers’ total savings before any deposit paid")
end
it "does not add an error if input is a multiple of ten" do
@@ -162,7 +162,7 @@ RSpec.describe Validations::SharedValidations do
it "adds an error if input has more than 2 decimal places" do
sales_log.mscharge = 30.7418
shared_validator.validate_numeric_step(sales_log)
- expect(sales_log.errors[:mscharge]).to include I18n.t("validations.numeric.nearest_hundredth", field: "Monthly leasehold charges")
+ expect(sales_log.errors[:mscharge]).to include I18n.t("validations.shared.numeric.nearest_hundredth", field: "Monthly leasehold charges")
end
it "does not add an error if the user attempts to input a number in exponent format" do
@@ -220,13 +220,13 @@ RSpec.describe Validations::SharedValidations do
it "does not allow letters" do
sales_log.income1 = "abc"
shared_validator.validate_numeric_input(sales_log)
- expect(sales_log.errors[:income1]).to include I18n.t("validations.numeric.format", field: "Buyer 1’s gross annual income")
+ expect(sales_log.errors[:income1]).to include I18n.t("validations.shared.numeric.format", field: "Buyer 1’s gross annual income")
end
it "does not allow special characters" do
sales_log.income1 = "3%5"
shared_validator.validate_numeric_input(sales_log)
- expect(sales_log.errors[:income1]).to include I18n.t("validations.numeric.format", field: "Buyer 1’s gross annual income")
+ expect(sales_log.errors[:income1]).to include I18n.t("validations.shared.numeric.format", field: "Buyer 1’s gross annual income")
end
it "allows a digit" do
@@ -244,7 +244,7 @@ RSpec.describe Validations::SharedValidations do
it "does not allow decimal point in a wrong format" do
sales_log.income1 = "300.09.78"
shared_validator.validate_numeric_input(sales_log)
- expect(sales_log.errors[:income1]).to include I18n.t("validations.numeric.format", field: "Buyer 1’s gross annual income")
+ expect(sales_log.errors[:income1]).to include I18n.t("validations.shared.numeric.format", field: "Buyer 1’s gross annual income")
end
end
end
diff --git a/spec/models/validations/tenancy_validations_spec.rb b/spec/models/validations/tenancy_validations_spec.rb
index a41752616..aa9ca8f6d 100644
--- a/spec/models/validations/tenancy_validations_spec.rb
+++ b/spec/models/validations/tenancy_validations_spec.rb
@@ -76,12 +76,12 @@ RSpec.describe Validations::TenancyValidations do
{
name: "assured shorthold",
code: 4,
- expected_error: ->(min_tenancy_length) { I18n.t("validations.tenancy.length.invalid_fixed", min_tenancy_length:) },
+ expected_error: ->(min_tenancy_length) { I18n.t("validations.lettings.tenancy.tenancylength.invalid_fixed_tenancylength", min_tenancy_length:) },
},
{
name: "secure fixed term",
code: 6,
- expected_error: ->(min_tenancy_length) { I18n.t("validations.tenancy.length.invalid_fixed", min_tenancy_length:) },
+ expected_error: ->(min_tenancy_length) { I18n.t("validations.lettings.tenancy.tenancylength.invalid_fixed_tenancylength", min_tenancy_length:) },
},
]
@@ -211,7 +211,7 @@ RSpec.describe Validations::TenancyValidations do
periodic_tenancy_case = {
name: "periodic",
code: 8,
- expected_error: ->(min_tenancy_length) { I18n.t("validations.tenancy.length.invalid_periodic", min_tenancy_length:) },
+ expected_error: ->(min_tenancy_length) { I18n.t("validations.lettings.tenancy.tenancylength.invalid_periodic_tenancylength", min_tenancy_length:) },
}
error_fields = %w[tenancylength tenancy]
include_examples "adds expected errors based on the tenancy length", periodic_tenancy_case, error_fields, 1
@@ -237,9 +237,8 @@ RSpec.describe Validations::TenancyValidations do
it "adds errors to tenancylength and tenancy" do
tenancy_validator.validate_tenancy_length_blank_when_not_required(record)
- expected_error = I18n.t("validations.tenancy.length.fixed_term_not_required")
- expect(record.errors["tenancylength"]).to include(expected_error)
- expect(record.errors["tenancy"]).to include(expected_error)
+ expect(record.errors["tenancylength"]).to include(I18n.t("validations.lettings.tenancy.tenancylength.fixed_term_not_required"))
+ expect(record.errors["tenancy"]).to include(I18n.t("validations.lettings.tenancy.tenancy.fixed_term_not_required"))
end
end
@@ -277,7 +276,7 @@ RSpec.describe Validations::TenancyValidations do
describe "tenancy type validations" do
let(:record) { FactoryBot.build(:lettings_log, :setup_completed) }
- let(:field) { "validations.other_field_missing" }
+ let(:field) { "validations.shared.other_field_missing" }
let(:main_field_label) { "tenancy type" }
let(:other_field) { "tenancyother" }
let(:other_field_label) { "other tenancy type" }
@@ -300,7 +299,7 @@ RSpec.describe Validations::TenancyValidations do
end
context "when tenancy type is not other" do
- let(:field) { "validations.other_field_not_required" }
+ let(:field) { "validations.shared.other_field_not_required" }
it "validates that other tenancy type is not provided" do
record.tenancy = 2
@@ -321,8 +320,8 @@ RSpec.describe Validations::TenancyValidations do
describe "joint tenancy validation" do
context "when the data inputter has said that there is only one member in the household" do
let(:record) { FactoryBot.build(:lettings_log, :setup_completed, hhmemb: 1) }
- let(:expected_error) { I18n.t("validations.tenancy.not_joint") }
- let(:hhmemb_expected_error) { I18n.t("validations.tenancy.joint_more_than_one_member") }
+ let(:expected_error) { I18n.t("validations.lettings.tenancy.joint.sole_tenancy") }
+ let(:hhmemb_expected_error) { I18n.t("validations.lettings.tenancy.joint.multiple_members_required") }
it "displays an error if the data inputter says the letting is a joint tenancy" do
record.joint = 1
diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb
index 308b90c1e..3d2c27400 100644
--- a/spec/requests/lettings_logs_controller_spec.rb
+++ b/spec/requests/lettings_logs_controller_spec.rb
@@ -82,7 +82,7 @@ RSpec.describe LettingsLogsController, type: :request do
it "validates lettings log parameters" do
json_response = JSON.parse(response.body)
expect(response).to have_http_status(:unprocessable_entity)
- expect(json_response["errors"]).to match_array([["offered", [I18n.t("validations.numeric.within_range", field: "Times previously offered since becoming available", min: 0, max: 20)]], ["age1", [I18n.t("validations.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120)]]])
+ expect(json_response["errors"]).to match_array([["offered", [I18n.t("validations.shared.numeric.within_range", field: "Times previously offered since becoming available", min: 0, max: 20)]], ["age1", [I18n.t("validations.shared.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120)]]])
end
end
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index a7d7684f0..6de8e7d33 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -180,7 +180,7 @@ RSpec.describe LocationsController, type: :request do
context "when signed in as a data coordinator user" do
let(:user) { create(:user, :data_coordinator) }
- let(:scheme) { create(:scheme, owning_organisation: user.organisation, service_name: "Some name") }
+ let(:scheme) { create(:scheme, owning_organisation: user.organisation) }
let!(:locations) { create_list(:location, 3, scheme:, startdate: Time.zone.local(2022, 4, 1)) }
before do
@@ -215,7 +215,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has correct title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page).to have_title(expected_title)
end
@@ -232,7 +232,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has correct page 1 of 2 title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page).to have_title(expected_title)
end
@@ -254,7 +254,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has correct page 2 of 2 title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page).to have_title(expected_title)
end
@@ -287,7 +287,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has search in the title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} (1 location matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} (1 location matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page.title).to eq(expected_title)
end
end
@@ -343,7 +343,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has correct title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page).to have_title(expected_title)
end
@@ -360,7 +360,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has correct page 1 of 2 title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page).to have_title(expected_title)
end
@@ -382,7 +382,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has correct page 1 of 2 title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page).to have_title(expected_title)
end
@@ -415,7 +415,7 @@ RSpec.describe LocationsController, type: :request do
end
it "has search in the title" do
- expected_title = CGI.escapeHTML("#{scheme.service_name} (1 location matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
+ expected_title = CGI.unescapeHTML("#{scheme.service_name} (1 location matching ‘#{search_param}’) - Submit social housing lettings and sales data (CORE) - GOV.UK")
expect(page).to have_title(expected_title)
end
end
diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
index 314db674d..591ffdd53 100644
--- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
@@ -263,7 +263,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error to all (and only) the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -300,7 +300,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -338,7 +338,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -385,7 +385,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -444,7 +444,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "does not add an error to all the fields used to determine duplicates" do
parser_too.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -479,7 +479,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -526,7 +526,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -585,7 +585,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "does not add an error to all the fields used to determine duplicates" do
parser_too.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2023.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -686,7 +686,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "cannot be nulled" do
parser.valid?
- expect(parser.errors[:field_45]).to eq(["You must show the MHCLG privacy notice to the tenant before you can submit this log."])
+ expect(parser.errors[:field_45]).to eq([I18n.t("validations.lettings.2023.bulk_upload.declaration.missing")])
end
end
end
@@ -697,8 +697,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "fetches the question's check_answer_label if it exists" do
parser.valid?
- expect(parser.errors[:field_19]).to eql(["You must answer address line 1."])
- expect(parser.errors[:field_21]).to eql(["You must answer town or city."])
+ expect(parser.errors[:field_19]).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "address line 1.")])
+ expect(parser.errors[:field_21]).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "town or city.")])
end
end
end
@@ -846,7 +846,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_5]).to be_present
- expect(parser.errors[:field_11]).to eq(["You must answer intermediate rent type."])
+ expect(parser.errors[:field_11]).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "intermediate rent type.")])
end
end
@@ -857,7 +857,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_5]).to be_present
- expect(parser.errors[:field_11]).to eq(["You must answer intermediate rent type."])
+ expect(parser.errors[:field_11]).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "intermediate rent type.")])
end
end
@@ -868,7 +868,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_5]).to be_present
- expect(parser.errors[:field_10]).to eq(["You must answer is this a London Affordable Rent letting."])
+ expect(parser.errors[:field_10]).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "is this a London Affordable Rent letting.")])
end
end
@@ -879,7 +879,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_5]).to be_present
- expect(parser.errors[:field_10]).to eq(["You must answer is this a London Affordable Rent letting."])
+ expect(parser.errors[:field_10]).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "is this a London Affordable Rent letting.")])
end
end
@@ -888,7 +888,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds error on field_12" do
parser.valid?
- expect(parser.errors[:field_12]).to eq(["You must answer product name."])
+ expect(parser.errors[:field_12]).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "product name.")])
end
end
@@ -910,8 +910,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "is not permitted" do
parser.valid?
- expect(parser.errors[:field_4]).to include("This letting type is supported housing, but the needs type is general needs. Change either the needs type or the letting type.")
- expect(parser.errors[:field_5]).to include("This needs type is general needs, but the letting type is supported housing. Change either the needs type or the letting type.")
+ expect(parser.errors[:field_4]).to include(I18n.t("validations.lettings.2023.bulk_upload.needstype.lettype_not_general_needs"))
+ expect(parser.errors[:field_5]).to include(I18n.t("validations.lettings.2023.bulk_upload.lettype.needstype_general_needs"))
end
end
end
@@ -925,8 +925,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "is not permitted" do
parser.valid?
- expect(parser.errors[:field_4]).to include("This letting type is general needs, but the needs type is supported housing. Change either the needs type or the letting type.")
- expect(parser.errors[:field_5]).to include("This needs type is supported housing, but the letting type is general needs. Change either the needs type or the letting type.")
+ expect(parser.errors[:field_4]).to include(I18n.t("validations.lettings.2023.bulk_upload.needstype.lettype_not_supported_housing"))
+ expect(parser.errors[:field_5]).to include(I18n.t("validations.lettings.2023.bulk_upload.lettype.needstype_supported_housing"))
end
end
@@ -951,7 +951,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_15]).to be_blank
- expect(parser.errors[:field_16]).to eq(["You must answer scheme code."])
+ expect(parser.errors[:field_16]).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "scheme code.")])
expect(parser.errors[:field_17]).to be_blank
end
end
@@ -979,7 +979,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_15]).to be_blank
- expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["This scheme code does not belong to the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.does_not_belong_to_org", scheme_or_management_group: "scheme")])
expect(parser.errors[:field_17]).to be_blank
end
end
@@ -992,7 +992,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
expect(parser.errors[:field_15]).to be_blank
expect(parser.errors[:field_16]).to be_blank
- expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq(["You must answer location code."])
+ expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "location code.")])
expect(parser.errors[:field_17].count).to eq(1)
end
end
@@ -1005,7 +1005,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
expect(parser.errors[:field_16]).to be_blank
expect(parser.errors[:field_17]).to be_blank
- expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq(["You must answer management group code."])
+ expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "management group code.")])
expect(parser.errors[:field_15].count).to eq(1)
end
end
@@ -1018,7 +1018,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
expect(parser.errors[:field_15]).to be_blank
expect(parser.errors[:field_16]).to be_blank
- expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq(["Location code must relate to a location that is owned by the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.must_relate_to_org", capitalised_location_or_scheme: "Location", location_or_scheme: "location")])
end
end
@@ -1054,7 +1054,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
expect(parser.errors[:field_15]).to be_blank
expect(parser.errors[:field_16]).to be_blank
- expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq(["Location code must relate to a location that is owned by the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_17, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.must_relate_to_org", capitalised_location_or_scheme: "Location", location_or_scheme: "location")])
end
end
@@ -1067,7 +1067,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_15]).to be_blank
- expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["This scheme code does not belong to the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.does_not_belong_to_org", scheme_or_management_group: "scheme")])
expect(parser.errors[:field_17]).to be_blank
end
end
@@ -1093,7 +1093,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_15]).to be_blank
- expect(parser.errors[:field_16]).to include("You must answer scheme name.")
+ expect(parser.errors[:field_16]).to include(I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "scheme name."))
expect(parser.errors[:field_17]).to be_blank
end
end
@@ -1122,7 +1122,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "returns a setup error" do
parser.valid?
- expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq(["This management group code does not belong to the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.does_not_belong_to_org", scheme_or_management_group: "management group")])
expect(parser.errors[:field_16]).to be_blank
expect(parser.errors[:field_17]).to be_blank
end
@@ -1135,7 +1135,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_15]).to be_blank
- expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["You must answer scheme code."])
+ expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "scheme code.")])
expect(parser.errors[:field_17]).to be_blank
end
end
@@ -1147,7 +1147,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_15]).to be_blank
- expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["Scheme code must relate to a scheme that is owned by the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.must_relate_to_org", capitalised_location_or_scheme: "Scheme", location_or_scheme: "scheme")])
expect(parser.errors[:field_17]).to be_blank
end
end
@@ -1173,7 +1173,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
expect(parser.errors[:field_15]).to be_blank
- expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq(["Scheme code must relate to a scheme that is owned by the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_16, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.must_relate_to_org", capitalised_location_or_scheme: "Scheme", location_or_scheme: "scheme")])
expect(parser.errors[:field_17]).to be_blank
end
end
@@ -1186,7 +1186,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "returns a setup error" do
parser.valid?
- expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq(["This management group code does not belong to the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_15, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2023.bulk_upload.scheme.does_not_belong_to_org", scheme_or_management_group: "management group")])
expect(parser.errors[:field_16]).to be_blank
expect(parser.errors[:field_17]).to be_blank
end
@@ -1212,7 +1212,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "clears the scheme answer" do
parser.valid?
- expect(parser.errors[:field_15]).to include("You must answer scheme name.")
+ expect(parser.errors[:field_15]).to include(I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "scheme name."))
expect(parser.errors[:field_16]).to be_blank
expect(parser.errors[:field_17]).to be_blank
end
@@ -1255,7 +1255,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "returns an error" do
parser.valid?
- expect(parser.errors[:field_102]).to include("Enter a valid value for what is the tenant’s main reason for the household leaving their last settled home?")
+ expect(parser.errors[:field_102]).to include(I18n.t("validations.lettings.2023.bulk_upload.invalid_option", question: "what is the tenant’s main reason for the household leaving their last settled home?"))
end
end
end
@@ -1490,7 +1490,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "returns an error" do
parser.valid?
- expect(parser.errors[:field_9]).to include("Tenancy start year must be 2 or 4 digits.")
+ expect(parser.errors[:field_9]).to include(I18n.t("validations.lettings.2023.bulk_upload.startdate.year_not_two_or_four_digits"))
end
end
@@ -1537,7 +1537,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "is not permitted as setup error" do
parser.valid?
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You must answer owning organisation."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "owning organisation.")])
end
it "blocks log creation" do
@@ -1553,7 +1553,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code is incorrect.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.lettings.2023.bulk_upload.owning_organisation.not_found"))
end
it "blocks log creation" do
@@ -1571,7 +1571,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code provided is for an organisation that does not own stock.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.lettings.2023.bulk_upload.owning_organisation.not_stock_owner"))
end
it "blocks log creation" do
@@ -1589,7 +1589,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("You do not have permission to add logs for this owning organisation.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.lettings.2023.bulk_upload.owning_organisation.not_permitted"))
end
it "blocks log creation" do
@@ -1652,7 +1652,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("The managing organisation code is incorrect.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.lettings.2023.bulk_upload.managing_organisation.not_answered"))
end
it "blocks log creation" do
@@ -1668,7 +1668,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("The managing organisation code is incorrect.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.lettings.2023.bulk_upload.managing_organisation.not_found"))
end
it "blocks log creation" do
@@ -1686,7 +1686,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("This managing organisation does not have a relationship with the owning organisation.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.lettings.2023.bulk_upload.managing_organisation.no_relationship"))
end
it "blocks log creation" do
@@ -1702,7 +1702,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "is reported as a setup error" do
parser.valid?
- expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql(["You must answer needs type."])
+ expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "needs type.")])
end
end
end
@@ -1713,7 +1713,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "has setup errors on the field" do
parser.valid?
- expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eql(["You must answer property renewal."])
+ expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "property renewal.")])
end
end
@@ -1722,7 +1722,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds a setup error" do
parser.valid?
- expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to include("Enter a valid value for is this letting a renewal?")
+ expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to include(I18n.t("validations.lettings.2023.bulk_upload.invalid_option", question: "is this letting a renewal?"))
end
end
end
@@ -1743,9 +1743,9 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds appropriate errors" do
parser.valid?
- expect(parser.errors[:field_18]).to eql(["You must answer UPRN."])
- expect(parser.errors[:field_19]).to eql(["You must answer address line 1."])
- expect(parser.errors[:field_21]).to eql(["You must answer town or city."])
+ expect(parser.errors[:field_18]).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "UPRN.")])
+ expect(parser.errors[:field_19]).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "address line 1.")])
+ expect(parser.errors[:field_21]).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "town or city.")])
end
end
@@ -1821,7 +1821,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "populates with correct error message" do
parser.valid?
- expect(parser.errors[:field_30]).to eql(["You must answer type of building."])
+ expect(parser.errors[:field_30]).to eql([I18n.t("validations.lettings.2023.bulk_upload.not_answered", question: "type of building.")])
end
end
end
@@ -1851,8 +1851,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "populates with correct error message" do
parser.valid?
- expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
- expect(parser.errors.where(:field_50, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
+ expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
+ expect(parser.errors.where(:field_50, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
end
end
@@ -2170,7 +2170,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error" do
parser.valid?
- expect(parser.errors[:field_116]).to include("Enter a valid value for was the letting made under the Choice-Based Lettings (CBL)?")
+ expect(parser.errors[:field_116]).to include(I18n.t("validations.lettings.2023.bulk_upload.invalid_option", question: "was the letting made under the Choice-Based Lettings (CBL)?"))
end
end
end
@@ -2197,7 +2197,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error" do
parser.valid?
- expect(parser.errors[:field_118]).to include("Enter a valid value for was the letting made under the Common Housing Register (CHR)?")
+ expect(parser.errors[:field_118]).to include(I18n.t("validations.lettings.2023.bulk_upload.invalid_option", question: "was the letting made under the Common Housing Register (CHR)?"))
end
end
end
@@ -2224,7 +2224,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "adds an error" do
parser.valid?
- expect(parser.errors[:field_117]).to include("Enter a valid value for was the letting made under the Common Allocation Policy (CAP)?")
+ expect(parser.errors[:field_117]).to include(I18n.t("validations.lettings.2023.bulk_upload.invalid_option", question: "was the letting made under the Common Allocation Policy (CAP)?"))
end
end
end
@@ -2736,8 +2736,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "sets error on housingneeds a and b" do
parser.valid?
- expect(parser.errors[:field_83]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
- expect(parser.errors[:field_84]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
+ expect(parser.errors[:field_83]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds_type.only_one_option_permitted"))
+ expect(parser.errors[:field_84]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds_type.only_one_option_permitted"))
expect(parser.errors[:field_85]).to be_blank
end
end
@@ -2747,8 +2747,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "sets error on housingneeds a and c" do
parser.valid?
- expect(parser.errors[:field_83]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
- expect(parser.errors[:field_85]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
+ expect(parser.errors[:field_83]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds_type.only_one_option_permitted"))
+ expect(parser.errors[:field_85]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds_type.only_one_option_permitted"))
expect(parser.errors[:field_84]).to be_blank
end
end
@@ -2758,8 +2758,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "sets error on housingneeds b and c" do
parser.valid?
- expect(parser.errors[:field_84]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
- expect(parser.errors[:field_85]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
+ expect(parser.errors[:field_84]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds_type.only_one_option_permitted"))
+ expect(parser.errors[:field_85]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds_type.only_one_option_permitted"))
expect(parser.errors[:field_83]).to be_blank
end
end
@@ -2769,8 +2769,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "sets error on housingneeds a and g" do
parser.valid?
- expect(parser.errors[:field_87]).to include("No disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
- expect(parser.errors[:field_83]).to include("No disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
+ expect(parser.errors[:field_87]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds.no_disabled_needs_conjunction"))
+ expect(parser.errors[:field_83]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds.no_disabled_needs_conjunction"))
expect(parser.errors[:field_84]).to be_blank
expect(parser.errors[:field_85]).to be_blank
end
@@ -2793,8 +2793,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "sets error on housingneeds a and h" do
parser.valid?
- expect(parser.errors[:field_88]).to include("Don’t know disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
- expect(parser.errors[:field_83]).to include("Don’t know disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
+ expect(parser.errors[:field_88]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds.dont_know_disabled_needs_conjunction"))
+ expect(parser.errors[:field_83]).to include(I18n.t("validations.lettings.2023.bulk_upload.housingneeds.dont_know_disabled_needs_conjunction"))
expect(parser.errors[:field_84]).to be_blank
expect(parser.errors[:field_85]).to be_blank
end
diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
index d82effa0b..e9047b2ae 100644
--- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
@@ -283,7 +283,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all (and only) the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -339,7 +339,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -381,7 +381,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -432,7 +432,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -492,7 +492,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "does not add an error to all the fields used to determine duplicates" do
parser_too.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -527,7 +527,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -574,7 +574,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -634,7 +634,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "does not add an error to all the fields used to determine duplicates" do
parser_too.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.lettings.2024.bulk_upload.duplicate")
[
:field_1, # owning_organisation
@@ -770,7 +770,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "fetches the question's check_answer_label if it exists" do
parser.valid?
- expect(parser.errors[:field_43]).to eql(["You must answer lead tenant’s gender identity."])
+ expect(parser.errors[:field_43]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "lead tenant’s gender identity.")])
end
end
@@ -779,7 +779,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "only has one error added to the field" do
parser.valid?
- expect(parser.errors[:field_112]).to eql(["You must answer was the letting made under the Choice-Based Lettings (CBL)?"])
+ expect(parser.errors[:field_112]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "was the letting made under the Choice-Based Lettings (CBL)?")])
end
end
@@ -789,7 +789,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "does not add an additional error" do
parser.valid?
expect(parser.errors[:field_116].length).to eq(1)
- expect(parser.errors[:field_116]).to include(match "Enter a valid value for")
+ expect(parser.errors[:field_116]).to include(match I18n.t("validations.lettings.2024.bulk_upload.invalid_option", question: ""))
end
end
end
@@ -833,7 +833,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "is not permitted" do
parser.valid?
expect(parser.errors[:field_3]).to be_present
- expect(parser.errors[:field_3]).to include("You must answer what is the CORE username of the account this letting log should be assigned to?")
+ expect(parser.errors[:field_3]).to include(I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "what is the CORE username of the account this letting log should be assigned to?"))
end
it "blocks log creation" do
@@ -915,8 +915,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "cannot be nulled" do
parser.valid?
- expect(parser.errors[:field_5]).to eq(["You must answer scheme code."])
- expect(parser.errors[:field_6]).to eq(["You must answer location code."])
+ expect(parser.errors[:field_5]).to eq([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "scheme code.")])
+ expect(parser.errors[:field_6]).to eq([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "location code.")])
end
end
@@ -942,7 +942,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_11: "2", field_5: "S123", field_6: location.id } }
it "returns a setup error" do
- expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to eq(["This scheme code does not belong to the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2024.bulk_upload.scheme.must_relate_to_org")])
expect(parser.errors[:field_6]).to be_blank
end
end
@@ -952,7 +952,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "returns a setup error" do
expect(parser.errors[:field_5]).to be_blank
- expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eq(["You must answer location code."])
+ expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "location code.")])
expect(parser.errors[:field_6].count).to eq(1)
end
end
@@ -962,7 +962,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "returns a setup error" do
expect(parser.errors[:field_5]).to be_blank
- expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eq(["Location code must relate to a location that is owned by the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2024.bulk_upload.location.must_relate_to_org")])
end
end
@@ -991,7 +991,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "returns a setup error" do
expect(parser.errors[:field_5]).to be_blank
- expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eq(["Location code must relate to a location that is owned by the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2024.bulk_upload.location.must_relate_to_org")])
end
end
@@ -1001,7 +1001,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
let(:attributes) { { bulk_upload:, field_4: "2", field_11: "2", field_5: "S#{other_scheme.id}", field_6: other_location.id, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id } }
it "returns a setup error" do
- expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to eq(["This scheme code does not belong to the owning organisation or managing organisation."])
+ expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to eq([I18n.t("validations.lettings.2024.bulk_upload.scheme.must_relate_to_org")])
expect(parser.errors[:field_6]).to be_blank
end
end
@@ -1081,7 +1081,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "is not permitted" do
parser.valid?
- expect(parser.errors[:field_98]).to include('The reason for leaving must be "End of social or private sector tenancy - no fault", "End of social or private sector tenancy - evicted due to anti-social behaviour (ASB)", "End of social or private sector tenancy - evicted due to rent arrears" or "End of social or private sector tenancy - evicted for any other reason".')
+ expect(parser.errors[:field_98]).to include(I18n.t("validations.lettings.2024.bulk_upload.reason.renewal_reason_needed"))
end
end
end
@@ -1091,7 +1091,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "returns an error" do
parser.valid?
- expect(parser.errors[:field_98]).to include("Enter a valid value for what is the tenant’s main reason for the household leaving their last settled home?")
+ expect(parser.errors[:field_98]).to include(I18n.t("validations.lettings.2024.bulk_upload.invalid_option", question: "what is the tenant’s main reason for the household leaving their last settled home?"))
end
end
end
@@ -1317,7 +1317,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "returns an error" do
parser.valid?
- expect(parser.errors[:field_10]).to include("Tenancy start year must be 2 or 4 digits.")
+ expect(parser.errors[:field_10]).to include(I18n.t("validations.lettings.2024.bulk_upload.startdate.year_not_two_or_four_digits"))
end
end
@@ -1368,7 +1368,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "is not permitted as setup error" do
parser.valid?
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You must answer owning organisation."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "owning organisation.")])
end
it "blocks log creation" do
@@ -1385,7 +1385,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code is incorrect.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.lettings.2024.bulk_upload.owning_organisation.not_found"))
end
it "blocks log creation" do
@@ -1404,7 +1404,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code provided is for an organisation that does not own stock.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.lettings.2024.bulk_upload.owning_organisation.not_stock_owner"))
end
it "blocks log creation" do
@@ -1423,7 +1423,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("You do not have permission to add logs for this owning organisation.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.lettings.2024.bulk_upload.owning_organisation.not_permitted.not_support"))
end
it "blocks log creation" do
@@ -1492,7 +1492,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
parser = described_class.new(attributes)
parser.valid?
expect(parser).to be_block_log_creation
- expect(parser.errors[:field_1]).to include("You do not have permission to add logs for this owning organisation.")
+ expect(parser.errors[:field_1]).to include(I18n.t("validations.lettings.2024.bulk_upload.owning_organisation.not_permitted.not_support"))
end
end
@@ -1510,7 +1510,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "does not block log creation and does not add an error to field_1" do
parser = described_class.new(attributes)
parser.valid?
- expect(parser.errors[:field_1]).not_to include("You do not have permission to add logs for this owning organisation.")
+ expect(parser.errors[:field_1]).not_to include(I18n.t("validations.lettings.2024.bulk_upload.owning_organisation.not_permitted"))
end
end
end
@@ -1524,7 +1524,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("You must answer managing organisation.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "managing organisation."))
end
it "blocks log creation" do
@@ -1541,7 +1541,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("The managing organisation code is incorrect.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.lettings.2024.bulk_upload.managing_organisation.not_found"))
end
it "blocks log creation" do
@@ -1560,7 +1560,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("This managing organisation does not have a relationship with the owning organisation.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.lettings.2024.bulk_upload.managing_organisation.no_relationship"))
end
it "blocks log creation" do
@@ -1576,7 +1576,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "is reported as a setup error" do
parser.valid?
- expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql(["You must answer needs type."])
+ expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "needs type.")])
end
end
end
@@ -1587,7 +1587,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "has setup errors on the field" do
parser.valid?
- expect(parser.errors.where(:field_7, category: :setup).map(&:message)).to eql(["You must answer property renewal."])
+ expect(parser.errors.where(:field_7, category: :setup).map(&:message)).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "property renewal.")])
end
end
@@ -1596,7 +1596,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds a setup error" do
parser.valid?
- expect(parser.errors.where(:field_7, category: :setup).map(&:message)).to include("Enter a valid value for is this letting a renewal?")
+ expect(parser.errors.where(:field_7, category: :setup).map(&:message)).to include(I18n.t("validations.lettings.2024.bulk_upload.invalid_option", question: "is this letting a renewal?"))
end
end
end
@@ -1627,10 +1627,10 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds errors to missing key address fields" do
parser.valid?
- expect(parser.errors[:field_17]).to eql(["You must answer address line 1."])
- expect(parser.errors[:field_19]).to eql(["You must answer town or city."])
- expect(parser.errors[:field_21]).to eql(["You must answer part 1 of postcode."])
- expect(parser.errors[:field_22]).to eql(["You must answer part 2 of postcode."])
+ expect(parser.errors[:field_17]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "address line 1.")])
+ expect(parser.errors[:field_19]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "town or city.")])
+ expect(parser.errors[:field_21]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "part 1 of postcode.")])
+ expect(parser.errors[:field_22]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "part 2 of postcode.")])
end
end
@@ -1658,11 +1658,11 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds appropriate errors to UPRN and key address fields" do
parser.valid?
- expect(parser.errors[:field_16]).to eql(["You must answer UPRN."])
- expect(parser.errors[:field_17]).to eql(["You must answer address line 1."])
- expect(parser.errors[:field_19]).to eql(["You must answer town or city."])
- expect(parser.errors[:field_21]).to eql(["You must answer part 1 of postcode."])
- expect(parser.errors[:field_22]).to eql(["You must answer part 2 of postcode."])
+ expect(parser.errors[:field_16]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "UPRN.")])
+ expect(parser.errors[:field_17]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "address line 1.")])
+ expect(parser.errors[:field_19]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "town or city.")])
+ expect(parser.errors[:field_21]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "part 1 of postcode.")])
+ expect(parser.errors[:field_22]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "part 2 of postcode.")])
end
end
@@ -1671,8 +1671,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds errors to UPRN and the missing key address field" do
parser.valid?
- expect(parser.errors[:field_16]).to eql(["You must answer UPRN."])
- expect(parser.errors[:field_17]).to eql(["You must answer address line 1."])
+ expect(parser.errors[:field_16]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "UPRN.")])
+ expect(parser.errors[:field_17]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "address line 1.")])
expect(parser.errors[:field_19]).to be_empty
expect(parser.errors[:field_21]).to be_empty
expect(parser.errors[:field_22]).to be_empty
@@ -1706,7 +1706,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
parser.valid?
expect(parser.errors[:field_16]).to be_empty
%i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
- expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+ expect(parser.errors[field]).to eql([I18n.t("validations.lettings.2024.bulk_upload.address.not_found")])
end
end
end
@@ -1721,7 +1721,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
parser.valid?
expect(parser.errors[:field_16]).to be_empty
%i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
- expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+ expect(parser.errors[field]).to eql([I18n.t("validations.lettings.2024.bulk_upload.address.not_found")])
end
end
end
@@ -1765,7 +1765,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "populates with correct error message" do
parser.valid?
- expect(parser.errors[:field_27]).to eql(["You must answer type of building."])
+ expect(parser.errors[:field_27]).to eql([I18n.t("validations.lettings.2024.bulk_upload.not_answered", question: "type of building.")])
end
end
end
@@ -1864,7 +1864,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to field_45" do
parser.valid?
- expect(parser.errors["field_45"]).to include("Select a valid nationality.")
+ expect(parser.errors["field_45"]).to include(I18n.t("validations.lettings.2024.bulk_upload.nationality.invalid"))
end
end
end
@@ -1881,8 +1881,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "populates with correct error message" do
parser.valid?
- expect(parser.errors.where(:field_42, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
- expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
+ expect(parser.errors.where(:field_42, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
+ expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
end
end
@@ -2185,7 +2185,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error" do
parser.valid?
- expect(parser.errors[:field_112]).to include("Enter a valid value for was the letting made under the Choice-Based Lettings (CBL)?")
+ expect(parser.errors[:field_112]).to include(I18n.t("validations.lettings.2024.bulk_upload.invalid_option", question: "was the letting made under the Choice-Based Lettings (CBL)?"))
end
end
end
@@ -2212,7 +2212,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error" do
parser.valid?
- expect(parser.errors[:field_114]).to include("Enter a valid value for was the letting made under the Common Housing Register (CHR)?")
+ expect(parser.errors[:field_114]).to include(I18n.t("validations.lettings.2024.bulk_upload.invalid_option", question: "was the letting made under the Common Housing Register (CHR)?"))
end
end
end
@@ -2239,7 +2239,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error" do
parser.valid?
- expect(parser.errors[:field_113]).to include("Enter a valid value for was the letting made under the Common Allocation Policy (CAP)?")
+ expect(parser.errors[:field_113]).to include(I18n.t("validations.lettings.2024.bulk_upload.invalid_option", question: "was the letting made under the Common Allocation Policy (CAP)?"))
end
end
end
@@ -2266,7 +2266,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error" do
parser.valid?
- expect(parser.errors[:field_115]).to include("Enter a valid value for was the letting made under the Accessible Register?")
+ expect(parser.errors[:field_115]).to include(I18n.t("validations.lettings.2024.bulk_upload.invalid_option", question: "was the letting made under the Accessible Register?"))
end
end
end
@@ -2603,10 +2603,10 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all missing charges" do
parser.valid?
- expect(parser.errors[:field_125]).to eql(["Please enter the basic rent. If there is no basic rent, please enter '0'."])
- expect(parser.errors[:field_126]).to eql(["Please enter the service charge. If there is no service charge, please enter '0'."])
- expect(parser.errors[:field_127]).to eql(["Please enter the personal service charge. If there is no personal service charge, please enter '0'."])
- expect(parser.errors[:field_128]).to eql(["Please enter the basic rent. If there is no basic rent, please enter '0'.", "Please enter the service charge. If there is no service charge, please enter '0'.", "Please enter the personal service charge. If there is no personal service charge, please enter '0'."])
+ expect(parser.errors[:field_125]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "basic rent")])
+ expect(parser.errors[:field_126]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "service charge")])
+ expect(parser.errors[:field_127]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "personal service charge")])
+ expect(parser.errors[:field_128]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "basic rent"), I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "service charge"), I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "personal service charge")])
end
end
end
@@ -2627,10 +2627,10 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "adds an error to all charges" do
parser.valid?
- expect(parser.errors[:field_125]).to eql(["Please enter the support charge. If there is no support charge, please enter '0'."])
- expect(parser.errors[:field_126]).to eql(["Please enter the support charge. If there is no support charge, please enter '0'."])
- expect(parser.errors[:field_127]).to eql(["Please enter the support charge. If there is no support charge, please enter '0'."])
- expect(parser.errors[:field_128]).to eql(["Please enter the support charge. If there is no support charge, please enter '0'."])
+ expect(parser.errors[:field_125]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "support charge")])
+ expect(parser.errors[:field_126]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "support charge")])
+ expect(parser.errors[:field_127]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "support charge")])
+ expect(parser.errors[:field_128]).to eql([I18n.t("validations.lettings.2024.bulk_upload.charges.missing_charges", sentence_fragment: "support charge")])
end
end
end
@@ -2857,8 +2857,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "sets error on housingneeds a and b" do
parser.valid?
- expect(parser.errors[:field_79]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
- expect(parser.errors[:field_80]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
+ expect(parser.errors[:field_79]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds_type.only_one_option_permitted"))
+ expect(parser.errors[:field_80]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds_type.only_one_option_permitted"))
expect(parser.errors[:field_81]).to be_blank
end
end
@@ -2868,8 +2868,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "sets error on housingneeds a and c" do
parser.valid?
- expect(parser.errors[:field_79]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
- expect(parser.errors[:field_81]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
+ expect(parser.errors[:field_79]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds_type.only_one_option_permitted"))
+ expect(parser.errors[:field_81]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds_type.only_one_option_permitted"))
expect(parser.errors[:field_80]).to be_blank
end
end
@@ -2879,8 +2879,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "sets error on housingneeds b and c" do
parser.valid?
- expect(parser.errors[:field_80]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
- expect(parser.errors[:field_81]).to include("Only one disabled access need: fully wheelchair-accessible housing, wheelchair access to essential rooms or level access housing, can be selected.")
+ expect(parser.errors[:field_80]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds_type.only_one_option_permitted"))
+ expect(parser.errors[:field_81]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds_type.only_one_option_permitted"))
expect(parser.errors[:field_79]).to be_blank
end
end
@@ -2890,8 +2890,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "sets error on housingneeds a and g" do
parser.valid?
- expect(parser.errors[:field_83]).to include("No disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
- expect(parser.errors[:field_79]).to include("No disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
+ expect(parser.errors[:field_83]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds.no_disabled_needs_conjunction"))
+ expect(parser.errors[:field_79]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds.no_disabled_needs_conjunction"))
expect(parser.errors[:field_80]).to be_blank
expect(parser.errors[:field_81]).to be_blank
end
@@ -2914,8 +2914,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "sets error on housingneeds a and h" do
parser.valid?
- expect(parser.errors[:field_84]).to include("Don’t know disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
- expect(parser.errors[:field_79]).to include("Don’t know disabled access needs can’t be selected if you have selected fully wheelchair-accessible housing, wheelchair access to essential rooms, level access housing or other disabled access needs.")
+ expect(parser.errors[:field_84]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds.dont_know_disabled_needs_conjunction"))
+ expect(parser.errors[:field_79]).to include(I18n.t("validations.lettings.2024.bulk_upload.housingneeds.dont_know_disabled_needs_conjunction"))
expect(parser.errors[:field_80]).to be_blank
expect(parser.errors[:field_81]).to be_blank
end
diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb
index d196126c9..c275ce681 100644
--- a/spec/services/bulk_upload/sales/validator_spec.rb
+++ b/spec/services/bulk_upload/sales/validator_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe BulkUpload::Sales::Validator do
context "when file is empty" do
it "is not valid" do
expect(validator).not_to be_valid
- expect(validator.errors["base"]).to eql(["Template is blank - The template must be filled in for us to create the logs and check if data is correct."])
+ expect(validator.errors["base"]).to eql([I18n.t("validations.sales.2024.bulk_upload.blank_file")])
end
end
@@ -27,7 +27,7 @@ RSpec.describe BulkUpload::Sales::Validator do
it "is not valid" do
expect(validator).not_to be_valid
- expect(validator.errors["base"]).to eql(["Template is blank - The template must be filled in for us to create the logs and check if data is correct."])
+ expect(validator.errors["base"]).to eql([I18n.t("validations.sales.2024.bulk_upload.blank_file")])
end
end
@@ -54,7 +54,7 @@ RSpec.describe BulkUpload::Sales::Validator do
it "is not valid" do
expect(validator).not_to be_valid
- expect(validator.errors["base"]).to eql(["Incorrect sale dates, please ensure you have used the correct template."])
+ expect(validator.errors["base"]).to eql([I18n.t("validations.sales.2024.bulk_upload.wrong_template.wrong_template")])
end
end
diff --git a/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb
index 70bd923e6..2994a418e 100644
--- a/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb
@@ -406,7 +406,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
let(:attributes) { setup_section_params.merge(field_1: nil) }
it "is not permitted as setup error" do
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You must answer owning organisation."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2023.bulk_upload.not_answered", question: "owning organisation.")])
end
it "blocks log creation" do
@@ -418,7 +418,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
let(:attributes) { { bulk_upload:, field_1: "donotexist" } }
it "is not permitted as a setup error" do
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You must answer owning organisation."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2023.bulk_upload.not_answered", question: "owning organisation.")])
end
it "blocks log creation" do
@@ -432,7 +432,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
let(:attributes) { { bulk_upload:, field_1: unaffiliated_org.old_visible_id } }
it "is not permitted as setup error" do
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You do not have permission to add logs for this owning organisation."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2023.bulk_upload.owning_organisation.not_permitted")])
end
it "blocks log creation" do
@@ -608,7 +608,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
it "returns a setup error" do
parser.valid?
- expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to include("Sale completion year must be 2 or 4 digits.")
+ expect(parser.errors.where(:field_5, category: :setup).map(&:message)).to include(I18n.t("validations.sales.2023.bulk_upload.saledate.year_not_two_or_four_digits"))
end
end
@@ -672,7 +672,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
it "adds an error to all (and only) the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.sales.2023.bulk_upload.duplicate")
[
:field_1, # Owning org
@@ -932,7 +932,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
it "does not set ##{age}" do
parser.valid?
- expect(parser.errors[field.to_sym]).to include(/You must answer/)
+ expect(parser.errors[field.to_sym]).to include(/#{I18n.t("validations.sales.2023.bulk_upload.not_answered", question: "")}/)
end
end
end
@@ -980,7 +980,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
let(:attributes) { valid_attributes.merge({ field_35: "9" }) }
it "a custom validation is applied" do
- validation_message = "Buyer 1 cannot be a child under 16."
+ validation_message = I18n.t("validations.sales.2023.bulk_upload.ecstat1.child_under_16")
expect(parser.errors[:field_35]).to include validation_message
end
end
@@ -1052,7 +1052,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
let(:attributes) { setup_section_params.merge(field_105: "4") }
it "returns correct errors" do
- expect(parser.errors[:field_105]).to include("Enter a valid value for was a mortgage used for the purchase of this property? - Shared ownership.")
+ expect(parser.errors[:field_105]).to include(I18n.t("validations.sales.2023.bulk_upload.invalid_option", question: "was a mortgage used for the purchase of this property? - Shared ownership."))
parser.log.blank_invalid_non_setup_fields!
parser.log.save!
expect(parser.log.mortgageused).to be_nil
@@ -1420,7 +1420,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("This user belongs to an organisation that does not have a relationship with the owning organisation.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.sales.2023.bulk_upload.assigned_to.managing_organisation_not_related"))
end
it "blocks log creation" do
@@ -1442,7 +1442,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code provided is for an organisation that does not own stock.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.sales.2023.bulk_upload.owning_organisation.not_stock_owner"))
end
it "blocks log creation" do
diff --git a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
index 02b9aaed6..e4e2eb6f5 100644
--- a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
@@ -301,7 +301,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "fetches the question's check_answer_label if it exists" do
parser.valid?
- expect(parser.errors[:field_32]).to eql(["You must answer buyer 1’s gender identity."])
+ expect(parser.errors[:field_32]).to eql([I18n.t("validations.not_answered", question: "buyer 1’s gender identity.")])
end
end
@@ -310,7 +310,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "only has one error added to the field" do
parser.valid?
- expect(parser.errors[:field_23]).to eql(["You must answer address line 1."])
+ expect(parser.errors[:field_23]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "address line 1.")])
end
end
@@ -320,7 +320,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "does not add an additional error" do
parser.valid?
expect(parser.errors[:field_35].length).to eq(1)
- expect(parser.errors[:field_35]).to include(match "Enter a valid value for")
+ expect(parser.errors[:field_35]).to include(match I18n.t("validations.sales.2024.bulk_upload.invalid_option", question: ""))
end
end
end
@@ -463,7 +463,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "is not permitted as setup error" do
parser.valid?
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You must answer owning organisation."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "owning organisation.")])
end
it "blocks log creation" do
@@ -477,7 +477,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "is not permitted as a setup error" do
parser.valid?
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["The owning organisation code is incorrect."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2024.bulk_upload.owning_organisation.not_found")])
end
it "blocks log creation" do
@@ -493,7 +493,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "is not permitted as setup error" do
parser.valid?
- expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql(["You do not have permission to add logs for this owning organisation."])
+ expect(parser.errors.where(:field_1, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2024.bulk_upload.owning_organisation.not_permitted.not_support")])
end
it "blocks log creation" do
@@ -580,7 +580,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser = described_class.new(attributes)
parser.valid?
expect(parser).to be_block_log_creation
- expect(parser.errors[:field_1]).to include("You do not have permission to add logs for this owning organisation.")
+ expect(parser.errors[:field_1]).to include(I18n.t("validations.sales.2024.bulk_upload.owning_organisation.not_permitted.not_support"))
end
end
@@ -598,7 +598,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "does not block log creation and does not add an error to field_1" do
parser = described_class.new(attributes)
parser.valid?
- expect(parser.errors[:field_1]).not_to include("You do not have permission to add logs for this owning organisation.")
+ expect(parser.errors[:field_1]).not_to include(I18n.t("validations.sales.2024.bulk_upload.owning_organisation.not_permitted.not_support"))
end
end
end
@@ -631,7 +631,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "is not permitted" do
parser.valid?
expect(parser.errors[:field_3]).to be_present
- expect(parser.errors[:field_3]).to include("You must answer what is the CORE username of the account this sales log should be assigned to?")
+ expect(parser.errors[:field_3]).to include(I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "what is the CORE username of the account this sales log should be assigned to?"))
end
it "blocks log creation" do
@@ -736,7 +736,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns a setup error" do
parser.valid?
- expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to include("Sale completion year must be 2 or 4 digits.")
+ expect(parser.errors.where(:field_6, category: :setup).map(&:message)).to include(I18n.t("validations.sales.2024.bulk_upload.saledate.year_not_two_or_four_digits"))
end
end
@@ -802,7 +802,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "adds an error to all (and only) the fields used to determine duplicates" do
parser.valid?
- error_message = "This is a duplicate log."
+ error_message = I18n.t("validations.sales.2024.bulk_upload.duplicate")
[
:field_1, # Owning org
@@ -891,7 +891,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns correct error" do
parser.valid?
- expect(parser.errors.where(:field_116).map(&:message)).to include("Percentage discount must be between 0% and 70%.")
+ expect(parser.errors.where(:field_116).map(&:message)).to include(I18n.t("validations.sales.2024.bulk_upload.numeric.within_range", field: "Percentage discount", min: "0%", max: "70%"))
end
end
@@ -909,7 +909,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns correct error" do
parser.valid?
- expect(parser.errors.where(:field_116).map(&:message)).to include("Percentage discount must be between 0% and 70%.")
+ expect(parser.errors.where(:field_116).map(&:message)).to include(I18n.t("validations.sales.2024.bulk_upload.numeric.within_range", field: "Percentage discount", min: "0%", max: "70%"))
end
end
end
@@ -942,7 +942,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns setup error" do
parser.valid?
- expect(parser.errors.where(:field_13).map(&:message)).to include("Enter a valid value for is the buyer a company?")
+ expect(parser.errors.where(:field_13).map(&:message)).to include(I18n.t("validations.invalid_option", question: "is the buyer a company?"))
expect(parser.errors.where(:field_13, category: :setup)).to be_present
end
end
@@ -954,7 +954,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns setup error" do
parser.valid?
- expect(parser.errors.where(:field_14).map(&:message)).to eql(["Enter a valid value for will the buyers live in the property?"])
+ expect(parser.errors.where(:field_14).map(&:message)).to eql([I18n.t("validations.invalid_option", question: "will the buyers live in the property?")])
expect(parser.errors.where(:field_14, category: :setup)).to be_present
end
end
@@ -1011,10 +1011,10 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "adds errors to missing key address fields" do
parser.valid?
- expect(parser.errors[:field_23]).to eql(["You must answer address line 1."])
- expect(parser.errors[:field_25]).to eql(["You must answer town or city."])
- expect(parser.errors[:field_27]).to eql(["You must answer part 1 of postcode."])
- expect(parser.errors[:field_28]).to eql(["You must answer part 2 of postcode."])
+ expect(parser.errors[:field_23]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "address line 1.")])
+ expect(parser.errors[:field_25]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "town or city.")])
+ expect(parser.errors[:field_27]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "part 1 of postcode.")])
+ expect(parser.errors[:field_28]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "part 2 of postcode.")])
end
end
@@ -1042,11 +1042,11 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "adds appropriate errors to UPRN and key address fields" do
parser.valid?
- expect(parser.errors[:field_22]).to eql(["You must answer UPRN."])
- expect(parser.errors[:field_23]).to eql(["You must answer address line 1."])
- expect(parser.errors[:field_25]).to eql(["You must answer town or city."])
- expect(parser.errors[:field_27]).to eql(["You must answer part 1 of postcode."])
- expect(parser.errors[:field_28]).to eql(["You must answer part 2 of postcode."])
+ expect(parser.errors[:field_22]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "UPRN.")])
+ expect(parser.errors[:field_23]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "address line 1.")])
+ expect(parser.errors[:field_25]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "town or city.")])
+ expect(parser.errors[:field_27]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "part 1 of postcode.")])
+ expect(parser.errors[:field_28]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "part 2 of postcode.")])
end
end
@@ -1055,8 +1055,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "adds errors to UPRN and the missing key address field" do
parser.valid?
- expect(parser.errors[:field_22]).to eql(["You must answer UPRN."])
- expect(parser.errors[:field_23]).to eql(["You must answer address line 1."])
+ expect(parser.errors[:field_22]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "UPRN.")])
+ expect(parser.errors[:field_23]).to eql([I18n.t("validations.sales.2024.bulk_upload.not_answered", question: "address line 1.")])
expect(parser.errors[:field_25]).to be_empty
expect(parser.errors[:field_27]).to be_empty
expect(parser.errors[:field_28]).to be_empty
@@ -1090,7 +1090,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
expect(parser.errors[:field_22]).to be_empty
%i[field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
- expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+ expect(parser.errors[field]).to eql([I18n.t("validations.sales.2024.bulk_upload.address.not_found")])
end
end
end
@@ -1105,7 +1105,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
expect(parser.errors[:field_22]).to be_empty
%i[field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
- expect(parser.errors[field]).to eql(["We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site."])
+ expect(parser.errors[field]).to eql([I18n.t("validations.sales.2024.bulk_upload.address.not_found")])
end
end
end
@@ -1218,8 +1218,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "a custom validation is applied" do
parser.valid?
- validation_message = "Buyer 2 cannot have a working situation of child under 16."
- expect(parser.errors[:field_42]).to include validation_message
+ expect(parser.errors[:field_42]).to include I18n.t("validations.sales.2024.bulk_upload.ecstat2.buyer_cannot_be_child")
end
end
@@ -1240,9 +1239,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "a custom validation is applied" do
parser.valid?
- validation_message = "Buyer 2's age cannot be 16 or over if their working situation is child under 16."
- expect(parser.errors[:field_42]).to include validation_message
- expect(parser.errors[:field_38]).to include validation_message
+ expect(parser.errors[:field_42]).to include I18n.t("validations.sales.2024.bulk_upload.ecstat2.buyer_cannot_be_over_16_and_child")
+ expect(parser.errors[:field_38]).to include I18n.t("validations.sales.2024.bulk_upload.age2.buyer_cannot_be_over_16_and_child")
end
end
@@ -1264,8 +1262,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "a custom validation is applied" do
parser.valid?
- validation_message = "Buyer 1 cannot have a working situation of child under 16."
- expect(parser.errors[:field_35]).to include validation_message
+ expect(parser.errors[:field_35]).to include I18n.t("validations.sales.2024.bulk_upload.ecstat1.buyer_cannot_be_child")
end
end
@@ -1286,9 +1283,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "a custom validation is applied" do
parser.valid?
- validation_message = "Buyer 1's age cannot be 16 or over if their working situation is child under 16."
- expect(parser.errors[:field_35]).to include validation_message
- expect(parser.errors[:field_31]).to include validation_message
+ expect(parser.errors[:field_35]).to include I18n.t("validations.sales.2024.bulk_upload.ecstat1.buyer_cannot_be_over_16_and_child")
+ expect(parser.errors[:field_31]).to include I18n.t("validations.sales.2024.bulk_upload.age1.buyer_cannot_be_over_16_and_child")
end
end
end
@@ -1333,7 +1329,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns correct errors" do
parser.valid?
- expect(parser.errors[:field_103]).to include("Enter a valid value for was a mortgage used for the purchase of this property? - Shared ownership.")
+ expect(parser.errors[:field_103]).to include(I18n.t("validations.sales.2024.bulk_upload.invalid_option", question: "was a mortgage used for the purchase of this property? - Shared ownership."))
parser.log.blank_invalid_non_setup_fields!
parser.log.save!
@@ -1370,7 +1366,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns correct errors" do
parser.valid?
- expect(parser.errors[:field_103]).to include("Enter a valid value for was a mortgage used for the purchase of this property?")
+ expect(parser.errors[:field_103]).to include(I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?"))
parser.log.blank_invalid_non_setup_fields!
parser.log.save!
@@ -1383,7 +1379,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "returns correct errors" do
parser.valid?
- expect(parser.errors[:field_103]).to include("Enter a valid value for was a mortgage used for the purchase of this property?")
+ expect(parser.errors[:field_103]).to include(I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?"))
parser.log.blank_invalid_non_setup_fields!
parser.log.save!
@@ -1440,7 +1436,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
it "does not allow 3 (don't know) as an option for discounted ownership" do
parser.valid?
- expect(parser.errors[:field_117]).to include("Enter a valid value for was a mortgage used for the purchase of this property?")
+ expect(parser.errors[:field_117]).to include(I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?"))
parser.log.blank_invalid_non_setup_fields!
parser.log.save!
@@ -1696,7 +1692,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
expect(parser.log.nationality_all).to be(nil)
expect(parser.log.nationality_all_group).to be(nil)
- expect(parser.errors["field_34"]).to include("Select a valid nationality.")
+ expect(parser.errors["field_34"]).to include(I18n.t("validations.sales.2024.bulk_upload.nationality.invalid"))
end
end
end
@@ -1781,7 +1777,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
expect(parser.log.nationality_all_buyer2).to be(nil)
expect(parser.log.nationality_all_buyer2_group).to be(nil)
- expect(parser.errors["field_41"]).to include("Select a valid nationality.")
+ expect(parser.errors["field_41"]).to include(I18n.t("validations.sales.2024.bulk_upload.nationality.invalid"))
end
end
end
@@ -1983,7 +1979,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("You must answer reported by.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.not_answered", question: "reported by."))
end
it "blocks log creation" do
@@ -1999,7 +1995,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("You must answer reported by.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.not_answered", question: "reported by."))
end
it "blocks log creation" do
@@ -2017,7 +2013,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql("This organisation does not have a relationship with the owning organisation.")
+ expect(setup_errors.find { |e| e.attribute == :field_2 }.message).to eql(I18n.t("validations.sales.2024.bulk_upload.assigned_to.managing_organisation_not_related"))
end
it "blocks log creation" do
@@ -2039,7 +2035,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
parser.valid?
setup_errors = parser.errors.select { |e| e.options[:category] == :setup }
- expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql("The owning organisation code provided is for an organisation that does not own stock.")
+ expect(setup_errors.find { |e| e.attribute == :field_1 }.message).to eql(I18n.t("validations.sales.2024.bulk_upload.owning_organisation.not_stock_owner"))
end
it "blocks log creation" do