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

fix taxengine tests

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-11 20:18:34 +02:00
parent fa5c1aaefc
commit c35de47f10
2 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,11 @@ class Calculator
}
public function getTaxAmount($untaxedPrice)
{
return $this->getTaxedPrice($untaxedPrice) - $untaxedPrice;
}
public function getTaxedPrice($untaxedPrice)
{
if(null === $this->taxRulesCollection) {
throw new TaxEngineException('Tax rules collection is empty in Calculator::getTaxAmount', TaxEngineException::UNDEFINED_TAX_RULES_COLLECTION);
@@ -106,9 +111,4 @@ class Calculator
return $taxedPrice;
}
public function getTaxedPrice($untaxedPrice)
{
return $untaxedPrice + $this->getTaxAmount($untaxedPrice);
}
}

42
core/lib/Thelia/Tests/TaxEngine/CalculatorTest.php
View File

@@ -136,18 +136,21 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
public function testGetTaxAmountAndGetTaxedPrice()
{
/* consecutives taxes */
$taxRulesCollection = new ObjectCollection();
$taxRulesCollection->setModel('\Thelia\Model\Tax');
$tax = new Tax();
$tax->setType('PricePercentTaxType')
->setRequirements(array('percent' => 10));
->setRequirements(array('percent' => 10))
->setVirtualColumn('taxRuleCountryPosition', 1);
$taxRulesCollection->append($tax);
$tax = new Tax();
$tax->setType('PricePercentTaxType')
->setRequirements(array('percent' => 8));
->setRequirements(array('percent' => 8))
->setVirtualColumn('taxRuleCountryPosition', 2);
$taxRulesCollection->append($tax);
@@ -167,5 +170,40 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
*/
$this->assertEquals(94, $taxAmount);
$this->assertEquals(594, $taxedPrice);
/* same position taxes */
$taxRulesCollection = new ObjectCollection();
$taxRulesCollection->setModel('\Thelia\Model\Tax');
$tax = new Tax();
$tax->setType('PricePercentTaxType')
->setRequirements(array('percent' => 10))
->setVirtualColumn('taxRuleCountryPosition', 1);
$taxRulesCollection->append($tax);
$tax = new Tax();
$tax->setType('PricePercentTaxType')
->setRequirements(array('percent' => 8))
->setVirtualColumn('taxRuleCountryPosition', 1);
$taxRulesCollection->append($tax);
$calculator = new Calculator();
$rewritingUrlQuery = $this->getProperty('taxRulesCollection');
$rewritingUrlQuery->setValue($calculator, $taxRulesCollection);
$taxAmount = $calculator->getTaxAmount(500);
$taxedPrice = $calculator->getTaxedPrice(500);
/*
* expect :
* tax 1 = 500*0.10 = 50 // amout with tax 1 : 550
* tax 2 = 500*0.08 = 40 // amout with tax 2 : 590
* total tax amount = 90
*/
$this->assertEquals(90, $taxAmount);
$this->assertEquals(590, $taxedPrice);
}
}