From 9688e7741fc231d5ce2a505e353ce542d4ff60de Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Mon, 19 Dec 2011 09:51:59 +0000
Subject: [PATCH] // Fixing bugs in admin cart

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11343 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/carts/view.tpl | 6 +++---
 classes/Cart.php                         | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/template/carts/view.tpl b/admin-dev/themes/template/carts/view.tpl
index de19c85b3..9a28a1666 100755
--- a/admin-dev/themes/template/carts/view.tpl
+++ b/admin-dev/themes/template/carts/view.tpl
@@ -87,7 +87,7 @@
 						</a>
 					</td>
 					<td align="center">{displayWtPriceWithCurrency price=$product.price_wt currency=$currency}</td>
-					<td align="center" class="productQuantity">{$product.customizationQuantityTotal}</td>
+					<td align="center" class="productQuantity">{$product.customization_quantity}</td>
 					<td align="center" class="productQuantity">{$product.qty_in_stock}</td>
 					<td align="right">{displayWtPriceWithCurrency price=$product.total_customization_wt currency=$currency}</td>
 				</tr>
@@ -121,7 +121,7 @@
 				{/foreach}
 			{/if}
 			
-			{if $product.cart_quantity > $product.customizationQuantityTotal}
+			{if $product.cart_quantity > $product.customization_quantity}
 				<tr>
 					<td align="center">{$product.image}</td>
 					<td>
@@ -132,7 +132,7 @@
 						</a>
 					</td>
 					<td align="center">{displayWtPriceWithCurrency price=$product.product_price currency=$currency}</td>
-					<td align="center" class="productQuantity">{math equation='x - y' x=$product.cart_quantity y=$product.customizationQuantityTotal}</td>
+					<td align="center" class="productQuantity">{math equation='x - y' x=$product.cart_quantity y=$product.customization_quantity}</td>
 					<td align="center" class="productQuantity">{$product.qty_in_stock}</td>
 					<td align="right">{displayWtPriceWithCurrency price=$product.product_total currency=$currency}</td>
 				</tr>
diff --git a/classes/Cart.php b/classes/Cart.php
index e070e8c6a..010fcc154 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -427,6 +427,8 @@ class CartCore extends ObjectModel
 			$sql->select('cu.`id_customization`, cu.`quantity` AS customization_quantity');
 			$sql->leftJoin('customization cu ON p.`id_product` = cu.`id_product`');
 		}
+		else
+			$sql->select('0 AS customization_quantity');
 
 		if (Combination::isFeatureActive())
 		{