my $forgivemanualholdsexpire = $query->param('forgivemanualholdsexpire');
my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
-#
+ #
# Some code to handle the error if there is no branch or printer setting.....
#
wbortitle => $borr->{'title'},
wborphone => $borr->{'phone'},
wboremail => $borr->{'email'},
- wborstnum => $borr->{streetnumber},
- wboraddress => $borr->{'address'},
- wboraddress2 => $borr->{'address2'},
- wborcity => $borr->{'city'},
- wborzip => $borr->{'zipcode'},
+ streetnumber => $borr->{streetnumber},
+ streettype => $borr->{streettype},
+ address => $borr->{'address'},
+ address2 => $borr->{'address2'},
+ city => $borr->{'city'},
+ zipcode => $borr->{'zipcode'},
+ state => $borr->{'state'},
+ country => $borr->{'country'},
wborrowernumber => $reserve->{'borrowernumber'},
wborcnum => $borr->{'cardnumber'},
wtransfertFrom => $userenv_branch,
bortitle => $borr->{'title'},
borphone => $borr->{'phone'},
boremail => $borr->{'email'},
- boraddress => $borr->{'address'},
- boraddress2 => $borr->{'address2'},
- borstnum => $borr->{streetnumber},
- borcity => $borr->{'city'},
- borzip => $borr->{'zipcode'},
+ streetnumber => $borr->{streetnumber},
+ streettype => $borr->{streettype},
+ address => $borr->{'address'},
+ address2 => $borr->{'address2'},
+ city => $borr->{'city'},
+ zipcode => $borr->{'zipcode'},
+ state => $borr->{'state'},
+ country => $borr->{'country'},
borcnum => $borr->{'cardnumber'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
[% END %]
[% END %]
+[% BLOCK display_holdpatron_address %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-display-address-style-us.inc' %]
+ [% END %]
+[% END %]
+
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Circulation › Check in [% title |html %]</title>
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
<button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% TransferWaitingAt %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
<button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
- <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
+ <ul>
+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
- <li>[% wborstnum %] [% wboraddress %][% IF ( wboraddress2 ) %]<br />
- [% wboraddress2 %]<br />[% END %]
- [% wborcity %] [% wborzip %]</li>
- [% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
- [% IF ( wboremail ) %]<li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>[% END %]
+ [% INCLUDE display_holdpatron_address %]
+ [% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
+ [% IF ( wboremail ) %]<li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>[% END %]
</ul>
<form method="post" action="returns.pl" class="confirm">
[% END %]
<h4>Hold for:</h4>
-
+ <ul>
<li>
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])
<span class="patron-category"> - [% borcategory %]</span>
</li>
-
- <li>
- [% borstnum %] [% boraddress %]<br />
- [% IF ( boraddress2 ) %]
- [% boraddress2 %]<br />
- [% END %]
- [% borcity %] [% borzip %]
- </li>
-
+ [% INCLUDE display_holdpatron_address %]
[% IF ( borphone ) %]
<li> [% borphone %]</li>
[% END %]
[% IF ( gonenoaddress ) %]
<li class="error">Patron's address is in doubt</li>
[% END %]
+ </ul>
[% IF ( transfertodo ) %]
<h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) %]</h4>
<h4>Hold for: </h4>
<ul>
<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
- <li>[% borstnum %] [% boraddress %]<br />
- [% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
- [% borcity %] [% borzip %]</li>
+ [% INCLUDE display_holdpatron_address %]
[% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]
[% IF ( boremail ) %]<li>[% IF ( transfertodo ) %][% boremail %][% ELSE %]<a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>[% END %]</li>[% END %]
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
<h4>Notes: [% reservenotes %]</h4>
[% END %]
<h5>Hold for:</h5>
-
<li>
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
[% borsurname %], [% borfirstname %]
<span class="patron-category"> - [% borcategory %]</span>
</li>
- <li>
- [% borstnum %] [% boraddress %]<br />
- [% IF ( boraddress2 ) %]
- [% boraddress2 %]<br />
- [% END %]
- [% borcity %] [% borzip %]
- </li>
+ [% INCLUDE display_holdpatron_address %]
[% IF ( borphone ) %]
<li>[% borphone %]</li>