Tidying up formatting
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
parent
b47e7a9be4
commit
590551e14d
1 changed files with 100 additions and 98 deletions
|
@ -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;
|
||||
|
@ -92,6 +91,7 @@ if (! $bookseller){
|
|||
$template->param( NO_BOOKSELLER => 1 );
|
||||
}
|
||||
else {
|
||||
|
||||
# get librarian branch...
|
||||
if ( C4::Context->preference("IndependantBranches") ) {
|
||||
my $userenv = C4::Context->userenv;
|
||||
|
@ -110,8 +110,9 @@ if ( C4::Context->preference("IndependantBranches") ) {
|
|||
# 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",
|
||||
$debug
|
||||
and warn sprintf
|
||||
"loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
|
||||
$basket->{creationdate}, $basket->{authorisedby};
|
||||
|
||||
my @results = GetOrders( $basketno, $order );
|
||||
|
@ -123,7 +124,6 @@ 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
|
||||
|
@ -141,6 +141,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
|
|||
$qty_total += $results[$i]->{'quantity'};
|
||||
my %line;
|
||||
%line = %{ $results[$i] };
|
||||
|
||||
if ( $toggle == 0 ) {
|
||||
$line{color} = '#EEEEEE';
|
||||
$toggle = 1;
|
||||
|
@ -149,7 +150,8 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
|
|||
$line{color} = 'white';
|
||||
$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{basketno} = $basketno;
|
||||
$line{i} = $i;
|
||||
|
|
Loading…
Reference in a new issue