From ee60339a842b79fcf2d6f1646b11e70c541fe9d7 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 8 Jul 2021 20:57:58 +0000
Subject: [PATCH] Bug 28695: Add shelving location column to overdue.tt

To test:
1. have some overdues
2. go to the overdue report on the circulation page (overdue.tt)
3. no shelving location
4. apply patch and restart the things
5. look at the overdue report again and there should be a Shelving location column
6. make sure it is accurate
7. go to table settings and make sure you can properly hide the column. test other columns in the table and make sure they are still hiding correctly as well

Signed-off-by: Kelly McElligott <kelly@bywatersolutions.com>
Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/columns_settings.yml                              | 2 ++
 circ/overdue.pl                                         | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 8c87f4f050..16516b3452 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1321,6 +1321,8 @@ modules:
             -
               columnname: holding_library
               is_hidden: 1
+            -
+              columnname: shelving_location
             -
               columnname: barcode
             -
diff --git a/circ/overdue.pl b/circ/overdue.pl
index b8ed200b52..941458d7d7 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -232,6 +232,7 @@ if ($noreport) {
         items.barcode,
         items.homebranch,
         items.holdingbranch,
+        items.location,
         biblio.title,
         biblio.author,
         biblio.biblionumber,
@@ -324,6 +325,7 @@ if ($noreport) {
             author                 => $data->{author},
             homebranchcode         => $data->{homebranch},
             holdingbranchcode      => $data->{holdingbranch},
+            location               => $data->{location},
             itemcallnumber         => $data->{itemcallnumber},
             replacementprice       => $data->{replacementprice},
             itemnotes_nonpublic    => $data->{itemnotes_nonpublic},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index 3723357b3a..febd0d66c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -86,6 +86,7 @@
           <th class="anti-the">Title</th>
           <th>Home library</th>
           <th>Holding library</th>
+          <th>Shelving location</th>
           <th>Barcode</th>
           <th>Call number</th>
           <th>Item type</th>
@@ -109,6 +110,7 @@
           <td>[% INCLUDE 'biblio-title.inc' biblio=overdueloo link = 1 %] [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td>
             <td>[% Branches.GetName( overdueloo.homebranchcode ) | html %]</td>
             <td>[% Branches.GetName( overdueloo.holdingbranchcode ) | html %]</td>
+            <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => overdueloo.location ) | html %]</td>
           <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | uri %]&amp;itemnumber=[% overdueloo.itemnum | uri %]#item[% overdueloo.itemnum | uri %]">[% overdueloo.barcode | html %]</a></td>
           <td>[% overdueloo.itemcallnumber | html %]</td>
             <td>[% ItemTypes.GetDescription( overdueloo.itemtype ) | html %]</td>
-- 
2.39.5