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

// Merge -> revision 9061

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-05 15:21:55 +00:00
parent 51de6be6cc
commit b4d436ca21
53 changed files with 795 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/PDF.php
+4 -1
View File
@@ -775,7 +775,7 @@ class PDFCore extends PDF_PageGroupCore
$products = self::$order->getProducts();
}
else
$products = self::$orderSlip->getProducts();
$products = self::$orderSlip->getOrdersSlipProducts(self::$orderSlip->id, self::$order);
$customizedDatas = Product::getAllCustomizedDatas((int)(self::$order->id_cart));
Product::addCustomizationPrice($products, $customizedDatas);
@@ -974,7 +974,10 @@ class PDFCore extends PDF_PageGroupCore
$tmp = 0;
$product = &$tmp;
/* And secondly assign to each tax its own reduction part */
$discountAmount = 0;
if (!self::$orderSlip)
$discountAmount = (float)(self::$order->total_discounts);
foreach ($products as $product)
{
$ratio = $amountWithoutTax == 0 ? 0 : $product['priceWithoutTax'] / $amountWithoutTax;