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

(-)a/C4/Circulation.pm (-2 / +7 lines)
Lines 823-830 sub CanBookBeIssued { Link Here
823
	        $needsconfirmation{USERBLOCKEDOVERDUE} = $count;
823
	        $needsconfirmation{USERBLOCKEDOVERDUE} = $count;
824
	    }
824
	    }
825
    } elsif($blocktype == 1) {
825
    } elsif($blocktype == 1) {
826
        # patron has accrued fine days
826
        # patron has accrued fine days or has a restriction. $count is a date
827
        $issuingimpossible{USERBLOCKEDREMAINING} = $count;
827
        if ($count eq '9999-12-31') {
828
            $issuingimpossible{USERBLOCKEDNOENDDATE} = $count;
829
        }
830
        else {
831
            $issuingimpossible{USERBLOCKEDWITHENDDATE} = format_date($count);
832
        }
828
    }
833
    }
829
834
830
#
835
#
(-)a/C4/Members.pm (-1 / +2 lines)
Lines 650-656 that would block circulation privileges. Link Here
650
650
651
C<$block_status> can have the following values:
651
C<$block_status> can have the following values:
652
652
653
1 if the patron has outstanding fine days, in which case C<$count> is the number of them
653
1 if the patron has outstanding fine days or a manual debarment, in which case
654
C<$count> is the expiration date (9999-12-31 for indefinite)
654
655
655
-1 if the patron has overdue items, in which case C<$count> is the number of them
656
-1 if the patron has overdue items, in which case C<$count> is the number of them
656
657
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-6 / +9 lines)
Lines 409-420 $(document).ready(function() { Link Here
409
            <li>This item belongs to [% Branches.GetName( itemhomebranch ) %] and cannot be checked out from this location.</li>
409
            <li>This item belongs to [% Branches.GetName( itemhomebranch ) %] and cannot be checked out from this location.</li>
410
        [% END %]
410
        [% END %]
411
411
412
        [% IF ( USERBLOCKEDREMAINING ) %]
412
        [% IF ( USERBLOCKEDWITHENDDATE ) %]
413
            <li>Patron has had overdue items and is blocked for [% USERBLOCKEDREMAINING %] day(s).</li>
413
            <li>Patron has a restriction until [% USERBLOCKEDWITHENDDATE %].</li>
414
        [% END %]
414
        [% END %]
415
	
415
416
	    [% IF ( USERBLOCKEDOVERDUE ) %]
416
        [% IF ( USERBLOCKEDNOENDDATE ) %]
417
            <li>Checkouts are BLOCKED because patron has overdue items</li>
417
            <li>Patron has a restriction (no expiry date).</li>
418
        [% END %]
419
420
        [% IF ( USERBLOCKEDOVERDUE ) %]
421
            <li>Checkouts are BLOCKED because patron has overdue items.</li>
418
        [% END %]
422
        [% END %]
419
        </ul>
423
        </ul>
420
424
421
- 

Return to bug 12914