B2.branchname AS branchnamesuggestedby,
U2.email AS emailmanagedby,
U2.branchcode AS branchcodemanagedby,
- U2.borrowernumber AS borrnummanagedby
+ U2.borrowernumber AS borrnummanagedby,
+ BU.budget_name AS budget_name
FROM suggestions
LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber
LEFT JOIN branches AS B1 ON B1.branchcode=U1.branchcode
LEFT JOIN borrowers AS U2 ON managedby=U2.borrowernumber
LEFT JOIN branches AS B2 ON B2.branchcode=U2.branchcode
LEFT JOIN categories AS C2 ON C2.categorycode=U2.categorycode
+ LEFT JOIN aqbudgets AS BU ON budgetid=BU.budget_id
WHERE 1=1
}
);
}
);
-foreach my $suggestion (@$suggestions_loop) {
- if ($suggestion->{budgetid}){
- my $bud = GetBudget( $suggestion->{budgetid} );
- $suggestion->{budget_name} = $bud->{budget_name} if $bud;
- }
-}
-
my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
$template->param(
suggestions_loop => $suggestions_loop,
use Modern::Perl;
use DateTime::Duration;
-use Test::More tests => 107;
+use Test::More tests => 109;
use Test::Warn;
use t::lib::Mocks;
use C4::Context;
use C4::Letters;
-use C4::Budgets qw( AddBudgetPeriod AddBudget );
+use C4::Budgets qw( AddBudgetPeriod AddBudget GetBudget );
use Koha::Database;
use Koha::DateUtils qw( dt_from_string output_pref );
use Koha::Libraries;
});
is( @$search_suggestion, 3, 'SearchSuggestion (budgetid = "__ANY__") returns the correct number of suggestions' );
+$search_suggestion = SearchSuggestion({ budgetid => $budget_id });
+is( @$search_suggestion[0]->{budget_name}, GetBudget($budget_id)->{budget_name}, 'SearchSuggestion returns the correct budget name');
+$search_suggestion = SearchSuggestion({ budgetid => "__NONE__" });
+is( @$search_suggestion[0]->{budget_name}, undef, 'SearchSuggestion returns the correct budget name');
+
+
my $del_suggestion = {
title => 'my deleted title',
STATUS => 'CHECKED',