[-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325

2013-02-04 16:00:46 +01:00
parent a6a0dee0ca
commit 2bf3df1c7d
8 changed files with 60 additions and 49 deletions
@@ -345,6 +345,11 @@ class OrderInvoiceCore extends ObjectModel
 		// shipping cost are added in the product taxes breakdown
 		if ($this->useOneAfterAnotherTaxComputationMethod())
 			return $taxes_breakdown;
+		
+		// No shipping breakdown if it's free!
+		foreach ($order->getCartRules() as $cart_rule)
+			if ($cart_rule['free_shipping'])
+				return $taxes_breakdown;

 		$shipping_tax_amount = $this->total_shipping_tax_incl - $this->total_shipping_tax_excl;