X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Flateorders.pl;h=9febcf65c96ce261328e5f43a3e889bb674d5168;hb=3101a132a46369a23082ff8baaa8f6a718159f11;hp=031fc88443a2c6afb01ea0e7fd2aaa82b265e851;hpb=b20c2d6857629eed3f3eaf44cdca68dda36f4216;p=koha.git diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl index 031fc88443..9febcf65c9 100755 --- a/acqui/lateorders.pl +++ b/acqui/lateorders.pl @@ -1,20 +1,21 @@ #!/usr/bin/perl + +# 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., 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 . =head1 NAME @@ -42,9 +43,8 @@ To know on which branch this script have to display late order. =cut -use strict; -use warnings; -use CGI; +use Modern::Perl; +use CGI qw ( -utf8 ); use C4::Bookseller qw( GetBooksellersWithLateOrders ); use C4::Auth; use C4::Koha; @@ -52,57 +52,89 @@ 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'); 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}); +} + my $branch = $input->param('branch'); my $op = $input->param('op'); my @errors = (); -if ( defined $delay and not $delay =~ /^\d{1,3}$/ ) { +if ( $delay and not $delay =~ /^\d{1,3}$/ ) { push @errors, {delay_digits => 1, bad_delay => $delay}; } 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 %supplierlist = GetBooksellersWithLateOrders( - $delay, - $branch, - C4::Dates->new($estimateddeliverydatefrom)->output("iso"), - C4::Dates->new($estimateddeliverydateto)->output("iso") -); +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 (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{$_}} ) ; @@ -112,34 +144,34 @@ $template->param(SUPPLIER_LOOP => \@sloopy); $template->param(Supplier=>$supplierlist{$booksellerid}) if ($booksellerid); $template->param(booksellerid=>$booksellerid) if ($booksellerid); -my @lateorders = GetLateOrders( - $delay, - $booksellerid, - $branch, - C4::Dates->new($estimateddeliverydatefrom)->output("iso"), - C4::Dates->new($estimateddeliverydateto)->output("iso") -); +@parameters = + ( $delay, $booksellerid, $branch ); +if ($estimateddeliverydatefrom_dt) { + push @parameters, $estimateddeliverydatefrom_dt->ymd(); +} +else { + push @parameters, undef; +} +if ($estimateddeliverydateto_dt) { + push @parameters, $estimateddeliverydateto_dt->ymd(); +} +my @lateorders = GetLateOrders( @parameters ); my $total; 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;