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

// Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10843 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-12-01 19:09:27 +00:00
parent 8e2102c8ce
commit 8b618652bb
13 changed files with 1241 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminGroupShopController.php
+8 -1
View File
@@ -139,7 +139,8 @@ class AdminGroupShopControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Share available quantities to sale between shops of this group')
'desc' => $this->l('Share available quantities to sale between shops of this group'),
'h' => $this->l('When changing this option, all product available quantities for the current groupof shop will be reseted to 0.')
),
array(
'type' => 'radio',
@@ -252,12 +253,18 @@ class AdminGroupShopControllerCore extends AdminController
{
if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data))
$new_group_shop->copyGroupShopData(Tools::getValue('importFromShop'), $import_data);
//Reset available quantitites
StockAvailable::resetProductFromStockAvailableByGroupShop($new_group_shop);
}
public function afterUpdate($new_group_shop)
{
if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data))
$new_group_shop->copyGroupShopData(Tools::getValue('importFromShop'), $import_data);
//Reset available quantitites
StockAvailable::resetProductFromStockAvailableByGroupShop($new_group_shop);
}
}
controllers/admin/AdminProductsController.php
+1 -3
View File
@@ -3422,9 +3422,7 @@ class AdminProductsControllerCore extends AdminController
if (Tools::getValue('id_product_attribute') === false)
return Tools::jsonEncode(array('error' => 'Undefined id product attribute'));
$id_shop = (int)Context::getContext()->shop->getID(true);
StockAvailable::setQuantity($product->id, (int)Tools::getValue('id_product_attribute'), (int)Tools::getValue('value'), $id_shop);
StockAvailable::setQuantity($product->id, (int)Tools::getValue('id_product_attribute'), (int)Tools::getValue('value'));
break;
}
die(Tools::jsonEncode(array('error' => false)));