Better detection for same shipping/billing address.

plainblack · Apr 27, 2010 · 69bfa9b · 69bfa9b
1 parent 4a602b3
commit 69bfa9b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm
@@ -1005,7 +1005,10 @@ sub www_view {
         my $billingAddressData  = $self->get('billingAddressId')  ? $self->getBillingAddress->get()  : {};
         $addressBook->appendAddressFormVars(\%var, 'shipping_', $shippingAddressData);
         $addressBook->appendAddressFormVars(\%var, 'billing_',  $billingAddressData);
-        $var{sameShippingAsBilling} = WebGUI::Form::yesNo($session, {name => 'sameShippingAsBilling', value => $form->get('sameShippingAsBilling','yesNo')});
+        $var{sameShippingAsBilling} = WebGUI::Form::yesNo($session, {
+            name => 'sameShippingAsBilling',
+            value => $self->get('billingAddressId') && $self->get('billingAddressId') eq $self->get('shippingAddressId'),
+        });
     }
 
     # POS variables