From a519d7cb79734411a09c0b4fc1aab0a40433c6ce Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Tue, 22 Nov 2011 09:11:30 +0000 Subject: [PATCH] // broken due to merge --- controllers/front/ProductController.php | 2 +- modules/blocksearch/blocksearch.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 3416d233e..71d4965a1 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -251,7 +251,7 @@ class ProductControllerCore extends FrontController 'ecotax_tax_exc' => Tools::ps_round($this->product->ecotax, 2), 'ecotaxTax_rate' => $ecotax_rate, 'productPriceWithoutEcoTax' => (float)$product_price_without_eco_tax, - 'group_reduction' => (1 - $group_reduction),, + 'group_reduction' => (1 - $group_reduction), 'no_tax' => Tax::excludeTaxeOption() || !$this->product->getTaxesRate($address), 'ecotax' => (!count($this->errors) && $this->product->ecotax > 0 ? Tools::convertPrice((float)$this->product->ecotax) : 0), 'tax_enabled' => Configuration::get('PS_TAX') diff --git a/modules/blocksearch/blocksearch.php b/modules/blocksearch/blocksearch.php index f0fa3e0fd..bed5c987d 100644 --- a/modules/blocksearch/blocksearch.php +++ b/modules/blocksearch/blocksearch.php @@ -55,11 +55,11 @@ class BlockSearch extends Module { if (Configuration::get('PS_SEARCH_AJAX')) { - Tools::addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css'); - Tools::addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js'); + $this->context->controller->addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css'); + $this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js'); } - Tools::addCSS(_THEME_CSS_DIR_.'product_list.css'); - Tools::addCSS(($this->_path).'blocksearch.css', 'all'); + $this->context->controller->addCSS(_THEME_CSS_DIR_.'product_list.css'); + $this->context->controller->addCSS(($this->_path).'blocksearch.css', 'all'); } public function hookLeftColumn($params) @@ -95,3 +95,4 @@ class BlockSearch extends Module return true; } } +