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

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-12 / +9 lines)
Lines 58-64 $.tablesorter.addParser({ Link Here
58
    <div id="yui-main">
58
    <div id="yui-main">
59
    <div class="yui-b"><div class="yui-g">
59
    <div class="yui-b"><div class="yui-g">
60
	<div id="userdetails" class="container">
60
	<div id="userdetails" class="container">
61
62
	[% IF ( bor_messages ) %]
61
	[% IF ( bor_messages ) %]
63
	       <div class="dialog message">
62
	       <div class="dialog message">
64
	               <h3>Messages For You</h3>
63
	               <h3>Messages For You</h3>
Lines 89-95 $.tablesorter.addParser({ Link Here
89
        </div>
88
        </div>
90
        [% END %]
89
        [% END %]
91
90
92
        [% IF ( BORROWER_INF.flagged ) %]
91
        [% IF ( patron_flagged ) %]
93
		<div class="dialog alert">
92
		<div class="dialog alert">
94
        <ul>
93
        <ul>
95
            [% IF ( userdebarred ) %]
94
            [% IF ( userdebarred ) %]
Lines 196-202 $.tablesorter.addParser({ Link Here
196
        [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
195
        [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
197
        <th>Call No.</th>
196
        <th>Call No.</th>
198
        [% IF ( OpacRenewalAllowed ) %]
197
        [% IF ( OpacRenewalAllowed ) %]
199
        [% UNLESS  patron_flagged %]<th class="{sorter: false}">Renew</th>[% END %]
198
        <th class="{sorter: false}">Renew</th>
200
        [% END %]
199
        [% END %]
201
[% IF ( OPACFinesTab ) %]
200
[% IF ( OPACFinesTab ) %]
202
        <th>Fines</th>
201
        <th>Fines</th>
Lines 244-255 $.tablesorter.addParser({ Link Here
244
                [% IF ( show_barcode ) %]<td>[% ISSUE.barcode %]</td>[% END %]
243
                [% IF ( show_barcode ) %]<td>[% ISSUE.barcode %]</td>[% END %]
245
                <td>[% ISSUE.itemcallnumber %]</td>
244
                <td>[% ISSUE.itemcallnumber %]</td>
246
                [% IF ( OpacRenewalAllowed ) %]
245
                [% IF ( OpacRenewalAllowed ) %]
247
                    [% UNLESS patron_flagged %]
246
                    <td>[% IF ( ISSUE.status ) %][% IF ( canrenew ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
248
                    <td>[% IF ( ISSUE.status ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a> <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
249
                        [% ELSE %]
247
                        [% ELSE %]
250
                        Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
248
                        Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
251
                        [% END %]</td>
249
                        [% END %]</td>
252
                    [% END %]
253
                [% END %]
250
                [% END %]
254
[% IF ( OPACFinesTab ) %]
251
[% IF ( OPACFinesTab ) %]
255
                <td>[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
252
                <td>[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
Lines 271-277 $.tablesorter.addParser({ Link Here
271
			[% FOREACH ISSUE IN ISSUES %]
268
			[% FOREACH ISSUE IN ISSUES %]
272
			<input type="hidden" name="item" value="[% ISSUE.itemnumber %]" />
269
			<input type="hidden" name="item" value="[% ISSUE.itemnumber %]" />
273
			[% END %]
270
			[% END %]
274
			[% UNLESS patron_flagged %]<input type="submit" value="Renew All" />[% END %]
271
			<input type="submit" value="Renew All" />
275
		</form>
272
		</form>
276
		[% END %]
273
		[% END %]
277
    [% ELSE %]
274
    [% ELSE %]
Lines 293-299 $.tablesorter.addParser({ Link Here
293
<th>Call No.</th>
290
<th>Call No.</th>
294
<th>Due</th>
291
<th>Due</th>
295
[% IF ( OpacRenewalAllowed ) %]
292
[% IF ( OpacRenewalAllowed ) %]
296
                    [% UNLESS patron_flagged %]<th class="{sorter: false}">Renew</th>[% END %][% END %]
293
                    <th class="{sorter: false}">Renew</th>
294
[% END %]
297
[% IF ( OPACFinesTab ) %]
295
[% IF ( OPACFinesTab ) %]
298
<th>Fines</th>
296
<th>Fines</th>
299
[% END %]
297
[% END %]
Lines 325-339 $.tablesorter.addParser({ Link Here
325
<td>[% OVERDUE.itemcallnumber %]</td>
323
<td>[% OVERDUE.itemcallnumber %]</td>
326
<td>[% OVERDUE.date_due %]</td>
324
<td>[% OVERDUE.date_due %]</td>
327
                [% IF ( OpacRenewalAllowed ) %]
325
                [% IF ( OpacRenewalAllowed ) %]
328
                    [% UNLESS patron_flagged %]
329
<td>
326
<td>
330
[% IF ( OVERDUE.debarred ) %]Account Frozen
327
[% IF ( OVERDUE.debarred ) %]Account Frozen
331
[% ELSIF ( OVERDUE.status ) %]
328
[% ELSIF ( OVERDUE.status ) %]
332
<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber %]&amp;bornum=[% OVERDUE.borrowernumber %]">Renew</a> <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
329
[% IF ( canrenew ) %]<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber %]&amp;bornum=[% OVERDUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
333
[% ELSIF ( OVERDUE.onreserve ) %]On Reserve
330
[% ELSIF ( OVERDUE.onreserve ) %]On hold
334
[% ELSE %]No renewals left
331
[% ELSE %]No renewals left
335
[% END %]
332
[% END %]
336
</td>[% END %][% END %]
333
</td>[% END %]
337
[% IF ( OPACFinesTab ) %]
334
[% IF ( OPACFinesTab ) %]
338
<td>[% IF ( OVERDUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
335
<td>[% IF ( OVERDUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
339
[% END %]
336
[% END %]
(-)a/opac/opac-user.pl (-4 / +3 lines)
Lines 67-72 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
67
67
68
my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
68
my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
69
my $patronupdate = $query->param('patronupdate');
69
my $patronupdate = $query->param('patronupdate');
70
my $canrenew = 1;
70
71
71
# get borrower information ....
72
# get borrower information ....
72
my ( $borr ) = GetMemberDetails( $borrowernumber );
73
my ( $borr ) = GetMemberDetails( $borrowernumber );
Lines 92-97 if ($debar) { Link Here
92
93
93
if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
94
if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
94
    $borr->{'flagged'} = 1;
95
    $borr->{'flagged'} = 1;
96
    $canrenew = 0;
95
}
97
}
96
98
97
if ( $borr->{'amountoutstanding'} > 5 ) {
99
if ( $borr->{'amountoutstanding'} > 5 ) {
Lines 105-110 $no_renewal_amt ||= 0; Link Here
105
107
106
if ( $borr->{amountoutstanding} > $no_renewal_amt ) {
108
if ( $borr->{amountoutstanding} > $no_renewal_amt ) {
107
    $borr->{'flagged'} = 1;
109
    $borr->{'flagged'} = 1;
110
    $canrenew = 0;
108
    $template->param(
111
    $template->param(
109
        renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
112
        renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
110
    );
113
    );
Lines 144-156 $template->param( BORROWER_INFO => \@bordat, Link Here
144
#get issued items ....
147
#get issued items ....
145
148
146
my $count          = 0;
149
my $count          = 0;
147
my $toggle = 0;
148
my $overdues_count = 0;
150
my $overdues_count = 0;
149
my @overdues;
151
my @overdues;
150
my @issuedat;
152
my @issuedat;
151
my $itemtypes = GetItemTypes();
153
my $itemtypes = GetItemTypes();
152
my ($issues) = GetPendingIssues($borrowernumber);
154
my ($issues) = GetPendingIssues($borrowernumber);
153
my $canrenew = 0;
154
if ($issues){
155
if ($issues){
155
	foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) {
156
	foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) {
156
		# check for reserves
157
		# check for reserves
Lines 181-187 if ($issues){ Link Here
181
		($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
182
		($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
182
        if($status && C4::Context->preference("OpacRenewalAllowed")){
183
        if($status && C4::Context->preference("OpacRenewalAllowed")){
183
            $issue->{'status'} = $status;
184
            $issue->{'status'} = $status;
184
            $canrenew = 1;
185
        }
185
        }
186
		$issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
186
		$issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
187
		$issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
187
		$issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
188
- 

Return to bug 6598