From cf87d9b5a3440351f146505be1dee63d223bd1cc Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Fri, 25 Sep 2015 16:33:43 +0200
Subject: [PATCH] [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
---
 addons/website_sale/static/src/js/website_sale.js         | 8 ++++----
 addons/website_sale/views/templates.xml                   | 2 +-
 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 469be5e7e1f..f7fe7a58364 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)})
@@ -152,7 +152,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");
@@ -223,7 +223,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 dba86c39c7e..8d258e3f249 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -373,7 +373,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) {