From 4fe0b3501851a6f5a05645ca76ce9d4287667cc5 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 19 Sep 2018 19:45:12 -0300
Subject: [PATCH] Bug 17877: Add columns settings to the orders table on
 subscription-detail
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Test plan:
- Apply this patch and make sure to restart memcached (to re-read the yaml
file that is cached)
- Go to Home › Administration › Columns settings
- Confirm that a new "Serials" tab contain the different columns of the
"Acquisition details" table displayed on the subscription detail page
(if an order exist for this subscription)
- Play with it
- Go to Home › Serials › Details for subscription #ID
- Confirm that the "Column visibility" button is now displayed on top of
the table that it works correctly.

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 admin/columns_settings.yml                    | 22 +++++++++++++++++++
 .../prog/en/modules/admin/columns_settings.tt |  6 +++++
 .../en/modules/serials/subscription-detail.tt |  7 ++++--
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index a76acc0112..0a4f66ffc3 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -592,3 +592,25 @@ modules:
           columnname: serial_status
         -
           columnname: serial_notes
+
+  serials:
+    subscription-detail:
+      orders:
+        -
+          columnname: invoice
+        -
+          columnname: basket
+        -
+          columnname: ordernumber
+        -
+          columnname: creation_date
+        -
+          columnname: receive_date
+        -
+          columnname: status
+        -
+          columnname: fund
+        -
+          columnname: ordered
+        -
+          columnname: spent
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
index b41b653533..ebcd53e1c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
@@ -158,6 +158,12 @@
             [% PROCESS pagelist module=modules.reports modulename="reports" %]
           </div>
 
+          <h3><a href="#serials">Serials</a></h3>
+          <div id="serials">
+            <h4>Serials tables</h4>
+            [% PROCESS pagelist module=modules.serials modulename="serials" %]
+          </div>
+
         </div>
             </main>
         </div> <!-- /.col-sm-10.col-sm-push-2 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index e8e8364161..498ceb2ca5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -5,6 +5,7 @@
 [% USE Branches %]
 [% USE AuthorisedValues %]
 [% USE Price %]
+[% USE ColumnsSettings %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid | html %]</title>
@@ -420,6 +421,7 @@
     </script>
     [% Asset.js("js/serials-toolbar.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'columns_settings.inc' %]
     <script type="text/javascript">
         // the english words used in display purposes
         var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern",
@@ -431,14 +433,15 @@
                 return false;
             })
 
-            var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
+            var columns_settings = [% ColumnsSettings.GetColumns( 'serials', 'subscription-detail', 'orders', 'json' ) | $raw %];
+            var table = KohaTable("orders", {
                 'bPaginate': false,
                 'bAutoWidth': false,
                 "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber
                 "aoColumnDefs": [
                     { "aTargets": "title-string", "sType": "title-string" }
                 ]
-            }));
+            }, columns_settings);
 
             $("#hide_received_orders").click(function(e){
                 e.preventDefault();
-- 
2.39.5