diff options
| author | Goffin Simon <sig@odoo.com> | 2015-09-25 16:33:43 +0200 |
|---|---|---|
| committer | Goffin Simon <sig@odoo.com> | 2015-09-28 11:26:22 +0200 |
| commit | 9dcb05b1485c5b5c44ce4ebefd98f7daa4ac64bc (patch) | |
| tree | d12ec31558cc191222d28e281f4661d1c68207e7 | |
| parent | 9cf894389f65ef6c8bf609af51660c3672ec3548 (diff) | |
[FIX] website_sale, website_sale_options: product_variant_ids in website_sale.modal
To show the website_sale.modal, the product_variant_ids must be in the DOM
because all the prices are computed with the product_variant_ids.
From commit 0ff26cf
opw:650167
| -rw-r--r-- | addons/website_sale/static/src/js/website_sale.js | 8 | ||||
| -rw-r--r-- | addons/website_sale/views/templates.xml | 2 | ||||
| -rw-r--r-- | addons/website_sale_options/static/src/js/website_sale.js | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index 086473fec5c..03b913fff1c 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -21,9 +21,9 @@ $('.oe_website_sale').each(function () { $(oe_website_sale).on("change", 'input[name="add_qty"]', function (event) { product_ids = []; - var product_dom = $("ul.js_add_cart_variants[data-attribute_value_ids]").first(); + var product_dom = $(".js_add_cart_variants[data-attribute_value_ids]").first(); product_dom.data("attribute_value_ids").forEach(function(entry) { - product_ids.push(entry[0]);}); + product_ids.push(entry);}); var qty = $(event.target).closest('form').find('input[name="add_qty"]').val(); openerp.jsonRpc("/shop/get_unit_price", 'call', {'product_ids': product_ids,'add_qty': parseInt(qty)}) @@ -163,7 +163,7 @@ $('.oe_website_sale').each(function () { }); $(oe_website_sale).on('change', 'input.js_variant_change, select.js_variant_change, ul[data-attribute_value_ids]', function (ev) { - var $ul = $(ev.target).closest('ul.js_add_cart_variants'); + var $ul = $(ev.target).closest('.js_add_cart_variants'); var $parent = $ul.closest('.js_product'); var $product_id = $parent.find('input.product_id').first(); var $price = $parent.find(".oe_price:first .oe_currency_value"); @@ -234,7 +234,7 @@ $('.oe_website_sale').each(function () { $('input.js_product_change', this).first().trigger('change'); }); - $('ul.js_add_cart_variants', oe_website_sale).each(function () { + $('.js_add_cart_variants', oe_website_sale).each(function () { $('input.js_variant_change, select.js_variant_change', this).first().trigger('change'); }); diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index ad7b7d4d6c6..634e91c2710 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -314,7 +314,7 @@ <h1 itemprop="name" t-field="product.name">Product Name</h1> <span itemprop="url" style="display:none;" t-esc="'/shop/product/%s' % slug(product)"/> - <form t-att-action="keep('/shop/cart/update')" class="js_add_cart_variants" method="POST"> + <form t-att-action="keep('/shop/cart/update')" class="js_add_cart_variants" t-att-data-attribute_value_ids="product.product_variant_ids.ids" method="POST"> <div class="js_product"> <t t-placeholder="select"> diff --git a/addons/website_sale_options/static/src/js/website_sale.js b/addons/website_sale_options/static/src/js/website_sale.js index 8f1407c068a..9f2d704ceab 100644 --- a/addons/website_sale_options/static/src/js/website_sale.js +++ b/addons/website_sale_options/static/src/js/website_sale.js @@ -1,5 +1,5 @@ $(document).ready(function () { - if(! $("ul.js_add_cart_variants[data-attribute_value_ids]").length){ + if(! $(".js_add_cart_variants[data-attribute_value_ids]").length){ return; } $('.oe_website_sale #add_to_cart, .oe_website_sale #products_grid .a-submit') @@ -63,7 +63,7 @@ $(document).ready(function () { }); $modal.find('input[name="add_qty"]').val(quantity).change(); - $('ul.js_add_cart_variants').each(function () { + $('.js_add_cart_variants').each(function () { $('input.js_variant_change, select.js_variant_change', this).first().trigger('change'); }); @@ -74,7 +74,7 @@ $(document).ready(function () { var qty = $dom.find('input[name="add_qty"]').val(); var product_ids = [product_id]; var $products_dom = []; - $modal.find("ul.js_add_cart_variants[data-attribute_value_ids]").each(function(){ + $modal.find(".js_add_cart_variants[data-attribute_value_ids]").each(function(){ var $el = $(this); $products_dom.push($el); _.each($el.data("attribute_value_ids"), function (values) { |
