Lines 67-73
my ($template, $loggedinuser, $cookie) = get_template_and_user(
Link Here
|
67 |
} |
67 |
} |
68 |
); |
68 |
); |
69 |
|
69 |
|
70 |
my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0 |
70 |
my $booksellerid = $input->param('booksellerid'); |
71 |
my $delay = $input->param('delay') // 0; |
71 |
my $delay = $input->param('delay') // 0; |
72 |
|
72 |
|
73 |
# Get the "date from" param if !defined is today |
73 |
# Get the "date from" param if !defined is today |
Lines 132-154
push @parameters, $estimateddeliverydateto_dt
Link Here
|
132 |
? $estimateddeliverydateto_dt->ymd() |
132 |
? $estimateddeliverydateto_dt->ymd() |
133 |
: undef; |
133 |
: undef; |
134 |
|
134 |
|
135 |
my %supplierlist = GetBooksellersWithLateOrders(@parameters); |
135 |
my @lateorders = Koha::Acquisition::Orders->filter_by_lates( |
136 |
|
|
|
137 |
my (@sloopy); # supplier loop |
138 |
foreach( sort { $supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist ) { |
139 |
push @sloopy, (($booksellerid and $booksellerid eq $_ ) ? |
140 |
{id=>$_, name=>$supplierlist{$_}, selected=>1} : |
141 |
{id=>$_, name=>$supplierlist{$_}} ) ; |
142 |
} |
143 |
$template->param(SUPPLIER_LOOP => \@sloopy); |
144 |
|
145 |
$template->param(Supplier=>$supplierlist{$booksellerid}) if ($booksellerid); |
146 |
$template->param(booksellerid=>$booksellerid) if ($booksellerid); |
147 |
|
148 |
my $lateorders = Koha::Acquisition::Orders->filter_by_lates( |
149 |
{ |
136 |
{ |
150 |
delay => $delay, |
137 |
delay => $delay, |
151 |
booksellerid => $booksellerid, |
|
|
152 |
( |
138 |
( |
153 |
$estimateddeliverydatefrom_dt |
139 |
$estimateddeliverydatefrom_dt |
154 |
? ( estimated_from => $estimateddeliverydatefrom_dt ) |
140 |
? ( estimated_from => $estimateddeliverydatefrom_dt ) |
Lines 159-172
my $lateorders = Koha::Acquisition::Orders->filter_by_lates(
Link Here
|
159 |
? ( estimated_to => $estimateddeliverydateto_dt ) |
145 |
? ( estimated_to => $estimateddeliverydateto_dt ) |
160 |
: () |
146 |
: () |
161 |
) |
147 |
) |
|
|
148 |
}, |
149 |
)->as_list; |
150 |
|
151 |
my $booksellers = Koha::Acquisition::Booksellers->search( |
152 |
{ |
153 |
id => { |
154 |
-in => map { $_->basket->booksellerid } @lateorders |
155 |
}, |
162 |
} |
156 |
} |
163 |
); |
157 |
); |
164 |
|
158 |
|
|
|
159 |
@lateorders = grep { $_->basket->booksellerid eq $booksellerid } @lateorders if $booksellerid; |
160 |
|
165 |
my $letters = GetLetters({ module => "claimacquisition" }); |
161 |
my $letters = GetLetters({ module => "claimacquisition" }); |
166 |
|
162 |
|
167 |
$template->param(ERROR_LOOP => \@errors) if (@errors); |
163 |
$template->param(ERROR_LOOP => \@errors) if (@errors); |
168 |
$template->param( |
164 |
$template->param( |
169 |
lateorders => $lateorders, |
165 |
lateorders => \@lateorders, |
|
|
166 |
booksellers => $booksellers, |
167 |
bookseller_filter => ( $booksellerid ? $booksellers->find($booksellerid) : undef), |
170 |
delay => $delay, |
168 |
delay => $delay, |
171 |
letters => $letters, |
169 |
letters => $letters, |
172 |
estimateddeliverydatefrom => $estimateddeliverydatefrom, |
170 |
estimateddeliverydatefrom => $estimateddeliverydatefrom, |