TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #506 from lovenunu/lovenunu-improvements

Browse Source 
Add load requirements in getTypeInstance
This commit is contained in:
Manuel Raynaud
2014-06-28 11:59:14 +02:00
parent ec6c39096f 65ba28a251
commit 5330defe11
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Model/Tax.php
View File

@@ -59,12 +59,14 @@ class Tax extends BaseTax
if (!class_exists($class)) { if (!class_exists($class)) {
throw new TaxEngineException('Recorded type `' . $class . '` does not exists', TaxEngineException::BAD_RECORDED_TYPE); throw new TaxEngineException('Recorded type `' . $class . '` does not exists', TaxEngineException::BAD_RECORDED_TYPE);
} }
/** @var \Thelia\TaxEngine\BaseTaxType $instance */
$instance = new $class; $instance = new $class;
if (!$instance instanceof BaseTaxType) { if (!$instance instanceof BaseTaxType) {
throw new TaxEngineException('Recorded type `' . $class . '` does not extends BaseTaxType', TaxEngineException::BAD_RECORDED_TYPE); throw new TaxEngineException('Recorded type `' . $class . '` does not extends BaseTaxType', TaxEngineException::BAD_RECORDED_TYPE);
} }
$instance->loadRequirements($this->getRequirements());
return $instance; return $instance;
} }

2
core/lib/Thelia/TaxEngine/Calculator.php
View File

@@ -154,7 +154,6 @@ class Calculator
$position = (int) $taxRule->getTaxRuleCountryPosition(); $position = (int) $taxRule->getTaxRuleCountryPosition();
$taxType = $taxRule->getTypeInstance(); $taxType = $taxRule->getTypeInstance();
$taxType->loadRequirements( $taxRule->getRequirements() );
if ($currentPosition !== $position) { if ($currentPosition !== $position) {
$taxedPrice += $currentTax; $taxedPrice += $currentTax;
@@ -209,7 +208,6 @@ class Calculator
$position = (int) $taxRule->getTaxRuleCountryPosition(); $position = (int) $taxRule->getTaxRuleCountryPosition();
$taxType = $taxRule->getTypeInstance(); $taxType = $taxRule->getTypeInstance();
$taxType->loadRequirements( $taxRule->getRequirements() );
if ($currentPosition !== $position) { if ($currentPosition !== $position) {
$untaxedPrice -= $currentFixTax; $untaxedPrice -= $currentFixTax;