Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Tidying up formatting

Browse source 
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Chris Cormack 2008-01-23 15:55:48 -06:00 committed by Joshua Ferraro
parent b47e7a9be4
commit 590551e14d
1 changed files with 100 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
acqui/basket.pl
View file

@ -20,7 +20,6 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA # Suite 330, Boston, MA 02111-1307 USA
use strict; use strict;
use C4::Auth; use C4::Auth;
use C4::Koha; use C4::Koha;
@ -88,12 +87,13 @@ my $basket = GetBasket($basketno);
$booksellerid = $basket->{booksellerid} unless $booksellerid; $booksellerid = $basket->{booksellerid} unless $booksellerid;
my ($bookseller) = GetBookSellerFromId($booksellerid); my ($bookseller) = GetBookSellerFromId($booksellerid);
if (! $bookseller){ if ( !$bookseller ) {
$template->param( NO_BOOKSELLER => 1 ); $template->param( NO_BOOKSELLER => 1 );
} }
else { else {
# get librarian branch...
if ( C4::Context->preference("IndependantBranches") ) { # get librarian branch...
if ( C4::Context->preference("IndependantBranches") ) {
my $userenv = C4::Context->userenv; my $userenv = C4::Context->userenv;
unless ( $userenv->{flags} == 1 ) { unless ( $userenv->{flags} == 1 ) {
my $validtest = ( $basket->{creationdate} eq '' ) my $validtest = ( $basket->{creationdate} eq '' )
@ -105,34 +105,34 @@ if ( C4::Context->preference("IndependantBranches") ) {
exit 1; exit 1;
} }
} }
} }
# if new basket, pre-fill infos # if new basket, pre-fill infos
$basket->{creationdate} = "" unless ( $basket->{creationdate} ); $basket->{creationdate} = "" unless ( $basket->{creationdate} );
$basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} ); $basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
$debug and warn $debug
sprintf "loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s", and warn sprintf
$basket->{creationdate}, $basket->{authorisedby} ; "loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
$basket->{creationdate}, $basket->{authorisedby};
my @results = GetOrders( $basketno, $order ); my @results = GetOrders( $basketno, $order );
my $count = scalar @results; my $count = scalar @results;
my $line_total; # total of each line my $line_total; # total of each line
my $sub_total; # total of line totals my $sub_total; # total of line totals
my $gist; # GST my $gist; # GST
my $grand_total; # $subttotal + $gist my $grand_total; # $subttotal + $gist
my $toggle = 0; my $toggle = 0;
# my $line_total_est; # total of each line
my $sub_total_est; # total of line totals
my $sub_total_rrp; # total of line totals
my $gist_est; # GST
my $grand_total_est; # $subttotal + $gist
# my $line_total_est; # total of each line my $qty_total;
my $sub_total_est; # total of line totals my @books_loop;
my $sub_total_rrp; # total of line totals for ( my $i = 0 ; $i < $count ; $i++ ) {
my $gist_est; # GST
my $grand_total_est; # $subttotal + $gist
my $qty_total;
my @books_loop;
for ( my $i = 0 ; $i < $count ; $i++ ) {
my $rrp = $results[$i]->{'listprice'}; my $rrp = $results[$i]->{'listprice'};
$rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp ); $rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp );
$sub_total_rrp += $results[$i]->{'quantity'} * $results[$i]->{'rrp'}; $sub_total_rrp += $results[$i]->{'quantity'} * $results[$i]->{'rrp'};
@ -140,7 +140,8 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
$sub_total += $line_total; $sub_total += $line_total;
$qty_total += $results[$i]->{'quantity'}; $qty_total += $results[$i]->{'quantity'};
my %line; my %line;
%line=%{$results[$i]}; %line = %{ $results[$i] };
if ( $toggle == 0 ) { if ( $toggle == 0 ) {
$line{color} = '#EEEEEE'; $line{color} = '#EEEEEE';
$toggle = 1; $toggle = 1;
@ -149,7 +150,8 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
$line{color} = 'white'; $line{color} = 'white';
$toggle = 0; $toggle = 0;
} }
$line{order_received} = ($results[$i]->{'quantity'} eq $results[$i]->{'quantityreceived'}); $line{order_received} =
( $results[$i]->{'quantity'} eq $results[$i]->{'quantityreceived'} );
$line{publishercode} = $results[$i]->{'publishercode'}; $line{publishercode} = $results[$i]->{'publishercode'};
$line{basketno} = $basketno; $line{basketno} = $basketno;
$line{i} = $i; $line{i} = $i;
@ -158,18 +160,18 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
$line{line_total} = sprintf( "%.2f", $line_total ); $line{line_total} = sprintf( "%.2f", $line_total );
$line{odd} = $i % 2; $line{odd} = $i % 2;
push @books_loop, \%line; push @books_loop, \%line;
} }
my $prefgist = C4::Context->preference("gist"); my $prefgist = C4::Context->preference("gist");
$gist = sprintf( "%.2f", $sub_total * $prefgist ); $gist = sprintf( "%.2f", $sub_total * $prefgist );
$grand_total = $sub_total; $grand_total = $sub_total;
$grand_total_est = $sub_total_est; $grand_total_est = $sub_total_est;
unless ($bookseller->{'listincgst'}) { unless ( $bookseller->{'listincgst'} ) {
$grand_total += $gist; $grand_total += $gist;
$grand_total_est += sprintf( "%.2f", $sub_total_est * $prefgist ); $grand_total_est += sprintf( "%.2f", $sub_total_est * $prefgist );
} }
my $grand_total_rrp = sprintf( "%.2f", $sub_total_rrp ); my $grand_total_rrp = sprintf( "%.2f", $sub_total_rrp );
$gist_est = sprintf( "%.2f", $sub_total_est * $prefgist ); $gist_est = sprintf( "%.2f", $sub_total_est * $prefgist );
$template->param( $template->param(
basketno => $basketno, basketno => $basketno,
creationdate => format_date( $basket->{creationdate} ), creationdate => format_date( $basket->{creationdate} ),
authorisedby => $basket->{authorisedby}, authorisedby => $basket->{authorisedby},
@ -185,9 +187,9 @@ $template->param(
entrydate => format_date( $results[0]->{'entrydate'} ), entrydate => format_date( $results[0]->{'entrydate'} ),
books_loop => \@books_loop, books_loop => \@books_loop,
count => $count, count => $count,
sub_total => sprintf( "%.2f", $sub_total), sub_total => sprintf( "%.2f", $sub_total ),
gist => $gist, gist => $gist,
grand_total => sprintf( "%.2f", $grand_total), grand_total => sprintf( "%.2f", $grand_total ),
sub_total_est => $sub_total_est, sub_total_est => $sub_total_est,
gist_est => $gist_est, gist_est => $gist_est,
grand_total_est => $grand_total_est, grand_total_est => $grand_total_est,
@ -195,6 +197,6 @@ $template->param(
currency => $bookseller->{'listprice'}, currency => $bookseller->{'listprice'},
qty_total => $qty_total, qty_total => $qty_total,
GST => $prefgist, GST => $prefgist,
); );
} }
output_html_with_http_headers $query, $cookie, $template->output; output_html_with_http_headers $query, $cookie, $template->output;