diff options
12 files changed, 41 insertions, 41 deletions
diff --git a/addons/sale/static/src/js/product_configurator_mixin.js b/addons/sale/static/src/js/variant_mixin.js index 54bf9379639..3e66df0a8c1 100644 --- a/addons/sale/static/src/js/product_configurator_mixin.js +++ b/addons/sale/static/src/js/variant_mixin.js @@ -1,4 +1,4 @@ -odoo.define('sale.ProductConfiguratorMixin', function (require) { +odoo.define('sale.VariantMixin', function (require) { 'use strict'; var core = require('web.core'); @@ -6,7 +6,7 @@ var utils = require('web.utils'); var ajax = require('web.ajax'); var _t = core._t; -var ProductConfiguratorMixin = { +var VariantMixin = { events: { 'click .css_attribute_color input': '_onChangeColorAttribute', 'change .main_product:not(.in_cart) input.js_quantity': 'onChangeAddQuantity', @@ -508,8 +508,8 @@ var ProductConfiguratorMixin = { var $price = $parent.find(".oe_price:first .oe_currency_value"); var $default_price = $parent.find(".oe_default_price:first .oe_currency_value"); var $optional_price = $parent.find(".oe_optional:first .oe_currency_value"); - $price.html(self._priceToStr(combination.price)); - $default_price.html(self._priceToStr(combination.list_price)); + $price.text(self._priceToStr(combination.price)); + $default_price.text(self._priceToStr(combination.list_price)); // compatibility_check to remove in master // needed for fix in 12.0 in the case of git pull and no server restart @@ -563,12 +563,12 @@ var ProductConfiguratorMixin = { $parent .find('.product_display_name') .first() - .val(combination.display_name); + .text(combination.display_name); $parent .find('.js_raw_price') .first() - .html(combination.price) + .text(combination.price) .trigger('change'); this.handleCustomValues($(ev.target)); @@ -652,6 +652,6 @@ var ProductConfiguratorMixin = { } }; -return ProductConfiguratorMixin; +return VariantMixin; }); diff --git a/addons/sale_product_configurator/static/src/js/product_configurator_controller.js b/addons/sale_product_configurator/static/src/js/product_configurator_controller.js index 18f006d3de9..1b162f3f301 100644 --- a/addons/sale_product_configurator/static/src/js/product_configurator_controller.js +++ b/addons/sale_product_configurator/static/src/js/product_configurator_controller.js @@ -276,9 +276,9 @@ var ProductConfiguratorFormController = FormController.extend({ * {integer} products.product_id: the id of the product * {integer} products.quantity: the added quantity for this product * {Array} products.product_custom_attribute_values: - * see product_configurator_mixin.getCustomVariantValues + * see variant_mixin.getCustomVariantValues * {Array} products.no_variant_attribute_values: - * see product_configurator_mixin.getNoVariantAttributeValues + * see variant_mixin.getNoVariantAttributeValues */ _addProducts: function (products) { this.do_action({type: 'ir.actions.act_window_close', infos: { diff --git a/addons/sale_product_configurator/static/src/js/product_configurator_modal.js b/addons/sale_product_configurator/static/src/js/product_configurator_modal.js index 104b0df0903..25835e1c539 100644 --- a/addons/sale_product_configurator/static/src/js/product_configurator_modal.js +++ b/addons/sale_product_configurator/static/src/js/product_configurator_modal.js @@ -4,13 +4,13 @@ odoo.define('sale_product_configurator.OptionalProductsModal', function (require var ajax = require('web.ajax'); var Dialog = require('web.Dialog'); var ServicesMixin = require('web.ServicesMixin'); -var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); +var VariantMixin = require('sale.VariantMixin'); var productNameMap = {}; var optionalProductsMap = {}; -var OptionalProductsModal = Dialog.extend(ServicesMixin, ProductConfiguratorMixin, { - events: _.extend({}, Dialog.prototype.events, ProductConfiguratorMixin.events, { +var OptionalProductsModal = Dialog.extend(ServicesMixin, VariantMixin, { + events: _.extend({}, Dialog.prototype.events, VariantMixin.events, { 'click a.js_add, a.js_remove': '_onAddOrRemoveOption', 'change .in_cart.main_product input.js_quantity': '_onChangeQuantity', 'change .js_raw_price': '_computePriceTotal' @@ -447,7 +447,7 @@ var OptionalProductsModal = Dialog.extend(ServicesMixin, ProductConfiguratorMixi .first() .text(combination.display_name); - ProductConfiguratorMixin._onChangeCombination.apply(this, arguments); + VariantMixin._onChangeCombination.apply(this, arguments); }, /** * When the quantity of the root product is updated, we need to update diff --git a/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js b/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js index eee2bdb8fea..339254c8e45 100644 --- a/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js +++ b/addons/sale_product_configurator/static/src/js/product_configurator_renderer.js @@ -2,9 +2,9 @@ odoo.define('sale_product_configurator.ProductConfiguratorFormRenderer', functio "use strict"; var FormRenderer = require('web.FormRenderer'); -var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); +var VariantMixin = require('sale.VariantMixin'); -var ProductConfiguratorFormRenderer = FormRenderer.extend(ProductConfiguratorMixin, { +var ProductConfiguratorFormRenderer = FormRenderer.extend(VariantMixin, { /** * @override */ diff --git a/addons/sale_product_configurator/views/assets.xml b/addons/sale_product_configurator/views/assets.xml index ce625666c04..f14e1f53ccd 100644 --- a/addons/sale_product_configurator/views/assets.xml +++ b/addons/sale_product_configurator/views/assets.xml @@ -6,7 +6,7 @@ </xpath> <xpath expr="script[last()]" position="after"> <script type="text/javascript" src="/sale_product_configurator/static/src/js/tour.js"></script> - <script type="text/javascript" src="/sale/static/src/js/product_configurator_mixin.js"></script> + <script type="text/javascript" src="/sale/static/src/js/variant_mixin.js"></script> <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_renderer.js"></script> <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_controller.js"></script> <script type="text/javascript" src="/sale_product_configurator/static/src/js/product_configurator_view.js"></script> diff --git a/addons/website_sale/static/src/js/product_configurator_mixin.js b/addons/website_sale/static/src/js/variant_mixin.js index 683ee27c465..0e92564bd5c 100644 --- a/addons/website_sale/static/src/js/product_configurator_mixin.js +++ b/addons/website_sale/static/src/js/variant_mixin.js @@ -1,7 +1,7 @@ -odoo.define('website_sale_.ProductConfiguratorMixin', function (require) { +odoo.define('website_sale.VariantMixin', function (require) { 'use strict'; -var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); +var VariantMixin = require('sale.VariantMixin'); /** * Website behavior is slightly different from backend so we append @@ -10,7 +10,7 @@ var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); * @private * @param {string} uri The uri to adapt */ -ProductConfiguratorMixin._getUri = function (uri) { +VariantMixin._getUri = function (uri) { if (this.isWebsite){ return uri + '_website'; } else { @@ -18,6 +18,6 @@ ProductConfiguratorMixin._getUri = function (uri) { } }; -return ProductConfiguratorMixin; +return VariantMixin; }); diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index 677c37e01f3..5ec92758b62 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -121,12 +121,12 @@ odoo.define('website_sale.website_sale', function (require) { var core = require('web.core'); var config = require('web.config'); var publicWidget = require('web.public.widget'); -var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); +var VariantMixin = require('sale.VariantMixin'); require("website.content.zoomodoo"); -publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(ProductConfiguratorMixin, { +publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(VariantMixin, { selector: '.oe_website_sale', - events: _.extend({}, ProductConfiguratorMixin.events || {}, { + events: _.extend({}, VariantMixin.events || {}, { 'change form .js_product:first input[name="add_qty"]': '_onChangeAddQuantity', 'mouseup .js_publish': '_onMouseupPublish', 'touchend .js_publish': '_onMouseupPublish', @@ -199,7 +199,7 @@ publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(ProductConfigurat if (combination) { return JSON.parse(combination); } - return ProductConfiguratorMixin.getSelectedVariantValues.apply(this, arguments); + return VariantMixin.getSelectedVariantValues.apply(this, arguments); }, //-------------------------------------------------------------------------- @@ -327,7 +327,7 @@ publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(ProductConfigurat return parseInt($parent.find('input.js_product_change:checked').val()); } else { - return ProductConfiguratorMixin._getProductId.apply(this, arguments); + return VariantMixin._getProductId.apply(this, arguments); } }, /** @@ -675,7 +675,7 @@ publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(ProductConfigurat $el.attr('selected', $el.is(':selected')); }); - return ProductConfiguratorMixin.onChangeVariant.apply(this, arguments); + return VariantMixin.onChangeVariant.apply(this, arguments); }, /** * @private diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index ccff8a1ad5d..a4935b6dd46 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -19,8 +19,8 @@ <link rel="stylesheet" type="text/scss" href="/sale/static/src/scss/product_configurator.scss"/> </xpath> <xpath expr="script[last()]" position="after"> - <script type="text/javascript" src="/sale/static/src/js/product_configurator_mixin.js"></script> - <script type="text/javascript" src="/website_sale/static/src/js/product_configurator_mixin.js"></script> + <script type="text/javascript" src="/sale/static/src/js/variant_mixin.js"></script> + <script type="text/javascript" src="/website_sale/static/src/js/variant_mixin.js"></script> <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script> <script type="text/javascript" src="/website_sale/static/src/js/website_sale_utils.js"></script> <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script> diff --git a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js index 9410db2c21a..306ee1a44f9 100644 --- a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js +++ b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js @@ -4,16 +4,16 @@ odoo.define('website_sale_comparison.comparison', function (require) { var core = require('web.core'); var publicWidget = require('web.public.widget'); var utils = require('web.utils'); -var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); +var VariantMixin = require('sale.VariantMixin'); var website_sale_utils = require('website_sale.utils'); var qweb = core.qweb; var _t = core._t; -// ProductConfiguratorMixin events are overridden on purpose here +// VariantMixin events are overridden on purpose here // to avoid registering them more than once since they are already registered // in website_sale.js -var ProductComparison = publicWidget.Widget.extend(ProductConfiguratorMixin, { +var ProductComparison = publicWidget.Widget.extend(VariantMixin, { xmlDependencies: ['/website_sale_comparison/static/src/xml/comparison.xml'], template: 'product_comparison_template', diff --git a/addons/website_sale_stock/static/src/js/product_configurator_mixin.js b/addons/website_sale_stock/static/src/js/variant_mixin.js index e844f90a649..efb828d64d5 100644 --- a/addons/website_sale_stock/static/src/js/product_configurator_mixin.js +++ b/addons/website_sale_stock/static/src/js/variant_mixin.js @@ -1,7 +1,7 @@ -odoo.define('website_sale_stock.ProductConfiguratorMixin', function (require) { +odoo.define('website_sale_stock.VariantMixin', function (require) { 'use strict'; -var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); +var VariantMixin = require('sale.VariantMixin'); var publicWidget = require('web.public.widget'); var ajax = require('web.ajax'); var core = require('web.core'); @@ -12,7 +12,7 @@ var xml_load = ajax.loadXML( ); /** - * Addition to the product_configurator_mixin._onChangeCombination + * Addition to the variant_mixin._onChangeCombination * * This will prevent the user from selecting a quantity that is not available in the * stock for that product. @@ -26,7 +26,7 @@ var xml_load = ajax.loadXML( * @param {$.Element} $parent * @param {Array} combination */ -ProductConfiguratorMixin._onChangeCombinationStock = function (ev, $parent, combination) { +VariantMixin._onChangeCombinationStock = function (ev, $parent, combination) { var product_id = 0; // needed for list view of variants if ($parent.find('input.product_id:checked').length) { @@ -82,10 +82,10 @@ publicWidget.registry.WebsiteSale.include({ */ _onChangeCombination: function (){ this._super.apply(this, arguments); - ProductConfiguratorMixin._onChangeCombinationStock.apply(this, arguments); + VariantMixin._onChangeCombinationStock.apply(this, arguments); } }); -return ProductConfiguratorMixin; +return VariantMixin; }); diff --git a/addons/website_sale_stock/views/website_sale_stock_templates.xml b/addons/website_sale_stock/views/website_sale_stock_templates.xml index cbfbebc068e..bd215e90516 100644 --- a/addons/website_sale_stock/views/website_sale_stock_templates.xml +++ b/addons/website_sale_stock/views/website_sale_stock_templates.xml @@ -2,7 +2,7 @@ <odoo> <template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Sale Stock"> <xpath expr="." position="inside"> - <script type="text/javascript" src="/website_sale_stock/static/src/js/product_configurator_mixin.js" /> + <script type="text/javascript" src="/website_sale_stock/static/src/js/variant_mixin.js" /> </xpath> </template> diff --git a/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js b/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js index 53f821c28c1..49ab188b294 100644 --- a/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js +++ b/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js @@ -3,12 +3,12 @@ odoo.define('website_sale_wishlist.wishlist', function (require) { var publicWidget = require('web.public.widget'); var wSaleUtils = require('website_sale.utils'); -var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin'); +var VariantMixin = require('sale.VariantMixin'); -// ProductConfiguratorMixin events are overridden on purpose here +// VariantMixin events are overridden on purpose here // to avoid registering them more than once since they are already registered // in website_sale.js -publicWidget.registry.ProductWishlist = publicWidget.Widget.extend(ProductConfiguratorMixin, { +publicWidget.registry.ProductWishlist = publicWidget.Widget.extend(VariantMixin, { selector: '.oe_website_sale', events: { 'click #my_wish': '_onClickMyWish', |