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

// categories multishop improved

Browse Source
This commit is contained in:
vChabot
2012-01-24 09:30:32 +00:00
parent e7e1f411ae
commit 7e0a2ce15e
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Category.php
+3 -1
View File
@@ -673,6 +673,8 @@ class CategoryCore extends ObjectModel
$shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
else
$shop = $context->shop;
else
return new Category($shop->getCategory(), $id_lang);
$is_more_than_one_root_category = count(Category::getCategoriesWithoutParent()) > 1;
if ((!Shop::isFeatureActive() && $is_more_than_one_root_category) ||
Shop::isFeatureActive() && $is_more_than_one_root_category && $context->shop() != Shop::CONTEXT_SHOP)
@@ -922,7 +924,7 @@ class CategoryCore extends ObjectModel
$categories = null;
$id_current = $this->id;
$context->shop = ($context->shop->id) ? $context->shop : new Shop(Configuration::get('PS_DEFAULT_SHOP'));
$context->shop = ($context->shop->id) ? $context->shop : new Shop(Configuration::get('PS_SHOP_DEFAULT'));
while (true)
{
$sql = '
classes/helper/Helper.php
+3 -1
View File
@@ -165,7 +165,9 @@ class HelperCore
);
$top_category = Category::getTopCategory();
$root_category = Category::getRootCategory();
$id_shop = Tools::isSubmit('id_shop') ? Tools::getValue('id_shop'): Configuration::get('PS_SHOP_DEFAULT');
$shop = new Shop($id_shop);
$root_category = Category::getRootCategory(null, $shop);
$disabled_categories[] = $top_category->id;
if (!$root)
$root = array('name' => $root_category->name, 'id_category' => $root_category->id);