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
- - Download the <%= govuk_link_to "bulk lettings template (new ordering)", @form.template_path %>
- - Export the data from your housing management system, matching the template. <%= govuk_link_to "Find out more about exporting your data", guidance_bulk_upload_lettings_logs_path %>
- - If you can not export it in this format, you may have to input it manually onto the template
- - You can not have a file with both general needs logs and supported housing logs. These must be in separate files
+ - If your organisation is new to using bulk upload or you have updated your HMS export use <%= govuk_link_to "this template (improved question ordering)", @form.template_path %>
+ - If your organisation was using bulk upload on the previous CORE website and hasn't changed its HMS to be compatible with the new CORE service, use <%= govuk_link_to "this template", @form.old_template_path %>
- Check your data
+ Create your file
- - Check data is complete and formatted correctly, using <%= govuk_link_to "Lettings #{@form.year_combo} Bulk Upload Specification", @form.specification_path %>
+ - Fill in the template with CORE data from your housing management system according to the <%= govuk_link_to "Lettings #{@form.year_combo} Bulk Upload Specification", @form.specification_path %>
+ - If you have to manually enter large volumes of data into the bulk upload template, we recommend creating logs directly in the service instead. <%= govuk_link_to "Find out more about exporting your data", guidance_bulk_upload_lettings_logs_path %>
- Save your file
+ <%= @form.inset_text %>
+
+ Save your file
- - Save the file (CSV format only)
+ - Save your file as a CSV
+ - Your file should now be ready to upload
<%= 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
- - Download the <%= govuk_link_to "bulk sales template (new ordering)", @form.template_path %>
- - Export the data from your housing management system, matching the template. <%= govuk_link_to "Find out more about exporting your data", guidance_bulk_upload_sales_logs_path %>
- - If you can not export it in this format, you may have to input it manually onto the template
- - You can not have a file with both general needs logs and supported housing logs. These must be in separate files
+ - If your organisation is new to using bulk upload or you have updated your HMS export use <%= govuk_link_to "this template (improved question ordering)", @form.template_path %>
+ - If your organisation was using bulk upload on the previous CORE website and hasn't changed its HMS to be compatible with the new CORE service, use <%= govuk_link_to "this template", @form.old_template_path %>
- Check your data
+ Create your file
- - Check data is complete and formatted correctly, using <%= govuk_link_to "Sales #{@form.year_combo} Bulk Upload Specification", @form.specification_path %>
+ - Fill in the template with CORE data from your housing management system according to the <%= govuk_link_to "Sales #{@form.year_combo} Bulk Upload Specification", @form.specification_path %>
+ - If you have to manually enter large volumes of data into the bulk upload template, we recommend creating logs directly in the service instead. <%= govuk_link_to "Find out more about exporting your data", guidance_bulk_upload_sales_logs_path, year:%>
- Save your file
+ Save your file
- - Save the file (CSV format only)
+ - Save your file as a CSV
+ - Your file should now be ready to upload
<%= 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"