Fixing hierarchy processing

[koha.git] / acqui / booksellers.pl

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 4332a28..24677ec 100755 (executable)
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -20,7 +20,6 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 =head1 NAME
 
@@ -58,17 +57,16 @@ use C4::Auth;
 use C4::Biblio;
 use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
+
+
 use C4::Acquisition;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Bookseller;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/suppliers.tmpl",
+        template_name   => "acqui/booksellers.tmpl",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -79,31 +77,37 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 #parameters
 my $supplier = $query->param('supplier');
+my $id       = $query->param('id') || $query->param('supplierid');
+my @suppliers;
 
-my @suppliers = GetBookSeller($supplier);
+if ($id) {
+       push @suppliers, GetBookSellerFromId($id);
+} else {
+       @suppliers = GetBookSeller($supplier);
+}
 my $count = scalar @suppliers;
-
+if ($count == 1){
+       $template->param( supplier_name => $suppliers[0]->{'name'},
+               id => $suppliers[0]->{'id'}
+       );
+}
 # check if we have to "close" a basket before building page
-my $op     = $query->param('op');
-my $basket = $query->param('basket');
-if ( $op eq 'close' ) {
-    CloseBasket($basket);
+if ($query->param('op') eq 'close') {
+       my $basket = $query->param('basketno');
+       $basket =~ /^\d+$/ and CloseBasket($basket);
 }
 
 #build result page
 my $toggle = 0;
 my @loop_suppliers;
 for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my $orders  = GetPendingOrders( $suppliers[$i]->{'id'} );
+    my $orders  = GetPendingOrders( $suppliers[$i]->{'id'}, "grouped" );
     my $ordcount = scalar @$orders;
-# FIXME : $ordcount seems to be equals to 0 each times...
-
     my %line;
     if ( $toggle == 0 ) {
         $line{even} = 1;
         $toggle = 1;
-    }
-    else {
+    } else {
         $line{even} = 0;
         $toggle = 0;
     }
@@ -113,14 +117,13 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     my @loop_basket;
     for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
         my %inner_line;
-        $inner_line{basketno}     = $orders->[$i2]->{'basketno'};
-        $inner_line{total}        = $orders->[$i2]->{'count(*)'};
-        $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
-        $inner_line{surname}      = $orders->[$i2]->{'firstname'};
-        $inner_line{firstname}    = $orders->[$i2]->{'surname'};
-        $inner_line{creationdate} =
-          format_date( $orders->[$i2]->{'creationdate'} );
-        $inner_line{closedate} = format_date( $orders->[$i2]->{'closedate'} );
+        $inner_line{basketno}     = $orders->[$i2]{'basketno'};
+        $inner_line{total}        = $orders->[$i2]{'count(*)'};
+        $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'};
+        $inner_line{surname}      = $orders->[$i2]{'firstname'};
+        $inner_line{firstname}    = $orders->[$i2]{'surname'};
+        $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
+        $inner_line{closedate}    = format_date( $orders->[$i2]{'closedate'}    );
         push @loop_basket, \%inner_line;
     }
     $line{loop_basket} = \@loop_basket;
@@ -128,12 +131,8 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
 }
 $template->param(
     loop_suppliers          => \@loop_suppliers,
-    supplier                => $supplier,
+    supplier                => ($id || $supplier),
     count                   => $count,
-    intranetcolorstylesheet =>
-    C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;