projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 10403: (follow-up) fix test to use vendor created earlier during test
[koha.git]
/
acqui
/
lateorders.pl
diff --git
a/acqui/lateorders.pl
b/acqui/lateorders.pl
index
d732357
..
1a64a4c
100755
(executable)
--- a/
acqui/lateorders.pl
+++ b/
acqui/lateorders.pl
@@
-66,7
+66,7
@@
my ($template, $loggedinuser, $cookie) = get_template_and_user({
});
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
+86,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, undef, 1
);
+ $estimateddeliverydatefrom = output_pref(
{dt => $estimateddeliverydatefrom_dt, dateonly => 1}
);
}
if ($estimateddeliverydateto_dt) {
}
if ($estimateddeliverydateto_dt) {
- $estimateddeliverydateto = output_pref(
$estimateddeliverydateto_dt, undef, undef, 1
);
+ $estimateddeliverydateto = output_pref(
{dt => $estimateddeliverydateto_dt, dateonly => 1}
);
}
my $branch = $input->param('branch');
}
my $branch = $input->param('branch');
@@
-101,7
+101,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
+109,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" ) {