X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fbooksellers.pl;h=5a1c2480d189ce07f1337cb0187b0bb6738e75f9;hb=HEAD;hp=0d534f43af998fe05f44880bd52ffc4c9b47a618;hpb=9c002b6b68c81eb26fe68fcdf0f47e0d3de644e8;p=koha_gimpoz diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index 0d534f43af..5a1c2480d1 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -4,6 +4,7 @@ # Copyright 2000-2002 Katipo Communications # Copyright 2008-2009 BibLibre SARL +# Copyright 2010 PTFS Europe # # This file is part of Koha. # @@ -16,10 +17,9 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 NAME @@ -27,7 +27,7 @@ booksellers.pl =head1 DESCRIPTION -this script displays the list of suppliers & orders like C<$supplier> given on input arg. +this script displays the list of suppliers & baskets like C<$supplier> given on input arg. thus, this page brings differents features like to display supplier's details, to add an order for a specific supplier or to just add a new supplier. @@ -37,107 +37,118 @@ to add an order for a specific supplier or to just add a new supplier. =item supplier -C<$supplier> is the suplier we have to search order. -=back - -=item op +C<$supplier> is the string with which we search for a supplier -C can be equals to 'close' if we have to close a basket before building the page. +=back -=item basket +=item id or booksellerid -the C we have to close if op is equal to 'close'. +The id of the supplier whose baskets we will display =back =cut use strict; +use warnings; use C4::Auth; use C4::Biblio; use C4::Output; use CGI; - -use C4::Acquisition; -use C4::Dates qw/format_date/; -use C4::Bookseller; +use C4::Acquisition qw/ GetBasketsInfosByBookseller /; +use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /; use C4::Members qw/GetMember/; +use C4::Context; -my $query = new CGI; +my $query = CGI->new; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "acqui/booksellers.tmpl", + { template_name => 'acqui/booksellers.tmpl', query => $query, - type => "intranet", + type => 'intranet', authnotrequired => 0, - flagsrequired => { acquisition => 'vendors_manage' }, + flagsrequired => { acquisition => '*' }, debug => 1, } ); #parameters my $supplier = $query->param('supplier'); -my $id = $query->param('id') || $query->param('supplierid'); +my $booksellerid = $query->param('booksellerid'); my @suppliers; -if ($id) { - push @suppliers, GetBookSellerFromId($id); +if ($booksellerid) { + push @suppliers, GetBookSellerFromId($booksellerid); } else { - @suppliers = GetBookSeller($supplier); + @suppliers = GetBookSeller($supplier); } -my $count = scalar @suppliers; -if ($count == 1){ - $template->param( supplier_name => $suppliers[0]->{'name'}, - id => $suppliers[0]->{'id'} - ); + +my $supplier_count = @suppliers; +if ( $supplier_count == 1 ) { + $template->param( + supplier_name => $suppliers[0]->{'name'}, + booksellerid => $suppliers[0]->{'booksellerid'} + ); } -# check if we have to "close" a basket before building page -if ($query->param('op') eq 'close') { - my $basket = $query->param('basketno'); - $basket =~ /^\d+$/ and CloseBasket($basket); -} elsif ($query->param('op') eq 'reopen') { - my $basket; - $basket->{basketno} = $query->param('basketno'); - $basket->{closedate} = undef; - ModBasket($basket); + +my $uid; +if ($loggedinuser) { + $uid = GetMember( borrowernumber => $loggedinuser )->{userid}; } +my $userenv = C4::Context::userenv; +my $viewbaskets = C4::Context->preference('AcqViewBaskets'); + +my $userbranch = $userenv->{branch}; + #build result page -my @loop_suppliers; -for ( my $i = 0 ; $i < $count ; $i++ ) { - my $orders = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} ); - my $ordcount = scalar @$orders; - my %line; - - $line{supplierid} = $suppliers[$i]->{'id'}; - $line{name} = $suppliers[$i]->{'name'}; - $line{active} = $suppliers[$i]->{'active'}; - my @loop_basket; - my $uid = GetMember($loggedinuser)->{userid} if $loggedinuser; - for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) { - if ( $orders->[$i2]{'authorisedby'} eq $loggedinuser || haspermission($uid, { flagsrequired => { 'acquisition' => '*' } } ) ) { - my %inner_line; - $inner_line{basketno} = $orders->[$i2]{'basketno'}; - $inner_line{basketname} = $orders->[$i2]{'basketname'}; - $inner_line{total} = scalar GetOrders($orders->[$i2]{'basketno'}); - $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'}; - my $authby = GetMember( $orders->[$i2]{'authorisedby'}); - $inner_line{surname} = $authby->{'firstname'}; - $inner_line{firstname} = $authby->{'surname'}; - $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} ); - $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} ); - $inner_line{uncertainprice} = $orders->[$i2]{'uncertainprice'}; - push @loop_basket, \%inner_line; +my $loop_suppliers = []; + +for my $vendor (@suppliers) { + my $baskets = GetBasketsInfosByBookseller( $vendor->{id} ); + + 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 + ) + ) + ) { + foreach (qw(total_items total_biblios expected_items)) { + $basket->{$_} ||= 0; + } + if($member) { + $basket->{authorisedby_firstname} = $member->{firstname}; + $basket->{authorisedby_surname} = $member->{surname}; + } + push @{$loop_basket}, $basket; } } - $line{loop_basket} = \@loop_basket; - push @loop_suppliers, \%line; + + push @{$loop_suppliers}, + { loop_basket => $loop_basket, + booksellerid => $vendor->{id}, + name => $vendor->{name}, + active => $vendor->{active}, + }; + } $template->param( - loop_suppliers => \@loop_suppliers, - supplier => ($id || $supplier), - count => $count, + loop_suppliers => $loop_suppliers, + supplier => ( $booksellerid || $supplier ), + count => $supplier_count, + dateformat => C4::Context->preference('dateformat'), ); output_html_with_http_headers $query, $cookie, $template->output;