From b3d3d6160296ae6bcb0d95c087c064f224948e7a Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 27 Nov 2013 10:07:58 +0100
Subject: [PATCH] add REF to product_sale_element loop and fix product tempalte

---
 .../Template/Loop/ProductSaleElements.php     |  1 +
 templates/frontOffice/default/product.html    | 34 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index da2929c70..e1d54ff90 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -174,6 +174,7 @@ class ProductSaleElements extends BaseLoop implements PropelSearchLoopInterface
                 ->set("IS_NEW"            , $PSEValue->getNewness() === 1 ? 1 : 0)
                 ->set("IS_DEFAULT"        , $PSEValue->getIsDefault() === 1 ? 1 : 0)
                 ->set("WEIGHT"            , $PSEValue->getWeight())
+                ->set("REF"               , $PSEValue->getRef())
                 ->set("EAN_CODE"          , $PSEValue->getEanCode())
                 ->set("PRICE"             , $price)
                 ->set("PRICE_TAX"         , $taxedPrice - $price)
diff --git a/templates/frontOffice/default/product.html b/templates/frontOffice/default/product.html
index 097d40a4b..e09c97f3e 100644
--- a/templates/frontOffice/default/product.html
+++ b/templates/frontOffice/default/product.html
@@ -159,9 +159,13 @@
                                 {form_field form=$form field='product_sale_elements_id'}
                                     <select name="{$name}" class="form-control">
                                         {loop name="stock" type="product_sale_elements" product="$ID" order="min_price"}
-                                            {loop name="combi" type="attribute_combination" product_sale_elements="$ID" order="alpha"}
-                                                <option value="{$ID}" data-quantity="{$QUANTITY}" data-price="{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}" data-old-price="{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}">{$ATTRIBUTE_AVAILABILITY_TITLE}</option>
-                                            {/loop}
+                                            <option value="{$ID}" data-quantity="{$QUANTITY}" data-price="{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}" data-old-price="{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}">
+                                                {$REF}
+                                                ({loop name="combi" type="attribute_combination" product_sale_elements="$ID" order="alpha"}
+                                                    {if $LOOP_COUNT > 1}-{/if}
+                                                    {$ATTRIBUTE_AVAILABILITY_TITLE}
+                                                {/loop})
+                                            </option>
                                         {/loop}
                                     </select>
                                 {/form_field}
@@ -192,17 +196,19 @@
 
             {strip}
             {capture "additional"}
-                {ifloop rel="feature_value_info"}
-                    <ul>
-                        {loop name="feature_info" type="feature" product="{$ID}"}
-                            <li>
-                                <strong>{$TITLE}</strong> :
-                                {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
-                                {$TITLE}
-                                {/loop}
-                            </li>
-                        {/loop}
-                    </ul>
+                {ifloop rel="feature_info"}
+                    {ifloop rel="feature_value_info"}
+                        <ul>
+                            {loop name="feature_info" type="feature" product="{$ID}"}
+                                <li>
+                                    <strong>{$TITLE}</strong> :
+                                    {loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
+                                    {$TITLE}
+                                    {/loop}
+                                </li>
+                            {/loop}
+                        </ul>
+                    {/ifloop}
                 {/ifloop}
             {/capture}
             {/strip}