From 5f5990a52fe446ced00aabe9ab56b09fc95a4545 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Mon, 2 Jul 2012 16:11:24 +0000
Subject: [PATCH] // Fix bugs on module wishlist

---
 modules/blockwishlist/WishList.php       | 10 +++++-----
 modules/blockwishlist/blockwishlist.css  |  1 +
 modules/blockwishlist/managewishlist.php |  6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/blockwishlist/WishList.php b/modules/blockwishlist/WishList.php
index 57f89f2d9..2b7ffb2e2 100644
--- a/modules/blockwishlist/WishList.php
+++ b/modules/blockwishlist/WishList.php
@@ -272,17 +272,17 @@ class WishList extends ObjectModel
 		$products = Db::getInstance()->executeS('
 		SELECT wp.`id_product`, wp.`quantity`, p.`quantity` AS product_quantity, pl.`name`, wp.`id_product_attribute`, wp.`priority`, pl.link_rewrite, cl.link_rewrite AS category_rewrite
 		FROM `'._DB_PREFIX_.'wishlist_product` wp
-		JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = wp.`id_product`
+		LEFT JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = wp.`id_product`
 		'.Shop::addSqlAssociation('product', 'p').'
-		JOIN `'._DB_PREFIX_.'product_lang` pl ON pl.`id_product` = wp.`id_product`'.Shop::addSqlRestrictionOnLang('pl').'
-		JOIN `'._DB_PREFIX_.'wishlist` w ON w.`id_wishlist` = wp.`id_wishlist`
+		LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON pl.`id_product` = wp.`id_product`'.Shop::addSqlRestrictionOnLang('pl').'
+		LEFT JOIN `'._DB_PREFIX_.'wishlist` w ON w.`id_wishlist` = wp.`id_wishlist`
 		LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON cl.`id_category` = product_shop.`id_category_default` AND cl.id_lang='.(int)$id_lang.Shop::addSqlRestrictionOnLang('cl').'
 		WHERE w.`id_customer` = '.(int)($id_customer).'
 		AND pl.`id_lang` = '.(int)($id_lang).'
 		AND wp.`id_wishlist` = '.(int)($id_wishlist).
 		(empty($id_product) === false ? ' AND wp.`id_product` = '.(int)($id_product) : '').
 		($quantity == true ? ' AND wp.`quantity` != 0': '').'
-		GROUP BY p.id_product');
+		GROUP BY p.id_product, wp.id_product_attribute');
 		if (empty($products) === true OR !sizeof($products))
 			return array();
 		for ($i = 0; $i < sizeof($products); ++$i)
@@ -292,7 +292,7 @@ class WishList extends ObjectModel
 			{
 				$result = Db::getInstance()->executeS('
 				SELECT al.`name` AS attribute_name, pa.`quantity` AS "attribute_quantity"
-				  FROM `'._DB_PREFIX_.'product_attribute_combination` pac
+				FROM `'._DB_PREFIX_.'product_attribute_combination` pac
 				LEFT JOIN `'._DB_PREFIX_.'attribute` a ON (a.`id_attribute` = pac.`id_attribute`)
 				LEFT JOIN `'._DB_PREFIX_.'attribute_group` ag ON (ag.`id_attribute_group` = a.`id_attribute_group`)
 				LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (a.`id_attribute` = al.`id_attribute` AND al.`id_lang` = '.(int)($id_lang).')
diff --git a/modules/blockwishlist/blockwishlist.css b/modules/blockwishlist/blockwishlist.css
index 47a71e97d..c5f79ef92 100644
--- a/modules/blockwishlist/blockwishlist.css
+++ b/modules/blockwishlist/blockwishlist.css
@@ -124,6 +124,7 @@
 
 /* form add ****************************************** */
 #form_wishlist {}
+#form_wishlist fieldset { padding: 20px }
 #form_wishlist label {
     display:inline-block;
     padding:6px 15px;
diff --git a/modules/blockwishlist/managewishlist.php b/modules/blockwishlist/managewishlist.php
index 608384bff..756939e7b 100644
--- a/modules/blockwishlist/managewishlist.php
+++ b/modules/blockwishlist/managewishlist.php
@@ -31,6 +31,7 @@ $useSSL = true;
 require_once(dirname(__FILE__).'/../../config/config.inc.php');
 require_once(dirname(__FILE__).'/../../init.php');
 require_once(dirname(__FILE__).'/WishList.php');
+require_once(dirname(__FILE__).'/blockwishlist.php');
 $context = Context::getContext();
 if ($context->customer->isLogged())
 {
@@ -63,10 +64,11 @@ if ($context->customer->isLogged())
 					continue;
 				else
 				{
-					if ($products[$i]['id_product_attribute'] != 0 && isset($combination_imgs[$products[$i]['id_product_attribute']][0]))
+					if ($products[$i]['id_product_attribute'] != 0)
 					{
 						$combination_imgs = $obj->getCombinationImages($context->language->id);
-						$products[$i]['cover'] = $obj->id.'-'.$combination_imgs[$products[$i]['id_product_attribute']][0]['id_image'];
+						if (isset($combination_imgs[$products[$i]['id_product_attribute']][0]))
+							$products[$i]['cover'] = $obj->id.'-'.$combination_imgs[$products[$i]['id_product_attribute']][0]['id_image'];
 					}
 					else
 					{