From fe5148e40d68adc906433c643771e62bec55cd5e Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 8 Jun 2015 01:30:58 +0200 Subject: [PATCH] Bug 14356: Improvements to the 'Transfers to receive' page Patch makes several small changes to the template for the 'Transfers to receive page' 1) Show the branch name instead of the branchcode in the table of incoming transfers. If there is a hold connected with the transfer: 2) Show the patron's name as 'surname, firstname' intead of 'surname firstname' 3) Restore broken feature: Show a mailto: link with a generated subject of 'Hold: '. The mailto: feature actually existed in the templates, but was broken to a misnamed database column. I made some small changes to make the subject translatable (see bug 8330). To test: - Create a transfer by placing a hold with pickup at another library - Craete a transfer manually - Go to the circulation > transfers to receive - Check the changes explained above, compare before and after - Check the mailto: link works as expected Bonus: Check the Hold: bit in the subject is really translatable now. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> --- circ/transferstoreceive.pl | 2 +- .../prog/en/modules/circ/transferstoreceive.tt | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl index bd184c9..1beb6b3 100755 --- a/circ/transferstoreceive.pl +++ b/circ/transferstoreceive.pl @@ -105,7 +105,7 @@ foreach my $br ( keys %$branches ) { $getransf{'borrowernum'} = $getborrower->{'borrowernumber'}; $getransf{'borrowername'} = $getborrower->{'surname'}; $getransf{'borrowerfirstname'} = $getborrower->{'firstname'}; - $getransf{'borrowermail'} = $getborrower->{'emailaddress'} if $getborrower->{'emailaddress'}; + $getransf{'borrowermail'} = $getborrower->{'email'} if $getborrower->{'email'}; $getransf{'borrowerphone'} = $getborrower->{'phone'}; } push( @transferloop, \%getransf ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index e1cc760..877be7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Circulation › Transfers to your library [% INCLUDE 'doc-head-close.inc' %] @@ -60,16 +61,18 @@ $(document).ready(function() {

[% reser.datetransfer | $KohaDates %]

[% IF ( reser.messcompa ) %]Transfer is [% reser.diff %] days late[% END %] [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title |html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield %][% END %][% END %] [% IF ( reser.author ) %]by [% reser.author %][% END %] - [% IF ( reser.itemtype ) %]  ([% reser.itemtype %])[% END %] + [% IF ( reser.itemtype ) %] ([% reser.itemtype %])[% END %]
Barcode: [% reser.barcode %] [% IF ( reser.borrowername ) %] - [% reser.borrowername %]   [% reser.borrowerfirstname %] + [% reser.borrowername %][%IF ( reser.borrowerfirstname ) %], [% reser.borrowerfirstname %][% END %] -
[% reser.borrowerphone %]
+ [% IF ( reser.borrowerphone ) %]
[% reser.borrowerphone %][% END %] [% IF ( reser.borrowermail ) %] - +
+ [% BLOCK subject %]Hold:[% END %] +
[% reser.borrowermail %] [% END %] @@ -77,7 +80,7 @@ $(document).ready(function() {

None

[% END %] - [% reser.homebranch %] + [% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) %][% END %] [% reser.itemcallnumber %] Cancel transfer -- 1.9.1