diff --git a/classes/tax/TaxRulesTaxManager.php b/classes/tax/TaxRulesTaxManager.php index 40b049565..e4e98c3a0 100644 --- a/classes/tax/TaxRulesTaxManager.php +++ b/classes/tax/TaxRulesTaxManager.php @@ -69,6 +69,10 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface if (isset($this->tax_calculator)) return $this->tax_calculator; + $taxes = array(); + if (!Configuration::get('PS_TAX')) + return new TaxCalculator($taxes); + $postcode = 0; if (!empty($this->address->postcode)) $postcode = $this->address->postcode; @@ -86,7 +90,6 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface $behavior = 0; $first_row = true; - $taxes = array(); foreach ($rows as $row) {