projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 12250: DBRev 3.17.00.049
[koha.git]
/
acqui
/
lateorders.pl
diff --git
a/acqui/lateorders.pl
b/acqui/lateorders.pl
index
544370d
..
d43dbbe
100755
(executable)
--- a/
acqui/lateorders.pl
+++ b/
acqui/lateorders.pl
@@
-56,17
+56,19
@@
use C4::Branch; # GetBranches
use Koha::DateUtils;
my $input = new CGI;
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 $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');
# Get the "date from" param if !defined is today
my $estimateddeliverydatefrom = $input->param('estimateddeliverydatefrom');
@@
-86,10
+88,10
@@
my $estimateddeliverydateto_dt = $estimateddeliverydateto
# Format the output of "date from" and "date to"
if ($estimateddeliverydatefrom_dt) {
# 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) {
}
if ($estimateddeliverydateto_dt) {
- $estimateddeliverydateto = output_pref(
$estimateddeliverydateto_dt, undef, 1
);
+ $estimateddeliverydateto = output_pref(
{dt => $estimateddeliverydateto_dt, dateonly => 1}
);
}
my $branch = $input->param('branch');
}
my $branch = $input->param('branch');
@@
-101,7
+103,7
@@
if ( $delay and not $delay =~ /^\d{1,3}$/ ) {
}
if ($op and $op eq "send_alert"){
}
if ($op and $op eq "send_alert"){
- my @ordernums = $input->param("
claim_fo
r");# FIXME: Fallback values?
+ my @ordernums = $input->param("
ordernumbe
r");# FIXME: Fallback values?
my $err;
eval {
$err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value?
my $err;
eval {
$err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value?
@@
-109,6
+111,7
@@
if ($op and $op eq "send_alert"){
AddClaim ( $_ ) for @ordernums;
}
};
AddClaim ( $_ ) for @ordernums;
}
};
+
if ( $@ ) {
$template->param(error_claim => $@);
} elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) {
if ( $@ ) {
$template->param(error_claim => $@);
} elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) {
@@
-118,7
+121,7
@@
if ($op and $op eq "send_alert"){
}
}
}
}
-my @parameters = ( $delay
, $branch
);
+my @parameters = ( $delay );
push @parameters, $estimateddeliverydatefrom_dt
? $estimateddeliverydatefrom_dt->ymd()
: undef;
push @parameters, $estimateddeliverydatefrom_dt
? $estimateddeliverydatefrom_dt->ymd()
: undef;
@@
-158,21
+161,16
@@
foreach (@lateorders){
$total += $_->{subtotal};
}
$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,
$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"),
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;
);
output_html_with_http_headers $input, $cookie, $template->output;