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

// MERGE product_multistore branch : product fields are now editable per shop

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Attribute.php
+7 -11
View File
@@ -88,15 +88,10 @@ class AttributeCore extends ObjectModel
foreach ($result as $row)
$combination_ids[] = (int)$row['id_product_attribute'];
if (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_attribute_combination`
WHERE `'.$this->def['primary'].'` = '.(int)$this->id) === false)
return false;
if (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` IN ('.implode(', ', $combination_ids).')') === false)
return false;
$combinations = new Collection('Combination');
$combinations->where('id_product', '=', $this->id);
foreach ($combinations as $combination)
$combination->delete();
}
/* Reinitializing position */
@@ -241,8 +236,9 @@ class AttributeCore extends ObjectModel
{
$minimal_quantity = Db::getInstance()->getValue('
SELECT `minimal_quantity`
FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` = '.(int)$id_product_attribute
FROM `'._DB_PREFIX_.'product_attribute_shop` pas
WHERE `id_shop` = '.(int)Context::getContext()->shop->id.'
AND `id_product_attribute` = '.(int)$id_product_attribute
);
if ($minimal_quantity > 1)