From ffc137566346ac910fffd94556f4446e845581f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Holger=20Mei=C3=9Fner?= <h.meissner.82@web.de>
Date: Thu, 11 Aug 2016 11:22:00 +0200
Subject: [PATCH] Bug 14434: Display "Not renewable (on hold)" in OPAC
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch makes the OPAC display "Not renewable (on hold)" when
a hold is placed.

Test plan:
1) Do not apply patch.
2) Issue an item with automatic renewal.
3) Issue an item with manual renewal.
4) Place a hold on both items.
5) Log in as patron and note that the column "Renew" says "Automatic
   renewal (x of y renewals remaining)" for the auto renewed item
   and "(On hold) for the other item.
6) Apply patch.
7) Refresh OPAC and note that now "Not renewable (on hold)" is displayed
   for both items.
8) Cancel the holds, then log in as patron again and confirm that the
   correct renewal conditions are displayed.

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 77b03f1e8b2afe0e9063b06785a0eb468fb029ed)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 930b32bc479628b9d8cb57ec73a5f1d22a4207e1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index bfb4a9320d..a0eec9a10a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -256,6 +256,8 @@ Using this account is not recommended because some parts of Koha will not functi
                                                             <input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>
                                                         [% END %]
                                                         <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
+                                                    [% ELSIF ( ISSUE.on_reserve ) %]
+                                                        Not renewable <span class="renewals">(on hold)</span>
                                                     [% ELSIF ( ISSUE.too_many ) %]
                                                         Not renewable
                                                     [% ELSIF ( ISSUE.norenew_overdue ) %]
@@ -266,8 +268,6 @@ Using this account is not recommended because some parts of Koha will not functi
                                                     [% ELSIF ( ISSUE.too_soon ) %]
                                                         No renewal before [% ISSUE.soonestrenewdate %]
                                                         <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
-                                                    [% ELSIF ( ISSUE.on_reserve ) %]
-                                                        <span class="renewals">(On hold)</span>
                                                     [% END %]
                                                     </td>
                                                 [% END %]
-- 
2.39.5