// Merge -> revision 7875

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-03 16:16:49 +00:00
parent 6f08bcb12e
commit f2b5ee338b
38 changed files with 320 additions and 85 deletions

View File

@@ -164,6 +164,16 @@ class OrderDetailControllerCore extends FrontController
}
}
public function setMedia()
{
if (Tools::getValue('ajax') != 'true')
{
parent::setMedia();
Tools::addCSS(_THEME_CSS_DIR_.'history.css');
Tools::addCSS(_THEME_CSS_DIR_.'addresses.css');
}
}
public function displayHeader()
{
if (Tools::getValue('ajax') != 'true')