display taxes again.

This commit is contained in:
Colin Kuskie 2010-04-26 16:23:17 -07:00
parent fe7f3e0cb2
commit fc95fa8f86

View file

@ -908,10 +908,6 @@ sub www_view {
); );
# if there is no shipping address we can't check out # if there is no shipping address we can't check out
# if (WebGUI::Error->caught) {
# $var{shippingPrice} = $var{tax} = $self->formatCurrency(0);
# }
#
# if there is a shipping address calculate tax and shipping options # if there is a shipping address calculate tax and shipping options
if ($address) { if ($address) {
my $ship = WebGUI::Shop::Ship->new($self->session); my $ship = WebGUI::Shop::Ship->new($self->session);
@ -953,9 +949,12 @@ sub www_view {
$var{shippingPrice} = $shipperId && $options->{$shipperId}->{hasPrice} ? $self->formatCurrency($var{shippingPrice}) : ''; $var{shippingPrice} = $shipperId && $options->{$shipperId}->{hasPrice} ? $self->formatCurrency($var{shippingPrice}) : '';
} }
} }
# else {
# # Tax variables $var{shippingPrice} = $var{tax} = $self->formatCurrency(0);
# $var{tax} = $self->calculateTaxes; }
# Tax variables
$var{tax} = $self->calculateTaxes;
#Address form variables #Address form variables
$var{userIsVisitor} = $session->user->isVisitor; $var{userIsVisitor} = $session->user->isVisitor;