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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 565-576 No patron matched <span class="ex">[% message %]</span> Link Here
565
565
566
            [% IF ( userdebarred ) %]
566
            [% IF ( userdebarred ) %]
567
               <li class="blocker">
567
               <li class="blocker">
568
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %]
568
               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted [% IF (userdebarreddate ) %] until [% userdebarreddate %] [% END %] [% IF (debarredcomment ) %] with the comment "[% debarredcomment %]"[% END %]
569
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
569
               <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post">
570
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
570
	                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
571
	                <input type="hidden" name="destination" value="circ" />
571
	                <input type="hidden" name="destination" value="circ" />
572
	                <input type="hidden" name="cardnumber" value="[% cardnumber %]" />
572
	                <input type="hidden" name="cardnumber" value="[% cardnumber %]" />
573
	                <input type="submit" value="Lift Debarment" />
573
	                <input type="submit" value="Lift restriction" />
574
               </form>
574
               </form>
575
			</li>[% END %]
575
			</li>[% END %]
576
576
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-2 / +2 lines)
Lines 92-99 $.tablesorter.addParser({ Link Here
92
        [% IF ( BORROWER_INF.flagged ) %]
92
        [% IF ( BORROWER_INF.flagged ) %]
93
		<div class="dialog alert">
93
		<div class="dialog alert">
94
        <ul>
94
        <ul>
95
            [% IF ( BORROWER_INF.debarred ) %]
95
            [% IF ( BORROWER_INF.userdebarred ) %]
96
                <li><strong>Please note:</strong> Your account has been frozen until [% BORROWER_INF.debarred %] - [% BORROWER_INF.debarredcomment %]. Usually the reason for freezing an account is old overdues or damage fees.If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
96
                <li><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until [% BORROWER_INF.userdebarreddate %][% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment "[% BORROWER_INF.debarredcomment %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
97
            [% END %]
97
            [% END %]
98
            [% IF ( BORROWER_INF.gonenoaddress ) %]
98
            [% IF ( BORROWER_INF.gonenoaddress ) %]
99
                <li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
99
                <li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
(-)a/opac/opac-user.pl (-3 / +10 lines)
Lines 30-35 use C4::Members; Link Here
30
use C4::Members::AttributeTypes;
30
use C4::Members::AttributeTypes;
31
use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
31
use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
32
use C4::Output;
32
use C4::Output;
33
use C4::Overdues qw/CheckBorrowerDebarred/;
33
use C4::Biblio;
34
use C4::Biblio;
34
use C4::Items;
35
use C4::Items;
35
use C4::Dates qw/format_date/;
36
use C4::Dates qw/format_date/;
Lines 78-84 for (qw(dateenrolled dateexpiry dateofbirth)) { Link Here
78
}
79
}
79
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
80
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
80
81
81
if ( $borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
82
my $debar = CheckBorrowerDebarred($borrowernumber);
83
if ($debar) {
84
    $borr->{'userdebarred'} = 1;
85
    if ( $debar ne "9999-12-31" ) {
86
        $borr->{'userdebarreddate'} = C4::Dates::format_date($debar);
87
    }
88
}
89
90
if ( $borr->{'userdebarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
82
    $borr->{'flagged'} = 1;
91
    $borr->{'flagged'} = 1;
83
}
92
}
84
93
Lines 104-110 if ( $borr->{'amountoutstanding'} < 0 ) { Link Here
104
}
113
}
105
114
106
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
115
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
107
$borr->{'debarred'} = C4::Dates->new($borr->{'debarred'},'iso')->output;
108
116
109
my @bordat;
117
my @bordat;
110
$bordat[0] = $borr;
118
$bordat[0] = $borr;
111
- 

Return to bug 7337