dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Replacement of getDiscounts method

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9900 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2011-11-04 16:52:39 +00:00
parent 37a918a0bf
commit e2026d1cc3
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/PDF.php
+2 -2
View File
@@ -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, ''); $this->Cell(array_sum($w), 0, '');
} }
@@ -903,7 +903,7 @@ class PDFCore extends PDF_PageGroupCore
{ {
$w = array(90, 25, 15, 10, 25, 25); $w = array(90, 25, 15, 10, 25, 25);
$this->SetFont(self::fontname(), 'B', 7); $this->SetFont(self::fontname(), 'B', 7);
$discounts = self::$order->getDiscounts(); $discounts = self::$order->getCartRules();
foreach($discounts AS $discount) foreach($discounts AS $discount)
{ {
controllers/admin/AdminCartsController.php
+1 -1
View File
@@ -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') : '--'); $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, $this->context->smarty->assign(array('products' => $products,
'discounts' => $cart->getDiscounts(), 'discounts' => $cart->getCartRules(),
'order' => $order, 'order' => $order,
'cart' => $cart, 'cart' => $cart,
'currency' => $currency, 'currency' => $currency,
controllers/admin/AdminOrdersController.php
+1 -1
View File
@@ -526,7 +526,7 @@ class AdminOrdersControllerCore extends AdminController
), ),
'customerStats' => $customer->getStats(), 'customerStats' => $customer->getStats(),
'products' => $products, 'products' => $products,
'discounts' => $order->getDiscounts(), 'discounts' => $order->getCartRules(),
'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id), 'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id),
'slips' => OrderSlip::getOrdersSlip($order->id_customer, $order->id), 'slips' => OrderSlip::getOrdersSlip($order->id_customer, $order->id),
'orderMessages' => OrderMessage::getOrderMessages($order->id_lang), 'orderMessages' => OrderMessage::getOrderMessages($order->id_lang),
controllers/front/GuestTrackingController.php
+1 -1
View File
@@ -140,7 +140,7 @@ class GuestTrackingControllerCore extends FrontController
'invoice' => (OrderState::invoiceAvailable((int)($id_order_state)) && $order->invoice_number), 'invoice' => (OrderState::invoiceAvailable((int)($id_order_state)) && $order->invoice_number),
'order_history' => $order->getHistory((int)$this->context->language->id, false, true), 'order_history' => $order->getHistory((int)$this->context->language->id, false, true),
'products' => $products, 'products' => $products,
'discounts' => $order->getDiscounts(), 'discounts' => $order->getCartRules(),
'carrier' => $carrier, 'carrier' => $carrier,
'address_invoice' => $addressInvoice, 'address_invoice' => $addressInvoice,
'invoiceState' => (Validate::isLoadedObject($addressInvoice) && $addressInvoice->id_state) ? new State((int)($addressInvoice->id_state)) : false, 'invoiceState' => (Validate::isLoadedObject($addressInvoice) && $addressInvoice->id_state) ? new State((int)($addressInvoice->id_state)) : false,
controllers/front/OrderDetailController.php
+1 -1
View File
@@ -169,7 +169,7 @@ class OrderDetailControllerCore extends FrontController
'invoice' => (OrderState::invoiceAvailable($id_order_state) && $order->invoice_number), 'invoice' => (OrderState::invoiceAvailable($id_order_state) && $order->invoice_number),
'order_history' => $order->getHistory($this->context->language->id, false, true), 'order_history' => $order->getHistory($this->context->language->id, false, true),
'products' => $products, 'products' => $products,
'discounts' => $order->getDiscounts(), 'discounts' => $order->getCartRules(),
'carrier' => $carrier, 'carrier' => $carrier,
'address_invoice' => $addressInvoice, 'address_invoice' => $addressInvoice,
'invoiceState' => (Validate::isLoadedObject($addressInvoice) && $addressInvoice->id_state) ? new State($addressInvoice->id_state) : false, 'invoiceState' => (Validate::isLoadedObject($addressInvoice) && $addressInvoice->id_state) ? new State($addressInvoice->id_state) : false,