diff --git a/classes/PDF.php b/classes/PDF.php index 0296b6b98..a3586eebd 100644 --- a/classes/PDF.php +++ b/classes/PDF.php @@ -892,7 +892,7 @@ class PDFCore extends PDF_PageGroupCore } } - if (!sizeof(self::$order->getDiscounts()) AND !$delivery) + if (!sizeof(self::$order->getCartRules()) AND !$delivery) $this->Cell(array_sum($w), 0, ''); } @@ -903,7 +903,7 @@ class PDFCore extends PDF_PageGroupCore { $w = array(90, 25, 15, 10, 25, 25); $this->SetFont(self::fontname(), 'B', 7); - $discounts = self::$order->getDiscounts(); + $discounts = self::$order->getCartRules(); foreach($discounts AS $discount) { diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 85e4df489..f3db1f7e0 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -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, diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 8aa3c9921..3d8994e1a 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -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), diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index 74db79538..7f4e50ce6 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -140,7 +140,7 @@ class GuestTrackingControllerCore extends FrontController 'invoice' => (OrderState::invoiceAvailable((int)($id_order_state)) && $order->invoice_number), 'order_history' => $order->getHistory((int)$this->context->language->id, false, true), 'products' => $products, - 'discounts' => $order->getDiscounts(), + 'discounts' => $order->getCartRules(), 'carrier' => $carrier, 'address_invoice' => $addressInvoice, 'invoiceState' => (Validate::isLoadedObject($addressInvoice) && $addressInvoice->id_state) ? new State((int)($addressInvoice->id_state)) : false, diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 3964519b7..a4135b5ca 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -169,7 +169,7 @@ class OrderDetailControllerCore extends FrontController 'invoice' => (OrderState::invoiceAvailable($id_order_state) && $order->invoice_number), 'order_history' => $order->getHistory($this->context->language->id, false, true), 'products' => $products, - 'discounts' => $order->getDiscounts(), + 'discounts' => $order->getCartRules(), 'carrier' => $carrier, 'address_invoice' => $addressInvoice, 'invoiceState' => (Validate::isLoadedObject($addressInvoice) && $addressInvoice->id_state) ? new State($addressInvoice->id_state) : false,