From f1571f44c76c4b84290b2e97034b5091007598c1 Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Sun, 11 Sep 2022 22:18:45 +0000
Subject: [PATCH] Bug 31525: display streetnumber with address in patron search

Adds back street number to the address when searching for patrons

To test:
1) Edit a patron's contact information
2) Under Main Address put an address, make sure to put something in the
Street number field
3) Do a simple patron search that will yield results (i.e. "a")
4) Confirm the street number does not show, but the rest of the address
does
5) Apply this patch
6) Do another patron search
5) Confirm the street number now shows

Sponsored-by: Catalyst IT

Testing note:  AddressFormat system preference must be set to "US style"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 432f058a722cd66cdb2ebde4d8d47222830a7632)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/includes/js-patron-format-address.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc
index 407bc42e2f..1b6425b28e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format-address.inc
@@ -19,7 +19,7 @@
                     if ( data.street_type ) {
                         roadtype_desc = roadtypes_map[data.street_type] ? roadtypes_map[data.street_type].street_type : data.street_type;
                     }
-                    address += '<li class="patronaddress1">' + escape_str(data.streetnumber) + ' ' + escape_str(data.address) + ' ' + escape_str(roadtype_desc) + '</li>';
+                    address += '<li class="patronaddress1">' + escape_str(data.street_number) + ' ' + escape_str(data.address) + ' ' + escape_str(roadtype_desc) + '</li>';
                 }
             }
             if ( data.address2 ) {
-- 
2.39.5