Bug 31028: Add display to details page

[koha-ffzg.git] / catalogue / imageviewer.pl

diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
index fe64ecc..fc65a1a 100755 (executable)
--- a/catalogue/imageviewer.pl
+++ b/catalogue/imageviewer.pl
@@ -17,98 +17,74 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
-use C4::Images;
-use C4::Search;
-use C4::Acquisition qw(GetOrdersByBiblionumber);
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Search qw( enabled_staff_search_views );
 
-my $query = new CGI;
+use Koha::Biblios;
+use Koha::Items;
+use Koha::Patrons;
+
+my $query = CGI->new;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => "catalogue/imageviewer.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
 
-my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my $itemnumber  = $query->param('itemnumber');
+my $biblionumber = $query->param('biblionumber') || $query->param('bib') || Koha::Items->find($itemnumber)->biblionumber;
 my $imagenumber = $query->param('imagenumber');
-my $biblio = GetBiblio($biblionumber);
-my $itemcount = GetItemsCount($biblionumber);
-
-my @items = GetItemsInfo($biblionumber);
-
-my $norequests = 1;
-foreach my $item (@items) {
+my $biblio = Koha::Biblios->find( $biblionumber );
+my $itemcount = $biblio ? $biblio->items->count : 0;
 
-    # can place holds defaults to yes
-    $norequests = 0
-      unless ( ( $item->{'notforloan_per_itemtype'} > 0 )
-        || ( $item->{'itemnotforloan'} > 0 ) );
+if ( $query->cookie("holdfor") ) {
+    my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
+    $template->param(
+        holdfor        => $query->cookie("holdfor"),
+        holdfor_patron => $holdfor_patron,
+    );
 }
 
-if ( $query->cookie("holdfor") ) {
-    my $holdfor_patron =
-      GetMember( 'borrowernumber' => $query->cookie("holdfor") );
+if( $query->cookie("searchToOrder") ){
+    my ( $basketno, $vendorid ) = split( /\//, $query->cookie("searchToOrder") );
     $template->param(
-        holdfor            => $query->cookie("holdfor"),
-        holdfor_surname    => $holdfor_patron->{'surname'},
-        holdfor_firstname  => $holdfor_patron->{'firstname'},
-        holdfor_cardnumber => $holdfor_patron->{'cardnumber'},
+        searchtoorder_basketno => $basketno,
+        searchtoorder_vendorid => $vendorid
     );
 }
 
 if ( C4::Context->preference("LocalCoverImages") ) {
-    my @images = ListImagesForBiblio($biblionumber);
-    $template->{VARS}->{'LocalCoverImages'} = 1;
-    $template->{VARS}->{'images'}           = \@images;
-    $template->{VARS}->{'imagenumber'}      = $imagenumber || $images[0] || '';
+    my $images;
+    if ( $itemnumber ) {
+        my $item = Koha::Items->find($itemnumber);
+        $images = $item->cover_images->as_list;
+    } else {
+        $images = $biblio->cover_images->as_list;
+    }
+
+    $template->param(
+        LocalCoverImages => 1,
+        images           => $images,
+        imagenumber      => ( $imagenumber || ( @$images ? $images->[0]->imagenumber : undef ) ),
+    );
 }
 $template->{VARS}->{'count'}        = $itemcount;
-$template->{VARS}->{'biblionumber'} = $biblionumber;
-$template->{VARS}->{'norequests'}   = $norequests;
 $template->param(C4::Search::enabled_staff_search_views);
 $template->{VARS}->{'biblio'} = $biblio;
 
-my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
-my @deletedorders_using_biblio;
-my @orders_using_biblio;
-my @baskets_orders;
-my @baskets_deletedorders;
-
-foreach my $myorder (@allorders_using_biblio) {
-    my $basket = $myorder->{'basketno'};
-    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
-        push @deletedorders_using_biblio, $myorder;
-        unless (grep(/^$basket$/, @baskets_deletedorders)){
-            push @baskets_deletedorders,$myorder->{'basketno'};
-        }
-    }
-    else {
-        push @orders_using_biblio, $myorder;
-        unless (grep(/^$basket$/, @baskets_orders)){
-            push @baskets_orders,$myorder->{'basketno'};
-            }
-    }
-}
-
-my $count_orders_using_biblio = scalar @orders_using_biblio ;
-$template->param (countorders => $count_orders_using_biblio);
-
-my $count_deletedorders_using_biblio = scalar @deletedorders_using_biblio ;
-$template->param (countdeletedorders => $count_deletedorders_using_biblio);
+$template->param(
+    biblionumber => $biblionumber,
+    itemnumber => $itemnumber,
+);
 
-my $holds= C4::Reserves::GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 });
-my $holdcount = scalar( @$holds );
-$template->param( holdcount => scalar ( @$holds ) );
+my $hold_count = $biblio ? $biblio->holds->count : 0;
+$template->param( holdcount => $hold_count );
 
 output_html_with_http_headers $query, $cookie, $template->output;