diff --git a/app/helpers/collection_deadline_helper.rb b/app/helpers/collection_deadline_helper.rb index 231ae8a66..ffce461fe 100644 --- a/app/helpers/collection_deadline_helper.rb +++ b/app/helpers/collection_deadline_helper.rb @@ -20,10 +20,6 @@ module CollectionDeadlineHelper send("#{quarter}_quarter", year)[:cutoff_date].strftime("%A %-d %B %Y") end - def formatted_deadline - quarterly_cutoff_date("fourth", current_collection_start_year) - end - def quarter_deadlines_for_year(year) QUARTERLY_DEADLINES[year] end diff --git a/app/views/home/_upcoming_deadlines.html.erb b/app/views/home/_upcoming_deadlines.html.erb index 822b80f20..47590c85d 100644 --- a/app/views/home/_upcoming_deadlines.html.erb +++ b/app/views/home/_upcoming_deadlines.html.erb @@ -1,13 +1,14 @@
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')} #{current_quarter.cutoff_date.to_formatted_s(:govuk_date)}" %>: 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? %>