From 3d7c57df2b0177151acd0f4b6573f71831aa3b9b Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 7 Dec 2017 13:09:24 +0000
Subject: [PATCH] Bug 19770 - Add cardnumber to holds awaiting pickup and add
 classes to borrower info

To Test:
1 - View the holds awaiting pickup report
2 - Note there is no cardnumber
3 - Apply patch
4 - Cardnumber now shows
5 - Add to IntranetUserCSS
    .borrowercardnumber { display: none; }
6 - Cardnumber does not show
7 - Verify the same works for 'Holds over' tab
8 - Sign off
---
 circ/waitingreserves.pl                                     |  7 ++++---
 .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt   | 13 ++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 8527f2d..09293cb 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -127,9 +127,10 @@ foreach my $num (@getreserves) {
     if ( $homebranch ne $holdingbranch ) {
         $getreserv{'dotransfer'} = 1;
     }
-    $getreserv{'borrowername'}      = $patron->surname;
-    $getreserv{'borrowerfirstname'} = $patron->firstname;
-    $getreserv{'borrowerphone'}     = $patron->phone;
+    $getreserv{'borrowername'}       = $patron->surname;
+    $getreserv{'borrowerfirstname'}  = $patron->firstname;
+    $getreserv{'borrowerphone'}      = $patron->phone;
+    $getreserv{'borrowercardnumber'} = $patron->cardnumber;
 
     my $borEmail = GetFirstValidEmailAddress( $borrowernum );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index e0f7169..d3a4382 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -103,10 +103,11 @@
                             [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %]
                             <br />Barcode: [% reserveloo.barcode %]
                     </td>
-                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a>
-                        [% IF ( reserveloo.borrowerphone ) %]<br />[% reserveloo.borrowerphone %][% END %]
+                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]"><span class="borrowersurname">[% reserveloo.borrowername %]</span>, <span class="borrowerfirstname">[% reserveloo.borrowerfirstname %]</span></a>
+                        [% IF ( reserveloo.borrowercardnumber ) %]<br /><span class="borrowercardnumber">[% reserveloo.borrowercardnumber %]</span>[% END %]
+                        [% IF ( reserveloo.borrowerphone ) %]<br /><span class="borrowerphone">[% reserveloo.borrowerphone %]</span>[% END %]
                         [% IF ( reserveloo.borrowermail ) %]<br /><a href="mailto:[% reserveloo.borrowermail %]?subject=Hold waiting: [% reserveloo.title %]">
-                        [% reserveloo.borrowermail %]</a>[% END %]
+                        <span class="borroweremail">[% reserveloo.borrowermail %]</span></a>[% END %]
                     </td>
                     <td>[% Branches.GetName( reserveloo.homebranch ) %]</td>
                     <td>[% Branches.GetName( reserveloo.holdingbranch ) %]</td>
@@ -172,9 +173,11 @@
                             [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
                         <br />Barcode: [% overloo.barcode %]
                     </td>
-                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]">[% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
+                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]"><span class="borrowersurname">[% overloo.borrowername %]</span>, <span class="borrowerfirstname">[% overloo.borrowerfirstname %]</span></a>
+                        [% IF ( overloo.borrowercardnumber ) %]<br /><span class="borrowercardnumber">[% overloo.borrowercardnumber %]</span>[% END %]
+                        [% IF ( overloo.borrowerphone ) %]<br /><span class="borrowerphone">[% overloo.borrowerphone %]</span>[% END %]
                         [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.borrowermail %]?subject=Reservation: [% overloo.title |url %]">
-        [% overloo.borrowermail %]</a>[% END %]
+        <span class="borroweremail">[% overloo.borrowermail %]</span></a>[% END %]
                     </td>
                     <td>[% Branches.GetName( overloo.homebranch ) %]</td>
                     <td>[% Branches.GetName( overloo.holdingbranch ) %]</td>
-- 
2.1.4