From 414880167c40eed1b2e3dce6e429e459800f89dd Mon Sep 17 00:00:00 2001 From: "ruth@bywatersolutions.com" Date: Mon, 6 Jun 2011 18:50:15 -0400 Subject: [PATCH] Bug 6467: Add shelving location to checkin screen Signed-off-by: Liz Rea Signed-off-by: Ian Walls Signed-off-by: Chris Cormack --- circ/returns.pl | 6 ++++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/circ/returns.pl b/circ/returns.pl index d7fad0cc25..bb5230b785 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -537,6 +537,7 @@ if ($borrower) { my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8; my $count = 0; my @riloop; +my $shelflocations = GetKohaAuthorisedValues('items.location',''); foreach ( sort { $a <=> $b } keys %returneditems ) { my %ri; if ( $count++ < $returned_counter ) { @@ -575,6 +576,11 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{ccode} = $biblio->{'ccode'}; $ri{itemnumber} = $biblio->{'itemnumber'}; $ri{barcode} = $bar_code; + + $ri{location} = $biblio->{'location'}; + my $shelfcode = $ri{'location'}; + $ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) ); + } else { last; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 620f770291..c02be49b9c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -396,7 +396,7 @@ function Dopop(link) { [% IF ( riloop ) %]

Checked-In items

- + [% FOREACH riloo IN riloop %] @@ -412,6 +412,7 @@ function Dopop(link) { [% riloo.itemtitle |html %] +
Due DateTitle Author BarcodeCall NumberType PatronNote
Due DateTitle Author BarcodeShelving LocationCall NumberType PatronNote
[% riloo.itemauthor %] [% riloo.barcode %][% riloo.location %] [% riloo.itemcallnumber %] [% riloo.itemtype %] [% riloo.ccode %] [% IF ( riloo.duedate ) %] -- 2.39.5