diff --git a/app/models/forms/bulk_upload_lettings/guidance.rb b/app/models/forms/bulk_upload_lettings/guidance.rb index 24bc531f2..dc0de3271 100644 --- a/app/models/forms/bulk_upload_lettings/guidance.rb +++ b/app/models/forms/bulk_upload_lettings/guidance.rb @@ -24,10 +24,6 @@ module Forms end end - def lettings_legacy_template_path - Forms::BulkUploadLettings::PrepareYourFile.new.legacy_template_path - end - def lettings_template_path Forms::BulkUploadLettings::PrepareYourFile.new(year:).template_path end @@ -36,10 +32,6 @@ module Forms Forms::BulkUploadLettings::PrepareYourFile.new(year:).specification_path end - def sales_legacy_template_path - Forms::BulkUploadSales::PrepareYourFile.new.legacy_template_path - end - def sales_template_path Forms::BulkUploadSales::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 984451dbb..b66c1649f 100644 --- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb @@ -32,29 +32,12 @@ module Forms bulk_upload_lettings_log_path(id: "upload-your-file", form: { year:, needstype:, organisation_id: }.compact) end - def legacy_template_path - case year - when 2023 - download_23_24_lettings_bulk_upload_legacy_template_path - end - end - def template_path - case year - when 2023 - download_23_24_lettings_bulk_upload_template_path - when 2024 - download_24_25_lettings_bulk_upload_template_path - end + download_mandatory_collection_resource_path(year:, log_type: "lettings", resource_type: "bulk_upload_template") end def specification_path - case year - when 2023 - download_23_24_lettings_bulk_upload_specification_path - when 2024 - download_24_25_lettings_bulk_upload_specification_path - end + download_mandatory_collection_resource_path(year:, log_type: "lettings", resource_type: "bulk_upload_specification") end def year_combo diff --git a/app/models/forms/bulk_upload_sales/guidance.rb b/app/models/forms/bulk_upload_sales/guidance.rb index ef792a3e4..be61ef650 100644 --- a/app/models/forms/bulk_upload_sales/guidance.rb +++ b/app/models/forms/bulk_upload_sales/guidance.rb @@ -24,10 +24,6 @@ module Forms end end - def lettings_legacy_template_path - Forms::BulkUploadLettings::PrepareYourFile.new.legacy_template_path - end - def lettings_template_path Forms::BulkUploadLettings::PrepareYourFile.new(year:).template_path end @@ -36,10 +32,6 @@ module Forms Forms::BulkUploadLettings::PrepareYourFile.new(year:).specification_path end - def sales_legacy_template_path - Forms::BulkUploadSales::PrepareYourFile.new.legacy_template_path - end - def sales_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 d6d5276c2..6bac024cc 100644 --- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb @@ -31,29 +31,12 @@ module Forms bulk_upload_sales_log_path(id: "upload-your-file", form: { year:, organisation_id: }.compact) end - def legacy_template_path - case year - when 2023 - download_23_24_sales_bulk_upload_legacy_template_path - end - end - def template_path - case year - when 2023 - download_23_24_sales_bulk_upload_template_path - when 2024 - download_24_25_sales_bulk_upload_template_path - end + download_mandatory_collection_resource_path(year:, log_type: "sales", resource_type: "bulk_upload_template") end def specification_path - case year - when 2023 - download_23_24_sales_bulk_upload_specification_path - when 2024 - download_24_25_sales_bulk_upload_specification_path - end + download_mandatory_collection_resource_path(year:, log_type: "sales", resource_type: "bulk_upload_specification") end def year_combo diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb index 21d19dba8..a07092278 100644 --- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb +++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb @@ -18,10 +18,6 @@
  • <%= govuk_link_to "Download the new template", @form.template_path %>: In this template, the questions are in the same order as the 2023/24 paper form and web form.
  • - -
  • - <%= govuk_link_to "Download the legacy template", @form.legacy_template_path %>: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end. -
  • There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.

    diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb index b9d0990be..427a835e8 100644 --- a/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb +++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb @@ -16,7 +16,6 @@

    Use one of these templates to upload logs for 2023/24:

    There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.

    diff --git a/app/views/bulk_upload_shared/guidance.html.erb b/app/views/bulk_upload_shared/guidance.html.erb index e530aa5b5..4cb8b76b4 100644 --- a/app/views/bulk_upload_shared/guidance.html.erb +++ b/app/views/bulk_upload_shared/guidance.html.erb @@ -52,8 +52,6 @@

    <%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – New question ordering", @form.sales_template_path %>

    Legacy template: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end. Use this template if you have not updated your system to match the new template yet.

    -

    <%= govuk_link_to "Download the lettings bulk upload template (2023 to 2024) - Legacy version", @form.lettings_legacy_template_path %>

    -

    <%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – Legacy version", @form.sales_legacy_template_path %>

    <% else %>

    <%= govuk_link_to "Download the lettings bulk upload template (2024 to 2025)", @form.lettings_template_path %>

    <%= govuk_link_to "Download the sales bulk upload template (2024 to 2025)", @form.sales_template_path %>