Inital commit

core/lib/Thelia/Model/TaxRuleQuery.php

@@ -20,26 +20,48 @@ class TaxRuleQuery extends BaseTaxRuleQuery
 {
     const ALIAS_FOR_TAX_RULE_COUNTRY_POSITION = 'taxRuleCountryPosition';
 
+    protected static $caches = [];
+
     /**
      * @param TaxRule $taxRule
      * @param Country $country
      *
      * @return array|mixed|\Propel\Runtime\Collection\ObjectCollection
      */
-    public function getTaxCalculatorCollection(TaxRule $taxRule, Country $country)
+    public function getTaxCalculatorCollection(TaxRule $taxRule, Country $country, State $state = null)
     {
+        $key = sprintf(
+            '%s-%s-%s',
+            $taxRule->getId(),
+            $country->getId(),
+            ($state !== null) ? $state->getId() : 0
+        );
+
+        if (array_key_exists($key, self::$caches)) {
+            return self::$caches[$key];
+        }
+
+
+        $taxRuleQuery = TaxRuleCountryQuery::create()
+            ->filterByCountry($country, Criteria::EQUAL)
+            ->filterByTaxRuleId($taxRule->getId());
+
+        if (null !== $state) {
+            $taxRuleCount = $taxRuleQuery
+                ->filterByStateId($state->getId(), Criteria::EQUAL)
+                ->count();
+            if (0 === $taxRuleCount) {
+                $taxRuleQuery->filterByStateId(null, Criteria::EQUAL);
+            }
+        }
+
         $search = TaxQuery::create()
-            ->filterByTaxRuleCountry(
-                TaxRuleCountryQuery::create()
-                    ->filterByCountry($country, Criteria::EQUAL)
-                    ->filterByTaxRuleId($taxRule->getId())
-                    ->orderByPosition()
-                    ->find()
-            )
+            ->filterByTaxRuleCountry($taxRuleQuery->find())
             ->withColumn(TaxRuleCountryTableMap::POSITION, self::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION)
             ->orderBy(self::ALIAS_FOR_TAX_RULE_COUNTRY_POSITION, Criteria::ASC);
         ;
 
-        return $search->find();
+        return self::$caches[$key] = $search->find();
     }
-} // TaxRuleQuery
+}
+// TaxRuleQuery