pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website_sale: don't call get_unit_price at checkout

Browse Source 
Pricelist has been already applied in the sale order, so not needed.

If we refresh with the price computed by pricelist (gup), in
the case of a discount setted on the quotation order, the gup price
will override the real price from sale order by a price.
This commit is contained in:
Jeremy Kersten
2015-05-08 12:14:38 +02:00
parent c2de4e255c
commit a6b1141cb7
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/static/src/js/website_sale.js
+23 -15
View File
@@ -38,7 +38,7 @@ $('.oe_website_sale').each(function () {
});
$(oe_website_sale).on("change", 'input[name="add_qty"]', function (event) {
product_ids = [];
var product_ids = [];
var product_dom = $("ul.js_add_cart_variants[data-attribute_value_ids]").first();
product_dom.data("attribute_value_ids").forEach(function(entry) {
product_ids.push(entry[0]);});
@@ -72,21 +72,29 @@ $('.oe_website_sale').each(function () {
product_ids.push($(this).find('span[data-oe-model="product.product"]').data('oe-id'));
});
if (isNaN(value)) value = 0;
ajax.jsonRpc("/shop/get_unit_price", 'call', {
'product_ids': product_ids,
'add_qty': value})
.then(function (res) {
//basic case
$dom.find('span.oe_currency_value').last().text(res[product_id].toFixed(2));
$dom.find('.text-danger').toggle(res[product_id]<default_price && (default_price-res[product_id] > default_price/100));
//optional case
$dom_optional.each(function(){
var id = $(this).find('span[data-oe-model="product.product"]').data('oe-id');
var price = parseFloat($(this).find(".text-danger > span.oe_currency_value").text());
$(this).find("span.oe_currency_value").last().text(res[id].toFixed(2));
$(this).find('.text-danger').toggle(res[id]<price && (price-res[id]>price/100));
if ($(this).hasClass('js_no_gup')) { // if get_unit_price (gup) not needed
var gup = $.when();
}
else {
var gup = ajax.jsonRpc("/shop/get_unit_price", 'call', {
'product_ids': product_ids,
'add_qty': value})
.then(function (res) {
//basic case
$dom.find('span.oe_currency_value').last().text(res[product_id].toFixed(2));
$dom.find('.text-danger').toggle(res[product_id]<default_price && (default_price-res[product_id] > default_price/100));
//optional case
$dom_optional.each(function(){
var id = $(this).find('span[data-oe-model="product.product"]').data('oe-id');
var price = parseFloat($(this).find(".text-danger > span.oe_currency_value").text());
$(this).find("span.oe_currency_value").last().text(res[id].toFixed(2));
$(this).find('.text-danger').toggle(res[id]<price && (price-res[id]>price/100));
});
});
ajax.jsonRpc("/shop/cart/update_json", 'call', {
}
gup.then(function(res) {
ajax.jsonRpc("/shop/cart/update_json", 'call', {
'line_id': line_id,
'product_id': parseInt($input.data('product-id'),10),
'set_qty': value})
addons/website_sale/views/templates.xml
+1 -1
View File
@@ -661,7 +661,7 @@
<a t-attf-href="#" class="mb8 input-group-addon js_add_cart_json" data-no-instant="">
<i class="fa fa-minus"></i>
</a>
<input type="text" class="js_quantity form-control"
<input type="text" class="js_quantity js_no_gup form-control"
t-att-data-line-id="line.id"
t-att-data-product-id="line.product_id.id"
t-att-value="int(line.product_uom_qty)"/>
addons/website_sale_options/static/src/js/website_sale.js
+1 -1
View File
@@ -1,4 +1,4 @@
odoo.define('website_sale.website_sale', function(require) {
odoo.define('website_sale_options.website_sale', function(require) {
"use strict";
var ajax = require('web.ajax');