Lines 78-93
my $estimateddeliverydatefrom_dt =
Link Here
|
78 |
: undef; |
78 |
: undef; |
79 |
|
79 |
|
80 |
# Get the "date to" param. If it is not defined and $delay is not defined too, it is the today's date. |
80 |
# Get the "date to" param. If it is not defined and $delay is not defined too, it is the today's date. |
81 |
my $estimateddeliverydateto_dt = dt_from_string($estimateddeliverydateto); |
81 |
my $estimateddeliverydateto_dt = $estimateddeliverydateto |
|
|
82 |
? dt_from_string($estimateddeliverydateto) |
83 |
: ( not defined $delay and not defined $estimateddeliverydatefrom) |
84 |
? dt_from_string() |
85 |
: undef; |
82 |
|
86 |
|
83 |
# Format the output of "date from" and "date to" |
87 |
# Format the output of "date from" and "date to" |
84 |
if ($estimateddeliverydatefrom) { |
88 |
if ($estimateddeliverydatefrom_dt) { |
85 |
$estimateddeliverydatefrom = output_pref($estimateddeliverydatefrom_dt); |
89 |
$estimateddeliverydatefrom = output_pref($estimateddeliverydatefrom_dt, undef, 1); |
86 |
$estimateddeliverydatefrom =~ s/ \d\d:\d\d$//; |
|
|
87 |
} |
90 |
} |
88 |
if ($estimateddeliverydateto) { |
91 |
if ($estimateddeliverydateto_dt) { |
89 |
$estimateddeliverydateto = output_pref($estimateddeliverydateto_dt); |
92 |
$estimateddeliverydateto = output_pref($estimateddeliverydateto_dt, undef, 1); |
90 |
$estimateddeliverydateto =~ s/ \d\d:\d\d$//; |
|
|
91 |
} |
93 |
} |
92 |
|
94 |
|
93 |
my $branch = $input->param('branch'); |
95 |
my $branch = $input->param('branch'); |
Lines 117-131
if ($op and $op eq "send_alert"){
Link Here
|
117 |
} |
119 |
} |
118 |
|
120 |
|
119 |
my @parameters = ( $delay, $branch ); |
121 |
my @parameters = ( $delay, $branch ); |
120 |
if ($estimateddeliverydatefrom_dt) { |
122 |
push @parameters, $estimateddeliverydatefrom_dt |
121 |
push @parameters, $estimateddeliverydatefrom_dt->ymd(); |
123 |
? $estimateddeliverydatefrom_dt->ymd() |
122 |
} |
124 |
: undef; |
123 |
else { |
125 |
|
124 |
push @parameters, undef; |
126 |
push @parameters, $estimateddeliverydateto_dt |
125 |
} |
127 |
? $estimateddeliverydateto_dt->ymd() |
126 |
if ($estimateddeliverydateto_dt) { |
128 |
: undef; |
127 |
push @parameters, $estimateddeliverydateto_dt->ymd(); |
129 |
|
128 |
} |
|
|
129 |
my %supplierlist = GetBooksellersWithLateOrders(@parameters); |
130 |
my %supplierlist = GetBooksellersWithLateOrders(@parameters); |
130 |
|
131 |
|
131 |
my (@sloopy); # supplier loop |
132 |
my (@sloopy); # supplier loop |
132 |
- |
|
|