prod feature loop

core/lib/Thelia/Core/Template/Loop/Product.php

@@ -24,6 +24,7 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Join;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
@@ -32,7 +33,11 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
+use Thelia\Model\Base\FeatureProdQuery;
 use Thelia\Model\CategoryQuery;
+use Thelia\Model\FeatureAvQuery;
+use Thelia\Model\FeatureQuery;
+use Thelia\Model\Map\FeatureProdTableMap;
 use Thelia\Model\Map\ProductTableMap;
 use Thelia\Model\ProductCategoryQuery;
 use Thelia\Model\ProductQuery;
@@ -311,6 +316,58 @@ class Product extends BaseLoop
             );
         }
 
+        $feature_available = $this->getFeature_available();
+
+        if(null !== $feature_available) {
+            //$search->joinFeatureProd('fa2', Criteria::LEFT_JOIN)->condition('foocond', '`fa2`.`product_id`=1')->setJoinCondition('fa2', 'foocond');
+            //$search->joinFeatureProd('fa3', Criteria::LEFT_JOIN)->condition('foocond2', 'fa3.product_id=?', 2)->setJoinCondition('fa3', 'foocond2');
+
+            /* fonctionne mais pas avec ?
+            $search->joinFeatureProd('fa3', Criteria::LEFT_JOIN)->addJoinCondition('fa3', "'fa3.PRODUCT_ID' = 4");
+            $search->joinFeatureProd('fa2', Criteria::LEFT_JOIN)->addJoinCondition('fa2', "'fa2.PRODUCT_ID' = 3");
+            */
+
+            $x = new Join();
+            $x->addExplicitCondition('product', 'id', null, 'feature_prod', 'PRODUCT_ID', 'fa0', Criteria::EQUAL);
+            $search->addJoinObject(
+                $x
+            );
+
+            /*
+             * ne marche pas de cette façon :
+             *
+             *
+            $search->filterByFeatureProd(
+                FeatureProdQuery::create('fa')
+                    ->filterByFeature(
+                        FeatureQuery::create('fq')
+                            ->filterById(array(1,2,3), Criteria::IN)
+                            ->find()
+                    )
+                    ->filterByFeatureAv(
+                        FeatureAvQuery::create()
+                            ->filterById(array(1,2,3), Criteria::IN)
+                            ->find()
+                    )
+                    ->find()
+            );
+
+            */
+
+            /*
+
+            CategoryQuery::create()->filterByProduct(
+                    ProductCategoryQuery::create()->filterByProductId(
+                        $this->request->get("product_id"),
+                        Criteria::EQUAL
+                    )->find(),
+                    Criteria::IN
+                )->find(),
+                Criteria::NOT_IN
+
+             */
+        }
+
         /**
          * Criteria::INNER_JOIN in second parameter for joinWithI18n  exclude query without translation.
          *

core/lib/Thelia/Type/IntToCombinedIntsList.php

@@ -43,7 +43,7 @@ class IntToCombinedIntsList implements TypeInterface
                 return false;
             if(filter_var($parts[0], FILTER_VALIDATE_INT) === false)
                 return false;
-            if(!preg_match('#([0-9]+)|\*|&\*]+#', $parts[1]))
+            if(!preg_match('#^([0-9]+([\&\|]{1}[0-9]+)*|\*)$#', $parts[1]))
                 return false;
         }
 
@@ -52,6 +52,17 @@ class IntToCombinedIntsList implements TypeInterface
 
     public function getFormattedValue($values)
     {
-        return $this->isValid($values) ? explode(',', $values) : null;
+        if( $this->isValid($values) ) {
+            $return = '';
+
+            foreach(explode(',', $values) as $intToCombinedInts) {
+                $parts = explode(':', $intToCombinedInts);
+                $return[$parts[0]] = $parts[1];
+            }
+
+            return $return;
+        } else {
+            return null;
+        }
     }
 }

templates/smarty-sample/category.html

@@ -19,7 +19,15 @@
     <hr />
 {/loop*}
 <h2>PRODUCTS</h2>
-{loop name="product" type="product" order="promo,min_price" exclude_category="3"}
+{*loop name="product" type="product" order="promo,min_price" exclude_category="3"}
+    <h3>PRODUCT : #REF / #TITLE</h3>
+    price : #PRICE €<br />
+    promo price : #PROMO_PRICE €<br />
+    is promo : #PROMO<br />
+    is new : #NEW<br />
+    weight : #WEIGHT<br />
+{/loop*}
+{loop name="product" type="product" feature_available="15:1|2|3,12:5&8|6,6:*"}
     <h3>PRODUCT : #REF / #TITLE</h3>
     price : #PRICE €<br />
     promo price : #PROMO_PRICE €<br />