Merge remote branch 'kc/new/enh/bug_3659' into kcmaster

[koha.git] / catalogue / moredetail.pl

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 5d09087..c3d7a95 100755 (executable)
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -13,13 +13,13 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
 use C4::Koha;
 use CGI;
 use C4::Biblio;
@@ -31,6 +31,8 @@ use C4::Auth;
 use C4::Serials;
 use C4::Dates qw/format_date/;
 use C4::Circulation;  # to use itemissues
+use C4::Members; # to use GetMember
+use C4::Search;                # enabled_staff_search_views
 
 my $query=new CGI;
 
@@ -47,12 +49,22 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     flagsrequired   => {catalogue => 1},
     });
 
+if($query->cookie("holdfor")){ 
+    my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
+    $template->param(
+        holdfor => $query->cookie("holdfor"),
+        holdfor_surname => $holdfor_patron->{'surname'},
+        holdfor_firstname => $holdfor_patron->{'firstname'},
+        holdfor_cardnumber => $holdfor_patron->{'cardnumber'},
+    );
+}
+
 # get variables
 
 my $biblionumber=$query->param('biblionumber');
 my $title=$query->param('title');
-# my $bi=$query->param('bi');
-# $bi = $biblionumber unless $bi;
+my $bi=$query->param('bi');
+$bi = $biblionumber unless $bi;
 my $data=GetBiblioData($biblionumber);
 my $dewey = $data->{'dewey'};
 
@@ -76,25 +88,29 @@ my @items= GetItemsInfo($biblionumber);
 my $count=@items;
 $data->{'count'}=$count;
 
-my $ordernum = GetOrderNumber($biblionumber);
-my $order = GetOrder($ordernum);
 my $ccodes= GetKohaAuthorisedValues('items.ccode',$fw);
 my $itemtypes = GetItemTypes;
 
 $data->{'itemtypename'} = $itemtypes->{$data->{'itemtype'}}->{'description'};
 $results[0]=$data;
+my $itemnumber;
+($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items);
 foreach my $item (@items){
     $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw);
     $item->{itemdamagedloop}= GetAuthorisedValues(GetAuthValCode('items.damaged',$fw),$item->{damaged}) if GetAuthValCode('items.damaged',$fw);
-    $item->{'collection'} = $ccodes->{$item->{ccode}};
-    $item->{'itype'} = $itemtypes->{$item->{'itype'}}->{'description'}; 
-    $item->{'replacementprice'}=sprintf("%.2f", $item->{'replacementprice'});
-    $item->{'datelastborrowed'}= format_date($item->{'datelastborrowed'});
-    $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
-    $item->{'datelastseen'} = format_date($item->{'datelastseen'});
-    $item->{'ordernumber'} = $ordernum;
+    $item->{'collection'}              = $ccodes->{ $item->{ccode} } if ($ccodes);
+    $item->{'itype'}                   = $itemtypes->{ $item->{'itype'} }->{'description'};
+    $item->{'replacementprice'}        = sprintf( "%.2f", $item->{'replacementprice'} );
+    $item->{'datelastborrowed'}        = format_date( $item->{'datelastborrowed'} );
+    $item->{'dateaccessioned'}         = format_date( $item->{'dateaccessioned'} );
+    $item->{'datelastseen'}            = format_date( $item->{'datelastseen'} );
+    $item->{'copyvol'}                 = $item->{'copynumber'};
+
+    my $order = GetOrderFromItemnumber( $item->{'itemnumber'} );
+    $item->{'ordernumber'}             = $order->{'ordernumber'};
+    $item->{'basketno'}                = $order->{'basketno'};
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
-    $item->{'copyvol'} = $item->{'copynumber'};
+
     if ($item->{notforloantext} or $item->{itemlost} or $item->{damaged} or $item->{wthdrawn}) {
         $item->{status_advisory} = 1;
     }
@@ -108,22 +124,27 @@ foreach my $item (@items){
     }
     $item->{'homebranchname'} = GetBranchName($item->{'homebranch'});
     $item->{'holdingbranchname'} = GetBranchName($item->{'holdingbranch'});
-    if ($item->{'onloan'} eq ''){
-        $item->{'issue'}= 0;
-    } else {
-        $item->{'onloan'} = format_date($item->{'onloan'});
+    if ($item->{'datedue'}) {
+        $item->{'datedue'} = format_date($item->{'datedue'});
         $item->{'issue'}= 1;
+    } else {
+        $item->{'issue'}= 0;
     }
 }
 $template->param(count => $data->{'count'},
        subscriptionsnumber => $subscriptionsnumber,
     subscriptiontitle   => $data->{title},
+       C4::Search::enabled_staff_search_views,
 );
 $template->param(BIBITEM_DATA => \@results);
 $template->param(ITEM_DATA => \@items);
 $template->param(moredetailview => 1);
 $template->param(loggedinuser => $loggedinuser);
 $template->param(biblionumber => $biblionumber);
+$template->param(biblioitemnumber => $bi);
+$template->param(itemnumber => $itemnumber);
+$template->param(ONLY_ONE => 1) if ( $itemnumber && $count != @items );
+$template->param(z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)));
 
 output_html_with_http_headers $query, $cookie, $template->output;