Browse Source

Remove cause of some warnings in order display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
3.2.x
Colin Campbell 14 years ago
committed by Galen Charlton
parent
commit
c3d1b33a2a
  1. 2
      C4/Acquisition.pm
  2. 8
      acqui/basket.pl

2
C4/Acquisition.pm

@ -1009,7 +1009,7 @@ sub NewOrder {
die "Mandatory parameter $key missing" unless $orderinfo->{$key};
}
if ( $orderinfo->{'subscription'} eq 'yes' ) {
if ( defined $orderinfo->{subscription} && $orderinfo->{'subscription'} eq 'yes' ) {
$orderinfo->{'subscription'} = 1;
} else {
$orderinfo->{'subscription'} = 0;

8
acqui/basket.pl

@ -86,6 +86,9 @@ my $basket = GetBasket($basketno);
$booksellerid = $basket->{booksellerid} unless $booksellerid;
my ($bookseller) = GetBookSellerFromId($booksellerid);
my $op = $query->param('op');
if (!defined $op) {
$op = q{};
}
if ( $op eq 'delete_confirm' ) {
my $basketno = $query->param('basketno');
@ -231,6 +234,9 @@ if ( $op eq 'delete_confirm' ) {
for ( my $i = 0 ; $i < $count ; $i++ ) {
my $rrp = $results[$i]->{'listprice'};
my $qty = $results[$i]->{'quantity'} || 0;
if (!defined $results[$i]->{quantityreceived}) {
$results[$i]->{quantityreceived} = 0;
}
my $budget = GetBudget( $results[$i]->{'budget_id'} );
$rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp );
@ -242,7 +248,7 @@ if ( $op eq 'delete_confirm' ) {
my %line = %{ $results[$i] };
($i%2) and $line{toggle} = 1;
$line{order_received} = ( $qty eq $results[$i]->{'quantityreceived'} );
$line{order_received} = ( $qty == $results[$i]->{'quantityreceived'} );
$line{basketno} = $basketno;
$line{i} = $i;
$line{budget_name} = $budget->{budget_name};

Loading…
Cancel
Save