#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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, see <http://www.gnu.org/licenses>.
-# $Id$
-use strict;
+=head1 NAME
+
+acqui-search-result.pl
+
+=head1 DESCRIPTION
+
+ TODO
+
+=head1 PARAMETERS
+
+=over 4
+
+=item supplier
+
+=back
+
+=cut
+
+
+use Modern::Perl;
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;
-
-my $query=new CGI;
+use CGI qw ( -utf8 );
+use C4::Acquisition qw( SearchOrders );
+use Koha::DateUtils;
+
+use Koha::Acquisition::Booksellers;
+
+my $query=CGI->new;
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,
- });
+ = get_template_and_user({template_name => "serials/acqui-search-result.tt",
+ query => $query,
+ type => "intranet",
+ flagsrequired => {serials => '*'},
+ });
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 = Koha::Acquisition::Booksellers->search(
+ { name => { -like => "%$supplier%" } },
+ { order_by => { -asc => 'name' } } );
+
+#build result page
+my $loop_suppliers = [];
+for my $s (@suppliers) {
+ my $orders = SearchOrders({
+ booksellerid => $s->id,
+ pending => 1
+ });
+
+ my $loop_basket = [];
+ for my $ord ( @{$orders} ) {
+ push @{$loop_basket}, {
+ basketno => $ord->{'basketno'},
+ total => $ord->{'count(*)'},
+ authorisedby => $ord->{'authorisedby'},
+ creationdate => output_pref( { str => $ord->{'creationdate'} } ),
+ closedate => output_pref( { str => $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;