From 9f0a2111a58e933a28105e54aba6ca08c2d043b7 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Mon, 3 Feb 2025 14:33:55 +0000 Subject: [PATCH] Revert "Add manual entry button instead of change skip link" This reverts commit 22577c801aca940acfc16caf94d3159071ea8258. --- app/helpers/form_page_helper.rb | 5 ----- app/models/form/lettings/pages/address_search.rb | 9 +++++++++ app/models/form/sales/pages/address_search.rb | 10 ++++++++++ app/views/form/_address_autocomplete_question.html.erb | 4 ---- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/helpers/form_page_helper.rb b/app/helpers/form_page_helper.rb index 6e34bd8a6..74e75e572 100644 --- a/app/helpers/form_page_helper.rb +++ b/app/helpers/form_page_helper.rb @@ -46,9 +46,4 @@ module FormPageHelper page.skip_href(log) || send(log.form.next_page_redirect_path(page, log, current_user, ignore_answered: true), log) end end - - def manual_address_link(log) - base_url = send("#{log.log_type}_url", log) - "#{base_url}/address" - end end diff --git a/app/models/form/lettings/pages/address_search.rb b/app/models/form/lettings/pages/address_search.rb index 7f0eeeb12..6aca0ac44 100644 --- a/app/models/form/lettings/pages/address_search.rb +++ b/app/models/form/lettings/pages/address_search.rb @@ -15,4 +15,13 @@ class Form::Lettings::Pages::AddressSearch < ::Form::Page ] end + def skip_text + "Enter the address manually instead" + end + + def skip_href(log = nil) + return unless log + + "address" + end end diff --git a/app/models/form/sales/pages/address_search.rb b/app/models/form/sales/pages/address_search.rb index 29d399613..2a0848668 100644 --- a/app/models/form/sales/pages/address_search.rb +++ b/app/models/form/sales/pages/address_search.rb @@ -14,4 +14,14 @@ class Form::Sales::Pages::AddressSearch < ::Form::Page Form::Sales::Questions::AddressSearch.new(nil, nil, self), ] end + + def skip_text + "Enter the address manually instead" + end + + def skip_href(log = nil) + return unless log + + "address" + end end diff --git a/app/views/form/_address_autocomplete_question.html.erb b/app/views/form/_address_autocomplete_question.html.erb index 854239a47..e151406c2 100644 --- a/app/views/form/_address_autocomplete_question.html.erb +++ b/app/views/form/_address_autocomplete_question.html.erb @@ -22,7 +22,3 @@ <% end %> <%= render partial: "form/guidance/#{question.bottom_guidance_partial}" if question.bottom_guidance? %> - -
- <%= govuk_link_to "Enter the address manually instead" , manual_address_link(@log), class: "govuk-button govuk-button--secondary" %> -