X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Facqui-search-result.pl;h=5839cd498e716f3c8672702f130cc2ae0c04ba3c;hb=bc866c25f48975a73c2fab6ad9276d958f0780ba;hp=e936ea5caaf1d8e533bba24035ea3818c2f96e20;hpb=7e52a5665c02d76c9f99e64d841be795ca6f0546;p=koha_fer

diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index e936ea5caa..5839cd498e 100755
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -16,11 +16,10 @@
 # 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.
 
-# $Id$
 
 =head1 NAME
 
@@ -28,7 +27,7 @@ acqui-search-result.pl
 
 =head1 DESCRIPTION
  TODO
- 
+
 =head1 PARAMETERS
 
 =over 4
@@ -41,14 +40,14 @@ acqui-search-result.pl
 
 
 use strict;
+use warnings;
 use C4::Auth;
 use C4::Biblio;
+use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-use C4::Date;
-use C4::Bookseller;
 use C4::Acquisition;
+use C4::Dates qw/format_date/;
+use C4::Bookseller qw( GetBookSeller );
 
 my $query=new CGI;
 my ($template, $loggedinuser, $cookie)
@@ -56,47 +55,39 @@ my ($template, $loggedinuser, $cookie)
                  query => $query,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {acquisition => 1},
+                 flagsrequired => {serials => '*'},
                  debug => 1,
                  });
 
 my $supplier=$query->param('supplier');
 my @suppliers = GetBookSeller($supplier);
-my $count = scalar @suppliers;
+#my $count = scalar @suppliers;
 
 #build result page
-my $toggle=0;
-my @loop_suppliers;
-for (my $i=0; $i<$count; $i++) {
-    my $orders = GetPendingOrders($suppliers[$i]->{'id'});
-    my $ordcount = scalar @$orders;
-    
-    my %line;
-    if ($toggle==0){
-        $line{even}=1;
-        $toggle=1;
-    } else {
-        $line{even}=0;
-        $toggle=0;
+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'}),
+        };
     }
-    $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;
+    push @{$loop_suppliers}, {
+        loop_basket => $loop_basket,
+        aqbooksellerid => $s->{'id'},
+        name => $s->{'name'},
+        active => $s->{'active'},
+    };
 }
-$template->param(loop_suppliers => \@loop_suppliers,
+
+$template->param(loop_suppliers => $loop_suppliers,
                         supplier => $supplier,
-                        count => $count);
+                        count => scalar @suppliers);
 
 output_html_with_http_headers $query, $cookie, $template->output;