V4.3: Fix handling of STSameAsBT flag (shipping address same as billing - Checkbox)

3ba96dcc · Reinhold Kainhofer · 2e122f12 · 3ba96dcc · 3ba96dcc · 3ba96dcc
Commit 3ba96dcc authored 10 years ago by Reinhold Kainhofer
--- a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip
+++ b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip
--- a/releases/plg_opentools_vm2_rules_shipping_v4.3.zip
+++ b/releases/plg_opentools_vm2_rules_shipping_v4.3.zip
--- a/rules_shipping_base.php
+++ b/rules_shipping_base.php
@@ -598,7 +598,7 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
 	protected function addCustomCartValues (VirtueMartCart $cart, $cart_prices, &$values) {
 	}
 	protected function getCartValues (VirtueMartCart $cart, $method, $cart_prices) {
-		$address = (($cart->ST == 0) ? $cart->BT : $cart->ST);
+		$address = (($cart->ST == 0 || $cart->STSameAsBT == 1) ? $cart->BT : $cart->ST);
 		$zip = isset($address['zip'])?trim($address['zip']):'';
 		$cartvals = array('zip'=>$zip,
 				  'zip1'=>substr($zip,0,1),