diff --git a/app/views/home/_upcoming_deadlines.html.erb b/app/views/home/_upcoming_deadlines.html.erb index 47590c85d..17879da33 100644 --- a/app/views/home/_upcoming_deadlines.html.erb +++ b/app/views/home/_upcoming_deadlines.html.erb @@ -1,14 +1,14 @@

Upcoming deadlines

<% 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")}" %> +<% formatted_deadline = "#{open_lettings_form.submission_deadline.to_formatted_s.strftime('%A %-d %B %Y')}" %> <% if FormHandler.instance.in_crossover_period? %>

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 %> <% current_quarter = quarter_for_date(date: Time.zone.now) %> <% if current_quarter.present? %> -

<%= "#{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) %>.

+

<%= "#{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? %>