Bug 11889: (QA follow-up) Fix tests

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

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index cbb8896..05eb16b 100755 (executable)
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -29,29 +29,38 @@ this script is the main page for acqui
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Output;
-use C4::Acquisition;
-use C4::Budgets;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Budgets qw( GetBudgetHierarchy GetBudget CanUserUseBudget );
 use C4::Members;
-use C4::Debug;
-use C4::Suggestions;
 use Koha::Acquisition::Currencies;
 use Koha::Patrons;
+use Koha::Suggestions;
 
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {   template_name   => 'acqui/acqui-home.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
-        debug           => 1,
     }
 );
 
 my $status           = $query->param('status') || "ASKED";
-my $suggestions_count       = CountSuggestion($status);
+# Get current branch count and total viewable count, if they don't match then pass
+# both to template
+if( C4::Context->only_my_library ){
+    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
+    $template->param( suggestions_count => $local_pendingsuggestions_count );
+} else {
+    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
+    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
+    my $pendingsuggestions_count = $pendingsuggestions->count();
+    $template->param(
+        all_pendingsuggestions => $pendingsuggestions_count != $local_pendingsuggestions_count ? $pendingsuggestions_count : 0,
+        suggestions_count => $local_pendingsuggestions_count
+    );
+}
 
 my $budget_arr = GetBudgetHierarchy;
 
@@ -72,18 +81,12 @@ foreach my $budget ( @{$budget_arr} ) {
 
     my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
     if ( $patron ) {
-        # FIXME should pass the entire object into budget_owner
-        $budget->{budget_owner_firstname} = $patron->firstname;
-        $budget->{budget_owner_surname} = $patron->surname;
-        $budget->{budget_owner_borrowernumber} = $patron->borrowernumber;
+        $budget->{budget_owner} = $patron;
     }
 
     if ( !defined $budget->{budget_amount} ) {
         $budget->{budget_amount} = 0;
     }
-
-    $budget->{'budget_ordered'} = GetBudgetOrdered( $budget->{'budget_id'} );
-    $budget->{'budget_spent'}   = GetBudgetSpent( $budget->{'budget_id'} );
     if ( !defined $budget->{budget_spent} ) {
         $budget->{budget_spent} = 0;
     }
@@ -92,6 +95,8 @@ foreach my $budget ( @{$budget_arr} ) {
     }
     $budget->{'budget_avail'} =
       $budget->{'budget_amount'} - ( $budget->{'budget_spent'} + $budget->{'budget_ordered'} );
+    $budget->{'total_avail'} =
+      $budget->{'budget_amount'} - ( $budget->{'total_spent'} + $budget->{'total_ordered'} );
 
     $total      += $budget->{'budget_amount'};
     $totspent   += $budget->{'budget_spent'};
@@ -120,7 +125,6 @@ $template->param(
     totspent_active     => $totspent_active,
     totordered_active   => $totordered_active,
     totavail_active     => $totavail_active,
-    suggestions_count   => $suggestions_count,
 );
 
 my $cur = Koha::Acquisition::Currencies->get_active;