|
Lines 193-199
if ( $op eq 'delete_confirm' ) {
Link Here
|
| 193 |
if ($confirm) { |
193 |
if ($confirm) { |
| 194 |
my $basketno = $query->param('basketno'); |
194 |
my $basketno = $query->param('basketno'); |
| 195 |
my $booksellerid = $query->param('booksellerid'); |
195 |
my $booksellerid = $query->param('booksellerid'); |
| 196 |
$basketno =~ /^\d+$/ and CloseBasket($basketno, $loggedinuser); |
196 |
$basketno =~ /^\d+$/ and CloseBasket($basketno); |
| 197 |
# if requested, create basket group, close it and attach the basket |
197 |
# if requested, create basket group, close it and attach the basket |
| 198 |
if ($query->param('createbasketgroup')) { |
198 |
if ($query->param('createbasketgroup')) { |
| 199 |
my $branchcode; |
199 |
my $branchcode; |
|
Lines 207-214
if ( $op eq 'delete_confirm' ) {
Link Here
|
| 207 |
closed => 1, |
207 |
closed => 1, |
| 208 |
}); |
208 |
}); |
| 209 |
ModBasket( { basketno => $basketno, |
209 |
ModBasket( { basketno => $basketno, |
| 210 |
basketgroupid => $basketgroupid, |
210 |
basketgroupid => $basketgroupid } ); |
| 211 |
borrowernumber => $loggedinuser } ); |
|
|
| 212 |
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1'); |
211 |
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1'); |
| 213 |
} else { |
212 |
} else { |
| 214 |
print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid); |
213 |
print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid); |
|
Lines 241-248
elsif ( $op eq 'ediorder' ) {
Link Here
|
| 241 |
$branch = undef if(defined $branch and $branch eq ''); |
240 |
$branch = undef if(defined $branch and $branch eq ''); |
| 242 |
ModBasket({ |
241 |
ModBasket({ |
| 243 |
basketno => $basket->{basketno}, |
242 |
basketno => $basket->{basketno}, |
| 244 |
branch => $branch, |
243 |
branch => $branch |
| 245 |
borrowernumber => $loggedinuser |
|
|
| 246 |
}); |
244 |
}); |
| 247 |
print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno"); |
245 |
print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno"); |
| 248 |
exit; |
246 |
exit; |
|
Lines 536-542
sub edi_close_and_order {
Link Here
|
| 536 |
if ( create_edi_order($edi_params) ) { |
534 |
if ( create_edi_order($edi_params) ) { |
| 537 |
#$template->param( edifile => 1 ); |
535 |
#$template->param( edifile => 1 ); |
| 538 |
} |
536 |
} |
| 539 |
CloseBasket($basketno, $loggedinuser); |
537 |
CloseBasket($basketno); |
| 540 |
|
538 |
|
| 541 |
# if requested, create basket group, close it and attach the basket |
539 |
# if requested, create basket group, close it and attach the basket |
| 542 |
if ( $query->param('createbasketgroup') ) { |
540 |
if ( $query->param('createbasketgroup') ) { |
|
Lines 558-565
sub edi_close_and_order {
Link Here
|
| 558 |
ModBasket( |
556 |
ModBasket( |
| 559 |
{ |
557 |
{ |
| 560 |
basketno => $basketno, |
558 |
basketno => $basketno, |
| 561 |
basketgroupid => $basketgroupid, |
559 |
basketgroupid => $basketgroupid |
| 562 |
borrowernumber => $loggedinuser |
|
|
| 563 |
} |
560 |
} |
| 564 |
); |
561 |
); |
| 565 |
print $query->redirect( |
562 |
print $query->redirect( |