From a853b0653f1096a5b1d8ec5aea2132487c65670c Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 14 Feb 2022 17:13:53 +0100
Subject: [PATCH] Bug 30063: Fix address format
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Séverine Queune <severine.queune@bulac.fr>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/css/src/staff-global.scss            |  6 ++---
 .../prog/en/includes/patron-search.inc        | 25 +++++++++++++++++++
 .../prog/en/modules/members/member.tt         |  7 +++---
 koha-tmpl/intranet-tmpl/prog/js/members.js    |  2 +-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index b1b12ffcaa..b9d0573dc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2161,7 +2161,8 @@ li {
     }
 }
 
-#searchresults {
+#searchresults,
+#table_borrowers {
     .address {
         ul {
             margin: 0;
@@ -4031,8 +4032,7 @@ input.renew {
 }
 
 #pat_member {
-    #patron_list_dialog,
-    #searchresults {
+    #patron_list_dialog {
         display: none;
     }
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 11fce49397..6e19c926cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -421,6 +421,31 @@
                                     return r;
                                 }
                             }
+                            [% CASE 'name-address' %]
+                            {
+                                "data": "me.firstname:me.surname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country",
+                                "searchable": true,
+                                "orderable": true,
+                                "render": function( data, type, row, meta ) {
+                                    let patron_id = encodeURIComponent(row.patron_id);
+                                    let r = '';
+                                    [% IF ! open_on_row_click %]
+                                    r += "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=" + patron_id + "\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">" + $patron_to_html(row, { invert_name: 1 }) + "</a>";
+                                    [% ELSE %]
+                                    r += $patron_to_html(row, { invert_name: 1 });
+                                    [% END %]
+                                    r += '<br/>';
+                                    r += '<div class="address"><ul>';
+                                    r += $format_address(row, { no_line_break: 1 });
+
+                                    if ( row.email ) {
+                                        r += "<li>" + _("Email: ") + "<a href='mailto:" + encodeURIComponent(row.email) + "'>" + escape_str(row.email) + "</a></li>";
+                                    }
+                                    r += '</ul></div>'
+
+                                    return r;
+                                }
+                            }
                             [% CASE 'name' %]
                             {
                                 "data": "me.firstname:me.surname:me.othernames",
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 016060065d..f8c60f664b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -8,7 +8,7 @@
 [% PROCESS 'patronfields.inc' %]
 [% SET libraries = Branches.all %]
 [% SET categories = Categories.all.unblessed %]
-[% SET columns = ['cardnumber', 'name', 'dateofbirth', 'branch', 'category', 'dateexpiry', 'checkouts', 'account_balance', 'borrowernotes', 'action'] %]
+[% SET columns = ['cardnumber', 'name-address', 'dateofbirth', 'branch', 'category', 'dateexpiry', 'checkouts', 'account_balance', 'borrowernotes', 'action'] %]
 [% PROCESS 'patron-search.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Patrons[% IF ( searching ) %] &rsaquo; Search results[% END %] &rsaquo; Koha</title>
@@ -64,7 +64,7 @@
             </div>
           [% END %]
 
-          <div id="patron_search_results">
+          <div id="searchresults">
             [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
               <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
                   <div>
@@ -310,7 +310,8 @@
         redirect_if_one_result => 1,
         redirect_url           => redirect_url,
         sticky_header => "searchheader",
-        sticky_to     => "patron_search_results",
+        sticky_to     => "searchresults",
+        default_sort_column => 'name-address',
     %]
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js
index 1cbf1c5c1b..946af76f33 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/members.js
@@ -197,7 +197,7 @@ $(document).ready(function(){
 
     $('body').on('click', '#guarantor_search', function(e) {
         e.preventDefault();
-        var newin = window.open('/cgi-bin/koha/members/search.pl?columns=cardnumber,name,category,branch,dateofbirth,address,action','popup','width=1024,height=768,resizable=no,toolbar=false,scrollbars=yes,top');
+        var newin = window.open('/cgi-bin/koha/members/search.pl?columns=cardnumber,name,category,branch,dateofbirth,address-library,action','popup','width=1024,height=768,resizable=no,toolbar=false,scrollbars=yes,top');
     });
 
     $('#guarantor_relationships').on('click', '.guarantor_cancel', function(e) {
-- 
2.39.5