From 77105ccd3a36fb35b921f72fbf76e19ff731682e Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Tue, 28 Mar 2023 12:32:11 +0100
Subject: [PATCH] feat: merge with new behaviour on main

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

diff --git a/app/models/forms/bulk_upload_lettings/guidance.rb b/app/models/forms/bulk_upload_lettings/guidance.rb
index 2610ed62d..55db10718 100644
--- a/app/models/forms/bulk_upload_lettings/guidance.rb
+++ b/app/models/forms/bulk_upload_lettings/guidance.rb
@@ -15,6 +15,10 @@ module Forms
         bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: })
       end
 
+      def old_template_path
+        Forms::BulkUploadLettings::PrepareYourFile.new.old_template_path
+      end
+
       def template_path
         Forms::BulkUploadLettings::PrepareYourFile.new(year:).template_path
       end
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 e1738bace..c30cf88ad 100644
--- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
@@ -25,6 +25,10 @@ module Forms
         bulk_upload_lettings_log_path(id: page_id, form: { year:, needstype: })
       end
 
+      def old_template_path
+        "/files/bulk-upload-lettings-template-2022-23.xlsx"
+      end
+
       def template_path
         case year
         when 2022
diff --git a/app/models/forms/bulk_upload_sales/guidance.rb b/app/models/forms/bulk_upload_sales/guidance.rb
index 869ce8be2..c9869ee14 100644
--- a/app/models/forms/bulk_upload_sales/guidance.rb
+++ b/app/models/forms/bulk_upload_sales/guidance.rb
@@ -15,6 +15,10 @@ module Forms
         bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: })
       end
 
+      def old_template_path
+        Forms::BulkUploadLettings::PrepareYourFile.new.old_template_path
+      end
+
       def template_path
         Forms::BulkUploadSales::PrepareYourFile.new(year:).template_path
       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 cdf2cf455..710cdbef3 100644
--- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
@@ -23,6 +23,10 @@ module Forms
         bulk_upload_sales_log_path(id: "upload-your-file", form: { year: })
       end
 
+      def old_template_path
+        "/files/bulk-upload-sales-template-2022-23.xlsx"
+      end
+
       def template_path
         case year
         when 2022
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 3f4a6261f..56b8dff90 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
@@ -19,7 +19,7 @@
       <h2 class="govuk-heading-s">Create your file</h2>
       <ul class="govuk-list govuk-list--bullet">
         <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(form: { year: @form.year }) %></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", bulk_upload_lettings_log_path(id: "guidance", form: { year: @form.year }) %></li>
       </ul>
 
       <%= @form.inset_text %>
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 0509cd6a7..ad1449d3c 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
@@ -19,7 +19,7 @@
       <h2 class="govuk-heading-s">Create your file</h2>
       <ul class="govuk-list govuk-list--bullet">
         <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(form: { year: @form.year }) %></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", bulk_upload_sales_log_path(id: "guidance", form: { year: @form.year }) %></li>
       </ul>
 
       <h2 class="govuk-heading-s">Save your file</h2>