feat: update designs and add inset text

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
+          '<p class="govuk-inset-text">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.</p>'.html_safe
+        end
+      end
+
       def save!
         true
       end

app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb

@@ -10,23 +10,24 @@
       <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @form.year_combo %>)</span>
       <h1 class="govuk-heading-l">Prepare your file</h1>
 
-      <p class="govuk-inset-text">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.</p>
-      <h2 class="govuk-heading-m">Create your file</h2>
+      <h2 class="govuk-heading-s">Download template</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Download the <%= govuk_link_to "bulk lettings template (new ordering)", @form.template_path %></li>
-        <li>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 %></li>
-        <li>If you can not export it in this format, you may have to input it manually onto the template</li>
-        <li>You can not have a file with both general needs logs and supported housing logs. These must be in separate files</li>
+        <li>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 %></li>
+        <li>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 %></li>
       </ul>
 
-      <h2 class="govuk-heading-m">Check your data</h2>
+      <h2 class="govuk-heading-s">Create your file</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Check data is complete and formatted correctly, using <%= govuk_link_to "Lettings #{@form.year_combo} Bulk Upload Specification", @form.specification_path %></li>
+        <li>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 %></li>
+        <li>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 %></li>
       </ul>
 
-      <h2 class="govuk-heading-m">Save your file</h2>
+      <%= @form.inset_text %>
+
+      <h2 class="govuk-heading-s">Save your file</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Save the file (CSV format <strong>only</strong>)</li>
+        <li>Save your file as a CSV</li>
+        <li>Your file should now be ready to upload</li>
       </ul>
 
       <%= f.govuk_submit %>

app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb

@@ -10,23 +10,22 @@
       <span class="govuk-caption-l">Upload sales logs in bulk (<%= @form.year_combo %>)</span>
       <h1 class="govuk-heading-l">Prepare your file</h1>
 
-      <p class="govuk-inset-text">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.</p>
-      <h2 class="govuk-heading-m">Create your file</h2>
+      <h2 class="govuk-heading-s">Download template</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Download the <%= govuk_link_to "bulk sales template (new ordering)", @form.template_path %></li>
-        <li>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 %></li>
-        <li>If you can not export it in this format, you may have to input it manually onto the template</li>
-        <li>You can not have a file with both general needs logs and supported housing logs. These must be in separate files</li>
+        <li>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 %></li>
+        <li>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 %></li>
       </ul>
 
-      <h2 class="govuk-heading-m">Check your data</h2>
+      <h2 class="govuk-heading-s">Create your file</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Check data is complete and formatted correctly, using <%= govuk_link_to "Sales #{@form.year_combo} Bulk Upload Specification", @form.specification_path %></li>
+        <li>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 %></li>
+        <li>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:%></li>
       </ul>
 
-      <h2 class="govuk-heading-m">Save your file</h2>
+      <h2 class="govuk-heading-s">Save your file</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Save the file (CSV format <strong>only</strong>)</li>
+        <li>Save your file as a CSV</li>
+        <li>Your file should now be ready to upload</li>
       </ul>
 
       <%= f.govuk_submit %>

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"