X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=catalogue%2Fmoredetail.pl;h=787bac26b3d650a22cf8ffcd2792aef496b359ca;hb=0970eef56df1ac8fee1f3c5f0216a164be5048ec;hp=763e1c048734090a03a7d7c84890e9e5a2054274;hpb=c1be2b8817c27c767f9f2ca2939f6b8f3013d7e2;p=koha-ffzg.git

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 763e1c0487..787bac26b3 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -20,32 +20,29 @@
 
 
 use Modern::Perl;
-use C4::Koha;
+use C4::Koha qw( GetAuthorisedValues );
 use CGI qw ( -utf8 );
 use HTML::Entities;
-use C4::Biblio;
-use C4::Items;
-use C4::Acquisition;
-use C4::Output;
-use C4::Auth;
-use C4::Serials;
-use C4::Search;		# enabled_staff_search_views
+use C4::Biblio qw( GetBiblioData GetFrameworkCode );
+use C4::Acquisition qw( GetOrderFromItemnumber GetBasket GetInvoice );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
+use C4::Serials qw( CountSubscriptionFromBiblionumber );
+use C4::Search qw( enabled_staff_search_views z3950_search_args );
 
 use Koha::Acquisition::Booksellers;
 use Koha::AuthorisedValues;
 use Koha::Biblios;
-use Koha::DateUtils;
 use Koha::Items;
 use Koha::Patrons;
 
-my $query=new CGI;
+my $query=CGI->new;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user(
     {
         template_name   => 'catalogue/moredetail.tt',
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
@@ -57,10 +54,8 @@ $template->param(
 if($query->cookie("holdfor")){ 
     my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") );
     $template->param(
-        holdfor => $query->cookie("holdfor"),
-        holdfor_surname => $holdfor_patron->surname,
-        holdfor_firstname => $holdfor_patron->firstname,
-        holdfor_cardnumber => $holdfor_patron->cardnumber,
+        holdfor        => $query->cookie("holdfor"),
+        holdfor_patron => $holdfor_patron,
     );
 }
 
@@ -73,13 +68,21 @@ if( $query->cookie("searchToOrder") ){
 }
 
 # get variables
+my $biblionumber;
+my $itemnumber;
+if( $query->param('itemnumber') && !$query->param('biblionumber') ){
+    $itemnumber = $query->param('itemnumber');
+    my $item = Koha::Items->find( $itemnumber );
+    $biblionumber = $item->biblionumber;
+} else {
+    $biblionumber = $query->param('biblionumber');
+}
 
-my $biblionumber=$query->param('biblionumber');
 $biblionumber = HTML::Entities::encode($biblionumber);
 my $title=$query->param('title');
 my $bi=$query->param('bi');
 $bi = $biblionumber unless $bi;
-my $itemnumber = $query->param('itemnumber');
+$itemnumber = $query->param('itemnumber');
 my $data = &GetBiblioData($biblionumber);
 my $dewey = $data->{'dewey'};
 my $showallitems = $query->param('showallitems');
@@ -98,34 +101,33 @@ my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
 # $dewey=~ s/\.$//;
 # $data->{'dewey'}=$dewey;
 
+my $biblio = Koha::Biblios->find( $biblionumber );
+my $record = $biblio ? $biblio->metadata->record : undef;
+
+output_and_exit( $query, $cookie, $template, 'unknown_biblio')
+    unless $biblio && $record;
+
 my $fw = GetFrameworkCode($biblionumber);
-my @all_items= GetItemsInfo($biblionumber);
+my $all_items = $biblio->items->search_ordered;
+
 my @items;
 my $patron = Koha::Patrons->find( $loggedinuser );
-for my $itm (@all_items) {
-    push @items, $itm unless ( $itm->{itemlost} && 
-                               $patron->category->hidelostitems &&
-                               !$showallitems && 
-                               ($itemnumber != $itm->{itemnumber}));
+while ( my $item = $all_items->next ) {
+    push @items, $item
+      unless $item->itemlost
+      && $patron->category->hidelostitems
+      && !$showallitems;
 }
 
-my $record=GetMarcBiblio({ biblionumber => $biblionumber });
-
-output_and_exit( $query, $cookie, $template, 'unknown_biblio')
-    unless $record;
-
 my $hostrecords;
-# adding items linked via host biblios
-my @hostitems = GetHostItemsInfo($record);
-if (@hostitems){
-        $hostrecords =1;
-        push (@items,@hostitems);
+my $hostitems = $biblio->host_items;
+if ( $hostitems->count ) {
+    $hostrecords = 1;
+    push @items, $hostitems->as_list;
 }
 
-my $biblio = Koha::Biblios->find( $biblionumber );
-
-my $totalcount=@all_items;
-my $showncount=@items;
+my $totalcount = $all_items->count;
+my $showncount = scalar @items;
 my $hiddencount = $totalcount - $showncount;
 $data->{'count'}=$totalcount;
 $data->{'showncount'}=$showncount;
@@ -144,53 +146,63 @@ foreach ( keys %{$data} ) {
     $template->param( "$_" => defined $data->{$_} ? $data->{$_} : '' );
 }
 
-($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items);
+if ($itemnumber) {
+    @items = (grep {$_->itemnumber == $itemnumber} @items);
+}
+my @item_data;
 foreach my $item (@items){
-    $item->{object} = Koha::Items->find( $item->{itemnumber} );
-    $item->{'collection'}              = $ccodes->{ $item->{ccode} } if $ccodes && $item->{ccode} && exists $ccodes->{ $item->{ccode} };
-    $item->{'itype'}                   = $itemtypes->{ $item->{'itype'} }->{'translated_description'} if exists $itemtypes->{ $item->{'itype'} };
-    $item->{'replacementprice'}        = $item->{'replacementprice'};
-    if ( defined $item->{'copynumber'} ) {
-        $item->{'displaycopy'} = 1;
-        if ( defined $copynumbers->{ $item->{'copynumber'} } ) {
-            $item->{'copyvol'} = $copynumbers->{ $item->{'copynumber'} }
+
+    my $item_info = $item->unblessed;
+    $item_info->{object} = $item;
+    $item_info->{itype} = $itemtypes->{ $item->itype }->{'translated_description'} if exists $itemtypes->{ $item->itype };
+    $item_info->{effective_itemtype} = $itemtypes->{$item->effective_itemtype};
+    $item_info->{'ccode'}              = $ccodes->{ $item->ccode } if $ccodes && $item->ccode && exists $ccodes->{ $item->ccode };
+    if ( defined $item->copynumber ) {
+        $item_info->{'displaycopy'} = 1;
+        if ( defined $copynumbers->{ $item_info->{'copynumber'} } ) {
+            $item_info->{'copyvol'} = $copynumbers->{ $item_info->{'copynumber'} }
         }
         else {
-            $item->{'copyvol'} = $item->{'copynumber'};
+            $item_info->{'copyvol'} = $item_info->{'copynumber'};
         }
     }
 
     # item has a host number if its biblio number does not match the current bib
-    if ($item->{biblionumber} ne $biblionumber){
-        $item->{hostbiblionumber} = $item->{biblionumber};
-        $item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title};
+    if ($item->biblionumber ne $biblionumber){
+        $item_info->{hostbiblionumber} = $item->biblionumber;
+        $item_info->{hosttitle} = $item->biblio->title;
     }
 
-    my $order  = GetOrderFromItemnumber( $item->{'itemnumber'} );
-    $item->{'ordernumber'}             = $order->{'ordernumber'};
-    $item->{'basketno'}                = $order->{'basketno'};
-    $item->{'orderdate'}               = $order->{'entrydate'};
-    if ($item->{'basketno'}){
-	    my $basket = GetBasket($item->{'basketno'});
+    # FIXME The acquisition code below could be improved using methods from Koha:: objects
+    my $order  = GetOrderFromItemnumber( $item->itemnumber );
+    $item_info->{'basketno'}                = $order->{'basketno'};
+    $item_info->{'orderdate'}               = $order->{'entrydate'};
+    if ($item_info->{'basketno'}){
+        my $basket = GetBasket($item_info->{'basketno'});
         my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} );
-        $item->{'vendor'} = $bookseller->name;
+        $item_info->{'vendor'} = $bookseller->name;
     }
-    $item->{'invoiceid'}               = $order->{'invoiceid'};
-    if($item->{invoiceid}) {
-        my $invoice = GetInvoice($item->{invoiceid});
-        $item->{invoicenumber} = $invoice->{invoicenumber} if $invoice;
+    $item_info->{'invoiceid'}               = $order->{'invoiceid'};
+    if($item_info->{invoiceid}) {
+        my $invoice = GetInvoice($item_info->{invoiceid});
+        $item_info->{invoicenumber} = $invoice->{invoicenumber} if $invoice;
     }
-    $item->{'datereceived'}            = $order->{'datereceived'};
+    $item_info->{'datereceived'}            = $order->{'datereceived'};
 
-    if ($item->{notforloantext} or $item->{itemlost} or $item->{damaged} or $item->{withdrawn}) {
-        $item->{status_advisory} = 1;
+    if (   $item->notforloan
+        || $item->itemtype->notforloan
+        || $item->itemlost
+        || $item->damaged
+        || $item->withdrawn )
+    {
+        $item_info->{status_advisory} = 1;
     }
 
     # Add paidfor info
-    if ( $item->{itemlost} ) {
+    if ( $item->itemlost ) {
         my $accountlines = Koha::Account::Lines->search(
             {
-                itemnumber        => $item->{itemnumber},
+                itemnumber        => $item->itemnumber,
                 debit_type_code   => 'LOST',
                 status            => [ undef, { '<>' => 'RETURNED' } ],
                 amountoutstanding => 0
@@ -202,20 +214,19 @@ foreach my $item (@items){
         );
 
         if ( my $accountline = $accountlines->next ) {
-            my $payment_offsets = Koha::Account::Offsets->search(
+            my $payment_offsets = $accountline->debit_offsets(
                 {
-                    debit_id  => $accountline->id,
                     credit_id => { '!=' => undef }, # it is not the debit itself
-                    type => { '!=' => [ 'Writeoff', 'Forgiven' ] },
-                    amount => { '<' => 0 }    # credits are negative on the DB
+                    'credit.credit_type_code' =>
+                      { '!=' => [ 'Writeoff', 'Forgiven' ] },
                 },
-                { order_by => { '-desc' => 'created_on' } }
+                { join => 'credit', order_by => { '-desc' => 'created_on' } }
             );
 
             if ($payment_offsets->count) {
                 my $patron = $accountline->patron;
                 my $payment_offset = $payment_offsets->next;
-                $item->{paidfor} = { patron => $patron, created_on => $payment_offset->created_on };
+                $item_info->{paidfor} = { patron => $patron, created_on => $payment_offset->created_on };
             }
         }
     }
@@ -223,20 +234,22 @@ foreach my $item (@items){
     if (C4::Context->preference("IndependentBranches")) {
         #verifying rights
         my $userenv = C4::Context->userenv();
-        unless (C4::Context->IsSuperLibrarian() or ($userenv->{'branch'} eq $item->{'homebranch'})) {
-                $item->{'nomod'}=1;
+        unless (C4::Context->IsSuperLibrarian() or ($userenv->{'branch'} eq $item->homebranch)) {
+                $item_info->{'nomod'}=1;
         }
     }
-    if ($item->{'datedue'}) {
-        $item->{'issue'}= 1;
-    } else {
-        $item->{'issue'}= 0;
-    }
 
-    if ( $item->{'borrowernumber'} ) {
-        my $curr_borrower = Koha::Patrons->find( $item->{borrowernumber} );
-        $item->{patron} = $curr_borrower;
-    }
+    $item_info->{old_issues} = Koha::Old::Checkouts->search(
+        { itemnumber => $item->itemnumber },
+        {
+            order_by => { '-desc' => 'returndate' },
+            limit    => 3
+        }
+    );
+
+    $item_info->{nomod} = !$patron->can_edit_items_from( $item->homebranch );
+
+    push @item_data, $item_info;
 }
 
 my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $fw, kohafield => 'items.itemlost', authorised_value => [ -and => {'!=' => undef }, {'!=' => ''}] });
@@ -258,8 +271,40 @@ $template->param(count => $data->{'count'},
 	C4::Search::enabled_staff_search_views,
 );
 
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($query->cookie("intranet_bib_list")){
+    my $cart_list = $query->cookie("intranet_bib_list");
+    @cart_list = split(/\//, $cart_list);
+    if ( grep {$_ eq $biblionumber} @cart_list) {
+        $template->param( incart => 1 );
+    }
+}
+
+my $some_private_shelves = Koha::Virtualshelves->get_some_shelves(
+    {
+        borrowernumber => $loggedinuser,
+        add_allowed    => 1,
+        public         => 0,
+    }
+);
+my $some_public_shelves = Koha::Virtualshelves->get_some_shelves(
+    {
+        borrowernumber => $loggedinuser,
+        add_allowed    => 1,
+        public         => 1,
+    }
+);
+
+
+$template->param(
+    add_to_some_private_shelves => $some_private_shelves,
+    add_to_some_public_shelves  => $some_public_shelves,
+);
+
 $template->param(
-    ITEM_DATA           => \@items,
+    ITEM_DATA           => \@item_data,
     moredetailview      => 1,
     loggedinuser        => $loggedinuser,
     biblionumber        => $biblionumber,