From e59573e0f0a38133f5967ff504e8377589e522e9 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 5 Nov 2012 13:52:36 +0000 Subject: [PATCH] [-] FO : fixed bug #PSCFV-5304 - theme tools.js needed in OrderFollowController.php and OrderSlipController.php --- controllers/front/OrderFollowController.php | 5 ++--- controllers/front/OrderSlipController.php | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php index dcbfced78..94a4c72b2 100644 --- a/controllers/front/OrderFollowController.php +++ b/controllers/front/OrderFollowController.php @@ -112,10 +112,9 @@ class OrderFollowControllerCore extends FrontController public function setMedia() { parent::setMedia(); - $this->addCSS(_THEME_CSS_DIR_.'history.css'); - $this->addCSS(_THEME_CSS_DIR_.'addresses.css'); + $this->addCSS(array(_THEME_CSS_DIR_.'history.css', _THEME_CSS_DIR_.'addresses.css')); $this->addJqueryPlugin('scrollTo'); - $this->addJS(_THEME_JS_DIR_.'history.js'); + $this->addJS(_THEME_JS_DIR_.'history.js', _THEME_JS_DIR_.'tools.js'); } } diff --git a/controllers/front/OrderSlipController.php b/controllers/front/OrderSlipController.php index 7639f5211..dbda3f57b 100644 --- a/controllers/front/OrderSlipController.php +++ b/controllers/front/OrderSlipController.php @@ -35,10 +35,9 @@ class OrderSlipControllerCore extends FrontController public function setMedia() { parent::setMedia(); - $this->addCSS(_THEME_CSS_DIR_.'history.css'); - $this->addCSS(_THEME_CSS_DIR_.'addresses.css'); + $this->addCSS(array(_THEME_CSS_DIR_.'history.css', _THEME_CSS_DIR_.'addresses.css')); $this->addJqueryPlugin('scrollTo'); - $this->addJS(_THEME_JS_DIR_.'history.js'); + $this->addJS(array(_THEME_JS_DIR_.'history.js', _THEME_JS_DIR_.'tools.js')); } /**