$template->param( NO_BOOKSELLER => 1 );
} elsif ( $op eq 'del_basket') {
$template->param( delete_confirm => 1 );
- if ( C4::Context->preference("IndependantBranches") ) {
+ if ( C4::Context->preference("IndependentBranches") ) {
my $userenv = C4::Context->userenv;
unless ( $userenv->{flags} == 1 ) {
my $validtest = ( $basket->{creationdate} eq '' )
}
exit;
} else {
- $template->param(confirm_close => "1",
- booksellerid => $booksellerid,
- basketno => $basket->{'basketno'},
- basketname => $basket->{'basketname'},
- basketgroupname => $basket->{'basketname'});
-
+ $template->param(
+ confirm_close => "1",
+ booksellerid => $booksellerid,
+ basketno => $basket->{'basketno'},
+ basketname => $basket->{'basketname'},
+ basketgroupname => $basket->{'basketname'},
+ );
}
} elsif ($op eq 'reopen') {
- my $basket;
- $basket->{basketno} = $query->param('basketno');
- $basket->{closedate} = undef;
- ModBasket($basket);
+ ReopenBasket($query->param('basketno'));
print $query->redirect('/cgi-bin/koha/acqui/basket.pl?basketno='.$basket->{'basketno'})
} else {
# get librarian branch...
- if ( C4::Context->preference("IndependantBranches") ) {
+ if ( C4::Context->preference("IndependentBranches") ) {
my $userenv = C4::Context->userenv;
unless ( $userenv->{flags} == 1 ) {
my $validtest = ( $basket->{creationdate} eq '' )
}
}
#if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
- my $basketgroups;
- my $member = GetMember(borrowernumber => $loggedinuser);
- if ($basket->{closedate} && haspermission({ acquisition => 'group_manage'} )) {
+ my ($basketgroup, $basketgroups);
+ my $staffuser = GetMember(borrowernumber => $loggedinuser);
+ if ($basket->{closedate} && haspermission($staffuser->{userid}, { acquisition => 'group_manage'} )) {
$basketgroups = GetBasketgroups($basket->{booksellerid});
for my $bg ( @{$basketgroups} ) {
if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
$bg->{default} = 1;
+ $basketgroup = $bg;
}
}
my %emptygroup = ( id => undef,
my @orders = GetOrders($basketno);
if ($basket->{basketgroupid}){
- my $basketgroup = GetBasketgroup($basket->{basketgroupid});
- for my $key (keys %$basketgroup ){
- $basketgroup->{"basketgroup$key"} = delete $basketgroup->{$key};
- }
- $basketgroup->{basketgroupdeliveryplace} = C4::Branch::GetBranchName( $basketgroup->{basketgroupdeliveryplace} );
- $basketgroup->{basketgroupbillingplace} = C4::Branch::GetBranchName( $basketgroup->{basketgroupbillingplace} );
- $template->param(%$basketgroup);
+ $basketgroup = GetBasketgroup($basket->{basketgroupid});
+ $basketgroup->{deliveryplacename} = C4::Branch::GetBranchName( $basketgroup->{deliveryplace} );
+ $basketgroup->{billingplacename} = C4::Branch::GetBranchName( $basketgroup->{billingplace} );
}
my $borrower= GetMember('borrowernumber' => $loggedinuser);
my $budgets = GetBudgetHierarchy;
last;
}
- my @cancelledorders = GetCancelledOrders($basketno);
- foreach (@cancelledorders) {
- $_->{'line_total'} = sprintf("%.2f", $_->{'ecost'} * $_->{'quantity'});
- }
-
$template->param(
basketno => $basketno,
basketname => $basket->{'basketname'},
name => $bookseller->{'name'},
books_loop => \@books_loop,
book_foot_loop => \@book_foot_loop,
- cancelledorders_loop => \@cancelledorders,
+ cancelledorders_loop => \@cancelledorders_loop,
total_quantity => $total_quantity,
total_gste => sprintf( "%.2f", $total_gste ),
total_gsti => sprintf( "%.2f", $total_gsti ),
currency => $cur->{'currency'},
listincgst => $bookseller->{listincgst},
basketgroups => $basketgroups,
+ basketgroup => $basketgroup,
grouped => $basket->{basketgroupid},
unclosable => @orders ? 0 : 1,
has_budgets => $has_budgets,
$line{surnamesuggestedby} = $$suggestion{surnamesuggestedby};
$line{firstnamesuggestedby} = $$suggestion{firstnamesuggestedby};
+ foreach my $key (qw(transferred_from transferred_to)) {
+ if ($line{$key}) {
+ my $order = GetOrder($line{$key});
+ my $basket = GetBasket($order->{basketno});
+ my $bookseller = GetBookSellerFromId($basket->{booksellerid});
+ $line{$key} = {
+ order => $order,
+ basket => $basket,
+ bookseller => $bookseller,
+ timestamp => $line{$key . '_timestamp'},
+ };
+ }
+ }
+
return \%line;
}