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

(-)a/C4/Circulation.pm (-1 / +5 lines)
Lines 1677-1683 sub AddReturn { Link Here
1677
        
1677
        
1678
        # fix fine days
1678
        # fix fine days
1679
        my $debardate = _FixFineDaysOnReturn( $borrower, $item, $issue->{date_due} );
1679
        my $debardate = _FixFineDaysOnReturn( $borrower, $item, $issue->{date_due} );
1680
        $messages->{'Debarred'} = $debardate if ($debardate);
1680
        if ($debardate) {
1681
            $messages->{'Debarred'} = $debardate;
1682
        } elsif ($borrower->{'debarred'}) {
1683
            $messages->{'PrevDebarred'} = $borrower->{'debarred'};
1684
        }
1681
    }
1685
    }
1682
1686
1683
    # find reserves.....
1687
    # 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 470-475 foreach my $code ( keys %$messages ) { Link Here
470
        $err{debarborrowernumber} = $borrower->{borrowernumber};
471
        $err{debarborrowernumber} = $borrower->{borrowernumber};
471
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
472
        $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
472
    }
473
    }
474
    elsif ( $code eq 'PrevDebarred' ) {
475
        $err{prevdebarred}        = format_date( $messages->{'PrevDebarred'} );
476
    }
473
    else {
477
    else {
474
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
478
        die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
475
        # This forces the issue of staying in sync w/ Circulation.pm
479
        # 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 338-343 $(document).ready(function () { Link Here
338
                    [% IF ( errmsgloo.debarred ) %]
338
                    [% IF ( errmsgloo.debarred ) %]
339
                        <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>
339
                        <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>
340
                    [% END %]
340
                    [% END %]
341
                    [% IF ( errmsgloo.prevdebarred ) %]
342
                        <p class="problem"><b>REMINDER: </b>Patron is restricted until [% errmsgloo.prevdebarred %]</p>
343
                    [% END %]
341
            [% END %]
344
            [% END %]
342
[% IF ( soundon ) %]
345
[% IF ( soundon ) %]
343
<audio src="/intranet-tmpl/prog/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
346
<audio src="/intranet-tmpl/prog/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
344
- 

Return to bug 8231