in progress : feature loop

core/lib/Thelia/Config/Resources/config.xml

@@ -11,6 +11,7 @@
         <loop class="Thelia\Core\Template\Loop\Category" name="category"/>
         <loop class="Thelia\Core\Template\Loop\Country" name="country"/>
         <loop class="Thelia\Core\Template\Loop\Customer" name="customer"/>
+        <loop class="Thelia\Core\Template\Loop\Feature" name="feature"/>
         <loop class="Thelia\Core\Template\Loop\Product" name="product"/>
         <loop class="Thelia\Core\Template\Loop\Feed" name="feed"/>
         <loop class="Thelia\Core\Template\Loop\Title" name="title"/>

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

@@ -110,11 +110,11 @@ class Country extends BaseLoop
 
         $search->addAscendingOrderByColumn(\Thelia\Model\Map\CountryI18nTableMap::TITLE);
 
-        $countrys = $this->search($search, $pagination);
+        $countries = $this->search($search, $pagination);
 
         $loopResult = new LoopResult();
 
-        foreach ($countrys as $country) {
+        foreach ($countries as $country) {
             $loopResultRow = new LoopResultRow();
             $loopResultRow->set("ID", $country->getId());
             $loopResultRow->set("AREA", $country->getAreaId());

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

@@ -0,0 +1,168 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+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;
+
+use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Core\Template\Loop\Argument\Argument;
+use Thelia\Log\Tlog;
+
+use Thelia\Model\Base\ProductCategoryQuery;
+use Thelia\Model\Base\FeatureQuery;
+use Thelia\Model\ConfigQuery;
+use Thelia\Model\Map\ProductCategoryTableMap;
+use Thelia\Type\TypeCollection;
+use Thelia\Type;
+
+/**
+ *
+ * Feature loop
+ *
+ *
+ * Class Feature
+ * @package Thelia\Core\Template\Loop
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class Feature extends BaseLoop
+{
+    /**
+     * @return ArgumentCollection
+     */
+    protected function getArgDefinitions()
+    {
+        return new ArgumentCollection(
+            Argument::createIntListTypeArgument('id'),
+            Argument::createIntListTypeArgument('product'),
+            Argument::createIntListTypeArgument('category'),
+            Argument::createBooleanTypeArgument('visible', 1),
+            Argument::createIntListTypeArgument('exclude'),
+            new Argument(
+                'order',
+                new TypeCollection(
+                    new Type\EnumListType(array('alpha', 'alpha_reverse', 'manual', 'manual_reverse'))
+                ),
+                'manual'
+            )
+        );
+    }
+
+    /**
+     * @param $pagination
+     *
+     * @return \Thelia\Core\Template\Element\LoopResult
+     */
+    public function exec(&$pagination)
+    {
+        $search = FeatureQuery::create();
+
+        $id = $this->getId();
+
+        if (null !== $id) {
+            $search->filterById($id, Criteria::IN);
+        }
+
+        $exclude = $this->getExclude();
+
+        if (null !== $exclude) {
+            $search->filterById($exclude, Criteria::NOT_IN);
+        }
+
+        $visible = $this->getVisible();
+
+        $search->filterByVisible($visible);
+
+        $product = $this->getProduct();
+        $category = $this->getCategory();
+
+        if(null !== $product) {
+            $productCategories = ProductCategoryQuery::create()->select(array(ProductCategoryTableMap::CATEGORY_ID))->filterByProductId($product, Criteria::IN)->find()->getData();
+
+            if(null === $category) {
+                $category = $productCategories;
+            } else {
+                $category = array_merge($category, $productCategories);
+            }
+        }
+
+        /* TODO */
+        if(null !== $category) {
+            $search->filterByCategory(
+                ProductCategoryQuery::create()->select(array(ProductCategoryTableMap::CATEGORY_ID))->filterByProductId($product, Criteria::IN)->find(),
+                Criteria::IN
+            );
+        }
+
+        /**
+         * Criteria::INNER_JOIN in second parameter for joinWithI18n  exclude query without translation.
+         *
+         * @todo : verify here if we want results for row without translations.
+         */
+
+        $search->joinWithI18n(
+            $this->request->getSession()->getLocale(),
+            (ConfigQuery::read("default_lang_without_translation", 1)) ? Criteria::LEFT_JOIN : Criteria::INNER_JOIN
+        );
+
+        $orders  = $this->getOrder();
+
+        foreach($orders as $order) {
+            switch ($order) {
+                case "alpha":
+                    $search->addAscendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);
+                    break;
+                case "alpha_reverse":
+                    $search->addDescendingOrderByColumn(\Thelia\Model\Map\FeatureI18nTableMap::TITLE);
+                    break;
+                case "manual":
+                    $search->orderByPosition(Criteria::ASC);
+                    break;
+                case "manual_reverse":
+                    $search->orderByPosition(Criteria::DESC);
+                    break;
+            }
+        }
+
+        $features = $this->search($search, $pagination);
+
+        $loopResult = new LoopResult();
+
+        foreach ($features as $feature) {
+            $loopResultRow = new LoopResultRow();
+            $loopResultRow->set("ID", $feature->getId());
+            $loopResultRow->set("TITLE",$feature->getTitle());
+            $loopResultRow->set("CHAPO", $feature->getChapo());
+            $loopResultRow->set("DESCRIPTION", $feature->getDescription());
+            $loopResultRow->set("POSTSCRIPTUM", $feature->getPostscriptum());
+
+            $loopResult->addRow($loopResultRow);
+        }
+
+        return $loopResult;
+    }
+}

templates/default/category.html

@@ -48,10 +48,19 @@
 
 {loop name="product" type="product" order="ref"}
     <h3>PRODUCT #ID : #REF / #TITLE</h3>
+
     <h4>Accessories</h4>
         <ul>
     {loop name="acc" type="accessory" product="#ID" order="accessory,max_price"}
         <li>#REF</li>
     {/loop}
         </ul>
+
+    <h4>Features</h4>
+    <ul>
+        {loop name="ft" type="feature" order="manual" product="#ID"}
+        <li>#TITLE</li>
+        {/loop}
+    </ul>
+
 {/loop}