Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'origin/new/bug_8408'

  • Loading branch information...
commit c8ef17ea3965f04ed3b0bebb85d4c70dd1cfc131 2 parents b346046 + 8e590ab
@PaulPoulain PaulPoulain authored
View
4 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -101,9 +101,9 @@ $.tablesorter.addParser({
<span id="lost"><li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please contact the library.</li></span>
[% END %]
[% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %]
- <span id="renewal_blocked_fines"><li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">more than <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines %]</span></a> in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li></span>
+ <span id="renewal_blocked_fines"><li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">[% IF renewal_blocked_fines != "0.00" %] more than <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines %]</span> in [% END %] fines</a>, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li></span>
[% ELSIF ( renewal_blocked_fines ) %]
- <span id="renewal_blocked_fines"><li><strong>Please note: </strong> You currently owe <a href="/cgi-bin/koha/opac-account.pl"><span id="renewal_blocked_fines_amount">[% renewal_blocked_fines %] in fines.</span></a></li></span>
+ <span id="renewal_blocked_fines"><li><strong>Please note: </strong> You currently owe <a href="/cgi-bin/koha/opac-account.pl"><span id="renewal_blocked_fines_amount">[% renewal_blocked_fines_amountoutstanding %] in fines. Please pay your fines if you wish to renew your books.</span></a></li></span>
[% END %]
</ul></div>
[% END %]
View
3  opac/opac-user.pl
@@ -109,7 +109,8 @@ BEGIN
$borr->{'flagged'} = 1;
$canrenew = 0;
$template->param(
- renewal_blocked_fines => sprintf( '%.02f', $borr->{amountoutstanding} ),
+ renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
+ renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ),
);
}
Please sign in to comment.
Something went wrong with that request. Please try again.