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

// Refactoring of shop class with new context

Browse Source
This commit is contained in:
rMalie
2011-07-12 16:28:20 +00:00
parent e7ea230525
commit 2d77925e7d
28 changed files with 216 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Shop.php
+13 -10
View File
@@ -253,31 +253,34 @@ class ShopCore extends ObjectModel
/**
* Get group of current shop
*
* @param bool $asObject If false, return only the ID of the group
* @return GroupShop
*/
public function getGroup($asObject = false)
{
if (!$asObject)
return $this->id_group_shop;
if (!$this->group)
$this->group = new GroupShop($this->id_group_shop);
return $this->group;
}
/**
* Get current shop ID.
* Get current shop ID
*
* @param bool $forceContext If true and if no shop is selected in context, get default shop ID
* @return int
*/
public static function getID($forceContext = false)
public function getID()
{
if (!$this->id && $forceContext)
return (int)Configuration::get('PS_SHOP_DEFAULT');
return (int)$this->id;
}
/**
* Get current shop group ID
*
* @return int
*/
public function getGroupID()
{
return (int)$this->id_group_shop;
}
/**
* Get root category of current shop
@@ -571,7 +574,7 @@ class ShopCore extends ObjectModel
$alias .= '.';
if (is_null($shopID))
$shopID = Shop::getCurrentShop(true);
$shopID = Context::getContext()->shop->getID();
if (!$shopID)
return ($shopGroupID) ? ' AND '.$alias.'id_group_shop = '.(int)$shopGroupID : '';