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

// Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix

Browse Source
This commit is contained in:
dSevere
2011-12-02 17:31:16 +00:00
parent 7733bc9efe
commit f426575405
13 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/StockAvailable.php
+9 -5
View File
@@ -540,7 +540,6 @@ class StockAvailableCore extends ObjectModel
public static function addSqlShopRestriction(DbQuery $sql = null, $id_shop = null, $alias = null)
{
$context = Context::getContext();
$group_ok = false;
if (!empty($alias))
$alias .= '.';
@@ -565,12 +564,17 @@ class StockAvailableCore extends ObjectModel
$sql = ' AND '.pSQL($alias).'id_group_shop = '.(int)$group_shop->id.' ';
$sql .= ' AND '.pSQL($alias).'id_shop = 0 ';
}
$group_ok = true;
}
// else if we are in group context
else if ($context->shop() == Shop::CONTEXT_GROUP)
{
if (is_object($sql))
$sql->where(pSQL($alias).'id_shop IN ('.implode(', ', Shop::getShops(true, $group_shop->id, true)).')');
else
$sql = ' AND '.pSQL($alias).'id_shop IN ('.implode(', ', Shop::getShops(true, $group_shop->id, true)).') ';
}
// if no group specific restriction, set simple shop restriction
if (!$group_ok)
else
{
if (is_object($sql))
$sql->where(pSQL($alias).'id_shop = '.(int)$id_shop);