From 3d7c57df2b0177151acd0f4b6573f71831aa3b9b Mon Sep 17 00:00:00 2001 From: Nick Clemens 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 ) %]  ([% reserveloo.itemtype %])[% END %][% END %]
Barcode: [% reserveloo.barcode %] - [% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %] - [% IF ( reserveloo.borrowerphone ) %]
[% reserveloo.borrowerphone %][% END %] + [% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %] + [% IF ( reserveloo.borrowercardnumber ) %]
[% reserveloo.borrowercardnumber %][% END %] + [% IF ( reserveloo.borrowerphone ) %]
[% reserveloo.borrowerphone %][% END %] [% IF ( reserveloo.borrowermail ) %]
- [% reserveloo.borrowermail %][% END %] + [% reserveloo.borrowermail %][% END %] [% Branches.GetName( reserveloo.homebranch ) %] [% Branches.GetName( reserveloo.holdingbranch ) %] @@ -172,9 +173,11 @@ [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype %])[% END %][% END %]
Barcode: [% overloo.barcode %] - [% overloo.borrowername %], [% overloo.borrowerfirstname %]
[% overloo.borrowerphone %]
+ [% overloo.borrowername %], [% overloo.borrowerfirstname %] + [% IF ( overloo.borrowercardnumber ) %]
[% overloo.borrowercardnumber %][% END %] + [% IF ( overloo.borrowerphone ) %]
[% overloo.borrowerphone %][% END %] [% IF ( overloo.borrowermail ) %] - [% overloo.borrowermail %][% END %] + [% overloo.borrowermail %][% END %] [% Branches.GetName( overloo.homebranch ) %] [% Branches.GetName( overloo.holdingbranch ) %] -- 2.1.4