diff --git a/app/frontend/controllers/address_search_controller.js b/app/frontend/controllers/address_search_controller.js index 5d01608d6..2669b803e 100644 --- a/app/frontend/controllers/address_search_controller.js +++ b/app/frontend/controllers/address_search_controller.js @@ -22,7 +22,7 @@ const fetchAndPopulateSearchResults = async (query, populateResults, searchUrl, populateResults([]) } else { populateOptions(results, selectEl) - populateResults(Object.values(results).map((o) => o.text)) + populateResults(Object.values(results).map((o) => `${o.text} (${o.value})`)) } } catch (error) { populateOptions([], selectEl) @@ -37,7 +37,7 @@ const populateOptions = (results, selectEl) => { results.forEach((result) => { const option = document.createElement('option') option.value = result.value - option.innerHTML = result.text + option.innerHTML = `${result.text} (${result.value})` selectEl.appendChild(option) options.push(option) }) diff --git a/app/models/form/lettings/questions/address_search.rb b/app/models/form/lettings/questions/address_search.rb index 4e71596fd..ed7edf894 100644 --- a/app/models/form/lettings/questions/address_search.rb +++ b/app/models/form/lettings/questions/address_search.rb @@ -14,7 +14,9 @@ class Form::Lettings::Questions::AddressSearch < ::Form::Question return {} unless ActiveRecord::Base.connected? return {} unless log&.address_options&.any? - { log.address_options.first[:uprn] => { "value" => log.address_options.first[:address] } } + log.address_options.each_with_object({}) do |option, hash| + hash[option[:uprn]] = { "value" => "#{option[:address]} (#{option[:uprn]})" } + end end def get_extra_check_answer_value(log) diff --git a/app/models/form/sales/questions/address_search.rb b/app/models/form/sales/questions/address_search.rb index c46a77a10..9e3f7befb 100644 --- a/app/models/form/sales/questions/address_search.rb +++ b/app/models/form/sales/questions/address_search.rb @@ -15,7 +15,9 @@ class Form::Sales::Questions::AddressSearch < ::Form::Question return {} unless ActiveRecord::Base.connected? return {} unless log&.address_options&.any? - { log.address_options.first[:uprn] => { "value" => log.address_options.first[:address] } } + log.address_options.each_with_object({}) do |option, hash| + hash[option[:uprn]] = { "value" => "#{option[:address]} (#{option[:uprn]})" } + end end def get_extra_check_answer_value(log)