@@ -, +, @@ --- acqui/basket.pl | 4 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 48 +++++++++++++------- 2 files changed, 34 insertions(+), 18 deletions(-) --- a/acqui/basket.pl +++ a/acqui/basket.pl @@ -204,13 +204,14 @@ if ( $op eq 'delete_confirm' ) { } } #if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups - my $basketgroups; + my ($basketgroup, $basketgroups); my $member = GetMember(borrowernumber => $loggedinuser); if ($basket->{closedate} && haspermission({ 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, @@ -404,6 +405,7 @@ my $total_est_gste; qty_total => $qty_total, GST => $gist, basketgroups => $basketgroups, + basketgroup => $basketgroup, grouped => $basket->{basketgroupid}, unclosable => @orders ? 0 : 1, has_budgets => $has_budgets, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -202,24 +202,38 @@ [% IF ( closedate ) %]
+

+ + [% IF basketgroup.closed %] + [% basketgroup.name %] (closed) + [% ELSE %] +

+

+ + [% END %] +

-

-

- -

- - -

- + [% UNLESS basketgroup.closed %] +

+ + + + +

+ [% END %]
[% END %] --