diff --git a/website_sale_secondary_unit/__manifest__.py b/website_sale_secondary_unit/__manifest__.py index 39da2798cc..91a6fb38df 100644 --- a/website_sale_secondary_unit/__manifest__.py +++ b/website_sale_secondary_unit/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Website Sale Secondary Unit", "summary": "Allow manage secondary units in website shop", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "development_status": "Beta", "category": "Website", "website": "https://github.com/OCA/e-commerce", diff --git a/website_sale_secondary_unit/readme/CONTRIBUTORS.rst b/website_sale_secondary_unit/readme/CONTRIBUTORS.rst index 5a78ea95cf..94cf8b8d42 100644 --- a/website_sale_secondary_unit/readme/CONTRIBUTORS.rst +++ b/website_sale_secondary_unit/readme/CONTRIBUTORS.rst @@ -2,3 +2,7 @@ * Sergio Teruel * Carlos Roca + +* `ArcheTI `_: + + * Carmen Rondon Regalado diff --git a/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.js b/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.js index aff2935b0e..44b76057fb 100644 --- a/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.js +++ b/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.js @@ -3,6 +3,28 @@ odoo.define("website_sale_secondary_unit.animation", function (require) { const VariantMixin = require("sale.VariantMixin"); const sAnimation = require("website.content.snippets.animation"); + var publicWidget = require("web.public.widget"); + require("website_sale.website_sale"); + + publicWidget.registry.WebsiteSale.include({ + _submitForm: function () { + if ( + this.$form.find('input[name="add_secondary_qty"]').val() !== undefined + ) { + this.rootProduct.add_secondary_qty = parseFloat( + this.$form.find('input[name="add_secondary_qty"]').val() + ); + } + if ( + this.$form.find('select[name="secondary_uom_id"]').val() !== undefined + ) { + this.rootProduct.secondary_uom_id = parseFloat( + this.$form.find('select[name="secondary_uom_id"]').val() + ); + } + return this._super(); + }, + }); sAnimation.registry.sale_secondary_unit = sAnimation.Class.extend(VariantMixin, { selector: ".secondary-unit", diff --git a/website_sale_secondary_unit/tests/test_website_sale_secondary_unit.py b/website_sale_secondary_unit/tests/test_website_sale_secondary_unit.py index 2f4508b703..c71382e00c 100644 --- a/website_sale_secondary_unit/tests/test_website_sale_secondary_unit.py +++ b/website_sale_secondary_unit/tests/test_website_sale_secondary_unit.py @@ -46,3 +46,13 @@ def setUp(self): def test_ui_website(self): """Test frontend tour.""" self.start_tour("/", "website_sale_secondary_unit", login="admin") + + def test_add_product_not_allowed_uom(self): + self.product_template.write({"allow_uom_sell": False}) + order = self.env['sale.order'].create( + {"partner_id": self.env.ref('base.res_partner_1').id} + ) + order._cart_update( + product_id=self.product_template.product_variant_id.id, add_qty=1 + ) + self.assertEqual(order.cart_quantity, 1) diff --git a/website_sale_secondary_unit/views/product_template_views.xml b/website_sale_secondary_unit/views/product_template_views.xml index c0d4aa4054..90e4edc2e3 100644 --- a/website_sale_secondary_unit/views/product_template_views.xml +++ b/website_sale_secondary_unit/views/product_template_views.xml @@ -7,7 +7,7 @@ product.template - +