From 1153c1e79682c45435e02b1ea4d770d7156975e9 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 1 Aug 2019 11:44:39 +0000
Subject: [PATCH] Bug 23408: Move relatives-issues-table to an include

TO test:
1 - Find and adult patron
2 - Add a child account
3 - Check out some things to the child
4 - View the adults account, click 'Relatives checkouts'
5 - Observe table is oddly formatted
6 - View on both the 'Check out' and 'Details' tabs
7 - Apply patch
8 - Tables are displayed correctly

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 0548bfcd67ab8e0445ff7f0f52d3c7c10b98ed1b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 6a0775cef50598d3d33912fe41749fec09dc4631)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../en/includes/relatives-issues-table.inc    | 25 +++++++++++++++++++
 .../prog/en/modules/circ/circulation.tt       |  6 +++++
 .../prog/en/modules/members/moremember.tt     | 23 +----------------
 3 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc
new file mode 100644
index 0000000000..28addf4815
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc
@@ -0,0 +1,25 @@
+[% USE Koha %]
+[% IF ( relatives_issues_count ) %]
+    <div id="relatives-issues">
+        <table id="relatives-issues-table" style="width: 100% !Important;">
+            <thead>
+                <tr>
+                    <th scope="col">Due date (unformatted, hidden)</th>
+                    <th scope="col">Due date</th>
+                    <th scope="col">Title</th>
+                    <th scope="col">Item type</th>
+                    <th scope="col">Collection code</th>
+                    <th scope="col">Location</th>
+                    <th scope="col">Checked out on (hidden, unformatted)</th>
+                    <th scope="col">Checked out on</th>
+                    <th scope="col">Checked out from</th>
+                    <th scope="col">Call no</th>
+                    <th scope="col">Charge</th>
+                    <th scope="col">Fine</th>
+                    <th scope="col">Price</th>
+                    <th scope="col">Patron</th>
+                </tr>
+            </thead>
+        </table>
+    </div>
+[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 0a68087a56..2420b84fcd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -531,6 +531,12 @@ No patron matched <span class="ex">[% message | html %]</span>
     [% END %]
     <button type="submit" class="btn btn-default">Check out</button>
 
+                            <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
+
+                            [% INCLUDE "checkouts-table.inc" %]
+
+                            [% INCLUDE "relatives-issues-table.inc" %]
+
     <div id="show-checkout-settings">
         <a href="#"><i class="fa fa-caret-right checkout-settings-icon"></i> Checkout settings</a>
     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 765ef474d9..31cae1d33e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -682,28 +682,7 @@
 
                         [% INCLUDE "checkouts-table.inc" %]
 
-                        [% IF ( relatives_issues_count ) %]
-                            <div id="relatives-issues">
-                                <table id="relatives-issues-table" style="width: 100% !Important;">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col">Due date hidden not formatted</th>
-                                            <th scope="col">Due date</th>
-                                            <th scope="col">Title</th>
-                                            <th scope="col">Item type</th>
-                                            <th scope="col">Location</th>
-                                            <th scope="col">Checked out on</th>
-                                            <th scope="col">Checked out from</th>
-                                            <th scope="col">Call no</th>
-                                            <th scope="col">Charge</th>
-                                            <th scope="col">Fine</th>
-                                            <th scope="col">Price</th>
-                                            <th scope="col">Patron</th>
-                                        </tr>
-                                    </thead>
-                                </table>
-                            </div>
-                        [% END %]
+                        [% INCLUDE "relatives-issues-table.inc" %]
 
                         <div id="finesandcharges">
                             [% IF ( totaldue_raw ) %]
-- 
2.39.5