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

(-)a/C4/Circulation.pm (-1 / +5 lines)
Lines 1680-1686 sub AddReturn { Link Here
1680
        
1680
        
1681
        # fix fine days
1681
        # fix fine days
1682
        my $debardate = _FixFineDaysOnReturn( $borrower, $item, $issue->{date_due} );
1682
        my $debardate = _FixFineDaysOnReturn( $borrower, $item, $issue->{date_due} );
1683
        $messages->{'Debarred'} = $debardate if ($debardate);
1683
        if ($debardate) {
1684
            $messages->{'Debarred'} = $debardate;
1685
        } elsif ($borrower->{'debarred'}) {
1686
            $messages->{'PrevDebarred'} = $borrower->{'debarred'};
1687
        }
1684
    }
1688
    }
1685
1689
1686
    # find reserves.....
1690
    # find reserves.....
(-)a/circ/returns.pl (+4 lines)
Lines 46-51 use C4::Koha; # FIXME : is it still useful ? Link Here
46
use C4::RotatingCollections;
46
use C4::RotatingCollections;
47
use Koha::DateUtils;
47
use Koha::DateUtils;
48
use Koha::Calendar;
48
use Koha::Calendar;
49
use C4::Dates qw/format_date/;
49
50
50
my $query = new CGI;
51
my $query = new CGI;
51
52
Lines 469-474 foreach my $code ( keys %$messages ) { Link Here
469
        $err{debarborrowernumber} = $borrower->{borrowernumber};
470
        $err{debarborrowernumber} = $borrower->{borrowernumber};
470
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
471
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
471
    }
472
    }
473
    elsif ( $code eq 'PrevDebarred' ) {
474
        $err{prevdebarred}        = format_date( $messages->{'PrevDebarred'} );
475
    }
472
    else {
476
    else {
473
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
477
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
474
        # This forces the issue of staying in sync w/ Circulation.pm
478
        # This forces the issue of staying in sync w/ Circulation.pm
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +3 lines)
Lines 340-345 $(document).ready(function () { Link Here
340
                    [% IF ( errmsgloo.debarred ) %]
340
                    [% IF ( errmsgloo.debarred ) %]
341
                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %] </p>
341
                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %] </p>
342
                    [% END %]
342
                    [% END %]
343
                    [% IF ( errmsgloo.prevdebarred ) %]
344
                        <p class="problem"><b>REMINDER: </b>Patron is restricted until [% errmsgloo.prevdebarred %]</p>
345
                    [% END %]
343
            [% END %]
346
            [% END %]
344
[% IF ( soundon ) %]
347
[% IF ( soundon ) %]
345
<audio src="/intranet-tmpl/prog/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
348
<audio src="/intranet-tmpl/prog/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
346
- 

Return to bug 8231