DBREV Bug 14659 - Allow patrons to enter card number and patron category on OPAC...

[koha.git] / catalogue / detail.pl

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 2a6dddb..96e7752 100755 (executable)
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -22,7 +22,6 @@ use warnings;
 use CGI qw ( -utf8 );
 use C4::Acquisition qw( GetHistory );
 use C4::Auth;
-use C4::Dates qw/format_date/;
 use C4::Koha;
 use C4::Serials;    #uses getsubscriptionfrom biblionumber
 use C4::Output;
@@ -37,7 +36,6 @@ use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn);
 use C4::External::Amazon;
 use C4::Search;                # enabled_staff_search_views
 use C4::Tags qw(get_tags);
-use C4::VirtualShelves;
 use C4::XSLT;
 use C4::Images;
 use Koha::DateUtils;
@@ -45,6 +43,8 @@ use C4::HTML5Media;
 use C4::CourseReserves qw(GetItemCourseReservesInfo);
 use C4::Acquisition qw(GetOrdersByBiblionumber);
 
+use Koha::Virtualshelves;
+
 my $query = CGI->new();
 
 my $analyze = $query->param('analyze');
@@ -206,9 +206,6 @@ foreach my $item (@items) {
     $item->{imageurl} = defined $item->{itype} ? getitemtypeimagelocation('intranet', $itemtypes->{ $item->{itype} }{imageurl})
                                                : '';
 
-       foreach (qw(datelastseen onloan)) {
-               $item->{$_} = format_date($item->{$_});
-    }
     $item->{datedue} = format_sqldatetime($item->{datedue});
     # item damaged, lost, withdrawn loops
     $item->{itemlostloop} = GetAuthorisedValues($authvalcode_items_itemlost, $item->{itemlost}) if $authvalcode_items_itemlost;
@@ -229,7 +226,7 @@ foreach my $item (@items) {
 
     # checking for holds
     my ($reservedate,$reservedfor,$expectedAt,undef,$wait) = GetReservesFromItemnumber($item->{itemnumber});
-    my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);
+    my $ItemBorrowerReserveInfo = C4::Members::GetMember( borrowernumber => $reservedfor);
     
     if (C4::Context->preference('HidePatronName')){
        $item->{'hidepatronname'} = 1;
@@ -237,7 +234,7 @@ foreach my $item (@items) {
 
     if ( defined $reservedate ) {
         $item->{backgroundcolor} = 'reserved';
-        $item->{reservedate}     = format_date($reservedate);
+        $item->{reservedate}     = $reservedate;
         $item->{ReservedForBorrowernumber}     = $reservedfor;
         $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
         $item->{ReservedForFirstname}   = $ItemBorrowerReserveInfo->{'firstname'};
@@ -251,7 +248,7 @@ foreach my $item (@items) {
        # Check the transit status
     my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($item->{itemnumber});
     if ( defined( $transfertwhen ) && ( $transfertwhen ne '' ) ) {
-        $item->{transfertwhen} = format_date($transfertwhen);
+        $item->{transfertwhen} = $transfertwhen;
         $item->{transfertfrom} = $branches->{$transfertfrom}{branchname};
         $item->{transfertto}   = $branches->{$transfertto}{branchname};
         $item->{nocancel} = 1;
@@ -381,7 +378,16 @@ $template->param(
 # Lists
 
 if (C4::Context->preference("virtualshelves") ) {
-   $template->param( 'GetShelves' => GetBibliosShelves( $biblionumber ) );
+    my $shelves = Koha::Virtualshelves->search(
+        {
+            biblionumber => $biblionumber,
+            category => 2,
+        },
+        {
+            join => 'virtualshelfcontents',
+        }
+    );
+    $template->param( 'shelves' => $shelves );
 }
 
 # XISBN Stuff