bug 2505: fix warnings in opac-MARCdetail.pl

[koha_gimpoz] / acqui / basket.pl

diff --git a/acqui/basket.pl b/acqui/basket.pl
index c573035..eaa6f59 100755 (executable)
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -86,6 +86,9 @@ my $basket = GetBasket($basketno);
 $booksellerid = $basket->{booksellerid} unless $booksellerid;
 my ($bookseller) = GetBookSellerFromId($booksellerid);
 my $op = $query->param('op');
+if (!defined $op) {
+    $op = q{};
+}
 
 if ( $op eq 'delete_confirm' ) {
     my $basketno = $query->param('basketno');
@@ -135,22 +138,39 @@ if ( $op eq 'delete_confirm' ) {
 } elsif ($op eq 'attachbasket' && $template->{'param_map'}->{'CAN_user_acquisition_group_manage'} == 1) {
       print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno=' . $basket->{'basketno'} . '&op=attachbasket&booksellerid=' . $booksellerid);
     # check if we have to "close" a basket before building page
+} elsif ($op eq 'export') {
+    print $query->header(
+        -type       => 'text/csv',
+        -attachment => 'basket' . $basket->{'basketno'} . '.csv',
+    );
+    print GetBasketAsCSV($query->param('basketno'));
+    exit;
 } elsif ($op eq 'close') {
     my $confirm = $query->param('confirm');
     if ($confirm) {
-       my $basketno = $query->param('basketno');
-       my $booksellerid = $query->param('booksellerid');
-       $basketno =~ /^\d+$/ and CloseBasket($basketno);
-       print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno='.$basketno.'&op=attachbasket&booksellerid=' . $booksellerid);
-       exit;
-
+        my $basketno = $query->param('basketno');
+        my $booksellerid = $query->param('booksellerid');
+        $basketno =~ /^\d+$/ and CloseBasket($basketno);
+        # if requested, create basket group, close it and attach the basket
+        if ($query->param('createbasketgroup')) {
+            my $basketgroupid = NewBasketgroup( { name => $basket->{basketname},
+                            booksellerid => $booksellerid,
+                            closed => 1,
+                            });
+            ModBasket( { basketno => $basketno,
+                         basketgroupid => $basketgroupid } );
+            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid);
+        } else {
+            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno='.$basketno.'&op=attachbasket&booksellerid=' . $booksellerid);
+        }
+        exit;
     } else {
-       $template->param(confirm_close => "1",
-                       booksellerid    => $booksellerid,
-                       basketno        => $basket->{'basketno'},
-                       basketname      => $basket->{'basketname'},
-                       basketgroupname => $basket->{'basketname'});
-               
+    $template->param(confirm_close => "1",
+            booksellerid    => $booksellerid,
+            basketno        => $basket->{'basketno'},
+                basketname      => $basket->{'basketname'},
+            basketgroupname => $basket->{'basketname'});
+        
     }
 } elsif ($query->param('op') eq 'reopen') {
     my $basket;
@@ -175,7 +195,7 @@ if ( $op eq 'delete_confirm' ) {
     }
 #if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
     my $basketgroups;
-    my $member = GetMember($loggedinuser, "borrowernumber");
+    my $member = GetMember(borrowernumber => $loggedinuser);
     if ($basket->{closedate} && haspermission({ flagsrequired   => { acquisition => 'group_manage'} })) {
         $basketgroups = GetBasketgroups($basket->{booksellerid});
         for (my $i=0; $i < scalar(@$basketgroups); $i++) {
@@ -213,7 +233,10 @@ if ( $op eq 'delete_confirm' ) {
 
     for ( my $i = 0 ; $i < $count ; $i++ ) {
         my $rrp = $results[$i]->{'listprice'};
-               my $qty = $results[$i]->{'quantity'};
+               my $qty = $results[$i]->{'quantity'} || 0;
+        if (!defined $results[$i]->{quantityreceived}) {
+            $results[$i]->{quantityreceived} = 0;
+        }
 
         my $budget = GetBudget(  $results[$i]->{'budget_id'} );
         $rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp );
@@ -225,7 +248,7 @@ if ( $op eq 'delete_confirm' ) {
         my %line = %{ $results[$i] };
                ($i%2) and $line{toggle} = 1;
 
-        $line{order_received} = ( $qty eq $results[$i]->{'quantityreceived'} );
+        $line{order_received} = ( $qty == $results[$i]->{'quantityreceived'} );
         $line{basketno}       = $basketno;
         $line{i}              = $i;
         $line{budget_name}    = $budget->{budget_name};
@@ -272,18 +295,14 @@ if ( $op eq 'delete_confirm' ) {
         basketbooksellernote => $basket->{booksellernote},
         basketcontractno     => $basket->{contractnumber},
         basketcontractname   => $contract->{contractname},
-        creationdate         => format_date( $basket->{creationdate} ),
+        creationdate         => C4::Dates->new($basket->{creationdate},'iso')->output,
         authorisedby         => $basket->{authorisedby},
         authorisedbyname     => $basket->{authorisedbyname},
-        closedate            => format_date( $basket->{closedate} ),
+        closedate            => C4::Dates->new($basket->{closedate},'iso')->output,
         active               => $bookseller->{'active'},
         booksellerid         => $bookseller->{'id'},
         name                 => $bookseller->{'name'},
-        address1             => $bookseller->{'address1'},
-        address2             => $bookseller->{'address2'},
-        address3             => $bookseller->{'address3'},
-        address4             => $bookseller->{'address4'},
-        entrydate            => format_date( $results[0]->{'entrydate'} ),
+        entrydate            => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
         books_loop           => \@books_loop,
         count                => $count,
         gist_rate            => sprintf( "%.2f", $gist * 100 ) . '%',
@@ -300,4 +319,5 @@ if ( $op eq 'delete_confirm' ) {
         grouped              => $basket->{basketgroupid},
     );
 }
+
 output_html_with_http_headers $query, $cookie, $template->output;