// A few table name replaced

classes/Cart.php

@@ -298,7 +298,7 @@ class CartCore extends ObjectModel
 	}
 
 	// Todo: see uses and change name
-	public function getDiscountsCustomer($id_discount)
+	public function getDiscountsCustomer($id_cart_rule)
 	{
 		if (!CartRule::isFeatureActive())
 			return 0;
@@ -306,7 +306,7 @@ class CartCore extends ObjectModel
 		return Db::getInstance()->getValue('
 			SELECT COUNT(*)
 			FROM `'._DB_PREFIX_.'cart_cart_rule`
-			WHERE `id_discount` = '.(int)($id_discount).' AND `id_cart` = '.(int)($this->id));
+			WHERE `id_cart_rule` = '.(int)$id_cart_rule.' AND `id_cart` = '.(int)$this->id);
 	}
 
 	public function getLastProduct()

classes/CartRule.php

@@ -206,7 +206,7 @@ class CartRuleCore extends ObjectModel
 			$quantityUsed = Db::getInstance()->getValue('
 			SELECT count(*)
 			FROM '._DB_PREFIX_.'orders o
-			LEFT JOIN '._DB_PREFIX_.'order_discount od ON o.id_order = od.id_order
+			LEFT JOIN '._DB_PREFIX_.'order_cart_rule od ON o.id_order = od.id_order
 			WHERE o.id_customer = '.$context->cart->id_customer.'
 			AND od.id_cart_rule = '.(int)$this->id.'
 			AND '.(int)Configuration::get('PS_OS_ERROR').' != (

classes/Discount.php

@@ -187,7 +187,7 @@ class DiscountCore extends CartRule
 		// Refresh cache of feature detachable
 		Configuration::updateGlobalValue('PS_DISCOUNT_FEATURE_ACTIVE', self::isCurrentlyUsed($this->table, true));
 
-		return (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_discount WHERE id_discount = '.(int)($this->id)) &&
+		return (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_cart_rule WHERE id_discount = '.(int)($this->id)) &&
 				Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'discount_category WHERE id_discount = '.(int)($this->id)));
 	}
 
@@ -303,7 +303,7 @@ class DiscountCore extends CartRule
 	{
 		return (bool)Db::getInstance()->getValue('
 			SELECT COUNT(*)
-			FROM `'._DB_PREFIX_.'order_discount` od
+			FROM `'._DB_PREFIX_.'order_cart_rule` od
 			LEFT JOIN `'._DB_PREFIX_.'orders` o ON (od.`id_order` = o.`id_order`)
 			WHERE od.`id_discount` = '.(int)$this->id.'
 			AND o.`id_customer` = '.(int)$id_customer);

classes/Order.php

@@ -625,7 +625,7 @@ class OrderCore extends ObjectModel
 	{
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
 		SELECT *
-		FROM `'._DB_PREFIX_.'order_discount` od '.
+		FROM `'._DB_PREFIX_.'order_cart_rule` od '.
 		($details ? 'LEFT JOIN `'._DB_PREFIX_.'discount` d ON (d.`id_discount` = od.`id_discount`)' : '').'
 		WHERE od.`id_order` = '.(int)($this->id));
 	}
@@ -634,7 +634,7 @@ class OrderCore extends ObjectModel
 	{
 		return Db::getInstance()->getValue('
 			SELECT COUNT(*) FROM `'._DB_PREFIX_.'orders` o
-			LEFT JOIN '._DB_PREFIX_.'order_discount od ON (od.id_order = o.id_order)
+			LEFT JOIN '._DB_PREFIX_.'order_cart_rule od ON (od.id_order = o.id_order)
 			WHERE o.id_customer = '.(int)($id_customer).'
 			AND od.id_discount = '.(int)($id_discount));
 	}

classes/cache/Cache.php

@@ -57,7 +57,7 @@ abstract class CacheCore
 	 */
 	protected $blacklist = array(
 		'cart',
-		'cart_discount',
+		'cart_cart_rule',
 		'cart_product',
 		'connections',
 		'connections_source',