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

// improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mBertholino
2011-12-13 13:37:59 +00:00
parent 659cc9235a
commit 225c8523e9
4 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+2 -3
View File
@@ -758,13 +758,12 @@ class ShopCore extends ObjectModel
}
else
{
if ($shop_group_id && ($share == Shop::SHARE_CUSTOMER || $share == Shop::SHARE_ORDER))
$restriction = ' AND '.$alias.'id_group_shop = '.$shop_group_id.' AND '.$alias.'id_shop = 0';
else if ($shop_id || $shop_group_id)
if ($shop_id || $shop_group_id)
$restriction = ' AND '.$alias.'id_shop IN ('.implode(', ', $this->getListOfID($share)).') ';
//else if ($share == Shop::SHARE_STOCK)
// $restriction = ' AND '.$alias.'id_shop = '.$this->getID(true);
}
return $restriction;
}