Merge branch 'master' of https://github.com/thelia/thelia

Conflicts: core/lib/Thelia/Core/Template/Element/BaseLoop.php
2013-07-09 11:45:01 +02:00
parent dd05888450 89a8ef80fe
commit aa6fe04eec
32 changed files with 2069 additions and 98 deletions
--- a/templates/smarty-sample/category.html
+++ b/templates/smarty-sample/category.html
@@ -19,7 +19,7 @@
    <hr />
 {/loop*}
 <h2>PRODUCTS</h2>
-{loop name="product" type="product" order="min_price"}
+{loop name="product" type="product" order="promo,min_price"}
    <h3>PRODUCT : #REF / #TITLE</h3>
    price : #PRICE €<br />
    promo price : #PROMO_PRICE €<br />