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

[-] BO: Allow only one default combination per product when using import

Browse Source
This commit is contained in:
rGaillard
2012-10-10 09:44:41 +00:00
parent 99710cd26e
commit fb3a2af5b9
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+13 -2
View File
@@ -617,7 +617,7 @@ class ProductCore extends ObjectModel
public static function updateDefaultAttribute($id_product) public static function updateDefaultAttribute($id_product)
{ {
Db::getInstance()->update('product', array( Db::getInstance()->update('product_shop', array(
'cache_default_attribute' => (int)Product::getDefaultAttribute($id_product), 'cache_default_attribute' => (int)Product::getDefaultAttribute($id_product),
), 'id_product = '.(int)$id_product); ), 'id_product = '.(int)$id_product);
} }
@@ -1284,7 +1284,7 @@ class ProductCore extends ObjectModel
'ecotax' => !is_null($ecotax), 'ecotax' => !is_null($ecotax),
'weight' => !is_null($weight), 'weight' => !is_null($weight),
'unit_price_impact' => !is_null($unit), 'unit_price_impact' => !is_null($unit),
'default_on' => !is_null($ecotax), 'default_on' => !is_null($default),
'minimal_quantity' => !is_null($minimal_quantity), 'minimal_quantity' => !is_null($minimal_quantity),
'available_date' => !is_null($available_date), 'available_date' => !is_null($available_date),
)); ));
@@ -2897,6 +2897,17 @@ class ProductCore extends ObjectModel
if (!$this->id) if (!$this->id)
return false; return false;
if (Db::getInstance()->getValue('SELECT COUNT(*)
FROM `'._DB_PREFIX_.'product_attribute` pa
'.Shop::addSqlAssociation('product_attribute', 'pa').'
WHERE product_attribute_shop.`default_on` = 1
AND pa.`id_product` = '.(int)$this->id) > 1)
Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'product_attribute_shop product_attribute_shop, '._DB_PREFIX_.'product_attribute pa
SET product_attribute_shop.default_on=0, pa.default_on = 0
WHERE product_attribute_shop.id_product_attribute=pa.id_product_attribute AND pa.id_product='.(int)$this->id
.Shop::addSqlRestriction(false, 'product_attribute_shop'));
$row = Db::getInstance()->getRow(' $row = Db::getInstance()->getRow('
SELECT pa.id_product SELECT pa.id_product
FROM `'._DB_PREFIX_.'product_attribute` pa FROM `'._DB_PREFIX_.'product_attribute` pa
controllers/admin/AdminImportController.php
+4 -1
View File
@@ -1548,7 +1548,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').mysql_error(); $this->errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').mysql_error();
} }
} }
else if (isset($info['image_position']) && $info['image_position']) elseif (isset($info['image_position']) && $info['image_position'])
{ {
$images = $product->getImages($default_language); $images = $product->getImages($default_language);
@@ -1735,6 +1735,9 @@ class AdminImportControllerCore extends AdminController
} }
} }
$product->checkDefaultAttributes();
if (!$product->cache_default_attribute)
Product::updateDefaultAttribute($product->id);
if ($id_product_attribute) if ($id_product_attribute)
{ {
// now adds the attributes in the attribute_combination table // now adds the attributes in the attribute_combination table