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

[-] BO : BugFix : #PSCFV-2630 : Combination and multishop association issue with shared stock through group shop

Browse Source
This commit is contained in:
vChabot
2012-06-07 14:20:53 +00:00
parent 3500b9d771
commit ff2bd93be5
4 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAttributeGeneratorController.php
+2 -2
View File
@@ -78,7 +78,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
public function initProcess()
{
if (isset($_POST['generate']))
if (Tools::isSubmit('generate'))
{
if ($this->tabAccess['edit'] === '1')
$this->action = 'generate';
@@ -101,7 +101,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
$this->errors[] = Tools::displayError('Please choose at least 1 attribute.');
else
{
$tab = array_values($_POST['options']);
$tab = array_values(Tools::getValue('options'));
if (count($tab) && Validate::isLoadedObject($this->product))
{
AdminAttributeGeneratorController::setAttributesImpacts($this->product->id, $tab);
controllers/admin/AdminProductsController.php
+3 -1
View File
@@ -641,6 +641,7 @@ class AdminProductsControllerCore extends AdminController
Tools::getValue('attribute_weight') * Tools::getValue('attribute_weight_impact'),
Tools::getValue('attribute_unity') * Tools::getValue('attribute_unit_impact'),
Tools::getValue('attribute_ecotax'),
0,
Tools::getValue('id_image_attr'),
Tools::getValue('attribute_reference'),
null,
@@ -3380,7 +3381,8 @@ class AdminProductsControllerCore extends AdminController
'list' => $this->renderListAttributes($product, $currency),
'product' => $product,
'id_category' => $product->getDefaultCategory(),
'token_generator' => Tools::getAdminTokenLite('AdminAttributeGenerator')
'token_generator' => Tools::getAdminTokenLite('AdminAttributeGenerator'),
'combination_exists' => (Shop::isFeatureActive() && (Shop::getContextShopGroup()->share_stock) && count(AttributeGroup::getAttributesGroups($this->context->language->id)) > 0)
));
}
}