Bug 5002: Show all patron categories after insert

[koha.git] / acqui / booksellers.pl

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index bb65dbc..a5eb47d 100755 (executable)
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -41,6 +41,8 @@ C<$supplier> is the string with which we search for a supplier
 
 =back
 
+=over 4
+
 =item id or booksellerid
 
 The id of the supplier whose baskets we will display
@@ -55,16 +57,17 @@ use C4::Auth;
 use C4::Biblio;
 use C4::Budgets;
 use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 
-use C4::Acquisition qw/ GetBasketsInfosByBookseller /;
-use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
+use C4::Acquisition qw/ GetBasketsInfosByBookseller CanUserManageBasket /;
 use C4::Members qw/GetMember/;
 use C4::Context;
 
+use Koha::Acquisition::Bookseller;
+
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
-    {   template_name   => 'acqui/booksellers.tmpl',
+    {   template_name   => 'acqui/booksellers.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 0,
@@ -80,9 +83,9 @@ my $allbaskets= $query->param('allbaskets')||0;
 my @suppliers;
 
 if ($booksellerid) {
-    push @suppliers, GetBookSellerFromId($booksellerid);
+    push @suppliers, Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
 } else {
-    @suppliers = GetBookSeller($supplier);
+    @suppliers = Koha::Acquisition::Bookseller->search({ name => $supplier });
 }
 
 my $supplier_count = @suppliers;
@@ -125,21 +128,8 @@ for my $vendor (@suppliers) {
     my $loop_basket = [];
 
     for my $basket ( @{$baskets} ) {
-        my $authorisedby = $basket->{authorisedby};
-        my $basketbranch = ''; # set a blank branch to start with
-        my $member = GetMember( borrowernumber => $authorisedby );
-        if ( $member ) {
-           $basketbranch = $member->{branchcode};
-        }
-
-        if ($userenv->{'flags'} & 1 || #user is superlibrarian
-               (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
-                   ($viewbaskets eq 'all' || #user is allowed to see all baskets
-                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
-                   ($basket->{authorisedby} &&  $viewbaskets eq 'user' && $authorisedby == $loggedinuser) #user created this basket
-                   ) 
-                ) 
-           ) { 
+        if (CanUserManageBasket($loggedinuser, $basket, $userflags)) {
+            my $member = GetMember( borrowernumber => $basket->{authorisedby} );
             foreach (qw(total_items total_biblios expected_items)) {
                 $basket->{$_} ||= 0;
             }
@@ -147,6 +137,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; 
         }
     }