Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0

This commit is contained in:
Colin Kuskie 2010-09-22 07:58:06 -07:00
commit 0180b11064
45 changed files with 480 additions and 46 deletions

View file

@ -94,7 +94,7 @@ sub appendCartVariables {
$var ||= {};
my $cart = $self->getCart;
$var->{shippableItemsInCart} = $cart->requiresShipping;
$var->{subtotal} = $cart->calculateSubtotal;
$var->{subtotal} = $cart->formatCurrency($cart->calculateSubtotal);
$var->{shipping} = $cart->calculateShipping;
$var->{taxes} = $cart->calculateTaxes;
my $totalPrice = $var->{subtotal} + $var->{shipping} + $var->{taxes};