$from .= ' AND borrowers.branchcode LIKE ? ';
push @query_params, $branch;
}
+
+ if ( defined $estimateddeliverydatefrom or defined $estimateddeliverydateto ) {
+ $from .= ' AND aqbooksellers.deliverytime IS NOT NULL ';
+ }
if ( defined $estimateddeliverydatefrom ) {
- $from .= '
- AND aqbooksellers.deliverytime IS NOT NULL
- AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
+ $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
push @query_params, $estimateddeliverydatefrom;
}
- if ( defined $estimateddeliverydatefrom and defined $estimateddeliverydateto ) {
+ if ( defined $estimateddeliverydateto ) {
$from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= ?';
push @query_params, $estimateddeliverydateto;
- } elsif ( defined $estimateddeliverydatefrom ) {
+ }
+ if ( defined $estimateddeliverydatefrom and not defined $estimateddeliverydateto ) {
$from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CAST(now() AS date)';
}
if (C4::Context->preference("IndependantBranches")
=cut
-use strict;
-use warnings;
+use Modern::Perl;
use CGI;
use C4::Bookseller qw( GetBooksellersWithLateOrders );
use C4::Auth;
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({
});
my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0
-my $delay = $input->param('delay');
+my $delay = $input->param('delay');
+
+# 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 = dt_from_string($estimateddeliverydateto);
+
+# Format the output of "date from" and "date to"
+if ($estimateddeliverydatefrom) {
+ $estimateddeliverydatefrom = output_pref($estimateddeliverydatefrom_dt);
+ $estimateddeliverydatefrom =~ s/ \d\d:\d\d$//;
+}
+if ($estimateddeliverydateto) {
+ $estimateddeliverydateto = output_pref($estimateddeliverydateto_dt);
+ $estimateddeliverydateto =~ s/ \d\d:\d\d$//;
+}
+
my $branch = $input->param('branch');
my $op = $input->param('op');
}
}
-my %supplierlist = GetBooksellersWithLateOrders(
- $delay,
- $branch,
- C4::Dates->new($estimateddeliverydatefrom)->output("iso"),
- C4::Dates->new($estimateddeliverydateto)->output("iso")
-);
+my @parameters = ( $delay, $branch );
+if ($estimateddeliverydatefrom_dt) {
+ push @parameters, $estimateddeliverydatefrom_dt->ymd();
+}
+else {
+ push @parameters, undef;
+}
+if ($estimateddeliverydateto_dt) {
+ push @parameters, $estimateddeliverydateto_dt->ymd();
+}
+my %supplierlist = GetBooksellersWithLateOrders(@parameters);
my (@sloopy); # supplier loop
foreach (keys %supplierlist){
$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){