From 535cadf081c6c6dfd6ed05e407c75853b6f674d9 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <cbrannon@cdalibrary.org>
Date: Tue, 7 Mar 2017 20:01:05 +0000
Subject: [PATCH] Bug 18219: Remove duplicated code in returns.tt

Removed lines of code that were duplicated in bug 16530.
Fixes alignment of a few lines of code surrounding duplication.

Modifies returns.tt

To test:
1) Check in items that are not checked out.
2) Note duplicated problem message (i.e. "Not checked out.")
3) Apply patch.
4) Repeat step 1.
5) Note the problem message is no longer duplicated.
---
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  | 43 ++--------------------
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 702a039..2744cbd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -634,45 +634,10 @@ $(document).ready(function () {
                     [% END %]
                     [% IF ( errmsgloo.prevdebarred ) %]
                         <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
-            [% END %]
-            [% IF ( errmsgloo.badbarcode ) %]
-                <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
-            [% END %]
-            [% IF ( errmsgloo.ispermanent ) %]
-                <p class="problem">Please return item to: [% errmsgloo.msg %]</p>
-            [% END %]
-            [% IF ( errmsgloo.notissued ) %]
-                <p class="problem">Not checked out.</p>
-            [% END %]
-            [% IF ( errmsgloo.localuse) %]
-                <p class="problem">Local use recorded</p>
-            [% END %]
-            [% IF ( errmsgloo.waslost ) %]
-                <p class="problem">Item was lost, now found.</p>
-                [% IF ( LostItemFeeRefunded ) %]
-                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
-                [% ELSE %]
-                    <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
-                [% END %]
-            [% END %]
-            [% IF ( errmsgloo.withdrawn ) %]
-                [% IF BlockReturnOfWithdrawnItems %]
-                    <h5>Cannot check in</h5>
-                    <p><strong>NOT CHECKED IN</strong></p>
-                    <p class="problem">Item is withdrawn.</p>
-                [% ELSE %]
-                    <p class="problem">Item is withdrawn.</p>
-                [% END %]
-            [% END %]
-            [% IF ( errmsgloo.debarred ) %]
-                <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
-            [% END %]
-            [% IF ( errmsgloo.prevdebarred ) %]
-                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
-            [% END %]
-            [% IF ( errmsgloo.foreverdebarred ) %]
-                <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
-            [% END %]
+                    [% END %]
+                    [% IF ( errmsgloo.foreverdebarred ) %]
+                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
+                    [% END %]
         [% END %]
     </div>
 [% END %]
-- 
2.1.4