From d684b043eecdf9a56c0942c0d6ac24b1d4a7e960 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Thu, 23 Feb 2023 17:13:57 +0000
Subject: [PATCH] feat: add inset text and old template (actual link to come)

---
 app/models/forms/bulk_upload_lettings/prepare_your_file.rb  | 4 ++++
 app/models/forms/bulk_upload_sales/prepare_your_file.rb     | 4 ++++
 .../forms/prepare_your_file.html.erb                        | 5 +++--
 .../bulk_upload_sales_logs/forms/prepare_your_file.html.erb | 6 ++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

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 5bfc0a2aa..75858e208 100644
--- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
@@ -29,6 +29,10 @@ module Forms
         "/files/bulk-upload-lettings-template-v1.xlsx"
       end
 
+      def old_template_path
+        "/files/bulk-upload-lettings-template-v1.xlsx"
+      end
+
       def year_combo
         "#{year}/#{year + 1 - 2000}"
       end
diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
index 5c7e775ef..39ba0f487 100644
--- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
@@ -27,6 +27,10 @@ module Forms
         "/files/bulk-upload-sales-template-v1.xlsx"
       end
 
+      def old_template_path
+        "/files/bulk-upload-sales-template-v1.xlsx"
+      end
+
       def year_combo
         "#{year}/#{year + 1 - 2000}"
       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 199d87e5f..cb4bf30a7 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,9 +10,10 @@
       <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">The new bulk upload template has been reordered to match the order of questions on the site. If your system is still exporting the old ordering then use this <%= govuk_link_to "bulk lettings template", @form.old_template_path %> instead.</p>
       <h2 class="govuk-heading-m">Create your file</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Download the <%= govuk_link_to "bulk lettings template", @form.template_path %></li>
+        <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</li>
         <li>If you cannot export it in this format, you may have to input it manually</li>
         <li>You can not have a file with both general needs logs and supported housing logs. These must be in separate files</li>
@@ -20,7 +21,7 @@
 
       <h2 class="govuk-heading-m">Check your data</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Check data is complete and formatted correctly, using data specifications (opens in a new tab)</li>
+        <li>Check data is complete and formatted correctly, using <%= govuk_link_to "Lettings 2022-23 Bulk Upload Specification", @form.specification_path %></li>
       </ul>
 
       <h2 class="govuk-heading-m">Save your file</h2>
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 0157b66eb..982bd2f00 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,16 +10,18 @@
       <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">The new bulk upload template has been reordered to match the order of questions on the site. If your system is still exporting the old ordering then use this <%= govuk_link_to "bulk sales template", @form.old_template_path %> instead.</p>
       <h2 class="govuk-heading-m">Create your file</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Download the <%= govuk_link_to "bulk sales template", @form.template_path %></li>
+        <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</li>
         <li>If you cannot export it in this format, you may have to input it manually</li>
+        <li>You can not have a file with both general needs logs and supported housing logs. These must be in separate files</li>
       </ul>
 
       <h2 class="govuk-heading-m">Check your data</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Check data is complete and formatted correctly, using data specifications (opens in a new tab)</li>
+        <li>Check data is complete and formatted correctly, using <%= govuk_link_to "Sales 2022-23 Bulk Upload Specification", @form.specification_path %></li>
       </ul>
 
       <h2 class="govuk-heading-m">Save your file</h2>