Merge branch 'tax'

2013-10-16 12:03:31 +02:00
parent b3c761798b c6dbb76ebb
commit dde7f15f42
42 changed files with 1496 additions and 76 deletions
--- a/core/lib/Thelia/Model/Tax.php
+++ b/core/lib/Thelia/Model/Tax.php
@@ -4,10 +4,13 @@ namespace Thelia\Model;

 use Thelia\Exception\TaxEngineException;
 use Thelia\Model\Base\Tax as BaseTax;
+use Thelia\Model\Tools\ModelEventDispatcherTrait;
 use Thelia\TaxEngine\TaxType\BaseTaxType;

 class Tax extends BaseTax
 {
+    use ModelEventDispatcherTrait;
+
    public function calculateTax($amount)
    {
        if(false === filter_var($amount, FILTER_VALIDATE_FLOAT)) {