From b057d211f1ba12234adf0d501ef9bcb3ade30124 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Fri, 7 Sep 2012 16:24:46 +0000
Subject: [PATCH] [-] BO: Fix many bug on combination generator

---
 classes/Product.php                           | 39 +++++++++++++++++++
 .../AdminAttributeGeneratorController.php     |  8 ++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index d8cb68bad..7bc6037ce 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -1059,7 +1059,43 @@ class ProductCore extends ObjectModel
 		$this->addSupplierReference($id_supplier, $id_product_attribute);
 		return $id_product_attribute;
 	}
+	
+	public function generateMultipleCombinations($combinations, $attributes)
+	{
+		$attributes_list = array();
+		$res = true;	
 
+		foreach ($combinations as $key => $combination)
+		{
+			$id_combination = (int)$this->productAttributeExists($attributes[$key], false, null, true, true);
+			$obj = new Combination($id_combination);
+			
+			if ($id_combination)
+			{
+				$obj->minimal_quantity = 1;
+				$obj->available_date = '0000-00-00';
+			}
+
+			foreach ($combination as $field => $value)
+				$obj->$field = $value;
+
+			$obj->save();
+		
+			if (!$id_combination)
+			{
+				$attribute_list = array();
+				foreach ($attributes[$key] as $id_attribute)
+					$attribute_list[] = array(
+						'id_product_attribute' => (int)$obj->id,
+						'id_attribute' => (int)$id_attribute
+					);
+				$res &= Db::getInstance()->insert('product_attribute_combination', $attribute_list);
+			}
+		}
+
+		return $res;
+	}
+	
 	/**
 	* @param integer $quantity DEPRECATED
 	* @param string $supplier_reference DEPRECATED
@@ -1089,6 +1125,7 @@ class ProductCore extends ObjectModel
 
 	public function addProductAttributeMultiple($attributes, $set_default = true)
 	{
+		Tools::displayAsDeprecated();
 		$return = array();
 		$default_value = 1;
 		foreach ($attributes as &$attribute)
@@ -1512,6 +1549,7 @@ class ProductCore extends ObjectModel
 
 	public function addAttributeCombinationMultiple($id_attributes, $combinations)
 	{
+		Tools::displayAsDeprecated();
 		$attributes_list = array();
 		foreach ($id_attributes as $nb => $id_product_attribute)
 			if (isset($combinations[$nb]))
@@ -1524,6 +1562,7 @@ class ProductCore extends ObjectModel
 		return Db::getInstance()->insert('product_attribute_combination', $attributes_list);
 	}
 
+
 	/**
 	* Delete a product attributes combination
 	*
diff --git a/controllers/admin/AdminAttributeGeneratorController.php b/controllers/admin/AdminAttributeGeneratorController.php
index 0dae7e109..f48b48fe6 100644
--- a/controllers/admin/AdminAttributeGeneratorController.php
+++ b/controllers/admin/AdminAttributeGeneratorController.php
@@ -36,6 +36,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 	{
 	 	$this->table = 'product_attribute';
 		$this->className = 'Product';
+		$this->multishop_context_group = false;
 		parent::__construct();
 	}
 
@@ -116,11 +117,10 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 					foreach ($attributes as $attribute)
 						StockAvailable::removeProductFromStockAvailable($this->product->id, $attribute['id_product_attribute'], $this->context->shop);
 				}
-
+				
 				$this->product->deleteProductAttributes();
-				$res = $this->product->addProductAttributeMultiple($values);
-				$this->product->addAttributeCombinationMultiple($res, $this->combinations);
-
+				$this->product->generateMultipleCombinations($values, $this->combinations);
+				
 				// @since 1.5.0
 				if ($this->product->depends_on_stock == 0)
 				{