Bug 19130: (followup) Controller scripts should preserve behaviour

[koha.git] / serials / acqui-search-result.pl

diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index 5839cd4..5e57288 100755 (executable)
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -7,18 +7,18 @@
 #
 # 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
 =head1 NAME
@@ -26,6 +26,7 @@
 acqui-search-result.pl
 
 =head1 DESCRIPTION
+
  TODO
 
 =head1 PARAMETERS
@@ -44,14 +45,15 @@ use warnings;
 use C4::Auth;
 use C4::Biblio;
 use C4::Output;
-use CGI;
-use C4::Acquisition;
-use C4::Dates qw/format_date/;
-use C4::Bookseller qw( GetBookSeller );
+use CGI qw ( -utf8 );
+use C4::Acquisition qw( SearchOrders );
+use Koha::DateUtils;
+
+use Koha::Acquisition::Booksellers;
 
 my $query=new CGI;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/acqui-search-result.tmpl",
+    = get_template_and_user({template_name => "serials/acqui-search-result.tt",
                  query => $query,
                  type => "intranet",
                  authnotrequired => 0,
@@ -60,13 +62,17 @@ my ($template, $loggedinuser, $cookie)
                  });
 
 my $supplier=$query->param('supplier');
-my @suppliers = GetBookSeller($supplier);
-#my $count = scalar @suppliers;
+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 = GetPendingOrders($s->{'id'});
+    my $orders = SearchOrders({
+        booksellerid => $s->id,
+        pending => 1
+    });
 
     my $loop_basket = [];
     for my $ord ( @{$orders} ) {
@@ -74,15 +80,15 @@ for my $s (@suppliers) {
             basketno     => $ord->{'basketno'},
             total        => $ord->{'count(*)'},
             authorisedby => $ord->{'authorisedby'},
-            creationdate => format_date($ord->{'creationdate'}),
-            closedate    => format_date($ord->{'closedate'}),
+            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'},
+        aqbooksellerid => $s->id,
+        name => $s->name,
+        active => $s->active,
     };
 }