From a0d5cba4060488b8eaff9c15791ae270712cce68 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 29 Oct 2018 13:40:20 +0000
Subject: [PATCH] Bug 20966: (follow-up) Add template variable filter; Fix
 table export

This patch makes to corrections:

1. The "$raw" filter has been added to the column configuration
2. The columns configuration now specifies which columns are exported in
   Copy, Excel, etc. operations.

To test, apply the patch and test the various table export buttons on a
both a closed and open basket. Confirm that the 'Modify' and 'Cancel'
columns are not exported.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

https://bugs.koha-community.org/show_bug.cgi?id=20996
---
 admin/columns_settings.yml                              | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index a372fc172c..299fe97539 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -76,6 +76,8 @@ modules:
           columnname: ecost_tax_included
           is_hidden: 1
         -
+          columnname: replacement_price
+        -
           columnname: quantity
         -
           columnname: total_tax_excluded
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 6d19ad73ed..62e165f7b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -887,10 +887,7 @@
         [% END %]
     [% END %]
     <script>
-<<<<<<< HEAD
-=======
-        var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) %];
->>>>>>> Bug 20966: Add column configuration to table of orders in a basket
+        var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
         $(document).ready(function() {
             KohaTable("orders", {
                 [% IF ( active ) %]
@@ -900,7 +897,8 @@
                     ],
                 [% END %]
                 "sPaginationType": "four_button",
-                "autoWidth": false
+                "autoWidth": false,
+                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13]
             }, columns_settings);
 
             var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
-- 
2.11.0