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

(-)a/C4/Circulation.pm (-5 / +9 lines)
Lines 1946-1956 sub AddReturn { Link Here
1946
            }
1946
            }
1947
        # there's no overdue on the item but borrower had been previously debarred
1947
        # there's no overdue on the item but borrower had been previously debarred
1948
        } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
1948
        } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
1949
             my $borrower_debar_dt = dt_from_string( $borrower->{debarred} );
1949
             if ( $borrower->{debarred} eq "9999-12-31") {
1950
             $borrower_debar_dt->truncate(to => 'day');
1950
                $messages->{'ForeverDebarred'} = $borrower->{'debarred'};
1951
             my $today_dt = $today->clone()->truncate(to => 'day');
1951
             } else {
1952
             if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
1952
                  my $borrower_debar_dt = dt_from_string( $borrower->{debarred} );
1953
                 $messages->{'PrevDebarred'} = $borrower->{'debarred'};
1953
                  $borrower_debar_dt->truncate(to => 'day');
1954
                  my $today_dt = $today->clone()->truncate(to => 'day');
1955
                  if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
1956
                      $messages->{'PrevDebarred'} = $borrower->{'debarred'};
1957
                  }
1954
             }
1958
             }
1955
        }
1959
        }
1956
    }
1960
    }
(-)a/circ/returns.pl (+3 lines)
Lines 506-511 foreach my $code ( keys %$messages ) { Link Here
506
    elsif ( $code eq 'PrevDebarred' ) {
506
    elsif ( $code eq 'PrevDebarred' ) {
507
        $err{prevdebarred}        = $messages->{'PrevDebarred'};
507
        $err{prevdebarred}        = $messages->{'PrevDebarred'};
508
    }
508
    }
509
    elsif ( $code eq 'ForeverDebarred' ) {
510
        $err{foreverdebarred}        = $messages->{'ForeverDebarred'};
511
    }
509
    elsif ( $code eq 'NotForLoanStatusUpdated' ) {
512
    elsif ( $code eq 'NotForLoanStatusUpdated' ) {
510
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
513
        $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
511
    }
514
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 440-446 $(document).ready(function() { Link Here
440
        [% END %]
440
        [% END %]
441
441
442
        [% IF ( USERBLOCKEDNOENDDATE ) %]
442
        [% IF ( USERBLOCKEDNOENDDATE ) %]
443
            <li>Patron has a restriction (no expiry date).</li>
443
            <li>Patron has an indefinite restriction.</li>
444
        [% END %]
444
        [% END %]
445
445
446
        [% IF ( USERBLOCKEDOVERDUE ) %]
446
        [% IF ( USERBLOCKEDOVERDUE ) %]
Lines 449-455 $(document).ready(function() { Link Here
449
        </ul>
449
        </ul>
450
450
451
        [% IF (forceallow) %]
451
        [% IF (forceallow) %]
452
            <li>Restriction overridden temporarily</li>
452
            <li>Restriction overridden temporarily.</li>
453
        [% END %]
453
        [% END %]
454
454
455
</div></div>
455
</div></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +4 lines)
Lines 423-428 $(document).ready(function () { Link Here
423
                    [% IF ( errmsgloo.prevdebarred ) %]
423
                    [% IF ( errmsgloo.prevdebarred ) %]
424
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %]</p>
424
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %]</p>
425
                    [% END %]
425
                    [% END %]
426
                    [% IF ( errmsgloo.foreverdebarred ) %]
427
                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction</p>
428
                    [% END %]
429
426
            [% END %]
430
            [% END %]
427
[% IF ( soundon ) %]
431
[% IF ( soundon ) %]
428
<audio src="[% interface %]/[% theme %]/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
432
<audio src="[% interface %]/[% theme %]/sound/critical.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
429
- 

Return to bug 13261