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

(-)a/C4/Auth_with_ldap.pm (-1 / +2 lines)
Lines 356-362 C4::Auth - Authenticates Koha users Link Here
356
		| dateexpiry          | date         | YES  |     | NULL    |                |
356
		| dateexpiry          | date         | YES  |     | NULL    |                |
357
		| gonenoaddress       | tinyint(1)   | YES  |     | NULL    |                |
357
		| gonenoaddress       | tinyint(1)   | YES  |     | NULL    |                |
358
		| lost                | tinyint(1)   | YES  |     | NULL    |                |
358
		| lost                | tinyint(1)   | YES  |     | NULL    |                |
359
		| debarred            | tinyint(1)   | YES  |     | NULL    |                |
359
		| debarred            | date         | YES  |     | NULL    |                |
360
        | debarredcomment     | varchar(255) | YES  |     | NULL    |                |
360
		| contactname         | mediumtext   | YES  |     | NULL    |                |
361
		| contactname         | mediumtext   | YES  |     | NULL    |                |
361
		| contactfirstname    | text         | YES  |     | NULL    |                |
362
		| contactfirstname    | text         | YES  |     | NULL    |                |
362
		| contacttitle        | text         | YES  |     | NULL    |                |
363
		| contacttitle        | text         | YES  |     | NULL    |                |
(-)a/C4/ILSDI/Utility.pm (-1 / +1 lines)
Lines 94-100 sub CanBookBeReserved { Link Here
94
    if ( $borrower->{lost} eq 1 ) {
94
    if ( $borrower->{lost} eq 1 ) {
95
        $out = undef;
95
        $out = undef;
96
    }
96
    }
97
    if ( $borrower->{debarred} eq 1 ) {
97
    if ( $borrower->{debarred} ) {
98
        $out = undef;
98
        $out = undef;
99
    }
99
    }
100
    my @reserves = GetReservesFromBorrowernumber( $borrower->{'borrowernumber'} );
100
    my @reserves = GetReservesFromBorrowernumber( $borrower->{'borrowernumber'} );
(-)a/C4/Members.pm (-8 / +10 lines)
Lines 25-31 use strict; Link Here
25
use C4::Context;
25
use C4::Context;
26
use C4::Dates qw(format_date_in_iso);
26
use C4::Dates qw(format_date_in_iso);
27
use Digest::MD5 qw(md5_base64);
27
use Digest::MD5 qw(md5_base64);
28
use Date::Calc qw/Today Add_Delta_YM/;
28
use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
29
use C4::Log; # logaction
29
use C4::Log; # logaction
30
use C4::Overdues;
30
use C4::Overdues;
31
use C4::Reserves;
31
use C4::Reserves;
Lines 489-501 sub patronflags { Link Here
489
        $flaginfo{'noissues'} = 1;
489
        $flaginfo{'noissues'} = 1;
490
        $flags{'LOST'}        = \%flaginfo;
490
        $flags{'LOST'}        = \%flaginfo;
491
    }
491
    }
492
    if (   $patroninformation->{'debarred'}
492
    if ( $patroninformation->{'debarred'} && check_date( split( /-/, $patroninformation->{'debarred'} ) ) ) {
493
        && $patroninformation->{'debarred'} == 1 )
493
        if ( Date_to_Days(Date::Calc::Today) < Date_to_Days( split( /-/, $patroninformation->{'debarred'} ) ) ) {
494
    {
494
            my %flaginfo;
495
        my %flaginfo;
495
            $flaginfo{'debarredcomment'} = $patroninformation->{'debarredcomment'};
496
        $flaginfo{'message'}  = 'Borrower is Debarred.';
496
            $flaginfo{'message'}         = $patroninformation->{'debarredcomment'};
497
        $flaginfo{'noissues'} = 1;
497
            $flaginfo{'noissues'}        = 1;
498
        $flags{'DBARRED'}     = \%flaginfo;
498
            $flaginfo{'dateend'}         = $patroninformation->{'debarred'};
499
            $flags{'DBARRED'}           = \%flaginfo;
500
        }
499
    }
501
    }
500
    if (   $patroninformation->{'borrowernotes'}
502
    if (   $patroninformation->{'borrowernotes'}
501
        && $patroninformation->{'borrowernotes'} )
503
        && $patroninformation->{'borrowernotes'} )
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-4 lines)
Lines 573-582 No patron matched <span class="ex">[% message %]</span> Link Here
573
               </form>
573
               </form>
574
			</li>[% END %]
574
			</li>[% END %]
575
575
576
            [% IF ( dbarred ) %]<li class="blocker">
577
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;status=0">Lift restriction</a>
578
</li>[% END %]
579
580
        	[% IF ( odues ) %]<li>[% IF ( nonreturns ) %]<span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a>[% END %]</li>
576
        	[% IF ( odues ) %]<li>[% IF ( nonreturns ) %]<span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a>[% END %]</li>
581
            [% END %]
577
            [% END %]
582
578
(-)a/opac/opac-reserve.pl (-2 / +2 lines)
Lines 29-34 use C4::Dates qw/format_date/; Link Here
29
use C4::Context;
29
use C4::Context;
30
use C4::Members;
30
use C4::Members;
31
use C4::Branch; # GetBranches
31
use C4::Branch; # GetBranches
32
use C4::Overdues;
32
use C4::Debug;
33
use C4::Debug;
33
# use Data::Dumper;
34
# use Data::Dumper;
34
35
Lines 256-262 if ( $borr->{lost} && ($borr->{lost} eq 1) ) { Link Here
256
                     lost    => 1
257
                     lost    => 1
257
                    );
258
                    );
258
}
259
}
259
if ( $borr->{debarred} && ($borr->{debarred} eq 1) ) {
260
if ( CheckBorrowerDebarred($borrowernumber) ) {
260
    $noreserves = 1;
261
    $noreserves = 1;
261
    $template->param(
262
    $template->param(
262
                     message  => 1,
263
                     message  => 1,
263
- 

Return to bug 6328