From e76ad603427b87e66a87df5ec76cce9be9b5c4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Chans=C3=A9aume?= <jchanseaume@openstudio.fr>
Date: Fri, 25 Jul 2014 11:51:46 +0200
Subject: [PATCH] Added the combination attibutes on cart popup

---
 .../frontOffice/default/assets/js/script.js   |  6 +-
 .../default/includes/addedToCart.html         | 56 ++++++++++---------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/templates/frontOffice/default/assets/js/script.js b/templates/frontOffice/default/assets/js/script.js
index 2ac548ccf..cad523b98 100644
--- a/templates/frontOffice/default/assets/js/script.js
+++ b/templates/frontOffice/default/assets/js/script.js
@@ -102,6 +102,7 @@ var pseManager = (function($){
                 // not exists, revert
                 setPseForm();
             } else {
+                $pse.id.val(pseId);
                 $pse.pseId = pseId;
             }
         }
@@ -359,12 +360,13 @@ var pseManager = (function($){
         $(document).on('submit.form-product', '.form-product', function () {
             if (doAjax) {
                 var url_action  = $(this).attr("action"),
-                    product_id  = $("input[name$='product_id']",this).val();
+                    product_id  = $("input[name$='product_id']",this).val(),
+                    pse_id  = $("input#pse-id",this).val();
 
                 $.ajax({type: "POST", data: $(this).serialize(), url: url_action,
                     success: function(data){
                         $(".cart-container").html($(data).html());
-                        $.ajax({url:"ajax/addCartMessage", data:{ product_id: product_id },
+                        $.ajax({url:"ajax/addCartMessage", data:{ product_id: product_id, pse_id: pse_id },
                             success: function (data) {
                                 // Hide all currently active bootbox dialogs
                                 bootbox.hideAll();
diff --git a/templates/frontOffice/default/includes/addedToCart.html b/templates/frontOffice/default/includes/addedToCart.html
index 1ecbf3317..464f0593c 100644
--- a/templates/frontOffice/default/includes/addedToCart.html
+++ b/templates/frontOffice/default/includes/addedToCart.html
@@ -1,34 +1,38 @@
 {default_translation_domain domain='fo.default'}
 {loop type="product" name="add_product_to_cart" id={product attr="id"}}
 <div class="clearfix">
-        <table>
-            <tr>
-                <td class="col-md-4">
-                    {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>
-                <td class="col-md-4">
-                    <h2>{$TITLE}</h2>
-                    {loop type="attribute_combination" name="product_options" product_sale_elements="$PRODUCT_SALE_ELEMENTS_ID"}
-                        <p>{$ATTRIBUTE_TITLE}</p>
-                        <p>{$ATTRIBUTE_AVAILABILITY_TITLE}</p>
-                    {/loop}
-                </td>
-                <td class="col-md-4">
+    <table>
+        <tr>
+            <td colspan="3">
+                <h3 class="text-center">{intl l="The product has been added to your cart" }</h3>
+            </td>
+        </tr>
+        <tr>
+            <td class="col-md-4">
+                {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>
+            <td class="col-md-4">
+                <h2>{$TITLE}</h2>
+                {loop type="attribute_combination" name="product_options" product_sale_elements="{$smarty.get.pse_id}"}
+                    <p>{$ATTRIBUTE_TITLE} : {$ATTRIBUTE_AVAILABILITY_TITLE}</p>
+                {/loop}
+            </td>
+            <td class="col-md-4">
 
-                    {if $IS_PROMO == 1}
-                        {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}
-                        <div class="special-price"><span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></div>
-                    {/if}
+                {if $IS_PROMO == 1}
+                    {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}
+                    <div class="special-price"><span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></div>
+                {/if}
 
-                </td>
-            </tr>
-        </table>
+            </td>
+        </tr>
+    </table>
     <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>