insert 19.6 tva

core/lib/Thelia/Model/TaxRuleQuery.php

@@ -2,6 +2,7 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery;
 
 
@@ -15,6 +16,16 @@ use Thelia\Model\Base\TaxRuleQuery as BaseTaxRuleQuery;
  * long as it does not already exist in the output directory.
  *
  */
-class TaxRuleQuery extends BaseTaxRuleQuery {
+class TaxRuleQuery extends BaseTaxRuleQuery
+{
+    public function getTaxCalculatorCollection(Product $product, Country $country)
+    {
+        $search = TaxRuleCountryQuery::create()
+            ->filterByCountry($country, Criteria::EQUAL)
+            ->filterByTaxRuleId($product->getTaxRuleId())
+            ->orderByPosition()
+            ->find();
 
+        return $search;
+    }
 } // TaxRuleQuery

core/lib/Thelia/TaxEngine/Calculator.php

@@ -25,6 +25,7 @@ namespace Thelia\TaxEngine;
 use Thelia\Exception\TaxEngineException;
 use Thelia\Model\Country;
 use Thelia\Model\Product;
+use Thelia\Model\TaxRuleQuery;
 
 /**
  * Class Calculator
@@ -33,6 +34,8 @@ use Thelia\Model\Product;
  */
 class Calculator
 {
+    protected $taxRuleQuery = null;
+
     protected $taxRulesCollection = null;
 
     protected $product = null;
@@ -40,6 +43,8 @@ class Calculator
 
     public function __construct()
     {
+        $this->taxRuleQuery = new TaxRuleQuery();
+
         return $this;
     }
 
@@ -55,11 +60,13 @@ class Calculator
         $this->product = $product;
         $this->country = $country;
 
+        $this->taxRulesCollection = $this->taxRuleQuery->getTaxCalculatorCollection($product, $country);
+
         return $this;
     }
 
     public function getTaxAmount()
     {
-        
+
     }
 }