Bug 29672: Fix test t/db_dependent/Koha/Plugins/Plugins.t

[koha-ffzg.git] / acqui / lateorders.pl

diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 1367e17..7ce5683 100755 (executable)
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -45,54 +45,36 @@ To know on which branch this script have to display late order.
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Bookseller qw( GetBooksellersWithLateOrders );
-use C4::Auth;
-use C4::Koha;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Context;
-use C4::Acquisition;
-use C4::Letters;
-use Koha::DateUtils;
-use Koha::Acquisition::Orders;
+use C4::Letters qw( SendAlerts GetLetters );
+use Koha::DateUtils qw( dt_from_string );
+use Koha::Acquisition::Orders qw( filter_by_lates );
+use Koha::CsvProfiles;
 
-my $input = new CGI;
+my $input = CGI->new;
 my ($template, $loggedinuser, $cookie) = get_template_and_user(
     {
         template_name   => "acqui/lateorders.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_receive' },
-        debug           => 1,
     }
 );
 
-my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0
+my $booksellerid = $input->param('booksellerid');
 my $delay        = $input->param('delay') // 0;
 
 # Get the "date from" param if !defined is today
 my $estimateddeliverydatefrom = $input->param('estimateddeliverydatefrom');
 my $estimateddeliverydateto   = $input->param('estimateddeliverydateto');
 
-my $estimateddeliverydatefrom_dt =
-  $estimateddeliverydatefrom
-  ? dt_from_string($estimateddeliverydatefrom)
-  : undef;
-
 # Get the "date to" param. If it is not defined and $delay is not defined too, it is the today's date.
-my $estimateddeliverydateto_dt = $estimateddeliverydateto
-    ? dt_from_string($estimateddeliverydateto)
-    : ( not defined $delay and not defined $estimateddeliverydatefrom)
-        ? dt_from_string()
-        : undef;
-
-# Format the output of "date from" and "date to"
-if ($estimateddeliverydatefrom_dt) {
-    $estimateddeliverydatefrom = output_pref({dt => $estimateddeliverydatefrom_dt, dateonly => 1});
-}
-if ($estimateddeliverydateto_dt) {
-    $estimateddeliverydateto = output_pref({dt => $estimateddeliverydateto_dt, dateonly => 1});
-}
+$estimateddeliverydateto ||=
+  ( not defined $delay and not defined $estimateddeliverydatefrom )
+  ? dt_from_string()
+  : undef;
 
 my $branch     = $input->param('branch');
 my $op         = $input->param('op');
@@ -123,54 +105,44 @@ if ($op and $op eq "send_alert"){
     }
 }
 
-my @parameters = ( $delay );
-push @parameters, $estimateddeliverydatefrom_dt
-    ? $estimateddeliverydatefrom_dt->ymd()
-    : undef;
-
-push @parameters, $estimateddeliverydateto_dt
-    ? $estimateddeliverydateto_dt->ymd()
-    : undef;
-
-my %supplierlist = GetBooksellersWithLateOrders(@parameters);
-
-my (@sloopy);  # supplier loop
-foreach( sort { $supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist ) {
-       push @sloopy, (($booksellerid and $booksellerid eq $_ )            ?
-                                       {id=>$_, name=>$supplierlist{$_}, selected=>1} :
-                                       {id=>$_, name=>$supplierlist{$_}} )            ;
-}
-$template->param(SUPPLIER_LOOP => \@sloopy);
-
-$template->param(Supplier=>$supplierlist{$booksellerid}) if ($booksellerid);
-$template->param(booksellerid=>$booksellerid) if ($booksellerid);
-
-my $lateorders = Koha::Acquisition::Orders->filter_by_lates(
+my @lateorders = Koha::Acquisition::Orders->filter_by_lates(
     {
         delay        => $delay,
-        booksellerid => $booksellerid,
         (
-            $estimateddeliverydatefrom_dt
-            ? ( estimated_from => $estimateddeliverydatefrom_dt )
+            $estimateddeliverydatefrom
+            ? ( estimated_from => dt_from_string($estimateddeliverydatefrom, 'iso') )
             : ()
         ),
         (
-            $estimateddeliverydateto_dt
-            ? ( estimated_to => $estimateddeliverydateto_dt )
+            $estimateddeliverydateto
+            ? ( estimated_to => dt_from_string($estimateddeliverydateto, 'iso') )
             : ()
         )
+    },
+)->as_list;
+
+my $booksellers = Koha::Acquisition::Booksellers->search(
+    {
+        id => {
+            -in => [ map { $_->basket->booksellerid } @lateorders ]
+        },
     }
 );
 
+@lateorders = grep { $_->basket->booksellerid eq $booksellerid } @lateorders if $booksellerid;
+
 my $letters = GetLetters({ module => "claimacquisition" });
 
 $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
-    lateorders => $lateorders,
+    lateorders => \@lateorders,
+    booksellers => $booksellers,
+    bookseller_filter => ( $booksellerid ? $booksellers->find($booksellerid) : undef),
        delay => $delay,
     letters => $letters,
     estimateddeliverydatefrom => $estimateddeliverydatefrom,
     estimateddeliverydateto   => $estimateddeliverydateto,
        intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+    csv_profiles         => Koha::CsvProfiles->search({ type => 'sql', used_for => 'late_orders' }),
 );
 output_html_with_http_headers $input, $cookie, $template->output;