Lines 200-206
if ( $op eq 'delete_confirm' ) {
Link Here
|
200 |
if ($confirm) { |
200 |
if ($confirm) { |
201 |
my $basketno = $query->param('basketno'); |
201 |
my $basketno = $query->param('basketno'); |
202 |
my $booksellerid = $query->param('booksellerid'); |
202 |
my $booksellerid = $query->param('booksellerid'); |
203 |
$basketno =~ /^\d+$/ and CloseBasket($basketno, $loggedinuser); |
203 |
$basketno =~ /^\d+$/ and CloseBasket($basketno); |
204 |
# if requested, create basket group, close it and attach the basket |
204 |
# if requested, create basket group, close it and attach the basket |
205 |
if ($query->param('createbasketgroup')) { |
205 |
if ($query->param('createbasketgroup')) { |
206 |
my $branchcode; |
206 |
my $branchcode; |
Lines 214-221
if ( $op eq 'delete_confirm' ) {
Link Here
|
214 |
closed => 1, |
214 |
closed => 1, |
215 |
}); |
215 |
}); |
216 |
ModBasket( { basketno => $basketno, |
216 |
ModBasket( { basketno => $basketno, |
217 |
basketgroupid => $basketgroupid, |
217 |
basketgroupid => $basketgroupid } ); |
218 |
borrowernumber => $loggedinuser } ); |
|
|
219 |
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1'); |
218 |
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1'); |
220 |
} else { |
219 |
} else { |
221 |
print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid); |
220 |
print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid); |
Lines 248-255
elsif ( $op eq 'ediorder' ) {
Link Here
|
248 |
$branch = undef if(defined $branch and $branch eq ''); |
247 |
$branch = undef if(defined $branch and $branch eq ''); |
249 |
ModBasket({ |
248 |
ModBasket({ |
250 |
basketno => $basket->{basketno}, |
249 |
basketno => $basket->{basketno}, |
251 |
branch => $branch, |
250 |
branch => $branch |
252 |
borrowernumber => $loggedinuser |
|
|
253 |
}); |
251 |
}); |
254 |
print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno"); |
252 |
print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno"); |
255 |
exit; |
253 |
exit; |
Lines 543-549
sub edi_close_and_order {
Link Here
|
543 |
if ( create_edi_order($edi_params) ) { |
541 |
if ( create_edi_order($edi_params) ) { |
544 |
#$template->param( edifile => 1 ); |
542 |
#$template->param( edifile => 1 ); |
545 |
} |
543 |
} |
546 |
CloseBasket($basketno, $loggedinuser); |
544 |
CloseBasket($basketno); |
547 |
|
545 |
|
548 |
# if requested, create basket group, close it and attach the basket |
546 |
# if requested, create basket group, close it and attach the basket |
549 |
if ( $query->param('createbasketgroup') ) { |
547 |
if ( $query->param('createbasketgroup') ) { |
Lines 565-572
sub edi_close_and_order {
Link Here
|
565 |
ModBasket( |
563 |
ModBasket( |
566 |
{ |
564 |
{ |
567 |
basketno => $basketno, |
565 |
basketno => $basketno, |
568 |
basketgroupid => $basketgroupid, |
566 |
basketgroupid => $basketgroupid |
569 |
borrowernumber => $loggedinuser |
|
|
570 |
} |
567 |
} |
571 |
); |
568 |
); |
572 |
print $query->redirect( |
569 |
print $query->redirect( |