From 6e5feaf8e99c6000a067578da01826969ad6fabd Mon Sep 17 00:00:00 2001
From: Emmanuel Nurit <enurit@openstudio.fr>
Date: Thu, 13 Feb 2014 15:48:28 +0100
Subject: [PATCH 1/6] [Front office] Modifying upsell products

Display off upsell products is now based on accessory loop but not promo products
---
 .../default/includes/addedToCart.html         | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/templates/frontOffice/default/includes/addedToCart.html b/templates/frontOffice/default/includes/addedToCart.html
index e90fc6029..e880dbeb5 100644
--- a/templates/frontOffice/default/includes/addedToCart.html
+++ b/templates/frontOffice/default/includes/addedToCart.html
@@ -1,9 +1,9 @@
+{loop type="product" name="add_product_to_cart" id=$smarty.get.product_id}
 <div class="clearfix">
-    {loop type="cart" name="cartloop" limit="1" order="reverse"}
-        <table>
+	<table>
             <tr>
                 <td class="col-md-4">
-                    {loop name="product_thumbnail" type="image" product=$PRODUCT_ID width="218" height="146" resize_mode="borders" limit="1"}
+                    {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
                         <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
                     {/loop}
                 </td>
@@ -17,8 +17,8 @@
                 <td class="col-md-4">
 
                     {if $IS_PROMO == 1}
-                        {assign "real_price" $PROMO_TAXED_PRICE}
-                        <div class="special-price"><span class="price">{$PROMO_TAXED_PRICE} {currency attr="symbol"}</span></div>
+                        {assign "real_price" $TAXED_PROMO_PRICE}
+                        <div class="special-price"><span class="price">{$TAXED_PROMO_PRICE} {currency attr="symbol"}</span></div>
                         <small class="old-price"> <span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></small>
                     {else}
                         {assign "real_price" $TAXED_PRICE}
@@ -28,25 +28,21 @@
                 </td>
             </tr>
         </table>
-    {/loop}
-
     <a href="{url path="/cart"}" role="button" class="btn btn_add_to_cart pull-right"><span>{intl l="View Cart"}</span></a>
     <button type="button" class="btn btn-checkout pull-right" data-dismiss="modal"><span>{intl l="Continue Shopping"}</span></button>
 </div>
-
-{ifloop rel="product_upsell"}
-        <aside id="products-upsell" role="complementary" aria-labelledby="products-upsell-label">
-            <div class="products-heading">
-                <h3 id="products-upsell-label">{intl l="Upsell Products"}</h3>
-            </div>
-
-            <div class="products-content">
-                <ul class="products-grid product-col-3 hover-effect">
-                    {loop name="product_upsell" type="product" promo="yes" limit="3"}
-                        {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=true width="218" height="146"}
-                    {/loop}
-
-                </ul>
-            </div>
-        </aside><!-- #products-upsell -->
-    {/ifloop}
+{ifloop rel="accessories"}
+    <aside id="products-upsell" role="complementary" aria-labelledby="products-upsell-label">
+        <div class="products-heading">
+            <h3 id="products-upsell-label">{intl l="Upsell Products"}</h3>
+        </div>
+        <div class="products-content">
+            <ul class="products-grid product-col-3 hover-effect">
+                {loop type="accessory" name="accessories" product="$ID" order="min_price"}
+				{include file="includes/single-product.html" product_id=$ACCESSORY_ID hasBtn=false hasDescription=false width="218" height="146"}
+				{/loop}
+            </ul>
+        </div>
+    </aside><!-- #products-upsell -->
+{/ifloop}
+{/loop}

From 814dfedaf37a2266ba558084f701c62540032174 Mon Sep 17 00:00:00 2001
From: Emmanuel Nurit <enurit@openstudio.fr>
Date: Thu, 13 Feb 2014 16:06:43 +0100
Subject: [PATCH 2/6] [Front office] Modifying upsell products

Display of upsell products is now based on accessory loop but not promo products
---
 templates/frontOffice/default/assets/js/script.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/frontOffice/default/assets/js/script.js b/templates/frontOffice/default/assets/js/script.js
index 68e313061..ff2ddc2fb 100644
--- a/templates/frontOffice/default/assets/js/script.js
+++ b/templates/frontOffice/default/assets/js/script.js
@@ -296,13 +296,13 @@
         $(".form-product").submit(function () {
             var url_action      = $(this).attr("action");
             var $cartContainer  = $(".cart-container");
-
+			var product_id  = "product_id=" + $("input[name$='product_id']",this).val();
+			
             $.ajax({type: "POST", data: $(this).serialize(), url: url_action,
                     success: function(data){
 
                         $cartContainer.html($(data).html());
-
-                        $.ajax({url:"ajax/addCartMessage",
+                        $.ajax({url:"ajax/addCartMessage", data:product_id,
                             success: function (data) {
                                 bootbox.dialog({
                                     message : data,

From ec0dddd62da1a591b39a7d860b8c91a82d524e34 Mon Sep 17 00:00:00 2001
From: Emmanuel Nurit <enurit@openstudio.fr>
Date: Thu, 13 Feb 2014 16:07:42 +0100
Subject: [PATCH 3/6] [Front office] Modifying upsell products

Display off upsell products is now based on accessory loop but not promo products
---
 .../default/includes/single-product.html      | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/templates/frontOffice/default/includes/single-product.html b/templates/frontOffice/default/includes/single-product.html
index ff1edc590..600a6962f 100644
--- a/templates/frontOffice/default/includes/single-product.html
+++ b/templates/frontOffice/default/includes/single-product.html
@@ -1,22 +1,24 @@
 <li class="item">
     {assign var="hasSubmit" value = false}
     {assign var="productTitle" value="{$TITLE}"}
-
+    {if not $product_id}
+	{assign var="$product_id" value=$ID}
+    {/if}
     <article itemscope itemtype="http://schema.org/Product">
         <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-        {loop name="brand.feature" type="feature" product=$ID title="brand"}
-        {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+        {loop name="brand.feature" type="feature" product=$product_id title="brand"}
+        {loop name="brand.value" type="feature_value" feature=$product_id product=$product_id}
             <meta itemprop="brand" content="{$TITLE}">
         {/loop}
         {/loop}
-        {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+        {loop name="brand.feature" type="feature" product=$product_id title="isbn"}
         {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
             <meta itemprop="productID" content="isbn:{$TITLE}">
         {/loop}
         {/loop}
 
         <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-            {loop name="product_thumbnail" type="image" product=$ID width="{$width}" height="{$height}" resize_mode="borders" limit="1"}
+            {loop name="product_thumbnail" type="image" product=$product_id width="{$width}" height="{$height}" resize_mode="borders" limit="1"}
                 <img itemprop="image" src="{$IMAGE_URL}" alt="{$productTitle}">
             {/loop}
             {elseloop rel="product_thumbnail"}
@@ -48,8 +50,8 @@
                     online_only : http://schema.org/OnlineOnly
                 -->
                 {if $IS_PROMO }
-                    {loop name="productSaleElements_promo" type="product_sale_elements" product=$ID limit="1" order="min_price"}
-                    {assign var="default_product_sale_elements" value=$ID}
+                    {loop name="productSaleElements_promo" type="product_sale_elements" product=$product_id limit="1" order="min_price"}
+                    {assign var="default_product_sale_elements" value=$product_id}
                         <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"}</span></span>
                         <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number=$TAXED_PRICE} {currency attr="symbol"}</span></span>
                     {/loop}
@@ -63,7 +65,7 @@
             <form id="form-product-details" action="{url path="/cart/add" }" method="post" class="form-product">
                 {form_hidden_fields form=$form}
                 <input type="hidden" name="view" value="product">
-                <input type="hidden" name="product_id" value="{$ID}">
+                <input type="hidden" name="product_id" value="{$product_id}">
 
                 {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
@@ -71,13 +73,13 @@
                 {if $default_product_sale_elements }
                     <input type="hidden" name="{$name}" value="{$default_product_sale_elements}" {$attr}>
                 {else}
-                    {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"}
+                    {loop name="productSaleElements_promo" type="product_sale_elements" product="{$product_id}" limit="1"}
                         <input type="hidden" name="{$name}" value="{$ID}" {$attr}>
                     {/loop}
                 {/if}
                 {/form_field}
                 {form_field form=$form field="product"}
-                    <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$ID}" {$attr} >
+                    <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$product_id}" {$attr} >
                 {/form_field}
 
                 <fieldset class="product-options hide">
@@ -86,11 +88,11 @@
                             <label for="options" class="option-heading">Options</label>
                             <div class="option-content">
                                 <select name="options" class="form-control">
-                                    {loop name="stock" type="product_sale_elements" product="$ID" order="min_price"}
+                                    {loop name="stock" type="product_sale_elements" product="$product_id" order="min_price"}
                                     {if $LOOP_TOTAL == 1}
                                         {assign var="hasSubmit" value = true}
                                     {/if}
-                                    {loop name="combi" type="attribute_combination" product_sale_elements="$ID" order="alpha"}
+                                    {loop name="combi" type="attribute_combination" product_sale_elements="$product_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}</small></option>
                                         {/loop}
                                     {/loop}
@@ -133,4 +135,4 @@
             {/if}
         </div>
     </article><!-- /product -->
-</li>
\ No newline at end of file
+</li>

From bc7cfe7f7915e41cd5e3a04c3a129ad5423a8bcf Mon Sep 17 00:00:00 2001
From: Emmanuel Nurit <enurit@openstudio.fr>
Date: Thu, 13 Feb 2014 16:39:29 +0100
Subject: [PATCH 4/6] [Front office] Modifying upsell products

Adding limit 3 + random order on loop accessory
---
 templates/frontOffice/default/includes/addedToCart.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/frontOffice/default/includes/addedToCart.html b/templates/frontOffice/default/includes/addedToCart.html
index e880dbeb5..ed49cab91 100644
--- a/templates/frontOffice/default/includes/addedToCart.html
+++ b/templates/frontOffice/default/includes/addedToCart.html
@@ -1,6 +1,6 @@
 {loop type="product" name="add_product_to_cart" id=$smarty.get.product_id}
 <div class="clearfix">
-	<table>
+        <table>
             <tr>
                 <td class="col-md-4">
                     {loop name="product_thumbnail" type="image" product=$ID width="218" height="146" resize_mode="borders" limit="1"}
@@ -38,9 +38,9 @@
         </div>
         <div class="products-content">
             <ul class="products-grid product-col-3 hover-effect">
-                {loop type="accessory" name="accessories" product="$ID" order="min_price"}
-				{include file="includes/single-product.html" product_id=$ACCESSORY_ID hasBtn=false hasDescription=false width="218" height="146"}
-				{/loop}
+                {loop type="accessory" name="accessories" product="$ID" order="random" limit="3"}
+                    {include file="includes/single-product.html" product_id=$ACCESSORY_ID hasBtn=false hasDescription=false width="218" height="146"}
+                {/loop}
             </ul>
         </div>
     </aside><!-- #products-upsell -->

From 5a9dcb3e444a522f6a86969c06c89e5f4293555f Mon Sep 17 00:00:00 2001
From: Emmanuel Nurit <enurit@openstudio.fr>
Date: Thu, 13 Feb 2014 16:40:03 +0100
Subject: [PATCH 5/6] [Front office] Modifying upsell products

Fixing $ID in some loops
---
 .../default/includes/single-product.html      | 103 ++++++++----------
 1 file changed, 48 insertions(+), 55 deletions(-)

diff --git a/templates/frontOffice/default/includes/single-product.html b/templates/frontOffice/default/includes/single-product.html
index 600a6962f..3651195ea 100644
--- a/templates/frontOffice/default/includes/single-product.html
+++ b/templates/frontOffice/default/includes/single-product.html
@@ -1,68 +1,62 @@
-<li class="item">
-    {assign var="hasSubmit" value = false}
-    {assign var="productTitle" value="{$TITLE}"}
-    {if not $product_id}
-	{assign var="$product_id" value=$ID}
-    {/if}
-    <article itemscope itemtype="http://schema.org/Product">
-        <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-        {loop name="brand.feature" type="feature" product=$product_id title="brand"}
-        {loop name="brand.value" type="feature_value" feature=$product_id product=$product_id}
+{assign var="hasSubmit" value = false}
+<article itemscope itemtype="http://schema.org/Product">
+{if not $product_id}
+{assign var="$product_id" value=$ID}
+{/if}
+    <!-- Use the meta tag to specify content that is not visible on the page in any way -->
+    {loop name="brand.feature" type="feature" product=$product_id title="brand"}
+        {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
             <meta itemprop="brand" content="{$TITLE}">
         {/loop}
-        {/loop}
-        {loop name="brand.feature" type="feature" product=$product_id title="isbn"}
+    {/loop}
+    {loop name="brand.feature" type="feature" product=$product_id title="isbn"}
         {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
             <meta itemprop="productID" content="isbn:{$TITLE}">
         {/loop}
+    {/loop}
+
+    <div class="product-image">
+        {loop name="product_thumbnail" type="image" product="$product_id" width="{$width}" height="{$height}" resize_mode="borders" limit="1"}
+            <img itemprop="image" src="{$IMAGE_URL}" alt="Product #{$LOOP_COUNT}">
         {/loop}
+    
+        <span class="mask">
+            <div class="product-btn">
+                <a class="product-link-btn" href="{$URL}">{intl l="More details"}</a>
 
-        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-            {loop name="product_thumbnail" type="image" product=$product_id width="{$width}" height="{$height}" resize_mode="borders" limit="1"}
-                <img itemprop="image" src="{$IMAGE_URL}" alt="{$productTitle}">
-            {/loop}
-            {elseloop rel="product_thumbnail"}
-                {images file='../assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="{$productTitle}">{/images}
-            {/elseloop}
-            <span class="mask"></span>
-        </a>
+            </div>
+        </span>
+    </div>
 
-        <div class="product-info">
-            <h3 class="name"><a href="{$URL}"><span itemprop="name">{$productTitle}</span></a></h3>
-            {if $hasDescription}
+    <div class="product-info">
+        <h3 class="name"><a href="{$URL}"><span itemprop="name">{$TITLE}</span></a></h3>
+        {if $hasDescription}
             <div class="description" itemprop="description">
                 <p>{$DESCRIPTION}</p>
             </div>
+        {/if}
+    </div>
+
+    <div class="product-price">
+        <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+            <meta itemprop="category" content="{category attr="title"}">
+            <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
+            <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
+            <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
+            {if $IS_PROMO }
+                {loop name="productSaleElements_promo" type="product_sale_elements" product=$product_id limit="1" order="min_price"}
+                {assign var="default_product_sale_elements" value=$ID}
+                    <span class="special-price"><span class="price">{format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"}</span>
+                    <span class="old-price"><span class="price">{format_number number=$TAXED_PRICE} {currency attr="symbol"}</span>
+                {/loop}
+            {else}
+                <span class="regular-price">{format_number number=$BEST_TAXED_PRICE} {currency attr="symbol"}</span>
             {/if}
+
         </div>
-
-        <div class="product-price">
-            <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                <meta itemprop="category" content="{category attr="title"}">
-                <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
-                <meta itemprop="priceCurrency" content="{currency attr="symbol"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
-                <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
-                <!-- List of availibility :
-                    out_of_stock : http://schema.org/OutOfStock
-                    in_stock : http://schema.org/InStock
-                    instore_only : http://schema.org/InStoreOnly
-                    preorder : http://schema.org/PreOrder
-                    online_only : http://schema.org/OnlineOnly
-                -->
-                {if $IS_PROMO }
-                    {loop name="productSaleElements_promo" type="product_sale_elements" product=$product_id limit="1" order="min_price"}
-                    {assign var="default_product_sale_elements" value=$product_id}
-                        <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"}</span></span>
-                        <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number=$TAXED_PRICE} {currency attr="symbol"}</span></span>
-                    {/loop}
-                {else}
-                    <span class="regular-price"><span itemprop="price" class="price">{format_number number=$BEST_TAXED_PRICE} {currency attr="symbol"}</span></span>
-                {/if}
-
-            </div>
-            {if $hasBtn == true}
+        {if $hasBtn == true}
             {form name="thelia.cart.add" }
-            <form id="form-product-details" action="{url path="/cart/add" }" method="post" class="form-product">
+            <form id="form-product-details" action="{url path="/cart/add" }" method="post" role="form" class="form-product">
                 {form_hidden_fields form=$form}
                 <input type="hidden" name="view" value="product">
                 <input type="hidden" name="product_id" value="{$product_id}">
@@ -132,7 +126,6 @@
                 </fieldset>
             </form>
             {/form}
-            {/if}
-        </div>
-    </article><!-- /product -->
-</li>
+        {/if}
+    </div>
+</article><!-- /product -->

From b03c0718920f2e075bcd425250d14040bbfd4a43 Mon Sep 17 00:00:00 2001
From: Emmanuel Nurit <enurit@openstudio.fr>
Date: Thu, 13 Feb 2014 18:21:23 +0100
Subject: [PATCH 6/6] modify the smarty syntax

---
 templates/frontOffice/default/includes/addedToCart.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/frontOffice/default/includes/addedToCart.html b/templates/frontOffice/default/includes/addedToCart.html
index ed49cab91..6e83a2612 100644
--- a/templates/frontOffice/default/includes/addedToCart.html
+++ b/templates/frontOffice/default/includes/addedToCart.html
@@ -1,4 +1,4 @@
-{loop type="product" name="add_product_to_cart" id=$smarty.get.product_id}
+{loop type="product" name="add_product_to_cart" id={product attr="id"}}
 <div class="clearfix">
         <table>
             <tr>