[Koha-patches] [PATCH 24/78] booksellers page, some changes

[paul.poulain at biblibre.com]

From: Paul Poulain <paul.poulain at biblibre.com>

* deal with granular permissions
* feature to reopen basket
---
 acqui/booksellers.pl                               |   36 +++++++++++++------
 .../prog/en/modules/acqui/booksellers.tmpl         |   12 ++++--
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 24677ec..21ca44b 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 
 #script to show suppliers and orders
-#written by chris at katipo.co.nz 23/2/2000
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2008-2009 BibLibre SARL
 #
 # This file is part of Koha.
 #
@@ -62,6 +62,7 @@ use CGI;
 use C4::Acquisition;
 use C4::Dates qw/format_date/;
 use C4::Bookseller;
+use C4::Members qw/GetMember/;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -70,7 +71,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
+        flagsrequired   => { acquisition => 'vendors_manage' },
         debug           => 1,
     }
 );
@@ -95,13 +96,18 @@ if ($count == 1){
 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);
 }
 
 #build result page
 my $toggle = 0;
 my @loop_suppliers;
 for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my $orders  = GetPendingOrders( $suppliers[$i]->{'id'}, "grouped" );
+    my $orders  = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} );
     my $ordcount = scalar @$orders;
     my %line;
     if ( $toggle == 0 ) {
@@ -115,16 +121,22 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     $line{name}       = $suppliers[$i]->{'name'};
     $line{active}     = $suppliers[$i]->{'active'};
     my @loop_basket;
+    my $uid = GetMember($loggedinuser)->{userid};
     for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
-        my %inner_line;
-        $inner_line{basketno}     = $orders->[$i2]{'basketno'};
-        $inner_line{total}        = $orders->[$i2]{'count(*)'};
-        $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'};
-        $inner_line{surname}      = $orders->[$i2]{'firstname'};
-        $inner_line{firstname}    = $orders->[$i2]{'surname'};
-        $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
-        $inner_line{closedate}    = format_date( $orders->[$i2]{'closedate'}    );
-        push @loop_basket, \%inner_line;
+        if ( $orders->[$i2]{'authorisedby'} eq $loggedinuser || haspermission(C4::Context->dbh, $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;
+        }
     }
     $line{loop_basket} = \@loop_basket;
     push @loop_suppliers, \%line;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
index 3a40109..ecb4aaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -25,14 +25,14 @@
 	<tr>
 		<th>Order</th>
 		<th>Order receive</th>
-		<th>Company</th>
+		<th>Vendor</th>
 		<th>&nbsp;</th>
 	</tr>
 	
 	<!-- TMPL_LOOP name="loop_suppliers" -->
 		<tr>
 			<td>	<!-- TMPL_IF name="active" -->
-					<a href="basket.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Add order</a>
+					<a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&op=add_form">Add basket</a>
 				<!-- TMPL_ELSE -->
 					Inactive
 				<!-- /TMPL_IF -->
@@ -54,8 +54,12 @@
 							<th>&nbsp;</th>
 						</tr>
 						<!-- TMPL_LOOP NAME="loop_basket" -->
-							<tr>
-								<td><!-- TMPL_VAR NAME="basketno" --></td>
+							<!-- TMPL_IF name="uncertainprice" -->
+							  <tr>
+							<!-- TMPL_ELSE -->
+							  <tr class="highlight">
+							<!-- /TMPL_IF -->
+								<td><!-- TMPL_VAR NAME="basketname" --></td>
 								<td><TMPL_VAR NAME="total"></td>
 								<td>						<!-- TMPL_VAR name="firstname" -->
 										<!-- TMPL_VAR name="surname" -->
-- 
1.6.0.4