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

// Small fix context is all when multishop is not activated

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16627 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-07-31 12:33:43 +00:00
parent fce1d9a60d
commit ea35da0a1a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+2 -2
View File
@@ -150,7 +150,7 @@ class AdminOrdersControllerCore extends AdminController
public function renderForm()
{
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP)
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && Shop::isFeatureActive())
{
$this->errors[] = $this->l('You have to select a shop in order to create new orders.');
return false;
@@ -218,7 +218,7 @@ class AdminOrdersControllerCore extends AdminController
);
}
$res = parent::initToolbar();
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && isset($this->toolbar_btn['new']))
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && isset($this->toolbar_btn['new']) && Shop::isFeatureActive())
unset($this->toolbar_btn['new']);
return $res;
}