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

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source
This commit is contained in:
Franck Allimant
2013-10-25 00:33:52 +02:00
parent 06cc8ce1ea 60683b7a32
commit 0d50557269
31 changed files with 1096 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Model/OrderQuery.php
View File

@@ -2,6 +2,7 @@
namespace Thelia\Model;
use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Propel;
use Thelia\Model\Base\OrderQuery as BaseOrderQuery;
@@ -52,4 +53,5 @@ class OrderQuery extends BaseOrderQuery
return $obj;
}
} // OrderQuery

9
core/lib/Thelia/Model/Product.php
View File

@@ -41,11 +41,16 @@ class Product extends BaseProduct
return $amount;
}
public function getTaxedPrice(Country $country)
public function getTaxedPrice(Country $country, $price)
{
$taxCalculator = new Calculator();
return round($taxCalculator->load($this, $country)->getTaxedPrice($price), 2);
}
return $taxCalculator->load($this, $country)->getTaxedPrice($this->getRealLowestPrice());
public function getTaxedPromoPrice(Country $country, $price)
{
$taxCalculator = new Calculator();
return round($taxCalculator->load($this, $country)->getTaxedPrice($price), 2);
}
/**