From bb3e76f7f9e7f65fa0de2ee0fe51d09c81368480 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@helsinki.fi>
Date: Wed, 22 Jul 2020 15:44:31 +0000
Subject: [PATCH] Bug 12556: Remove unused HTML

Koha::Hold::is_at_destination() already checks for found = 'W' so the ELSE
code path which would print "Item waiting to be pulled from [...]"
never gets executed.

Signed-off-by: Timothy Alexis Vass <timothy_alexis.vass@ub.lu.se>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../bootstrap/en/includes/holds-table.inc        | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
index 970df4cccf..0c365b5fb2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
@@ -104,18 +104,14 @@
                             [% IF ( HOLD.is_waiting ) %]
                                 <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
                                 [% IF ( HOLD.is_at_destination ) %]
-                                    [% IF ( HOLD.found ) %]
-                                        Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
-                                        [% IF ( HOLD.waitingdate ) %]
-                                            since [% HOLD.waitingdate | $KohaDates %]
-                                            [% IF HOLD.expirationdate %]
-                                                until [% HOLD.expirationdate | $KohaDates %]
-                                            [% END %]
+                                    Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
+                                    [% IF ( HOLD.waitingdate ) %]
+                                        since [% HOLD.waitingdate | $KohaDates %]
+                                        [% IF HOLD.expirationdate %]
+                                            until [% HOLD.expirationdate | $KohaDates %]
                                         [% END %]
-                                        <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
-                                    [% ELSE %]
-                                        Item waiting to be pulled from <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong>
                                     [% END %]
+                                    <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
                                 [% ELSE %]
                                     Item in transit to <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
                                 [% END %]
-- 
2.39.5