From 5f43d87a33b6e400fefe911a189e7c79b247fd57 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 6 Jun 2014 10:40:50 +0200 Subject: [PATCH 1/2] [IMP] website_sale: display image function of the selected product variant --- addons/website_sale/static/src/js/website_sale.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index 62c1f829bde..94580022151 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -78,17 +78,21 @@ $(document).ready(function () { $form_var.find('input:checked, select').each(function () { values.push(+$(this).val()); }); - var available = false; + var product_id = false; for (var k in variant_ids) { if (_.isEqual(variant_ids[k][1], values)) { var dec = variant_ids[k][2] % 1; - $('input[name="product_id"]').val(variant_ids[k][0]); + product_id = variant_ids[k][0]; + $('input[name="product_id"]').val(product_id); $price.html(variant_ids[k][2] + (dec < 0.01 ? ".00" : (dec < 1 ? "0" : "") )); - available = true; break; } } + if (product_id) { + $("#product_detail .product_detail_img").attr("src", "/website/image?field=image&model=product.product&id="+product_id); + } + $form_var.find("input:radio, select").each(function () { var id = +$(this).val(); var values = [id]; @@ -105,7 +109,7 @@ $(document).ready(function () { $(this).find("option[value='" + id + "']").addClass("css_not_available"); }); - if (available) { + if (product_id) { $(".oe_price_h4").removeClass("hidden"); $(".oe_not_available").addClass("hidden"); } else { From ef48c4d440bcfc032f237ed05317cf12c8080651 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 6 Jun 2014 10:57:50 +0200 Subject: [PATCH 2/2] [FIX] website_sale: disable button does'nt work in the product template. --- addons/website_sale/static/src/js/website_sale.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index 94580022151..e0b04a8e07f 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -73,7 +73,7 @@ $(document).ready(function () { $form_var.on('change', 'input, select', function (ev) { var values = []; $form_var.find("label").removeClass("text-muted css_not_available"); - $form_var.find(".a-submit").removeProp("disabled"); + $form_var.find(".a-submit").removeAttr("disabled"); $form_var.find('input:checked, select').each(function () { values.push(+$(this).val()); @@ -116,10 +116,9 @@ $(document).ready(function () { $(".oe_price_h4").addClass("hidden"); $(".oe_not_available").removeClass("hidden"); $form_var.find('input[name="product_id"]').val(0); - $form_var.find(".a-submit").prop("disabled", "disabled"); + $form_var.find(".a-submit").attr("disabled", "disabled"); } }); $form_var.find("input:first").trigger('change'); - });