[IMP] website_crm

bzr revid: chm@openerp.com-20130702163157-d9a2woqai8dfr4co

diff --git a/addons/website_sale/static/src/css/ecommerce.css b/addons/website_sale/static/src/css/ecommerce.css
index 6443c81..59a3a48 100644 (file)
--- a/addons/website_sale/static/src/css/ecommerce.css
+++ b/addons/website_sale/static/src/css/ecommerce.css
@@ -21,6 +21,9 @@
   border-radius: 5px;
   border: 1px solid rgba(0, 0, 0, 0.1);
 }
+.oe_ecommerce .oe_product .oe_hidden {
+  visibility: hidden;
+}
 .oe_ecommerce .oe_product .oe_ecommerce_price {
   text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.44);
   text-align: center;

diff --git a/addons/website_sale/static/src/css/ecommerce.sass b/addons/website_sale/static/src/css/ecommerce.sass
index 97879e2..01580c0 100644 (file)
--- a/addons/website_sale/static/src/css/ecommerce.sass
+++ b/addons/website_sale/static/src/css/ecommerce.sass
@@ -4,6 +4,8 @@
   font-family: "Lato"
   font-size: 13px
   .oe_product
+    .oe_hidden
+      visibility: hidden
     .oe_ecommerce_price
       +text-shadow(0px 1px 1px rgba(255, 255, 255, 0.44))
       text-align: center

diff --git a/addons/website_sale/static/src/js/ecommerce.js b/addons/website_sale/static/src/js/ecommerce.js
index e9976b8..334720f 100644 (file)
--- a/addons/website_sale/static/src/js/ecommerce.js
+++ b/addons/website_sale/static/src/js/ecommerce.js
@@ -1,5 +1,6 @@
 $(document).ready(function (){
     $('.oe_ecommerce').on('click', '.oe_product .btn-success,.oe_product .btn-primary,.btn-inverse', function (e) {
+        var mycart = !!$('.oe_ecommerce .oe_mycart').size();
         var $button = $(e.currentTarget);
         var link = $button.hasClass('btn-inverse') ? '/shop/remove_cart' : '/shop/add_cart';
         var $add = $button.parent().find('.btn-success,.btn-primary');
@@ -11,7 +12,7 @@ $(document).ready(function (){
             $add.find('.oe_quantity').html(quantity);
             $add.toggleClass('btn-primary', !quantity).toggleClass('btn-success', !!quantity);
             $remove.toggleClass('oe_hidden', !quantity);
-            if (!quantity) {
+            if (mycart && !quantity) {
                 $button.parents('.oe_product:first').remove()
             }
             $('.oe_ecommerce .oe_total').replaceWith(''+result.totalHTML);

diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index 6b1a3eb..5b2b933 100644 (file)
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -125,7 +125,7 @@
                             <t t-call="website_sale.products"/>
                         </t>
                         <t t-call="website_sale.total"/>
-                        <a t-if="order.order_line" href="/shop/customer"><button class="btn btn-success">Next stage</button></a>
+                        <a t-if="order.order_line" href="/shop/customer"><button class="oe_mycart btn btn-success">Next stage</button></a>
                     </t>
                 </t>
             </field>