From 590551e14dd7cb3fa8166e1de041d5c1afe26767 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Wed, 23 Jan 2008 15:55:48 -0600 Subject: [PATCH] Tidying up formatting Signed-off-by: Joshua Ferraro --- acqui/basket.pl | 208 ++++++++++++++++++++++++------------------------ 1 file changed, 105 insertions(+), 103 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 5f071e9659..0baae792c4 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -20,7 +20,6 @@ # 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::Koha; @@ -34,7 +33,7 @@ use C4::Dates qw/format_date/; use vars qw($debug); BEGIN { - $debug = $ENV{DEBUG} || 1; + $debug = $ENV{DEBUG} || 1; } =head1 NAME @@ -88,113 +87,116 @@ my $basket = GetBasket($basketno); $booksellerid = $basket->{booksellerid} unless $booksellerid; my ($bookseller) = GetBookSellerFromId($booksellerid); -if (! $bookseller){ - $template->param( NO_BOOKSELLER => 1 ); +if ( !$bookseller ) { + $template->param( NO_BOOKSELLER => 1 ); } else { -# get librarian branch... -if ( C4::Context->preference("IndependantBranches") ) { - my $userenv = C4::Context->userenv; - unless ( $userenv->{flags} == 1 ) { - my $validtest = ( $basket->{creationdate} eq '' ) - || ( $userenv->{branch} eq $basket->{branch} ) - || ( $userenv->{branch} eq '' ) - || ( $basket->{branch} eq '' ); - unless ($validtest) { - print $query->redirect("../mainpage.pl"); - exit 1; + + # get librarian branch... + if ( C4::Context->preference("IndependantBranches") ) { + my $userenv = C4::Context->userenv; + unless ( $userenv->{flags} == 1 ) { + my $validtest = ( $basket->{creationdate} eq '' ) + || ( $userenv->{branch} eq $basket->{branch} ) + || ( $userenv->{branch} eq '' ) + || ( $basket->{branch} eq '' ); + unless ($validtest) { + print $query->redirect("../mainpage.pl"); + exit 1; + } } } -} -# if new basket, pre-fill infos -$basket->{creationdate} = "" unless ( $basket->{creationdate} ); -$basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} ); -$debug and warn - sprintf "loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s", - $basket->{creationdate}, $basket->{authorisedby} ; - -my @results = GetOrders( $basketno, $order ); -my $count = scalar @results; - -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 $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 $qty_total; -my @books_loop; -for ( my $i = 0 ; $i < $count ; $i++ ) { - my $rrp = $results[$i]->{'listprice'}; - $rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp ); - $sub_total_rrp += $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=%{$results[$i]}; - if ( $toggle == 0 ) { - $line{color} = '#EEEEEE'; - $toggle = 1; + # if new basket, pre-fill infos + $basket->{creationdate} = "" unless ( $basket->{creationdate} ); + $basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} ); + $debug + and warn sprintf + "loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s", + $basket->{creationdate}, $basket->{authorisedby}; + + my @results = GetOrders( $basketno, $order ); + my $count = scalar @results; + + 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 $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 $qty_total; + my @books_loop; + for ( my $i = 0 ; $i < $count ; $i++ ) { + my $rrp = $results[$i]->{'listprice'}; + $rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp ); + $sub_total_rrp += $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 = %{ $results[$i] }; + + if ( $toggle == 0 ) { + $line{color} = '#EEEEEE'; + $toggle = 1; + } + else { + $line{color} = 'white'; + $toggle = 0; + } + $line{order_received} = + ( $results[$i]->{'quantity'} eq $results[$i]->{'quantityreceived'} ); + $line{publishercode} = $results[$i]->{'publishercode'}; + $line{basketno} = $basketno; + $line{i} = $i; + $line{rrp} = sprintf( "%.2f", $line{'rrp'} ); + $line{ecost} = sprintf( "%.2f", $line{'ecost'} ); + $line{line_total} = sprintf( "%.2f", $line_total ); + $line{odd} = $i % 2; + push @books_loop, \%line; } - else { - $line{color} = 'white'; - $toggle = 0; + my $prefgist = C4::Context->preference("gist"); + $gist = sprintf( "%.2f", $sub_total * $prefgist ); + $grand_total = $sub_total; + $grand_total_est = $sub_total_est; + unless ( $bookseller->{'listincgst'} ) { + $grand_total += $gist; + $grand_total_est += sprintf( "%.2f", $sub_total_est * $prefgist ); } - $line{order_received} = ($results[$i]->{'quantity'} eq $results[$i]->{'quantityreceived'}); - $line{publishercode} = $results[$i]->{'publishercode'}; - $line{basketno} = $basketno; - $line{i} = $i; - $line{rrp} = sprintf( "%.2f", $line{'rrp'} ); - $line{ecost} = sprintf( "%.2f", $line{'ecost'} ); - $line{line_total} = sprintf( "%.2f", $line_total ); - $line{odd} = $i % 2; - push @books_loop, \%line; -} -my $prefgist = C4::Context->preference("gist"); -$gist = sprintf( "%.2f", $sub_total * $prefgist ); -$grand_total = $sub_total; -$grand_total_est = $sub_total_est; -unless ($bookseller->{'listincgst'}) { - $grand_total += $gist; - $grand_total_est += sprintf( "%.2f", $sub_total_est * $prefgist ); + my $grand_total_rrp = sprintf( "%.2f", $sub_total_rrp ); + $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} ), + active => $bookseller->{'active'}, + booksellerid => $bookseller->{'id'}, + name => $bookseller->{'name'}, + address1 => $bookseller->{'address1'}, + address2 => $bookseller->{'address2'}, + address3 => $bookseller->{'address3'}, + address4 => $bookseller->{'address4'}, + entrydate => format_date( $results[0]->{'entrydate'} ), + books_loop => \@books_loop, + count => $count, + sub_total => sprintf( "%.2f", $sub_total ), + gist => $gist, + grand_total => sprintf( "%.2f", $grand_total ), + sub_total_est => $sub_total_est, + gist_est => $gist_est, + grand_total_est => $grand_total_est, + grand_total_rrp => $grand_total_rrp, + currency => $bookseller->{'listprice'}, + qty_total => $qty_total, + GST => $prefgist, + ); } -my $grand_total_rrp = sprintf( "%.2f", $sub_total_rrp ); -$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} ), - active => $bookseller->{'active'}, - booksellerid => $bookseller->{'id'}, - name => $bookseller->{'name'}, - address1 => $bookseller->{'address1'}, - address2 => $bookseller->{'address2'}, - address3 => $bookseller->{'address3'}, - address4 => $bookseller->{'address4'}, - entrydate => format_date( $results[0]->{'entrydate'} ), - books_loop => \@books_loop, - count => $count, - sub_total => sprintf( "%.2f", $sub_total), - gist => $gist, - grand_total => sprintf( "%.2f", $grand_total), - sub_total_est => $sub_total_est, - gist_est => $gist_est, - grand_total_est => $grand_total_est, - grand_total_rrp => $grand_total_rrp, - currency => $bookseller->{'listprice'}, - qty_total => $qty_total, - GST => $prefgist, -); - } output_html_with_http_headers $query, $cookie, $template->output; -- 2.39.5