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 (-10 / +6 lines)
Lines 27-33 $.tablesorter.addParser({ Link Here
27
            }); 
27
            }); 
28
			$("#overduest").tablesorter();
28
			$("#overduest").tablesorter();
29
[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
29
[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
30
        [% IF ( OpacRenewalAllowed ) %][% IF ( canrenew ) %]$("#renewselected").submit(function(){
30
        [% IF ( OpacRenewalAllowed && canrenew && !userdebarred ) %]$("#renewselected").submit(function(){
31
            valid = false;
31
            valid = false;
32
            $("input[type=checkbox]").each(function(){
32
            $("input[type=checkbox]").each(function(){
33
                if($(this).is(':checked')){
33
                if($(this).is(':checked')){
Lines 45-51 $.tablesorter.addParser({ Link Here
45
        $("#renewall_link").live('click',function(){
45
        $("#renewall_link").live('click',function(){
46
            $("#renewall").submit();
46
            $("#renewall").submit();
47
        });
47
        });
48
        $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");[% END %][% END %]
48
        $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");[% END %]
49
            });
49
            });
50
//]]>
50
//]]>
51
</script>
51
</script>
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 ( 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>
Lines 260-273 $.tablesorter.addParser({ Link Here
260
            </tr>
260
            </tr>
261
        [% END %]</tbody>
261
        [% END %]</tbody>
262
        </table>
262
        </table>
263
	   [% IF ( canrenew ) %]
263
	   [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
264
		[% IF ( OpacRenewalAllowed ) %]
265
		<input type="submit" value="Renew Selected" />
264
		<input type="submit" value="Renew Selected" />
266
		[% END %]
265
		[% END %]
267
        [% END %]
268
		</form>
266
		</form>
269
		[% IF ( OpacRenewalAllowed ) %]
267
        [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
270
        [% IF ( canrenew ) %]
271
		<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
268
		<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
272
			<input type="hidden" name="from" value="opac_user" />
269
			<input type="hidden" name="from" value="opac_user" />
273
			<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
270
			<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
Lines 277-283 $.tablesorter.addParser({ Link Here
277
			[% UNLESS patron_flagged %]<input type="submit" value="Renew All" />[% END %]
274
			[% UNLESS patron_flagged %]<input type="submit" value="Renew All" />[% END %]
278
		</form>
275
		</form>
279
		[% END %]
276
		[% END %]
280
        [% END %]
281
    [% ELSE %]
277
    [% ELSE %]
282
        <table>
278
        <table>
283
            <tr><td>You have nothing checked out</td></tr>
279
            <tr><td>You have nothing checked out</td></tr>
(-)a/opac/opac-user.pl (-3 / +14 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
my $userdebarred;
84
85
if ($debar) {
86
    $userdebarred = 1;
87
    $template->param( 'userdebarred' => $userdebarred );
88
    if ( $debar ne "9999-12-31" ) {
89
        $borr->{'userdebarreddate'} = C4::Dates::format_date($debar);
90
    }
91
}
92
93
if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
82
    $borr->{'flagged'} = 1;
94
    $borr->{'flagged'} = 1;
83
}
95
}
84
96
Lines 104-110 if ( $borr->{'amountoutstanding'} < 0 ) { Link Here
104
}
116
}
105
117
106
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
118
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
107
$borr->{'debarred'} = C4::Dates->new($borr->{'debarred'},'iso')->output;
108
119
109
my @bordat;
120
my @bordat;
110
$bordat[0] = $borr;
121
$bordat[0] = $borr;
Lines 127-132 $template->param( BORROWER_INFO => \@bordat, Link Here
127
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
138
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
128
                    surname           => $borr->{surname},
139
                    surname           => $borr->{surname},
129
                    showname          => $borr->{showname},
140
                    showname          => $borr->{showname},
141
130
                );
142
                );
131
143
132
#get issued items ....
144
#get issued items ....
133
- 

Return to bug 7337