diff --git a/app/views/home/_upcoming_deadlines.html.erb b/app/views/home/_upcoming_deadlines.html.erb index fa78b4055..462255d2a 100644 --- a/app/views/home/_upcoming_deadlines.html.erb +++ b/app/views/home/_upcoming_deadlines.html.erb @@ -2,7 +2,7 @@ <% open_lettings_form = FormHandler.instance.in_crossover_period? ? FormHandler.instance.previous_lettings_form : FormHandler.instance.current_lettings_form %> <% formatted_deadline = open_lettings_form.submission_deadline.strftime("%A %-d %B %Y") %> -<% if FormHandler.instance.in_crossover_period? %> +<% if FormHandler.instance.in_crossover_period? && Time.zone.now <= open_lettings_form.start_date %>

End of year deadline - <%= formatted_deadline %>: Deadline to submit logs for tenancies starting between <%= open_lettings_form.start_date.to_formatted_s(:govuk_date) %> to <%= collection_end_date(open_lettings_form.start_date).to_formatted_s(:govuk_date) %>

<% end %> @@ -11,12 +11,12 @@

<%= "#{current_quarter.quarter} - #{current_quarter.cutoff_date.strftime('%A %-d %B %Y')}" %>: Quarterly cut off date for tenancies and sales starting between <%= current_quarter.quarter_start_date.to_formatted_s(:govuk_date) %> and <%= current_quarter.quarter_end_date.to_formatted_s(:govuk_date) %>.

<% end %> -<% unless FormHandler.instance.in_crossover_period? %> +<% unless FormHandler.instance.in_crossover_period? && Time.zone.now <= open_lettings_form.start_date %>

Try to complete your logs for each quarter by the cut-off date.

You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the end-of-year deadline: <%= formatted_deadline %>.

<% end %> -<% if FormHandler.instance.in_crossover_period? %> +<% if FormHandler.instance.in_crossover_period? && Time.zone.now <= open_lettings_form.start_date %> <% previous_lettings_form = FormHandler.instance.previous_lettings_form %>

Prioritise completing logs for the closing collection year. You must complete all <%= previous_lettings_form.start_date.year %> to <%= previous_lettings_form.submission_deadline.year %> logs by the end-of-year deadline. You can still create <%= open_lettings_form.start_date.year %> to <%= open_lettings_form.submission_deadline.year %> logs for this quarter after the quarterly cut-off date.

<% end %>