+ <%= t(".heading") %> +
+ ++ <%= t(".paragraph1") %> +
+ +diff --git a/app/controllers/waste_carriers_engine/renews_controller.rb b/app/controllers/waste_carriers_engine/renews_controller.rb index c84bd8111..4b834e4e4 100644 --- a/app/controllers/waste_carriers_engine/renews_controller.rb +++ b/app/controllers/waste_carriers_engine/renews_controller.rb @@ -17,10 +17,10 @@ def new def validate_renew_token return render(:already_renewed) if registration.already_renewed? + return render(:past_renewal_window) if registration.past_renewal_window? # TODO # return render(:invalid_magic_link, status: 404) unless registration.present? - # return render(:past_renewal_window) if registration.past_renewal_window? end def registration diff --git a/app/models/waste_carriers_engine/registration.rb b/app/models/waste_carriers_engine/registration.rb index c23a1eae3..9ad6870d5 100644 --- a/app/models/waste_carriers_engine/registration.rb +++ b/app/models/waste_carriers_engine/registration.rb @@ -56,6 +56,10 @@ def already_renewed? check_service.date_can_renew_from > Time.now.in_time_zone("London").to_date end + def past_renewal_window? + !(check_service.expired? && check_service.in_expiry_grace_window?) + end + def expire! metaData.status = "EXPIRED" diff --git a/app/views/waste_carriers_engine/renews/past_renewal_window.html.erb b/app/views/waste_carriers_engine/renews/past_renewal_window.html.erb new file mode 100644 index 000000000..fdce86e99 --- /dev/null +++ b/app/views/waste_carriers_engine/renews/past_renewal_window.html.erb @@ -0,0 +1,13 @@ +
+ <%= t(".paragraph1") %> +
+ +