X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Facqui-search-result.pl;h=7b856b8933ab4eef0572ba04f541aedccb2b3b52;hb=ef142b1dbec4246e41b1f9d0ee71b5a9c94dfc49;hp=5206c4726872db00ae2851add70526d544c2f803;hpb=247e04d204697126208d6142e02bd49307ef9e29;p=koha.git

diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index 5206c47268..7b856b8933 100755
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -1,11 +1,8 @@
 #!/usr/bin/perl
 
-# $Id$
-
 #script to show suppliers and orders
 #written by chris@katipo.co.nz 23/2/2000
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -23,61 +20,74 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+
+=head1 NAME
+
+acqui-search-result.pl
+
+=head1 DESCRIPTION
+ TODO
+ 
+=head1 PARAMETERS
+
+=over 4
+
+=item supplier
+
+=back
+
+=cut
+
+
 use strict;
+use warnings;
 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 => "serials/acqui-search-result.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
+                 query => $query,
+                 type => "intranet",
+                 authnotrequired => 0,
+                 flagsrequired => {serials => '*'},
+                 debug => 1,
+                 });
 
 my $supplier=$query->param('supplier');
-my ($count,@suppliers)=bookseller($supplier);
-
-#build reult page
-my $toggle=0;
-my @loop_suppliers;
-for (my $i=0; $i<$count; $i++) {
-	my ($ordcount,$orders)=getorders($suppliers[$i]->{'id'});
-	my %line;
-	if ($toggle==0){
-		$line{even}=1;
-		$toggle=1;
-	} else {
-		$line{even}=0;
-		$toggle=0;
-	}
-	$line{aqbooksellerid} =$suppliers[$i]->{'id'};
-	$line{name} = $suppliers[$i]->{'name'};
-	$line{active} = $suppliers[$i]->{'active'};
-	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{creationdate} = format_date($orders->[$i2]->{'creationdate'});
-		$inner_line{closedate} = format_date($orders->[$i2]->{'closedate'});
-		push @loop_basket, \%inner_line;
-	}
-	$line{loop_basket} = \@loop_basket;
-	push @loop_suppliers, \%line;
+my @suppliers = GetBookSeller($supplier);
+#my $count = scalar @suppliers;
+
+#build result page
+my $loop_suppliers = [];
+for my $s (@suppliers) {
+    my $orders = GetPendingOrders($s->{'id'});
+    
+    my $loop_basket = [];
+    for my $ord ( @{$orders} ) {
+        push @{$loop_basket}, {
+            basketno     => $ord->{'basketno'},
+            total        => $ord->{'count(*)'},
+            authorisedby => $ord->{'authorisedby'},
+            creationdate => format_date($ord->{'creationdate'}),
+            closedate    => format_date($ord->{'closedate'}),
+        };
+    }
+    push @{$loop_suppliers}, {
+        loop_basket => $loop_basket,
+        aqbooksellerid => $s->{'id'},
+        name => $s->{'name'},
+        active => $s->{'active'},
+    };
 }
-$template->param(loop_suppliers => \@loop_suppliers,
-						supplier => $supplier,
-						count => $count);
+
+$template->param(loop_suppliers => $loop_suppliers,
+                        supplier => $supplier,
+                        count => scalar @suppliers);
 
 output_html_with_http_headers $query, $cookie, $template->output;