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

fix test suite

Browse Source
This commit is contained in:
Manuel Raynaud
2014-02-20 11:44:09 +01:00
parent dafce9e070
commit 3ab022e99d
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Thelia/Coupon/BaseFacade.php
View File

@@ -125,6 +125,12 @@ class BaseFacade implements FacadeInterface
}
public function getCartTotalTaxPrice()
{
$taxCountry = $this->getContainer()->get('thelia.taxEngine')->getDeliveryCountry();
return $this->getCart()->getTaxedAmount($taxCountry);
}
/**
* Return the Checkout currency EUR|USD
*

7
core/lib/Thelia/Coupon/FacadeInterface.php
View File

@@ -83,6 +83,13 @@ interface FacadeInterface
*/
public function getCartTotalPrice();
/**
* Return Product total tax price
*
* @return float
*/
public function getCartTotalTaxPrice();
/**
* Return the Checkout currency EUR|USD
*

5
core/lib/Thelia/Coupon/Type/RemoveXPercent.php
View File

@@ -103,10 +103,9 @@ class RemoveXPercent extends CouponAbstract
'Percentage must be inferior to 100'
);
}
$taxCountry = $this->facade->getContainer()->get('thelia.taxEngine')->getDeliveryCountry();
$basePrice = $this->facade->getCart()->getTaxedAmount($taxCountry);
return round($basePrice * $this->percentage/100, 2);
return round($this->facade->getCartTotalTaxPrice() * $this->percentage/100, 2);
}
/**