|
Lines 82-88
sub BasketTotal {
Link Here
|
| 82 |
$total = $total + ( $order->{ecost_tax_excluded} * $order->{quantity} ); |
82 |
$total = $total + ( $order->{ecost_tax_excluded} * $order->{quantity} ); |
| 83 |
} |
83 |
} |
| 84 |
} |
84 |
} |
| 85 |
$total .= " " . ($bookseller->invoiceprice // 0); |
85 |
# $total .= " " . ($bookseller->invoiceprice // 0); |
| 86 |
return $total; |
86 |
return $total; |
| 87 |
} |
87 |
} |
| 88 |
|
88 |
|
|
Lines 97-102
sub displaybasketgroups {
Link Here
|
| 97 |
my $basketsqty = 0; |
97 |
my $basketsqty = 0; |
| 98 |
while($i < scalar(@$baskets)){ |
98 |
while($i < scalar(@$baskets)){ |
| 99 |
my $basket = @$baskets[$i]; |
99 |
my $basket = @$baskets[$i]; |
|
|
100 |
my $active_currency = Koha::Acquisition::Currencies->get_active; |
| 101 |
$basket->{currency} = $active_currency->currency; |
| 100 |
if($basket->{'basketgroupid'} && $basket->{'basketgroupid'} == $basketgroup->{'id'}){ |
102 |
if($basket->{'basketgroupid'} && $basket->{'basketgroupid'} == $basketgroup->{'id'}){ |
| 101 |
$basket->{total} = BasketTotal($basket->{basketno}, $bookseller); |
103 |
$basket->{total} = BasketTotal($basket->{basketno}, $bookseller); |
| 102 |
push(@{$basketgroup->{'baskets'}}, $basket); |
104 |
push(@{$basketgroup->{'baskets'}}, $basket); |
|
Lines 254-259
if ( $op eq "add" ) {
Link Here
|
| 254 |
my $selecteds = GetBasketsByBasketgroup($basketgroupid); |
256 |
my $selecteds = GetBasketsByBasketgroup($basketgroupid); |
| 255 |
foreach my $basket(@{$selecteds}){ |
257 |
foreach my $basket(@{$selecteds}){ |
| 256 |
$basket->{total} = BasketTotal($basket->{basketno}, $bookseller); |
258 |
$basket->{total} = BasketTotal($basket->{basketno}, $bookseller); |
|
|
259 |
my $active_currency = Koha::Acquisition::Currencies->get_active; |
| 260 |
$basket->{currency} = $active_currency->currency; |
| 257 |
} |
261 |
} |
| 258 |
$template->param(basketgroupid => $basketgroupid, |
262 |
$template->param(basketgroupid => $basketgroupid, |
| 259 |
selectedbaskets => $selecteds); |
263 |
selectedbaskets => $selecteds); |