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

// Context - first commit

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-11 14:32:05 +00:00
parent 2ee764963b
commit 143022e488
78 changed files with 783 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/HistoryController.php
+5 -5
View File
@@ -40,9 +40,9 @@ class HistoryControllerCore extends FrontController
public function setMedia()
{
parent::setMedia();
Tools::addCSS(_THEME_CSS_DIR_.'history.css');
Tools::addCSS(_THEME_CSS_DIR_.'addresses.css');
Tools::addJS(array(
$this->addCSS(_THEME_CSS_DIR_.'history.css');
$this->addCSS(_THEME_CSS_DIR_.'addresses.css');
$this->addJS(array(
_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js',
_THEME_JS_DIR_.'history.js',
_THEME_JS_DIR_.'tools.js'));
@@ -59,7 +59,7 @@ class HistoryControllerCore extends FrontController
if (Validate::isLoadedObject($myOrder))
$order['virtual'] = $myOrder->isVirtual(false);
}
self::$smarty->assign(array(
$this->smarty->assign(array(
'orders' => $orders,
'invoiceAllowed' => (int)(Configuration::get('PS_INVOICE')),
'slowValidation' => Tools::isSubmit('slowvalidation')
@@ -69,7 +69,7 @@ class HistoryControllerCore extends FrontController
public function displayContent()
{
parent::displayContent();
self::$smarty->display(_PS_THEME_DIR_.'history.tpl');
$this->smarty->display(_PS_THEME_DIR_.'history.tpl');
}
}