@@ -, +, @@ 2014-09-30 day(s). --- C4/Circulation.pm | 9 +++++++-- C4/Members.pm | 3 ++- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 14 +++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -823,8 +823,13 @@ sub CanBookBeIssued { $needsconfirmation{USERBLOCKEDOVERDUE} = $count; } } elsif($blocktype == 1) { - # patron has accrued fine days - $issuingimpossible{USERBLOCKEDREMAINING} = $count; + # patron has accrued fine days or has a restriction. $count is a date + if ($count eq '9999-12-31') { + $issuingimpossible{USERBLOCKEDNOENDDATE} = $count; + } + else { + $issuingimpossible{USERBLOCKEDWITHENDDATE} = format_date($count); + } } # --- a/C4/Members.pm +++ a/C4/Members.pm @@ -650,7 +650,8 @@ that would block circulation privileges. C<$block_status> can have the following values: -1 if the patron has outstanding fine days, in which case C<$count> is the number of them +1 if the patron has outstanding fine days or a manual debarment, in which case +C<$count> is the expiration date (9999-12-31 for indefinite) -1 if the patron has overdue items, in which case C<$count> is the number of them --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -405,12 +405,16 @@ $(document).ready(function() {
  • This item belongs to [% Branches.GetName( itemhomebranch ) %] and cannot be checked out from this location.
  • [% END %] - [% IF ( USERBLOCKEDREMAINING ) %] -
  • Patron has had overdue items and is blocked for [% USERBLOCKEDREMAINING %] day(s).
  • + [% IF ( USERBLOCKEDWITHENDDATE ) %] +
  • Patron has a restriction until [% USERBLOCKEDWITHENDDATE %].
  • [% END %] - - [% IF ( USERBLOCKEDOVERDUE ) %] -
  • Checkouts are BLOCKED because patron has overdue items
  • + + [% IF ( USERBLOCKEDNOENDDATE ) %] +
  • Patron has a restriction (no expiry date).
  • + [% END %] + + [% IF ( USERBLOCKEDOVERDUE ) %] +
  • Checkouts are BLOCKED because patron has overdue items.
  • [% END %] --