X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Flateorders.pl;h=9febcf65c96ce261328e5f43a3e889bb674d5168;hb=refs%2Fheads%2Fkoha_ffzg;hp=544370d0b84a2a703e0baea219cfe611741cd90e;hpb=65be03846d064dd6d9e7159550a269a352054b65;p=koha.git

diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 544370d0b8..9febcf65c9 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -4,18 +4,18 @@
 # Copyright 2005 Biblibre
 # 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
 
@@ -44,7 +44,7 @@ To know on which branch this script have to display late order.
 =cut
 
 use Modern::Perl;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Bookseller qw( GetBooksellersWithLateOrders );
 use C4::Auth;
 use C4::Koha;
@@ -52,21 +52,22 @@ use C4::Output;
 use C4::Context;
 use C4::Acquisition;
 use C4::Letters;
-use C4::Branch; # GetBranches
 use Koha::DateUtils;
 
 my $input = new CGI;
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	template_name => "acqui/lateorders.tmpl",
-	query => $input,
-	 type => "intranet",
-	authnotrequired => 0,
-	flagsrequired => {acquisition => 'order_receive'},
-	debug => 1,
-});
+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 $delay        = $input->param('delay');
+my $delay        = $input->param('delay') // 0;
 
 # Get the "date from" param if !defined is today
 my $estimateddeliverydatefrom = $input->param('estimateddeliverydatefrom');
@@ -86,10 +87,10 @@ my $estimateddeliverydateto_dt = $estimateddeliverydateto
 
 # Format the output of "date from" and "date to"
 if ($estimateddeliverydatefrom_dt) {
-    $estimateddeliverydatefrom = output_pref($estimateddeliverydatefrom_dt, undef, 1);
+    $estimateddeliverydatefrom = output_pref({dt => $estimateddeliverydatefrom_dt, dateonly => 1});
 }
 if ($estimateddeliverydateto_dt) {
-    $estimateddeliverydateto = output_pref($estimateddeliverydateto_dt, undef, 1);
+    $estimateddeliverydateto = output_pref({dt => $estimateddeliverydateto_dt, dateonly => 1});
 }
 
 my $branch     = $input->param('branch');
@@ -101,24 +102,27 @@ if ( $delay and not $delay =~ /^\d{1,3}$/ ) {
 }
 
 if ($op and $op eq "send_alert"){
-    my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
+    my @ordernums = $input->multi_param("ordernumber");
     my $err;
     eval {
-        $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );    # FIXME: Fallback value?
+        $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") );
         if ( not ref $err or not exists $err->{error} ) {
             AddClaim ( $_ ) for @ordernums;
         }
     };
+
     if ( $@ ) {
         $template->param(error_claim => $@);
     } elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) {
         $template->{VARS}->{'error_claim'} = "no_email";
+    } elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_order_selected"){
+        $template->{VARS}->{'error_claim'} = "no_order_selected";
     } else {
         $template->{VARS}->{'info_claim'} = 1;
     }
 }
 
-my @parameters = ( $delay, $branch );
+my @parameters = ( $delay );
 push @parameters, $estimateddeliverydatefrom_dt
     ? $estimateddeliverydatefrom_dt->ymd()
     : undef;
@@ -130,7 +134,7 @@ push @parameters, $estimateddeliverydateto_dt
 my %supplierlist = GetBooksellersWithLateOrders(@parameters);
 
 my (@sloopy);	# supplier loop
-foreach (keys %supplierlist){
+foreach( sort { $supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist ) {
 	push @sloopy, (($booksellerid and $booksellerid eq $_ )            ?
 					{id=>$_, name=>$supplierlist{$_}, selected=>1} :
 					{id=>$_, name=>$supplierlist{$_}} )            ;
@@ -158,21 +162,16 @@ foreach (@lateorders){
 	$total += $_->{subtotal};
 }
 
-my @letters;
-my $letters=GetLetters("claimacquisition");
-foreach (keys %$letters){
-	push @letters, {code=>$_,name=>$letters->{$_}};
-}
-$template->param(letters=>\@letters) if (@letters);
+my $letters = GetLetters({ module => "claimacquisition" });
 
 $template->param(ERROR_LOOP => \@errors) if (@errors);
 $template->param(
 	lateorders => \@lateorders,
 	delay => $delay,
+    letters => $letters,
     estimateddeliverydatefrom => $estimateddeliverydatefrom,
     estimateddeliverydateto   => $estimateddeliverydateto,
 	total => $total,
 	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 output_html_with_http_headers $input, $cookie, $template->output;