synch'ing 2.2 and head

[srvgit] / acqui / basket.pl

diff --git a/acqui/basket.pl b/acqui/basket.pl
index e1f4824..515abfd 100755 (executable)
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -23,19 +23,21 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+use strict;
 use C4::Auth;
-use C4::Catalogue;
-use C4::Biblio;
+use C4::Koha;
 use C4::Output;
 use CGI;
 use C4::Interface::CGI::Output;
 use C4::Database;
 use HTML::Template;
+use C4::Acquisition;
 use C4::Date;
-use strict;
 
 my $query =new CGI;
-my $basket=$query ->param('basket');
+my $basketno = $query ->param('basket');
+my $booksellerid = $query->param('supplierid');
+my $order = $query->param('order');
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/basket.tmpl",
                             query => $query,
@@ -45,21 +47,23 @@ my ($template, $loggedinuser, $cookie)
                             debug => 1,
                             });
 my ($count,@results);
-if ($basket eq ''){
-       $basket=newbasket();
-       $results[0]->{'booksellerid'}=$query->param('id');
-       $results[0]->{'authorisedby'} = $loggedinuser;
-} else {
-       ($count,@results)=basket($basket);
-}
 
-my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'});
+my $basket = getbasket($basketno);
+# FIXME : the query->param('supplierid') below is probably useless. The bookseller is always known from the basket
+# if no booksellerid in parameter, get it from basket
+# warn "=>".$basket->{booksellerid};
+$booksellerid = $basket->{booksellerid} unless $booksellerid;
+my ($count2,@booksellers)=bookseller($booksellerid);
+
+# if new basket, pre-fill infos
+$basket->{creationdate} = "" unless ($basket->{creationdate});
+$basket->{authorisedby} = $loggedinuser unless ($basket->{authorisedby});
+($count,@results)=getbasketcontent($basketno,'',$order);
 
 my $line_total; # total of each line
 my $sub_total; # total of line totals
 my $gist;      # GST
 my $grand_total; # $subttotal + $gist
-my $toggle=0;
 
 my @books_loop;
 for (my $i=0;$i<$count;$i++){
@@ -69,18 +73,16 @@ for (my $i=0;$i<$count;$i++){
        $line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
        $sub_total+=$line_total;
        my %line;
-       if ($toggle==0){
-               $line{color}='#EEEEEE';
-               $toggle=1;
+       if ($i % 2){
+               $line{highlight}=1;
        } else {
-               $line{color}='white';
-               $toggle=0;
+               $line{highlight}=0;
        }
        $line{ordernumber} = $results[$i]->{'ordernumber'};
        $line{publishercode} = $results[$i]->{'publishercode'};
        $line{isbn} = $results[$i]->{'isbn'};
        $line{booksellerid} = $results[$i]->{'booksellerid'};
-       $line{basket}=$basket;
+       $line{basketno}=$basketno;
        $line{title} = $results[$i]->{'title'};
        $line{author} = $results[$i]->{'author'};
        $line{i} = $i;
@@ -90,22 +92,26 @@ for (my $i=0;$i<$count;$i++){
        $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
        $line{line_total} = $line_total;
        $line{biblionumber} = $results[$i]->{'biblionumber'};
+       $line{bookfundid} = $results[$i]->{'bookfundid'};
        push @books_loop, \%line;
 }
 my $prefgist =C4::Context->preference("gist");
 $gist=sprintf("%.2f",$sub_total*$prefgist);
 $grand_total=$sub_total+$gist;
-
-$template->param(basket => $basket,
-                                               authorisedby => $results[0]->{'authorisedby'},
-                                               entrydate => format_date($results[0]->{'entrydate'}),
-                                               id=> $results[0]->{'booksellerid'},
-                                               name => $booksellers[0]->{'name'},
-                                               books_loop => \@books_loop,
-                                               count =>$count,
-                                               sub_total => $sub_total,
-                                               gist => $gist,
-                                               grand_total =>$grand_total,
-                                               currency => $booksellers[0]->{'listprice'},
-                                               );
+$template->param(basketno => $basketno,
+                               creationdate => $basket->{creationdate},
+                               authorisedby => $basket->{authorisedby},
+                               authorisedbyname => $basket->{authorisedbyname},
+                               closedate => format_date($basket->{closedate}),
+                               active => $booksellers[0]->{'active'},
+                               booksellerid=> $booksellers[0]->{'id'},
+                               name => $booksellers[0]->{'name'},
+                               entrydate => format_date($results[0]->{'entrydate'}),
+                               books_loop => \@books_loop,
+                               count =>$count,
+                               sub_total => $sub_total,
+                               gist => $gist,
+                               grand_total =>$grand_total,
+                               currency => $booksellers[0]->{'listprice'},
+                               );
 output_html_with_http_headers $query, $cookie, $template->output;