From c9b873ff10694a9f36d15734bd2bb22e17c604c6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 30 Oct 2013 15:48:10 +0100 Subject: [PATCH] Bug 11171: Display basket group name on the supplier list page Test plan: Search supplier and verify the basket group column is filled. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Passes all tests and QA script. Works as described. Signed-off-by: Galen Charlton --- acqui/booksellers.pl | 6 ++++++ .../prog/en/modules/acqui/booksellers.tt | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index 80a42f1e2e..04aa2b8bb8 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -136,6 +136,12 @@ for my $vendor (@suppliers) { $basket->{authorisedby_firstname} = $member->{firstname}; $basket->{authorisedby_surname} = $member->{surname}; } + if ($basket->{basketgroupid}) { + my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid}); + if ($basketgroup) { + $basket->{basketgroup} = $basketgroup; + } + } push @{$loop_basket}, $basket; } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 3dae586dd6..5ee73521fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -102,6 +102,7 @@ $(document).ready(function() { Items expected Created by Date + Basket group Closed   @@ -123,6 +124,16 @@ $(document).ready(function() { [% basket.authorisedby_surname %] [% basket.creationdate | $KohaDates %] + + [% IF basket.basketgroup %] + [% basketgroup = basket.basketgroup %] + [% IF basketgroup.closed %] + [% basketgroup.name %] (closed) + [% ELSE %] + [% basketgroup.name %] + [% END %] + [% END %] + [% IF ( basket.closedate ) %] [% basket.closedate | $KohaDates %] -- 2.39.5