// norm + perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8695 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
+3
-2
@@ -137,7 +137,8 @@ class TaxCore extends ObjectModel
|
|||||||
public function isUsed()
|
public function isUsed()
|
||||||
{
|
{
|
||||||
return Db::getInstance()->getValue('
|
return Db::getInstance()->getValue('
|
||||||
SELECT COUNT(*) FROM `'._DB_PREFIX_.'order_detail_tax`
|
SELECT `id_tax`
|
||||||
|
FROM `'._DB_PREFIX_.'order_detail_tax`
|
||||||
WHERE `id_tax` = '.(int)$this->id
|
WHERE `id_tax` = '.(int)$this->id
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -266,7 +267,7 @@ class TaxCore extends ObjectModel
|
|||||||
if (!isset(self::$_product_tax_via_rules[$id_product.'-'.$id_country.'-'.$id_state.'-'.$zipcode]))
|
if (!isset(self::$_product_tax_via_rules[$id_product.'-'.$id_country.'-'.$id_state.'-'.$zipcode]))
|
||||||
{
|
{
|
||||||
$tax_rate = TaxRulesGroup::getTotalRate((int)Product::getIdTaxRulesGroupByIdProduct((int)$id_product), (int)$id_country, (int)$id_state, $zipcode);
|
$tax_rate = TaxRulesGroup::getTotalRate((int)Product::getIdTaxRulesGroupByIdProduct((int)$id_product), (int)$id_country, (int)$id_state, $zipcode);
|
||||||
self::$_product_tax_via_rules[$id_product.'-'.$id_country.'-'.$zipcode] = $tax_rate;
|
self::$_product_tax_via_rules[$id_product.'-'.$id_country.'-'.$zipcode] = $tax_rate;
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::$_product_tax_via_rules[$id_product.'-'.$id_country.'-'.$zipcode];
|
return self::$_product_tax_via_rules[$id_product.'-'.$id_country.'-'.$zipcode];
|
||||||
|
|||||||
Reference in New Issue
Block a user