feat: merge with new behaviour on main

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

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

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

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

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 %>

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>