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

[-] BO: Fix multishop employee restriction on cart and catalog price rules PSCFV-2505

Browse Source
This commit is contained in:
rGaillard
2012-05-25 17:12:55 +00:00
parent 45c018ad61
commit d3dbc5ba12
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+2 -2
View File
@@ -556,7 +556,7 @@ class ShopCore extends ObjectModel
$shops->where('active', '=', 1);
if ($id_shop_group)
$shops->where('id_shop_group', '=', $id_shop_group);
$shops->where('id_shop_group', '=', (int)$id_shop_group);
return $shops;
}
@@ -664,7 +664,7 @@ class ShopCore extends ObjectModel
*/
public static function getShopById($id, $identifier, $table)
{
return Db::getInstance()->executeS('SELECT `id_shop`, `'.pSQL($identifier).'` FROM `'._DB_PREFIX_.pSQL($table).'_shop` WHERE `'.pSQL($identifier).'` = '.(int)$id);
return Db::getInstance()->executeS('SELECT `id_shop`, `'.bqSQL($identifier).'` FROM `'._DB_PREFIX_.bqSQL($table).'_shop` WHERE `'.bqSQL($identifier).'` = '.(int)$id);
}
public static function setContext($type, $id = null)