diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip index 6ff290ef99325ce4dd84041aa2e2be06928e30f7..7ad29490064980040f8f996953f9b7503b71ab62 100644 Binary files a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip and b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.3.zip differ diff --git a/releases/plg_opentools_vm2_rules_shipping_v4.3.zip b/releases/plg_opentools_vm2_rules_shipping_v4.3.zip index aef08aa20faea801a7f3c2b29e26b89503f47a2e..e3f92a9ba2a27ba92f77c540b3009c0fb2a10dd8 100644 Binary files a/releases/plg_opentools_vm2_rules_shipping_v4.3.zip and b/releases/plg_opentools_vm2_rules_shipping_v4.3.zip differ diff --git a/rules_shipping_base.php b/rules_shipping_base.php index 8994c93528f85c4e24980c0a259af6571b2e683e..a3ddc2c279639c88bac1bcccd79dc891d0076a95 100644 --- 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),