From aefcc3e62f69ae2bcce55e9ec9cbf1c1b338f6bb Mon Sep 17 00:00:00 2001
From: Jesse Maseto <jesse@bywatersolutions.com>
Date: Fri, 2 Mar 2018 13:11:44 +0000
Subject: [PATCH] Bug 19719: Add new column for collection in the patron
 checkouts data tables

This makes the collection visible in the checkouts table
on the details and issues tab in the patron account in staff.

TEST:

1. Check out a few items to patron.
2. View check outs on patron account in staff client.
3. Collection code is not present.

4. Apply patch

5. Notice that not Collection code is visible while viewing check outs.

Signed-off-by: Severine QUEUNE <severine.queune@bulac.fr>
Signed-off by: Maksim Sen <maksim.sen@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 admin/columns_settings.yml                                   | 4 ++++
 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt  | 1 +
 koha-tmpl/intranet-tmpl/prog/js/checkouts.js                 | 2 ++
 svc/checkouts                                                | 3 +++
 5 files changed, 11 insertions(+)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index f56a745eb5..5371eff871 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -229,6 +229,8 @@ modules:
           columnname: title
         -
           columnname: item_type
+        -
+          columnname: collection_code
         -
           columnname: location
         -
@@ -341,6 +343,8 @@ modules:
           columnname: title
         -
           columnname: item_type
+        -
+          columnname: collection_code
         -
           columnname: location
         -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index b34089d3c7..aa38cc8531 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -16,6 +16,7 @@
                         <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">Home library</th>
                         <th scope="col">Checked out on</th>
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 198c47dd12..339239eedb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -850,6 +850,7 @@ No patron matched <span class="ex">[% message | html %]</span>
                     <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</th>
                     <th scope="col">Checked out from</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
index 5167ee12ae..d4c063ee98 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -291,6 +291,7 @@ $(document).ready(function() {
                     "sType": "anti-the"
                 },
                 { "mDataProp": "itemtype_description" },
+                { "mDataProp": "ccode" },
                 { "mDataProp": "location" },
                 { "mDataProp": "homebranch" },
                 { "mDataProp": "issuedate_formatted" },
@@ -589,6 +590,7 @@ $(document).ready(function() {
                         "sType": "anti-the"
                     },
                     { "mDataProp": "itemtype" },
+                    { "mDataProp": "ccode" },
                     { "mDataProp": "location" },
                     { "mDataProp": "issuedate_formatted" },
                     { "mDataProp": "branchname" },
diff --git a/svc/checkouts b/svc/checkouts
index fefadeeeea..d1fb8d34f9 100755
--- a/svc/checkouts
+++ b/svc/checkouts
@@ -90,6 +90,8 @@ my $sql = '
         items.itype,
         biblioitems.itemtype,
 
+        items.ccode,
+
         borrowernumber,
         surname,
         firstname,
@@ -171,6 +173,7 @@ while ( my $c = $sth->fetchrow_hashref() ) {
         barcode              => $c->{barcode},
         itemtype             => $item_level_itypes ? $c->{itype} : $c->{itemtype},
         itemtype_description => $itemtype ? $itemtype->translated_description : q{},
+        ccode                => $c->{ccode},
         location             => $location,
         homebranch           => $c->{homebranch},
         itemnotes            => $c->{itemnotes},
-- 
2.14.1