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

(-)a/C4/Circulation.pm (+6 lines)
Lines 2465-2470 sub CanBookBeRenewed { Link Here
2465
        $renewokay = 0;
2465
        $renewokay = 0;
2466
        $error = "on_reserve";
2466
        $error = "on_reserve";
2467
    }
2467
    }
2468
    
2469
    my ($memberblocked) = C4::Members::IsMemberBlocked($borrowernumber);
2470
    if ($memberblocked == 1) {
2471
        $renewokay = 0;
2472
        $error="member_blocked";
2473
    }
2468
2474
2469
    return ( $renewokay, $error );
2475
    return ( $renewokay, $error );
2470
}
2476
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+6 lines)
Lines 856-861 No patron matched <span class="ex">[% message %]</span> Link Here
856
                [% IF ( todayissue.renew_error_too_many ) %]
856
                [% IF ( todayissue.renew_error_too_many ) %]
857
            Not renewable
857
            Not renewable
858
                [% END %]
858
                [% END %]
859
                [% IF ( todayissue.renew_error_member_blocked ) %]
860
                    Not renewable: Patron restricted
861
                [% END %]
859
            [% IF ( todayissue.can_confirm ) %]
862
            [% IF ( todayissue.can_confirm ) %]
860
                </span>
863
                </span>
861
            [% END %]
864
            [% END %]
Lines 938-943 No patron matched <span class="ex">[% message %]</span> Link Here
938
                [% IF ( previssue.renew_error_too_many ) %]
941
                [% IF ( previssue.renew_error_too_many ) %]
939
            Not renewable
942
            Not renewable
940
                [% END %]
943
                [% END %]
944
                [% IF ( previssue.renew_error_member_blocked ) %]
945
                    Not renewable: Patron restricted
946
                [% END %]
941
            [% IF ( previssue.can_confirm ) %]
947
            [% IF ( previssue.can_confirm ) %]
942
                </span>
948
                </span>
943
            [% END %]
949
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+3 lines)
Lines 504-509 function validate1(date) { Link Here
504
                    [% IF ( issueloo.norenew_reason_too_many ) %]
504
                    [% IF ( issueloo.norenew_reason_too_many ) %]
505
                        Not renewable
505
                        Not renewable
506
                    [% END %]
506
                    [% END %]
507
                    [% IF ( issueloo.norenew_reason_member_blocked ) %]
508
                        Not renewable: Patron restricted
509
                    [% END %]
507
                [% IF ( issueloo.can_confirm ) %]
510
                [% IF ( issueloo.can_confirm ) %]
508
                    </span>
511
                    </span>
509
                [% END %]
512
                [% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-1 / +1 lines)
Lines 195-201 $.tablesorter.addParser({ Link Here
195
                [% IF ( OpacRenewalAllowed ) %]
195
                [% IF ( OpacRenewalAllowed ) %]
196
                    <td class="renew">[% 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>
196
                    <td class="renew">[% 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>
197
                        [% ELSE %]
197
                        [% ELSE %]
198
                        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 %] 
198
                        Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSIF ( ISSUE.member_blocked ) %]<span class="renewals">(Account frozen)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
199
                        [% END %]</td>
199
                        [% END %]</td>
200
                [% END %]
200
                [% END %]
201
[% IF ( OPACFinesTab ) %]
201
[% IF ( OPACFinesTab ) %]
(-)a/opac/opac-user.pl (-1 / +1 lines)
Lines 185-190 if ($issues){ Link Here
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
        $issue->{'member_blocked'} = 1 if $renewerror and $renewerror eq 'member_blocked';
188
189
189
        if ( $issue->{'overdue'} ) {
190
        if ( $issue->{'overdue'} ) {
190
            push @overdues, $issue;
191
            push @overdues, $issue;
191
- 

Return to bug 10089