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

// small fix

Browse Source
This commit is contained in:
rGaillard
2012-10-11 09:12:30 +00:00
parent 0b349abb66
commit ae18e7392a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+11 -7
View File
@@ -2798,14 +2798,18 @@ class AdminProductsControllerCore extends AdminController
} }
else else
$this->displayWarning($this->l('You must save this product before adding specific prices')); $this->displayWarning($this->l('You must save this product before adding specific prices'));
// prices part // prices part
$data->assign('link', $this->context->link); $data->assign(array(
$data->assign('currency', $currency = $this->context->currency); 'link' => $this->context->link,
$data->assign('tax_rules_groups', TaxRulesGroup::getTaxRulesGroups(true)); 'currency' => $currency = $this->context->currency,
$data->assign('taxesRatesByGroup', TaxRulesGroup::getAssociatedTaxRatesByIdCountry($this->context->country->id)); 'tax_rules_groups' => TaxRulesGroup::getTaxRulesGroups(true),
$data->assign('ecotaxTaxRate', Tax::getProductEcotaxRate()); 'taxesRatesByGroup' => TaxRulesGroup::getAssociatedTaxRatesByIdCountry($this->context->country->id),
$data->assign('tax_exclude_taxe_option', Tax::excludeTaxeOption()); 'ecotaxTaxRate' => Tax::getProductEcotaxRate(),
$data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX')); 'tax_exclude_taxe_option' => Tax::excludeTaxeOption(),
'ps_use_ecotax' => Configuration::get('PS_USE_ECOTAX'),
'ecotax_tax_excl' => 0
));
$product->price = Tools::convertPrice($product->price, $this->context->currency, true, $this->context); $product->price = Tools::convertPrice($product->price, $this->context->currency, true, $this->context);
if ($product->unit_price_ratio != 0) if ($product->unit_price_ratio != 0)