From bd5dd4a172c46846bc93f0761cf630a0b96b19ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Chans=C3=A9aume?= <jchanseaume@openstudio.fr>
Date: Fri, 25 Jul 2014 17:07:58 +0200
Subject: [PATCH] small fixes on frontoffice

---
 templates/frontOffice/default/address-update.html | 3 ++-
 templates/frontOffice/default/address.html        | 1 +
 templates/frontOffice/default/assets/js/script.js | 9 +++++++--
 templates/frontOffice/default/cart.html           | 5 +----
 templates/frontOffice/default/order-delivery.html | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/templates/frontOffice/default/address-update.html b/templates/frontOffice/default/address-update.html
index 65e9c0177..83c13c84e 100644
--- a/templates/frontOffice/default/address-update.html
+++ b/templates/frontOffice/default/address-update.html
@@ -26,7 +26,8 @@
     {loop name="customer.update" type="address" customer="current" id="{$address_id}"}
         <form id="form-address" class="form-horizontal" action="{url path="/address/update/{$address_id}"}" method="post">
         {form_field form=$form field='success_url'}
-            <input type="hidden" name="{$name}" value="{url path="/account"}" />
+            {$next_url=$smarty.get.next|default:{url path="/account"}}
+            <input type="hidden" name="{$name}" value="{$next_url}" />
         {/form_field}
 
         {form_field form=$form field='error_message'}
diff --git a/templates/frontOffice/default/address.html b/templates/frontOffice/default/address.html
index a9820d312..f9da8ccd2 100644
--- a/templates/frontOffice/default/address.html
+++ b/templates/frontOffice/default/address.html
@@ -25,6 +25,7 @@
         {form name="thelia.front.address.create"}
         <form id="form-address" class="form-horizontal" action="{url path="/address/create"}" method="post">
             {form_field form=$form field='success_url'}
+                {$next_url=$smarty.get.next|default:{url path="/account"}}
                 <input type="hidden" name="{$name}" value="{url path="/account"}" />
             {/form_field}
 
diff --git a/templates/frontOffice/default/assets/js/script.js b/templates/frontOffice/default/assets/js/script.js
index cad523b98..2a6cbd1ca 100644
--- a/templates/frontOffice/default/assets/js/script.js
+++ b/templates/frontOffice/default/assets/js/script.js
@@ -57,8 +57,13 @@ var pseManager = (function($){
         // get the select for options
         $("#pse-options .pse-option").each(function(){
             var $option = $(this);
-            $pse['options'][$option.data("attribute")] = $option;
-            $option.on("change", updateProductForm);
+            if ( $option.data("attribute") in PSE_COMBINATIONS){
+                $pse['options'][$option.data("attribute")] = $option;
+                $option.on("change", updateProductForm);
+            } else {
+                // not affected to this product -> remove
+                $option.closest(".option").remove();
+            }
         });
 
         // build select
diff --git a/templates/frontOffice/default/cart.html b/templates/frontOffice/default/cart.html
index dabbcb2d5..8662d1ba3 100644
--- a/templates/frontOffice/default/cart.html
+++ b/templates/frontOffice/default/cart.html
@@ -65,9 +65,7 @@
                                 {/elseloop}
                         </td>
                         <td class="product" >
-                            <h3 class="name"><a href="{$PRODUCT_URL}">
-                                    {$TITLE}
-                                </a></h3>
+                            <h3 class="name"><a href="{$PRODUCT_URL}">{$TITLE}</a></h3>
                             <div class="product-options">
                                 <dl class="dl-horizontal">
                                     <dt>{intl l="Available"} :</dt>
@@ -198,7 +196,6 @@
                         {loop name="product_upsell" type="product" promo="yes" limit="5"}
                             {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=true width="218" height="146"}
                         {/loop}
-
                     </ul>
                 </div>
             </aside><!-- #products-upsell -->
diff --git a/templates/frontOffice/default/order-delivery.html b/templates/frontOffice/default/order-delivery.html
index 49be8707d..bf661c555 100644
--- a/templates/frontOffice/default/order-delivery.html
+++ b/templates/frontOffice/default/order-delivery.html
@@ -39,7 +39,7 @@
 
                 <div id="delivery-address" class="panel">
                     <div class="panel-heading clearfix">
-                        <a href="{url path="/address/create"}" class="btn btn-add-address">{intl l="Add a new address"}</a>
+                        <a href="{url path="/address/create" next="{navigate to='current'}" }" class="btn btn-add-address">{intl l="Add a new address"}</a>
                         {intl l="Choose your delivery address"}
                         {if $error}
                             <span class="help-block"><span class="icon-remove"></span> {$message}</span>
@@ -97,7 +97,7 @@
                                 </td>
                                 <td>
                                     <div class="group-btn">
-                                        <a href="{url path="/address/update/{$ID}"}" class="btn btn-edit-address" data-toggle="tooltip" title="{intl l="Edit this address"}"><i class="icon-pencil"></i> <span>{intl l="Edit"}</span></a>
+                                        <a href="{url path="/address/update/{$ID}" next="{navigate to='current'}"}" class="btn btn-edit-address" data-toggle="tooltip" title="{intl l="Edit this address"}"><i class="icon-pencil"></i> <span>{intl l="Edit"}</span></a>
                                         {if $DEFAULT != 1}
                                             <a href="{url path="/address/delete/{$ID}"}" class="btn btn-remove-address" data-confirm="{intl l="Do you really want to delete this address ?"}" data-confirm-callback="address.delete" title="{intl l="Remove this address"}" data-toggle="tooltip"><i class="icon-remove"></i> <span>{intl l="Cancel"}</span></a>
                                         {/if}