Attachment #71725 for bug #18789

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

Lines 609-616 if ( $patron ) { Link Here

(-)a/circ/circulation.pl (-2 lines)
609	my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $patron->streettype });	609	my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $patron->streettype });
610	my $roadtype = $av->count ? $av->next->lib : '';	610	my $roadtype = $av->count ? $av->next->lib : '';
611	$template->param(	611	$template->param(
612	%{ $patron->unblessed },
613	borrower => $patron->unblessed,
614	roadtype => $roadtype,	612	roadtype => $roadtype,
615	patron => $patron,	613	patron => $patron,
616	categoryname => $patron->category->description,	614	categoryname => $patron->category->description,

Lines 165-169 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-1 / +1 lines)
165	var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers %]";	165	var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers %]";
166	var NorwegianPatronDBEnable = "[% NorwegianPatronDBEnable %]";	166	var NorwegianPatronDBEnable = "[% NorwegianPatronDBEnable %]";
167	var CATCODE_MULTI = "[% CATCODE_MULTI %]";	167	var CATCODE_MULTI = "[% CATCODE_MULTI %]";
168	var borrowernumber = "[% borrowernumber %]";	168	var borrowernumber = "[% patron.borrowernumber %]";
169	</script>	169	</script>




[% INCLUDE 'doc-head-open.inc' %]
[% SET destination = "circ" %]
<title>Koha &rsaquo; Circulation
[% IF patron %]
  &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %]
[% END %]
</title>

[% INCLUDE 'circ-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;
[% IF patron %]
    <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
[% ELSE %]
    <strong>Checkouts</strong>

	<div class="yui-b">
[% END %]

[% IF patron %]
[% INCLUDE 'members-toolbar.inc' %]
[% END %]


[% END %]

    <input type="hidden" name="barcode" value="[% barcode |html %]" />
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
    <input type="hidden" name="issueconfirmed" value="1" />
    <input type="hidden" name="override_high_holds" value="[% override_high_holds %]"/>
    [% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %]

[% IF ( RESERVED ) %]
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
    <input type="hidden" name="restoreduedatespec" />
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
    <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>

[% IF ( RESERVE_WAITING ) %]
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
    <input type="hidden" name="restoreduedatespec" />
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
    <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>


<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
    [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
    <input type="hidden" name="restoreduedatespec" />
    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />


[% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
    [% UNLESS noissues %]
        <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% patron.borrowernumber %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
    [% END %]
[% END %]
</div></div>


                    [% IF ( fast_cataloging ) %]
                        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
                            <a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% patron.borrowernumber %]&amp;branch=[% branch %]&amp;duedatespec=[% duedatespec %]&amp;stickyduedate=[% stickyduedate %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>
                        [% END %]
                    [% END %]
                </div>

                                                        <input type="hidden" name="forceallow" value="1">
                                                    [% END %]
                                                    <input type="hidden" name="restoreduedatespec" />
                                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
                                                    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
                                                    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
                                                    <input type="hidden" name="branch" value="[% branch %]" />


<!-- BARCODE ENTRY -->

[% IF patron %]
<div class="yui-g">

[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]


    </div> <!-- /.checkout-settings -->

          <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
          <input type="hidden" name="branch" value="[% branch %]" />
          <input type="hidden" name="print" value="maybe" />
          <input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" />


			[% IF ( warndeparture ) %]
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
            Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>

			</li>
			[% END %]


			[% IF ( expired ) %]
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
            [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>

			</li>
			[% END %]

                   [% END %]
                   <br/>
                   <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
                    [% IF (noissues && patron && CAN_user_circulate_force_checkout) %]
                        <span class="override_debarment">
                            <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% patron.borrowernumber %]" class="btn btn-default btn-sm">Override restriction temporarily</a>
                        </span>
                    [% END %]
               </li>

    <fieldset class="action">
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
            <input type="hidden" name="from" value="circ" />
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
            <input type="submit" value="Suspend all holds" />

            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]

    <fieldset class="action">
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
            <input type="hidden" name="from" value="circ" />
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
            <input type="hidden" name="suspend" value="0" />
            <input type="submit" value="Resume all suspended holds" />
	</form>


[% ELSIF borrowernumber %]
    <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
[% END %]
</div></div>
[% END %]
[% IF Koha.Preference('CircSidebar') %]
[% UNLESS ( borrowers ) %]
    [% IF not( borrowernumber and patron ) %]
        <div class="yui-b noprint">
            [% INCLUDE 'circ-nav.inc' %]
        </div>

</div>
</div>
[% UNLESS ( borrowers ) %]
    [% IF borrowernumber and patron %]
        <div class="yui-b">
            [% INCLUDE 'circ-menu.inc' %]
        </div>

        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
        var interface = "[% interface %]";
        var theme = "[% theme %]";
        var borrowernumber = "[% patron.borrowernumber %]";
        var branchcode = "[% branch %]";
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];


        columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]

        [% IF borrowernumber and patron %]
            if($.cookie("holdfor") != [% patron.borrowernumber %]){
                $.removeCookie("holdfor", { path: '/' });
            }
        [% ELSE %]
            $.removeCookie("holdfor", { path: '/' });
        [% END %]

        [% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]

        // On-site checkout
        function toggle_onsite_checkout(){

            if ( $('#clubs-tab').length ) {
                $('#clubs-tab-link').on('click', function() {
                    $('#clubs-tab').text(_("Loading..."));
                    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% patron.borrowernumber %]');
                });
            }

- 

Return to bug 18789

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-27 / +26 lines)
10	[% INCLUDE 'doc-head-open.inc' %]	10	[% INCLUDE 'doc-head-open.inc' %]
11	[% SET destination = "circ" %]	11	[% SET destination = "circ" %]
12	<title>Koha &rsaquo; Circulation	12	<title>Koha &rsaquo; Circulation
13	[% IF borrowernumber and borrower%]	13	[% IF patron %]
14	&rsaquo; Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %]	14	&rsaquo; Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %]
15	[% END %]	15	[% END %]
16	</title>	16	</title>
Lines 24-30 Link Here
24	[% INCLUDE 'circ-search.inc' %]	24	[% INCLUDE 'circ-search.inc' %]
25		25
26	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;	26	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;
27	[% IF borrowernumber and borrower %]	27	[% IF patron %]
28	<a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]	28	<a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
29	[% ELSE %]	29	[% ELSE %]
30	<strong>Checkouts</strong>	30	<strong>Checkouts</strong>
Lines 44-50 Link Here
44	<div class="yui-b">	44	<div class="yui-b">
45	[% END %]	45	[% END %]
46		46
47	[% IF borrowernumber %]	47	[% IF patron %]
48	[% INCLUDE 'members-toolbar.inc' %]	48	[% INCLUDE 'members-toolbar.inc' %]
49	[% END %]	49	[% END %]
50		50
Lines 226-232 Link Here
226	[% END %]	226	[% END %]
227		227
228	<input type="hidden" name="barcode" value="[% barcode \|html %]" />	228	<input type="hidden" name="barcode" value="[% barcode \|html %]" />
229	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	229	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
230	<input type="hidden" name="issueconfirmed" value="1" />	230	<input type="hidden" name="issueconfirmed" value="1" />
231	<input type="hidden" name="override_high_holds" value="[% override_high_holds %]"/>	231	<input type="hidden" name="override_high_holds" value="[% override_high_holds %]"/>
232	[% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %]	232	[% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %]
Lines 253-259 Link Here
253	[% IF ( RESERVED ) %]	253	[% IF ( RESERVED ) %]
254	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">	254	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
255	<input type="hidden" name="restoreduedatespec" />	255	<input type="hidden" name="restoreduedatespec" />
256	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	256	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
257	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />	257	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />
258	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />	258	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
259	<button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>	259	<button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
Lines 263-269 Link Here
263	[% IF ( RESERVE_WAITING ) %]	263	[% IF ( RESERVE_WAITING ) %]
264	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">	264	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
265	<input type="hidden" name="restoreduedatespec" />	265	<input type="hidden" name="restoreduedatespec" />
266	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	266	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
267	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />	267	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />
268	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />	268	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
269	<button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>	269	<button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
Lines 272-278 Link Here
272		272
273	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">	273	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
274	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]	274	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
275	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	275	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
276	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />	276	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />
277	<input type="hidden" name="restoreduedatespec" />	277	<input type="hidden" name="restoreduedatespec" />
278	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />	278	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
Lines 289-295 Link Here
289		289
290	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]	290	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
291	[% UNLESS noissues %]	291	[% UNLESS noissues %]
292	<button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>	292	<button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% patron.borrowernumber %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
293	[% END %]	293	[% END %]
294	[% END %]	294	[% END %]
295	</div></div>	295	</div></div>
Lines 326-332 Link Here
326		326
327	[% IF ( fast_cataloging ) %]	327	[% IF ( fast_cataloging ) %]
328	[% IF ( CAN_user_editcatalogue_fast_cataloging ) %]	328	[% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
329	<a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&barcode=[% barcode \|uri %]&circborrowernumber=[% borrowernumber %]&branch=[% branch %]&duedatespec=[% duedatespec %]&stickyduedate=[% stickyduedate %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>	329	<a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&barcode=[% barcode \|uri %]&circborrowernumber=[% patron.borrowernumber %]&branch=[% branch %]&duedatespec=[% duedatespec %]&stickyduedate=[% stickyduedate %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>
330	[% END %]	330	[% END %]
331	[% END %]	331	[% END %]
332	</div>	332	</div>
Lines 437-443 Link Here
437	<input type="hidden" name="forceallow" value="1">	437	<input type="hidden" name="forceallow" value="1">
438	[% END %]	438	[% END %]
439	<input type="hidden" name="restoreduedatespec" />	439	<input type="hidden" name="restoreduedatespec" />
440	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	440	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
441	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />	441	<input type="hidden" name="duedatespec" value="[% duedatespec %]" />
442	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />	442	<input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
443	<input type="hidden" name="branch" value="[% branch %]" />	443	<input type="hidden" name="branch" value="[% branch %]" />
Lines 487-493 No patron matched <span class="ex">[% message \| html %]</span> Link Here
487		487
488	<!-- BARCODE ENTRY -->	488	<!-- BARCODE ENTRY -->
489		489
490	[% IF borrowernumber and borrower %]	490	[% IF patron %]
491	<div class="yui-g">	491	<div class="yui-g">
492		492
493	[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]	493	[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
Lines 597-603 No patron matched <span class="ex">[% message \| html %]</span> Link Here
597		597
598	</div> <!-- /.checkout-settings -->	598	</div> <!-- /.checkout-settings -->
599		599
600	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />	600	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
601	<input type="hidden" name="branch" value="[% branch %]" />	601	<input type="hidden" name="branch" value="[% branch %]" />
602	<input type="hidden" name="print" value="maybe" />	602	<input type="hidden" name="print" value="maybe" />
603	<input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" />	603	<input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" />
Lines 655-661 No patron matched <span class="ex">[% message \| html %]</span> Link Here
655		655
656	[% IF ( warndeparture ) %]	656	[% IF ( warndeparture ) %]
657	<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.	657	<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
658	Patron's card expires on [% expiry \| $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a>	658	Patron's card expires on [% expiry \| $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a>
659		659
660	</li>	660	</li>
661	[% END %]	661	[% END %]
Lines 668-674 No patron matched <span class="ex">[% message \| html %]</span> Link Here
668		668
669	[% IF ( expired ) %]	669	[% IF ( expired ) %]
670	<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.	670	<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
671	[% IF ( expiry ) %]Patron's card expired on [% expiry \| $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a>	671	[% IF ( expiry ) %]Patron's card expired on [% expiry \| $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a>
672		672
673	</li>	673	</li>
674	[% END %]	674	[% END %]
Lines 700-708 No patron matched <span class="ex">[% message \| html %]</span> Link Here
700	[% END %]	700	[% END %]
701	<br/>	701	<br/>
702	<a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>	702	<a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
703	[% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %]	703	[% IF (noissues && patron && CAN_user_circulate_force_checkout) %]
704	<span class="override_debarment">	704	<span class="override_debarment">
705	<a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% borrowernumber %]" class="btn btn-default btn-sm">Override restriction temporarily</a>	705	<a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber %]" class="btn btn-default btn-sm">Override restriction temporarily</a>
706	</span>	706	</span>
707	[% END %]	707	[% END %]
708	</li>	708	</li>
Lines 902-908 No patron matched <span class="ex">[% message \| html %]</span> Link Here
902	<fieldset class="action">	902	<fieldset class="action">
903	<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">	903	<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
904	<input type="hidden" name="from" value="circ" />	904	<input type="hidden" name="from" value="circ" />
905	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	905	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
906	<input type="submit" value="Suspend all holds" />	906	<input type="submit" value="Suspend all holds" />
907		907
908	[% IF Koha.Preference('AutoResumeSuspendedHolds') %]	908	[% IF Koha.Preference('AutoResumeSuspendedHolds') %]
Lines 916-922 No patron matched <span class="ex">[% message \| html %]</span> Link Here
916	<fieldset class="action">	916	<fieldset class="action">
917	<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">	917	<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
918	<input type="hidden" name="from" value="circ" />	918	<input type="hidden" name="from" value="circ" />
919	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />	919	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
920	<input type="hidden" name="suspend" value="0" />	920	<input type="hidden" name="suspend" value="0" />
921	<input type="submit" value="Resume all suspended holds" />	921	<input type="submit" value="Resume all suspended holds" />
922	</form>	922	</form>
Lines 934-945 No patron matched <span class="ex">[% message \| html %]</span> Link Here
934		934
935	[% ELSIF borrowernumber %]	935	[% ELSIF borrowernumber %]
936	<div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>	936	<div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
937	[% END %] <!-- borrowernumber and borrower-->	937	[% END %]
938	</div></div>	938	</div></div>
939	[% END %]	939	[% END %]
940	[% IF Koha.Preference('CircSidebar') %]	940	[% IF Koha.Preference('CircSidebar') %]
941	[% UNLESS ( borrowers ) %]	941	[% UNLESS ( borrowers ) %]
942	[% IF not( borrowernumber and borrower ) %]	942	[% IF not( borrowernumber and patron ) %]
943	<div class="yui-b noprint">	943	<div class="yui-b noprint">
944	[% INCLUDE 'circ-nav.inc' %]	944	[% INCLUDE 'circ-nav.inc' %]
945	</div>	945	</div>
Lines 949-955 No patron matched <span class="ex">[% message \| html %]</span> Link Here
949	</div>	949	</div>
950	</div>	950	</div>
951	[% UNLESS ( borrowers ) %]	951	[% UNLESS ( borrowers ) %]
952	[% IF borrowernumber and borrower %]	952	[% IF borrowernumber and patron %]
953	<div class="yui-b">	953	<div class="yui-b">
954	[% INCLUDE 'circ-menu.inc' %]	954	[% INCLUDE 'circ-menu.inc' %]
955	</div>	955	</div>
Lines 988-994 No patron matched <span class="ex">[% message \| html %]</span> Link Here
988	var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");	988	var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
989	var interface = "[% interface %]";	989	var interface = "[% interface %]";
990	var theme = "[% theme %]";	990	var theme = "[% theme %]";
991	var borrowernumber = "[% borrowernumber %]";	991	var borrowernumber = "[% patron.borrowernumber %]";
992	var branchcode = "[% branch %]";	992	var branchcode = "[% branch %]";
993	var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";	993	var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
994	var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];	994	var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];
Lines 1013-1027 No patron matched <span class="ex">[% message \| html %]</span> Link Here
1013		1013
1014	columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]	1014	columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]
1015		1015
1016	[% IF borrowernumber and borrower %]	1016	[% IF borrowernumber and patron %]
1017	if($.cookie("holdfor") != [% borrowernumber %]){	1017	if($.cookie("holdfor") != [% patron.borrowernumber %]){
1018	$.removeCookie("holdfor", { path: '/' });	1018	$.removeCookie("holdfor", { path: '/' });
1019	}	1019	}
1020	[% ELSE %]	1020	[% ELSE %]
1021	$.removeCookie("holdfor", { path: '/' });	1021	$.removeCookie("holdfor", { path: '/' });
1022	[% END %]	1022	[% END %]
1023		1023
1024	[% UNLESS ( borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]	1024	[% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
1025		1025
1026	// On-site checkout	1026	// On-site checkout
1027	function toggle_onsite_checkout(){	1027	function toggle_onsite_checkout(){
Lines 1061-1067 No patron matched <span class="ex">[% message \| html %]</span> Link Here
1061	if ( $('#clubs-tab').length ) {	1061	if ( $('#clubs-tab').length ) {
1062	$('#clubs-tab-link').on('click', function() {	1062	$('#clubs-tab-link').on('click', function() {
1063	$('#clubs-tab').text(_("Loading..."));	1063	$('#clubs-tab').text(_("Loading..."));
1064	$('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');	1064	$('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% patron.borrowernumber %]');
1065	});	1065	});
1066	}	1066	}
1067		1067
1068	-