From 731a406d1c419caa2bf0ca2e1841c6721dd8d22b Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Tue, 20 Aug 2013 15:32:13 +0200
Subject: [PATCH] new product loop

---
 core/lib/Thelia/Core/Template/Element/BaseLoop.php |  6 +++---
 core/lib/Thelia/Core/Template/Loop/Product.php     | 10 +++++-----
 templates/default/debug.html                       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
index bff6ea54d..ab1f119fa 100755
--- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
@@ -191,8 +191,8 @@ abstract class BaseLoop
     }
 
     /**
-     * @param \ModelCriteria $search
-     * @param null           $pagination
+     * @param ModelCriteria $search
+     * @param null          $pagination
      *
      * @return array|mixed|\PropelModelPager|\PropelObjectCollection
      */
@@ -206,7 +206,7 @@ abstract class BaseLoop
     }
 
     /**
-     * @param \ModelCriteria $search
+     * @param ModelCriteria $search
      *
      * @return array|mixed|\PropelObjectCollection
      */
diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index 3429ec208..76d628b56 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -53,6 +53,8 @@ use Thelia\Type\BooleanOrBothType;
  * Class Product
  * @package Thelia\Core\Template\Loop
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ * @todo : manage currency in price filter
  */
 class Product extends BaseLoop
 {
@@ -512,11 +514,9 @@ class Product extends BaseLoop
                 ->set("CHAPO", $product->getChapo())
                 ->set("DESCRIPTION", $product->getDescription())
                 ->set("POSTSCRIPTUM", $product->getPostscriptum())
-                //->set("PRICE", $product->getPrice())
-                //->set("PROMO_PRICE", $product->getPrice2())
-                //->set("WEIGHT", $product->getWeight())
-                //->set("PROMO", $product->getPromo())
-                //->set("NEW", $product->getNewness())
+                ->set("BEST_PRICE", $product->getVirtualColumn('real_lowest_price'))
+                ->set("PROMO", $product->getVirtualColumn('main_product_is_promo'))
+                ->set("NEW", $product->getVirtualColumn('main_product_is_new'))
                 ->set("POSITION", $product->getPosition())
             ;
 
diff --git a/templates/default/debug.html b/templates/default/debug.html
index f023674ad..72bbc332b 100644
--- a/templates/default/debug.html
+++ b/templates/default/debug.html
@@ -15,5 +15,5 @@
 {/loop*}
 
 {loop name="product" type="product" order="promo,min_price"}
-<h3>PRODUCT : #REF / #TITLE (#ID)</h3>
+<h3>PRODUCT : #REF / #TITLE (#ID) / NEW : #NEW / PROMO : #PROMO / best price : #BEST_PRICE</h3>
 {/loop}
\ No newline at end of file