// Replacement of getDiscounts method

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9900 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-04 16:52:39 +00:00
parent 37a918a0bf
commit e2026d1cc3
5 changed files with 6 additions and 6 deletions
@@ -158,7 +158,7 @@ class AdminCartsController extends AdminController
 			$product['image'] = (isset($image['id_image']) ? cacheImage(_PS_IMG_DIR_.'p/'.$imageProduct->getExistingImgPath().'.jpg', 'product_mini_'.(int)($product['id_product']).(isset($product['id_product_attribute']) ? '_'.(int)($product['id_product_attribute']) : '').'.jpg', 45, 'jpg') : '--');
 		}
 		$this->context->smarty->assign(array('products' => $products,
-												'discounts' => $cart->getDiscounts(),
+												'discounts' => $cart->getCartRules(),
 												'order' => $order,
 												'cart' => $cart,
 												'currency' => $currency,
@@ -526,7 +526,7 @@ class AdminOrdersControllerCore extends AdminController
 			),
 			'customerStats' => $customer->getStats(),
 			'products' => $products,
-			'discounts' => $order->getDiscounts(),
+			'discounts' => $order->getCartRules(),
 			'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id),
 			'slips' => OrderSlip::getOrdersSlip($order->id_customer, $order->id),
 			'orderMessages' => OrderMessage::getOrderMessages($order->id_lang),