diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-07-02 18:31:57 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-07-02 18:31:57 +0200 |
| commit | fcd975efa48b2339f2a4e77820a6d39d7d3fe03a (patch) | |
| tree | be9a46e6f98880f29fdfdaaec96d39f6c3a305a4 | |
| parent | 702f955eccc2eb4d1480276dc54c6340dd4bf393 (diff) | |
[IMP] website_crm
bzr revid: chm@openerp.com-20130702163157-d9a2woqai8dfr4co
| -rw-r--r-- | addons/website_sale/static/src/css/ecommerce.css | 3 | ||||
| -rw-r--r-- | addons/website_sale/static/src/css/ecommerce.sass | 2 | ||||
| -rw-r--r-- | addons/website_sale/static/src/js/ecommerce.js | 3 | ||||
| -rw-r--r-- | addons/website_sale/views/ecommerce.xml | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/addons/website_sale/static/src/css/ecommerce.css b/addons/website_sale/static/src/css/ecommerce.css index 6443c817201..59a3a4892fc 100644 --- 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 97879e220a4..01580c03584 100644 --- 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 e9976b8f790..334720fdd59 100644 --- 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 6b1a3eb1b49..5b2b933dd57 100644 --- 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> |