[Koha-cvs] koha/acqui basket.pl
Mason James
szrj1m at yahoo.com
Wed Jun 7 05:25:01 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Changes by: Mason James <sushi> 06/06/07 03:25:01
Modified files:
acqui : basket.pl
Log message:
perltidy before commit.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/basket.pl?cvsroot=koha&r1=1.30&r2=1.31
Patches:
Index: basket.pl
===================================================================
RCS file: /sources/koha/koha/acqui/basket.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- basket.pl 8 Aug 2005 13:58:07 -0000 1.30
+++ basket.pl 7 Jun 2006 03:25:01 -0000 1.31
@@ -1,11 +1,10 @@
#!/usr/bin/perl
-# $Id: basket.pl,v 1.30 2005/08/08 13:58:07 hdl Exp $
+# $Id: basket.pl,v 1.31 2006/06/07 03:25:01 sushi Exp $
#script to show display basket of orders
#written by chris at katipo.co.nz 24/2/2000
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -34,37 +33,39 @@
use C4::Acquisition;
use C4::Date;
-my $query =new CGI;
+my $query = new CGI;
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",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "acqui/basket.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {acquisition => 1},
+ flagsrequired => { acquisition => 1 },
debug => 1,
- });
-my ($count, at results);
-
+ }
+);
+my ( $count, @results );
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, at booksellers)=bookseller($booksellerid);
+my ( $count2, @booksellers ) = bookseller($booksellerid);
# get librarian branch...
-if (C4::Context->preference("IndependantBranches")) {
+if ( C4::Context->preference("IndependantBranches") ) {
my $userenv = C4::Context->userenv;
- unless ($userenv->{flags} == 1){
- my $validtest = ($basket->{creationdate} eq '')
- || ($basket->{branch} eq '')
- || ($userenv->{branch} eq $basket->{branch})
- || ($userenv->{branch} eq '')
- || ($basket->{branch} eq '');
+ unless ( $userenv->{flags} == 1 ) {
+ my $validtest = ( $basket->{creationdate} eq '' )
+ || ( $basket->{branch} eq '' )
+ || ( $userenv->{branch} eq $basket->{branch} )
+ || ( $userenv->{branch} eq '' )
+ || ( $basket->{branch} eq '' );
unless ($validtest) {
print $query->redirect("../mainpage.pl");
exit 1;
@@ -73,9 +74,9 @@
}
# if new basket, pre-fill infos
-$basket->{creationdate} = "" unless ($basket->{creationdate});
-$basket->{authorisedby} = $loggedinuser unless ($basket->{authorisedby});
-($count, at results)=getbasketcontent($basketno,'',$order);
+$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
@@ -90,61 +91,63 @@
my $qty_total;
my @books_loop;
-for (my $i=0;$i<$count;$i++){
- my $rrp=$results[$i]->{'listprice'};
- $rrp=curconvert($results[$i]->{'currency'},$rrp);
-
- $sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
- $line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
- $sub_total+=$line_total;
+for ( my $i = 0 ; $i < $count ; $i++ ) {
+ my $rrp = $results[$i]->{'listprice'};
+ $rrp = curconvert( $results[$i]->{'currency'}, $rrp );
+
+ $sub_total_est += $results[$i]->{'quantity'} * $results[$i]->{'rrp'};
+ $line_total = $results[$i]->{'quantity'} * $results[$i]->{'ecost'};
+ $sub_total += $line_total;
$qty_total += $results[$i]->{'quantity'};
my %line;
$line{ordernumber} = $results[$i]->{'ordernumber'};
$line{publishercode} = $results[$i]->{'publishercode'};
$line{isbn} = $results[$i]->{'isbn'};
$line{booksellerid} = $results[$i]->{'booksellerid'};
- $line{basketno}=$basketno;
+ $line{basketno} = $basketno;
$line{title} = $results[$i]->{'title'};
$line{notes} = $results[$i]->{'notes'};
$line{author} = $results[$i]->{'author'};
$line{i} = $i;
- $line{rrp} = sprintf("%.2f",$results[$i]->{'rrp'});
- $line{ecost} = sprintf("%.2f",$results[$i]->{'ecost'});
+ $line{rrp} = sprintf( "%.2f", $results[$i]->{'rrp'} );
+ $line{ecost} = sprintf( "%.2f", $results[$i]->{'ecost'} );
$line{quantity} = $results[$i]->{'quantity'};
$line{quantityrecieved} = $results[$i]->{'quantityreceived'};
- $line{line_total} = sprintf("%.2f",$line_total);
+ $line{line_total} = sprintf( "%.2f", $line_total );
$line{biblionumber} = $results[$i]->{'biblionumber'};
$line{bookfundid} = $results[$i]->{'bookfundid'};
- $line{odd} = $i %2;
+ $line{odd} = $i % 2;
push @books_loop, \%line;
}
-my $prefgist =C4::Context->preference("gist");
-$gist=sprintf("%.2f",$sub_total*$prefgist);
-$grand_total=$sub_total+$gist;
-$grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
-$gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
-$template->param(basketno => $basketno,
- creationdate => format_date($basket->{creationdate}),
+my $prefgist = C4::Context->preference("gist");
+$gist = sprintf( "%.2f", $sub_total * $prefgist );
+$grand_total = $sub_total + $gist;
+$grand_total_est =
+ $sub_total_est + sprintf( "%.2f", $sub_total_est * $prefgist );
+$gist_est = sprintf( "%.2f", $sub_total_est * $prefgist );
+$template->param(
+ basketno => $basketno,
+ creationdate => format_date( $basket->{creationdate} ),
authorisedby => $basket->{authorisedby},
authorisedbyname => $basket->{authorisedbyname},
- closedate => format_date($basket->{closedate}),
+ closedate => format_date( $basket->{closedate} ),
active => $booksellers[0]->{'active'},
- booksellerid=> $booksellers[0]->{'id'},
+ booksellerid => $booksellers[0]->{'id'},
name => $booksellers[0]->{'name'},
address1 => $booksellers[0]->{'address1'},
address2 => $booksellers[0]->{'address2'},
address3 => $booksellers[0]->{'address3'},
address4 => $booksellers[0]->{'address4'},
- entrydate => format_date($results[0]->{'entrydate'}),
+ entrydate => format_date( $results[0]->{'entrydate'} ),
books_loop => \@books_loop,
- count =>$count,
+ count => $count,
sub_total => $sub_total,
gist => $gist,
- grand_total =>$grand_total,
+ grand_total => $grand_total,
sub_total_est => $sub_total_est,
gist_est => $gist_est,
- grand_total_est =>$grand_total_est,
+ grand_total_est => $grand_total_est,
currency => $booksellers[0]->{'listprice'},
qty_total => $qty_total,
- );
+);
output_html_with_http_headers $query, $cookie, $template->output;
More information about the Koha-cvs
mailing list