Bug 32070: Consistent classes for primary buttons: Acquisitions

[koha-ffzg.git] / acqui / booksellers.pl

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 99da78c..43407dd 100755 (executable)
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -52,13 +52,12 @@ The id of the supplier whose baskets we will display
 =cut
 
 use Modern::Perl;
-use C4::Auth;
-use C4::Biblio;
-use C4::Budgets;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Budgets qw( GetBudgetHierarchy GetBudget CanUserUseBudget );
+use C4::Output qw( output_html_with_http_headers );
 use CGI qw ( -utf8 );
 
-use C4::Acquisition qw/ GetBasketsInfosByBookseller CanUserManageBasket /;
+use C4::Acquisition qw( GetBasket GetBasketsInfosByBookseller CanUserManageBasket GetBasketgroup );
 use C4::Context;
 
 use Koha::Acquisition::Booksellers;
@@ -69,9 +68,7 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {   template_name   => 'acqui/booksellers.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
-        debug           => 1,
     }
 );
 
@@ -82,11 +79,11 @@ my $allbaskets= $query->param('allbaskets')||0;
 my @suppliers;
 
 if ($booksellerid) {
-    push @suppliers, scalar Koha::Acquisition::Booksellers->find( $booksellerid );
+    push @suppliers, Koha::Acquisition::Booksellers->find( $booksellerid );
 } else {
     @suppliers = Koha::Acquisition::Booksellers->search(
                         { name => { -like => "%$supplier%" } },
-                        { order_by => { -asc => 'name' } } );
+                        { order_by => { -asc => 'name' } } )->as_list;
 }
 
 my $supplier_count = @suppliers;
@@ -95,6 +92,7 @@ if ( $supplier_count == 1 ) {
         supplier_name => $suppliers[0]->name,
         booksellerid  => $suppliers[0]->id,
         basketcount   => $suppliers[0]->baskets->count,
+        subscriptionscount => $suppliers[0]->subscriptions->count,
         active        => $suppliers[0]->active,
     );
 }
@@ -114,9 +112,6 @@ my $userbranch = $userenv->{branch};
 my $budgets = GetBudgetHierarchy;
 my $has_budgets = 0;
 foreach my $r (@{$budgets}) {
-    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
-        next;
-    }
     next unless (CanUserUseBudget($loggedinuser, $r, $userflags));
 
     $has_budgets = 1;
@@ -155,6 +150,9 @@ for my $vendor (@suppliers) {
         booksellerid  => $vendor->id,
         name        => $vendor->name,
         active      => $vendor->active,
+        vendor_type => $vendor->type,
+        basketcount   => $vendor->baskets->count,
+        subscriptioncount => $vendor->subscriptions->count,
       };
 
 }