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

(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 537-543 foreach my $flag ( sort keys %$flags ) { Link Here
537
    }
537
    }
538
}
538
}
539
539
540
my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
540
my $amountold = $borrower->{flags} ? $borrower->{flags}->{'CHARGES'}->{'message'} || 0 : 0;
541
$amountold =~ s/^.*\$//;    # remove upto the $, if any
541
$amountold =~ s/^.*\$//;    # remove upto the $, if any
542
542
543
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
543
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-7 / +9 lines)
Lines 10-16 Link Here
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 %]
13
[% IF borrowernumber and borrower%]
14
  &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 %]
14
  &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 %]
15
[% END %]
15
[% END %]
16
</title>
16
</title>
Lines 50-56 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
50
50
51
columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]
51
columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]
52
52
53
[% IF ( borrowernumber ) %]
53
[% IF borrowernumber and borrower %]
54
    if($.cookie("holdfor") != [% borrowernumber %]){
54
    if($.cookie("holdfor") != [% borrowernumber %]){
55
        $.removeCookie("holdfor", { path: '/' });
55
        $.removeCookie("holdfor", { path: '/' });
56
    }
56
    }
Lines 129-135 $(document).ready(function() { Link Here
129
[% INCLUDE 'circ-search.inc' %]
129
[% INCLUDE 'circ-search.inc' %]
130
130
131
<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;
131
<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;
132
[% IF ( borrowernumber ) %]
132
[% IF borrowernumber and borrower %]
133
    <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
133
    <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
134
[% ELSE %]
134
[% ELSE %]
135
    <strong>Checkouts</strong>
135
    <strong>Checkouts</strong>
Lines 149-155 $(document).ready(function() { Link Here
149
	<div class="yui-b">
149
	<div class="yui-b">
150
[% END %]
150
[% END %]
151
151
152
[% IF ( borrowernumber ) %]
152
[% IF borrowernumber and borrower %]
153
[% INCLUDE 'members-toolbar.inc' %]
153
[% INCLUDE 'members-toolbar.inc' %]
154
[% END %]
154
[% END %]
155
155
Lines 599-605 No patron matched <span class="ex">[% message %]</span> Link Here
599
599
600
<!-- BARCODE ENTRY -->
600
<!-- BARCODE ENTRY -->
601
601
602
[% IF ( borrowernumber ) %]
602
[% IF borrowernumber and borrower %]
603
<div class="yui-g">
603
<div class="yui-g">
604
604
605
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
605
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
Lines 977-989 No patron matched <span class="ex">[% message %]</span> Link Here
977
[% END %]
977
[% END %]
978
</div> <!-- reservesloop -->
978
</div> <!-- reservesloop -->
979
979
980
[% END %] <!-- borrowernumber -->
980
[% ELSE %]
981
    <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
982
[% END %] <!-- borrowernumber and borrower-->
981
</div></div>
983
</div></div>
982
[% END %]
984
[% END %]
983
985
984
</div>
986
</div>
985
</div>
987
</div>
986
[% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]<div class="yui-b">
988
[% UNLESS ( borrowers ) %][% IF borrowernumber and borrower %]<div class="yui-b">
987
[% INCLUDE 'circ-menu.inc' %]
989
[% INCLUDE 'circ-menu.inc' %]
988
</div>[% END %][% END %]
990
</div>[% END %][% END %]
989
</div>
991
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-11 / +18 lines)
Lines 7-13 Link Here
7
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
[% SET destination = "circ" %]
8
[% SET destination = "circ" %]
9
<title>Koha &rsaquo; Circulation
9
<title>Koha &rsaquo; Circulation
10
[% IF borrowernumber %]
10
[% IF borrowernumber and borrower %]
11
  &rsaquo; Batch check out &rsaquo; Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 %]
11
  &rsaquo; Batch check out &rsaquo; Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 %]
12
[% END %]
12
[% END %]
13
</title>
13
</title>
Lines 42-48 $(document).ready(function() { Link Here
42
[% INCLUDE 'circ-search.inc' %]
42
[% INCLUDE 'circ-search.inc' %]
43
43
44
<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;
44
<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;
45
    <a href="/cgi-bin/koha/circ/circulation.pl">Batch check out</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
45
    [% IF borrower and borrowernumber %]
46
        <a href="/cgi-bin/koha/circ/circulation.pl">Batch check out</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
47
    [% ELSE %]
48
        Batch check out
49
    [% END %]
46
</div>
50
</div>
47
<div id="doc3" class="yui-t2">
51
<div id="doc3" class="yui-t2">
48
52
Lines 52-71 $(document).ready(function() { Link Here
52
56
53
<div class="yui-g">
57
<div class="yui-g">
54
58
55
[% IF ( borrowernumber ) %]
59
[% IF borrowernumber and borrower %]
56
[% INCLUDE 'members-toolbar.inc' %]
60
[% INCLUDE 'members-toolbar.inc' %]
57
[% END %]
61
[% END %]
58
62
59
[% IF NOT batch_allowed %]
63
[% IF borrower and not batch_allowed %]
60
  <div class="dialog alert">You are not allowed to use batch checkout for this patron</div>
64
  <div class="dialog alert">You are not allowed to use batch checkout for this patron</div>
61
[% ELSIF noissues and not checkout_infos %]
65
[% ELSIF borrower and noissues and not checkout_infos %]
62
  <div class="dialog alert">
66
  <div class="dialog alert">
63
    Cannot check out!
67
    Cannot check out!
64
    [% IF charges_is_blocker %]
68
    [% IF charges_is_blocker %]
65
      Checkouts are <span class="circ-hlt">BLOCKED</span> because fine balance is <span class="circ-hlt">OVER THE LIMIT</span>.
69
      Checkouts are <span class="circ-hlt">BLOCKED</span> because fine balance is <span class="circ-hlt">OVER THE LIMIT</span>.
66
    [% END %]
70
    [% END %]
67
  </div>
71
  </div>
68
[% ELSIF NOT checkout_infos %]
72
[% ELSIF borrower and not checkout_infos %]
69
  <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
73
  <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
70
    <fieldset id="circ_circulation_issue">
74
    <fieldset id="circ_circulation_issue">
71
      <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
75
      <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
Lines 94-100 $(document).ready(function() { Link Here
94
    </fieldset>
98
    </fieldset>
95
  </form>
99
  </form>
96
100
97
[% ELSE %]
101
[% ELSIF borrower %]
98
  [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
102
  [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
99
    <h3>Batch checkout confirmation [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
103
    <h3>Batch checkout confirmation [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
100
    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
104
    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
Lines 276-288 $(document).ready(function() { Link Here
276
    </form>
280
    </form>
277
    [% END %]
281
    [% END %]
278
282
283
[% ELSE %]
284
    <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
279
[% END %]
285
[% END %]
280
286
281
</div>
287
</div>
282
</div>
288
</div>
283
</div>
289
</div>
284
<div class="yui-b">
290
[% IF borrower %]
285
[% INCLUDE 'circ-menu.inc' %]
291
    <div class="yui-b">
286
</div>
292
        [% INCLUDE 'circ-menu.inc' %]
293
    </div>
294
[% END %]
287
</div>
295
</div>
288
[% INCLUDE 'intranet-bottom.inc' %]
296
[% INCLUDE 'intranet-bottom.inc' %]
289
- 

Return to bug 16082