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