Bug 5549 : Daily loans should be due at 23:59

[koha.git] / C4 / VirtualShelves.pm

diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index 6ed7549..c74ecb3 100644 (file)
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -26,10 +26,7 @@ use warnings;
 
 use Carp;
 use C4::Context;
-use C4::Circulation;
 use C4::Debug;
-use C4::Members;
-require C4::Auth;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
@@ -203,15 +200,19 @@ sub GetRecentShelves {
     my @params;
     my $selection;
     if (defined $owner) {
-        @params = ($owner, $mincategory, $row_count);
+        @params = ($owner, $mincategory);
         $selection = ' WHERE owner = ? AND category = ?';
     } else {
-        @params = ( $mincategory, $row_count);
+        @params = ( $mincategory);
         $selection = ' WHERE category >= ? ';
     }
     my $query = 'SELECT * FROM virtualshelves';
     $query .= $selection;
-    $query .= ' ORDER BY lastmodified DESC LIMIT ?';
+    $query .= ' ORDER BY lastmodified DESC';
+    if ($row_count){
+       $query .= ' LIMIT ?';
+       push @params,$row_count;
+    }
     my $sth = $dbh->prepare($query);
     $sth->execute(@params);
     my $shelflist = $sth->fetchall_arrayref({});
@@ -292,7 +293,7 @@ sub GetShelfContents ($;$$$) {
        }
     my $query =
        " SELECT vc.biblionumber, vc.shelfnumber, vc.dateadded, itemtypes.*,
-            biblio.*, biblioitems.itemtype, biblioitems.publicationyear, biblioitems.publishercode, biblioitems.place, biblioitems.size, biblioitems.pages
+            biblio.*, biblioitems.itemtype, biblioitems.publicationyear as year, biblioitems.publishercode, biblioitems.place, biblioitems.size, biblioitems.pages
          FROM   virtualshelfcontents vc
                 LEFT JOIN biblio      ON      vc.biblionumber =      biblio.biblionumber
                 LEFT JOIN biblioitems ON  biblio.biblionumber = biblioitems.biblionumber
@@ -462,7 +463,8 @@ sub ShelfPossibleAction {
     my $sth = $dbh->prepare($query);
     $sth->execute($shelfnumber);
     my ( $owner, $category ) = $sth->fetchrow;
-       my $borrower = GetMemberDetails($user);
+    require C4::Members;
+       my $borrower = C4::Members::GetMemberDetails($user);
        return 0 if not defined($user);
        return 1 if ( $category >= 3);                                                  # open list
     return 1 if (($category >= 2) and
@@ -555,7 +557,7 @@ This function is used in conjunction with the 'Lists' button in masthead.inc.
 =cut
 
 sub RefreshShelvesSummary ($$$) {
-       
+       require C4::Auth;
        my ($sessionID, $loggedinuser, $row_count) = @_;
        my $session = C4::Auth::get_session($sessionID);
        my ($total, $totshelves, $barshelves, $pubshelves);