// Merge -> revision 8851

2011-09-28 16:03:30 +00:00
parent 6424bf8541
commit fe96631b7b
8 changed files with 38 additions and 15 deletions
@@ -310,9 +310,11 @@ class CartCore extends ObjectModel
 			$row['description'] = $discount->description ? $discount->description : $discount->name;
 			$row['value_real'] = $discount->getValue(sizeof($result), $total_products_wt, $shipping_wt, $this->id);
 			$row['value_tax_exc'] = $discount->getValue(sizeof($result), $total_products, $shipping, $this->id, false);
+			if ($row['value_real'] !== 0)
 			self::$_discounts[$this->id][] = $row;
+			else
+				$this->deleteDiscount($row['id_discount']);
 		}
-
 		return isset(self::$_discounts[$this->id]) ? self::$_discounts[$this->id] : NULL;
 	}