diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb index ad256ad0f..83357c191 100644 --- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb @@ -47,6 +47,12 @@ module Forms "#{year}/#{year + 1 - 2000}" end + def inset_text + if year == 2022 + '

For 2022/23 data, you cannot have a CSV file with both general needs logs and supported housing logs. These must be in separate files.

'.html_safe + end + end + def save! true end diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb index 1ae824639..90f289b35 100644 --- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb +++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb @@ -10,23 +10,24 @@ Upload lettings logs in bulk (<%= @form.year_combo %>)

Prepare your file

-

If your housing management system still exports data in exactly the old order we recommend using this <%= govuk_link_to "bulk lettings template", @form.old_template_path %> instead of the one listed below.

-

Create your file

+

Download template

-

Check your data

+

Create your file

-

Save your file

+ <%= @form.inset_text %> + +

Save your file

<%= f.govuk_submit %> diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb index 0f4e75bd1..7ffaeeef5 100644 --- a/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb +++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb @@ -10,23 +10,22 @@ Upload sales logs in bulk (<%= @form.year_combo %>)

Prepare your file

-

If your housing management system still exports data in exactly the old order we recommend using this <%= govuk_link_to "bulk sales template", @form.old_template_path %> instead of the one listed below.

-

Create your file

+

Download template

-

Check your data

+

Create your file

-

Save your file

+

Save your file

<%= f.govuk_submit %> diff --git a/db/schema.rb b/db/schema.rb index fce5a4db6..225129dfd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -561,7 +561,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_20_084057) do t.integer "buy2living" t.integer "prevtenbuy2" t.integer "pregblank" - t.integer "nationalbuy2" t.string "uprn" t.integer "uprn_known" t.integer "uprn_confirmed"