Attachment #62297 for bug #18335

View | Details | Raw Unified | Return to bug 18335
Collapse All | Expand All

Lines 92-98 my $printer = $userenv->{'branchprinter'} // ''; Link Here

(-)a/circ/returns.pl (-11 / +17 lines)
92	my $forgivemanualholdsexpire = $query->param('forgivemanualholdsexpire');	92	my $forgivemanualholdsexpire = $query->param('forgivemanualholdsexpire');
93		93
94	my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');	94	my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
95	#	95	#
96	# Some code to handle the error if there is no branch or printer setting.....	96	# Some code to handle the error if there is no branch or printer setting.....
97	#	97	#
98		98
Lines 413-423 if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { Link Here
413	wbortitle => $borr->{'title'},	413	wbortitle => $borr->{'title'},
414	wborphone => $borr->{'phone'},	414	wborphone => $borr->{'phone'},
415	wboremail => $borr->{'email'},	415	wboremail => $borr->{'email'},
416	wborstnum => $borr->{streetnumber},	416	streetnumber => $borr->{streetnumber},
417	wboraddress => $borr->{'address'},	417	streettype => $borr->{streettype},
418	wboraddress2 => $borr->{'address2'},	418	address => $borr->{'address'},
419	wborcity => $borr->{'city'},	419	address2 => $borr->{'address2'},
420	wborzip => $borr->{'zipcode'},	420	city => $borr->{'city'},
		421	zipcode => $borr->{'zipcode'},
		422	state => $borr->{'state'},
		423	country => $borr->{'country'},
421	wborrowernumber => $reserve->{'borrowernumber'},	424	wborrowernumber => $reserve->{'borrowernumber'},
422	wborcnum => $borr->{'cardnumber'},	425	wborcnum => $borr->{'cardnumber'},
423	wtransfertFrom => $userenv_branch,	426	wtransfertFrom => $userenv_branch,
Lines 455-465 if ( $messages->{'ResFound'}) { Link Here
455	bortitle => $borr->{'title'},	458	bortitle => $borr->{'title'},
456	borphone => $borr->{'phone'},	459	borphone => $borr->{'phone'},
457	boremail => $borr->{'email'},	460	boremail => $borr->{'email'},
458	boraddress => $borr->{'address'},	461	streetnumber => $borr->{streetnumber},
459	boraddress2 => $borr->{'address2'},	462	streettype => $borr->{streettype},
460	borstnum => $borr->{streetnumber},	463	address => $borr->{'address'},
461	borcity => $borr->{'city'},	464	address2 => $borr->{'address2'},
462	borzip => $borr->{'zipcode'},	465	city => $borr->{'city'},
		466	zipcode => $borr->{'zipcode'},
		467	state => $borr->{'state'},
		468	country => $borr->{'country'},
463	borcnum => $borr->{'cardnumber'},	469	borcnum => $borr->{'cardnumber'},
464	debarred => $borr->{'debarred'},	470	debarred => $borr->{'debarred'},
465	gonenoaddress => $borr->{'gonenoaddress'},	471	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 &rsaquo; Circulation &rsaquo; 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 %]&amp;&amp;branchcode=[% TransferWaitingAt %]&amp;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 %]&amp;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 %]">
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
            [% INCLUDE display_holdpatron_address %]
            [% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
            [% IF ( wboremail ) %]<li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>[% END %]
        [% 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>
                    [% INCLUDE display_holdpatron_address %]
                    <li>
                        [% borstnum %] [% boraddress %]<br />
                        [% IF ( boraddress2 ) %]
                            [% boraddress2 %]<br />
                        [% END %]
                        [% borcity %] [% borzip %]
                    </li>

                    [% 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>
                        [% INCLUDE display_holdpatron_address %]
						[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
						[% borcity %]  [% borzip %]</li>
                        [% 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>

                        [% INCLUDE display_holdpatron_address %]
                            [% borstnum %] [% boraddress %]<br />
                            [% IF ( boraddress2 ) %]
                                [% boraddress2 %]<br />
                            [% END %]
                            [% borcity %] [% borzip %]
                        </li>

                        [% IF ( borphone ) %]
                            <li>[% borphone %]</li>
- 

Return to bug 18335

Lines 21-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-28 / +18 lines)
21	[% END %]	21	[% END %]
22	[% END %]	22	[% END %]
23		23
		24	[% BLOCK display_holdpatron_address %]
		25	[% IF Koha.Preference( 'AddressFormat' ) %]
		26	[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
		27	[% ELSE %]
		28	[% INCLUDE 'member-display-address-style-us.inc' %]
		29	[% END %]
		30	[% END %]
		31
24	[% INCLUDE 'doc-head-open.inc' %]	32	[% INCLUDE 'doc-head-open.inc' %]
25	<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title \|html %]</title>	33	<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title \|html %]</title>
26	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />	34	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
Lines 227-239 $(document).ready(function () { Link Here
227	<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>	235	<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>
228	<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>	236	<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>
229	[% IF ( wborcnum ) %]<h5>Hold for:</h5>	237	[% IF ( wborcnum ) %]<h5>Hold for:</h5>
230	<ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">	238	<ul>
		239	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
231	[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>	240	[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
232	<li>[% wborstnum %] [% wboraddress %][% IF ( wboraddress2 ) %]<br />	241	[% INCLUDE display_holdpatron_address %]
233	[% wboraddress2 %]<br />[% END %]	242	[% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
234	[% wborcity %] [% wborzip %]</li>	243	[% IF ( wboremail ) %]<li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>[% END %]
235	[% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
236	[% IF ( wboremail ) %]<li><a id="boremail" href="mailto:[% wboremail %]">[% wboremail %]</a></li>[% END %]
237	</ul>	244	</ul>
238		245
239	<form method="post" action="returns.pl" class="confirm">	246	<form method="post" action="returns.pl" class="confirm">
Lines 273-292 $(document).ready(function () { Link Here
273	[% END %]	280	[% END %]
274		281
275	<h4>Hold for:</h4>	282	<h4>Hold for:</h4>
276		283	<ul>
277	<li>	284	<li>
278	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])	285	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])
279	<span class="patron-category"> - [% borcategory %]</span>	286	<span class="patron-category"> - [% borcategory %]</span>
280	</li>	287	</li>
281		288	[% INCLUDE display_holdpatron_address %]
282	<li>
283	[% borstnum %] [% boraddress %]<br />
284	[% IF ( boraddress2 ) %]
285	[% boraddress2 %]<br />
286	[% END %]
287	[% borcity %] [% borzip %]
288	</li>
289
290	[% IF ( borphone ) %]	289	[% IF ( borphone ) %]
291	<li> [% borphone %]</li>	290	<li> [% borphone %]</li>
292	[% END %]	291	[% END %]
Lines 302-307 $(document).ready(function () { Link Here
302	[% IF ( gonenoaddress ) %]	301	[% IF ( gonenoaddress ) %]
303	<li class="error">Patron's address is in doubt</li>	302	<li class="error">Patron's address is in doubt</li>
304	[% END %]	303	[% END %]
		304	</ul>
305		305
306	[% IF ( transfertodo ) %]	306	[% IF ( transfertodo ) %]
307	<h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) %]</h4>	307	<h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) %]</h4>
Lines 358-366 $(document).ready(function () { Link Here
358	<h4>Hold for: </h4>	358	<h4>Hold for: </h4>
359	<ul>	359	<ul>
360	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>	360	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
361	<li>[% borstnum %] [% boraddress %]<br />	361	[% INCLUDE display_holdpatron_address %]
362	[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
363	[% borcity %] [% borzip %]</li>
364	[% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]	362	[% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]
365	[% IF ( boremail ) %]<li>[% IF ( transfertodo ) %][% boremail %][% ELSE %]<a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>[% END %]</li>[% END %]	363	[% IF ( boremail ) %]<li>[% IF ( transfertodo ) %][% boremail %][% ELSE %]<a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>[% END %]</li>[% END %]
366	[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]	364	[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
Lines 478-484 $(document).ready(function () { Link Here
478	<h4>Notes: [% reservenotes %]</h4>	476	<h4>Notes: [% reservenotes %]</h4>
479	[% END %]	477	[% END %]
480	<h5>Hold for:</h5>	478	<h5>Hold for:</h5>
481
482	<li>	479	<li>
483	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">	480	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
484	[% borsurname %], [% borfirstname %]	481	[% borsurname %], [% borfirstname %]
Lines 487-499 $(document).ready(function () { Link Here
487	<span class="patron-category"> - [% borcategory %]</span>	484	<span class="patron-category"> - [% borcategory %]</span>
488	</li>	485	</li>
489		486
490	<li>	487	[% INCLUDE display_holdpatron_address %]
491	[% borstnum %] [% boraddress %]<br />
492	[% IF ( boraddress2 ) %]
493	[% boraddress2 %]<br />
494	[% END %]
495	[% borcity %] [% borzip %]
496	</li>
497		488
498	[% IF ( borphone ) %]	489	[% IF ( borphone ) %]
499	<li>[% borphone %]</li>	490	<li>[% borphone %]</li>
500	-