=cut
-use strict;
-use warnings;
-use C4::Auth;
-use C4::Biblio;
-use C4::Budgets;
-use C4::Output;
+use Modern::Perl;
+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::Members qw/GetMember/;
+use C4::Acquisition qw( GetBasket GetBasketsInfosByBookseller CanUserManageBasket GetBasketgroup );
use C4::Context;
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Booksellers;
+use Koha::Patrons;
my $query = CGI->new;
my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
{ template_name => 'acqui/booksellers.tt',
query => $query,
type => 'intranet',
- authnotrequired => 0,
flagsrequired => { acquisition => '*' },
- debug => 1,
}
);
my @suppliers;
if ($booksellerid) {
- push @suppliers, Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+ push @suppliers, Koha::Acquisition::Booksellers->find( $booksellerid );
} else {
- @suppliers = Koha::Acquisition::Bookseller->search({ name => $supplier });
+ @suppliers = Koha::Acquisition::Booksellers->search(
+ { name => { -like => "%$supplier%" } },
+ { order_by => { -asc => 'name' } } )->as_list;
}
my $supplier_count = @suppliers;
if ( $supplier_count == 1 ) {
$template->param(
- supplier_name => $suppliers[0]->{'name'},
- booksellerid => $suppliers[0]->{'id'},
- basketcount => $suppliers[0]->{'basketcount'}
+ supplier_name => $suppliers[0]->name,
+ booksellerid => $suppliers[0]->id,
+ basketcount => $suppliers[0]->baskets->count,
+ subscriptionscount => $suppliers[0]->subscriptions->count,
+ active => $suppliers[0]->active,
);
}
my $uid;
+# FIXME This script should only be accessed by a valid logged in patron
if ($loggedinuser) {
- $uid = GetMember( borrowernumber => $loggedinuser )->{userid};
+ # FIXME Should not be needed, logged in patron should be cached
+ $uid = Koha::Patrons->find( $loggedinuser )->userid;
}
my $userenv = C4::Context::userenv;
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;
my $loop_suppliers = [];
for my $vendor (@suppliers) {
- my $baskets = GetBasketsInfosByBookseller( $vendor->{id}, $allbaskets );
+ my $baskets = GetBasketsInfosByBookseller( $vendor->id, $allbaskets );
my $loop_basket = [];
for my $basket ( @{$baskets} ) {
if (CanUserManageBasket($loggedinuser, $basket, $userflags)) {
- my $member = GetMember( borrowernumber => $basket->{authorisedby} );
+ my $patron = Koha::Patrons->find( $basket->{authorisedby} );
foreach (qw(total_items total_biblios expected_items)) {
$basket->{$_} ||= 0;
}
- if($member) {
- $basket->{authorisedby_firstname} = $member->{firstname};
- $basket->{authorisedby_surname} = $member->{surname};
+ if ( $patron ) {
+ $basket->{authorisedby} = $patron;
}
if ($basket->{basketgroupid}) {
my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});
push @{$loop_suppliers},
{ loop_basket => $loop_basket,
- booksellerid => $vendor->{id},
- name => $vendor->{name},
- active => $vendor->{active},
+ booksellerid => $vendor->id,
+ name => $vendor->name,
+ active => $vendor->active,
+ vendor_type => $vendor->type,
+ basketcount => $vendor->baskets->count,
+ subscriptioncount => $vendor->subscriptions->count,
};
}