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

[-] BO: Fix PSCFV-3345 display of prices with a currency different than default on backoffice orders

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16610 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-07-30 15:24:29 +00:00
parent 78a39a3fbc
commit 2ce01cc89e
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+9 -1
View File
@@ -150,6 +150,11 @@ class AdminOrdersControllerCore extends AdminController
public function renderForm()
{
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP)
{
$this->errors[] = $this->l('You have to select a shop in order to create new orders.');
return false;
}
parent::renderForm();
unset($this->toolbar_btn['save']);
$this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch'));
@@ -212,7 +217,10 @@ class AdminOrdersControllerCore extends AdminController
'class' => 'process-icon-partialRefund'
);
}
return parent::initToolbar();
$res = parent::initToolbar();
if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && isset($this->toolbar_btn['new']))
unset($this->toolbar_btn['new']);
return $res;
}
public function setMedia()