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

// broken due to merge

Browse Source
This commit is contained in:
fBrignoli
2011-11-22 09:11:30 +00:00
parent 423df9a333
commit a519d7cb79
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/ProductController.php
+1 -1
View File
@@ -251,7 +251,7 @@ class ProductControllerCore extends FrontController
'ecotax_tax_exc' => Tools::ps_round($this->product->ecotax, 2), 'ecotax_tax_exc' => Tools::ps_round($this->product->ecotax, 2),
'ecotaxTax_rate' => $ecotax_rate, 'ecotaxTax_rate' => $ecotax_rate,
'productPriceWithoutEcoTax' => (float)$product_price_without_eco_tax, '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), 'no_tax' => Tax::excludeTaxeOption() || !$this->product->getTaxesRate($address),
'ecotax' => (!count($this->errors) && $this->product->ecotax > 0 ? Tools::convertPrice((float)$this->product->ecotax) : 0), 'ecotax' => (!count($this->errors) && $this->product->ecotax > 0 ? Tools::convertPrice((float)$this->product->ecotax) : 0),
'tax_enabled' => Configuration::get('PS_TAX') 'tax_enabled' => Configuration::get('PS_TAX')
modules/blocksearch/blocksearch.php
+5 -4
View File
@@ -55,11 +55,11 @@ class BlockSearch extends Module
{ {
if (Configuration::get('PS_SEARCH_AJAX')) if (Configuration::get('PS_SEARCH_AJAX'))
{ {
Tools::addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css'); $this->context->controller->addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css');
Tools::addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js'); $this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js');
} }
Tools::addCSS(_THEME_CSS_DIR_.'product_list.css'); $this->context->controller->addCSS(_THEME_CSS_DIR_.'product_list.css');
Tools::addCSS(($this->_path).'blocksearch.css', 'all'); $this->context->controller->addCSS(($this->_path).'blocksearch.css', 'all');
} }
public function hookLeftColumn($params) public function hookLeftColumn($params)
@@ -95,3 +95,4 @@ class BlockSearch extends Module
return true; return true;
} }
} }