diff --git a/app/models/forms/bulk_upload_form/prepare_your_file.rb b/app/models/forms/bulk_upload_form/prepare_your_file.rb index 1838e754f..7ef0355b5 100644 --- a/app/models/forms/bulk_upload_form/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_form/prepare_your_file.rb @@ -10,12 +10,7 @@ module Forms attribute :organisation_id, :integer def view_path - case year - when 2024 - "bulk_upload_#{log_type}_logs/forms/prepare_your_file_2024" - when 2025 - "bulk_upload_#{log_type}_logs/forms/prepare_your_file_2025" - end + "bulk_upload_#{log_type}_logs/forms/prepare_your_file" end def back_path @@ -44,6 +39,10 @@ module Forms "#{year} to #{year + 1}" end + def slash_year_combo + "#{year}/#{(year + 1)%100}" + end + def save! true end diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2024.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb similarity index 82% rename from app/views/bulk_upload_sales_logs/forms/prepare_your_file_2024.html.erb rename to app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb index 723ae5314..00c693cd4 100644 --- a/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2024.html.erb +++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb @@ -14,15 +14,15 @@
Use one of these templates to upload logs for 2024/25:
-<%= govuk_link_to "Download the sales bulk upload template (2024 to 2025)", @form.template_path %>: In this template, the questions are in the same order as the 2024/25 paper form and web form.
+Use one of these templates to upload logs for <%= @form.slash_year_combo %>:
+<%= govuk_link_to "Download the sales bulk upload template (#{@form.year_combo})", @form.template_path %>: In this template, the questions are in the same order as the <%= @form.slash_year_combo %> paper form and web form.
There are 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.
<%= govuk_link_to "Read the full guidance", bulk_upload_sales_log_path(id: "guidance", form: { year: @form.year }, referrer: "prepare-your-file") %> before you start if you have not used bulk upload before.
- -Use one of these templates to upload logs for 2025/26:
-<%= govuk_link_to "Download the sales bulk upload template (2025 to 2026)", @form.template_path %>: In this template, the questions are in the same order as the 2025/26 paper form and web form.
-There are 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.
- -