[Koha-patches] [PATCH] Bug 7110 - Renewal messages still displays in OPAC if OpacRenewalAllowed is disabled

[Owen Leonard]

The original patch added a message to display if OpacRenewalAllowed
is disabled but OPACFineNoRenewals is enabled. This change was
reversed by a follow-up on Bug 8408.

I think both versions are incorrect: If a patron has fines which
exceed the limit set by OPACFineNoRenewals but OPAC renewals are
disallowed by OpacRenewalAllowed, no message should be displayed.
Information about outstanding fines in this case has no bearing on
how the user sees his summary of checkouts.

To test, try various combinations of OpacRenewalAllowed and
OPACFineNoRenewals with a patron who has outstanding fines:

- OpacRenewalAllowed ON and OPACFineNoRenewals ON (set to be triggered
  by the test patron's fines): Logging in to the OPAC the patron should
  see a warning on opac-user.pl about not being able to renew items
  because of fines.

- OpacRenewalAllowed ON and OPACFineNoRenewals OFF (threshold high
  enough not to trigger a block): No warning appears.

- OpacRenewalAllowed OFF and OPACFineNoRenewals ON: No warning appears.

- OpacRenewalAllowed OFF and OPACFineNoRenewals OFF: No warning appears.

If OpacRenewalAllowed is diabled and a patron's fines exceed the limit
set by OPACFineNoRenewals they should see no message.
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt |    2 --
 opac/opac-user.pl                                |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 96f6e8d..d19613c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -112,8 +112,6 @@ $.tablesorter.addParser({
             [% 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">[% 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_amountoutstanding %] in fines. Please pay your fines if you wish to renew your books.</span></a></li></span>
             [% END %]
         </ul></div>
         [% END %]
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 750a9c3..df60792 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -105,7 +105,7 @@ if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
 my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' );
 $no_renewal_amt ||= 0;
 
-if ( $borr->{amountoutstanding} > $no_renewal_amt ) {
+if (  C4::Context->preference( 'OpacRenewalAllowed' ) && $borr->{amountoutstanding} > $no_renewal_amt ) {
     $borr->{'flagged'} = 1;
     $canrenew = 0;
     $template->param(
-- 
1.7.9.5