From c2f88d5da40a33170d5a49a8ed3dfd49d4c0dcdf Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Wed, 4 Mar 2026 17:25:38 +0000 Subject: [PATCH] CLDC-4266: Reference UPRN in clear button for newbuilds --- app/helpers/form_page_helper.rb | 8 ++++++++ app/models/lettings_log.rb | 8 ++++++-- app/views/form/guidance/_address_fallback.html.erb | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/helpers/form_page_helper.rb b/app/helpers/form_page_helper.rb index 98b9bb8d5..850baab4f 100644 --- a/app/helpers/form_page_helper.rb +++ b/app/helpers/form_page_helper.rb @@ -55,4 +55,12 @@ module FormPageHelper question.date_example_override(log) || "For example, #{date_mid_collection_year_formatted(log.startdate).tr(' ', '/')}", ].compact.join("

").html_safe end + + def clear_address_text(log) + if log.lettings? && log.newbuild? + "Clear address and search by UPRN instead" + else + "Clear address and search instead" + end + end end diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index fb4866fc0..66aa6bd04 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -815,12 +815,16 @@ class LettingsLog < Log "lettings_log" end + def newbuild? + rsnvac == 15 + end + def changed_to_newbuild? - rsnvac == 15 && rsnvac_was != 15 + newbuild? && rsnvac_was != 15 end def changed_from_newbuild? - rsnvac != 15 && rsnvac_was == 15 + !newbuild? && rsnvac_was == 15 end def is_address_asked? diff --git a/app/views/form/guidance/_address_fallback.html.erb b/app/views/form/guidance/_address_fallback.html.erb index 4ee0bd608..26649c325 100644 --- a/app/views/form/guidance/_address_fallback.html.erb +++ b/app/views/form/guidance/_address_fallback.html.erb @@ -1,3 +1,3 @@
- <%= govuk_link_to "Clear address and search instead", address_search_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %> + <%= govuk_link_to clear_address_text(@log), address_search_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>