From 4566e9379d8080ce47ec4af00982040abb65909b Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Mon, 4 Mar 2019 12:51:21 +0100 Subject: [PATCH 1/7] [11.0][ADD] website_sale_secondary_unit: New module --- website_sale_secondary_unit/README.rst | 87 ++++ website_sale_secondary_unit/__init__.py | 4 + website_sale_secondary_unit/__manifest__.py | 30 ++ .../controllers/__init__.py | 2 + .../controllers/main.py | 31 ++ website_sale_secondary_unit/data/demo.xml | 26 ++ website_sale_secondary_unit/hooks.py | 14 + website_sale_secondary_unit/i18n/es.po | 60 +++ .../i18n/website_sale_secondary_unit.pot | 59 +++ .../models/__init__.py | 4 + .../models/product_secondary_unit.py | 10 + .../models/product_template.py | 12 + .../models/sale_order.py | 98 ++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 2 + website_sale_secondary_unit/readme/USAGE.rst | 9 + .../security/ir.model.access.csv | 5 + .../security/website_sale_secondary_unit.xml | 15 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 434 ++++++++++++++++++ .../src/js/website_sale_secondary_unit.js | 88 ++++ .../js/website_sale_secondary_unit_tour.js | 62 +++ .../src/less/website_sale_secondary_unit.less | 3 + website_sale_secondary_unit/tests/__init__.py | 1 + .../tests/test_website_sale_secondary_unit.py | 18 + website_sale_secondary_unit/views/assets.xml | 13 + .../views/product_secondary_unit_views.xml | 16 + .../views/product_template_views.xml | 17 + .../views/templates.xml | 156 +++++++ 29 files changed, 1277 insertions(+) create mode 100644 website_sale_secondary_unit/README.rst create mode 100644 website_sale_secondary_unit/__init__.py create mode 100644 website_sale_secondary_unit/__manifest__.py create mode 100644 website_sale_secondary_unit/controllers/__init__.py create mode 100644 website_sale_secondary_unit/controllers/main.py create mode 100644 website_sale_secondary_unit/data/demo.xml create mode 100644 website_sale_secondary_unit/hooks.py create mode 100644 website_sale_secondary_unit/i18n/es.po create mode 100644 website_sale_secondary_unit/i18n/website_sale_secondary_unit.pot create mode 100644 website_sale_secondary_unit/models/__init__.py create mode 100644 website_sale_secondary_unit/models/product_secondary_unit.py create mode 100644 website_sale_secondary_unit/models/product_template.py create mode 100644 website_sale_secondary_unit/models/sale_order.py create mode 100644 website_sale_secondary_unit/readme/CONTRIBUTORS.rst create mode 100644 website_sale_secondary_unit/readme/DESCRIPTION.rst create mode 100644 website_sale_secondary_unit/readme/USAGE.rst create mode 100644 website_sale_secondary_unit/security/ir.model.access.csv create mode 100644 website_sale_secondary_unit/security/website_sale_secondary_unit.xml create mode 100644 website_sale_secondary_unit/static/description/icon.png create mode 100644 website_sale_secondary_unit/static/description/index.html create mode 100644 website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.js create mode 100644 website_sale_secondary_unit/static/src/js/website_sale_secondary_unit_tour.js create mode 100644 website_sale_secondary_unit/static/src/less/website_sale_secondary_unit.less create mode 100644 website_sale_secondary_unit/tests/__init__.py create mode 100644 website_sale_secondary_unit/tests/test_website_sale_secondary_unit.py create mode 100644 website_sale_secondary_unit/views/assets.xml create mode 100755 website_sale_secondary_unit/views/product_secondary_unit_views.xml create mode 100755 website_sale_secondary_unit/views/product_template_views.xml create mode 100755 website_sale_secondary_unit/views/templates.xml diff --git a/website_sale_secondary_unit/README.rst b/website_sale_secondary_unit/README.rst new file mode 100644 index 0000000000..9e44e6218b --- /dev/null +++ b/website_sale_secondary_unit/README.rst @@ -0,0 +1,87 @@ +=========================== +Website Sale Secondary Unit +=========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github + :target: https://github.com/OCA/e-commerce/tree/11.0/website_sale_secondary_unit + :alt: OCA/e-commerce +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/e-commerce-11-0/e-commerce-11-0-website_sale_secondary_unit + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/113/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of sale_order_secondary_unit module to +allow sell products in online store in secondary units defined. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module you need to: + +* Go to *'Sales > Catalog > Products'*. +* Create secondary units for a product. +* Go to Website Shop and buy this product, you will see a selectable option + with all secondary units defined in the product and visible in website. +* If you do not want to sell in a base product unit and only allow sell in a + secondary unit you can disable the option *'Allow to sell in unit of + measure'* in a product sale tab. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* Sergio Teruel + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/e-commerce `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_sale_secondary_unit/__init__.py b/website_sale_secondary_unit/__init__.py new file mode 100644 index 0000000000..b754b9b624 --- /dev/null +++ b/website_sale_secondary_unit/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import controllers +from . import models +from .hooks import post_init_hook diff --git a/website_sale_secondary_unit/__manifest__.py b/website_sale_secondary_unit/__manifest__.py new file mode 100644 index 0000000000..b9fbb39de0 --- /dev/null +++ b/website_sale_secondary_unit/__manifest__.py @@ -0,0 +1,30 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + 'name': 'Website Sale Secondary Unit', + 'summary': 'Allow manage secondary units in website shop', + 'version': '11.0.1.0.0', + 'development_status': 'Beta', + 'category': 'Website', + 'website': 'https://github.com/OCA/e-commerce', + 'author': 'Tecnativa, Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'application': False, + 'installable': True, + 'depends': [ + 'website_sale', + 'sale_order_secondary_unit', + ], + 'data': [ + 'security/ir.model.access.csv', + 'security/website_sale_secondary_unit.xml', + 'views/assets.xml', + 'views/product_template_views.xml', + 'views/product_secondary_unit_views.xml', + 'views/templates.xml', + ], + 'demo': [ + 'data/demo.xml', + ], + 'post_init_hook': 'post_init_hook', +} diff --git a/website_sale_secondary_unit/controllers/__init__.py b/website_sale_secondary_unit/controllers/__init__.py new file mode 100644 index 0000000000..dea930adca --- /dev/null +++ b/website_sale_secondary_unit/controllers/__init__.py @@ -0,0 +1,2 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import main diff --git a/website_sale_secondary_unit/controllers/main.py b/website_sale_secondary_unit/controllers/main.py new file mode 100644 index 0000000000..0140df3e0c --- /dev/null +++ b/website_sale_secondary_unit/controllers/main.py @@ -0,0 +1,31 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo.addons.website_sale.controllers.main import WebsiteSale +from odoo import http +from odoo.http import request + + +class WebsiteSaleSecondaryUnit(WebsiteSale): + + @http.route() + def cart_update(self, product_id, add_qty=1, set_qty=0, **kw): + # Add secondary uom info to session + request.session.pop('secondary_uom_id', None) + if 'secondary_uom_id' in kw: + secondary_uom = request.env['product.secondary.unit'].browse( + int(kw['secondary_uom_id'])) + request.session['secondary_uom_id'] = secondary_uom.id + return super(WebsiteSaleSecondaryUnit, self).cart_update( + product_id, add_qty=add_qty, set_qty=set_qty, **kw) + + @http.route() + def cart_update_json(self, product_id, line_id=None, add_qty=None, + set_qty=None, display=True): + so_line = request.env['sale.order.line'].browse(line_id) + request.session.pop('secondary_uom_id', None) + if so_line.sudo().secondary_uom_id: + request.session['secondary_uom_id'] = \ + so_line.sudo().secondary_uom_id.id + return super(WebsiteSaleSecondaryUnit, self).cart_update_json( + product_id, line_id=line_id, add_qty=add_qty, set_qty=set_qty, + display=display) diff --git a/website_sale_secondary_unit/data/demo.xml b/website_sale_secondary_unit/data/demo.xml new file mode 100644 index 0000000000..84873676c2 --- /dev/null +++ b/website_sale_secondary_unit/data/demo.xml @@ -0,0 +1,26 @@ + + + + + Box + + 5.0 + + True + + + + Box + + 10.0 + + True + + + + + + + + diff --git a/website_sale_secondary_unit/hooks.py b/website_sale_secondary_unit/hooks.py new file mode 100644 index 0000000000..63727480e5 --- /dev/null +++ b/website_sale_secondary_unit/hooks.py @@ -0,0 +1,14 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + + +def post_init_hook(cr, registry): + """ + At installation time, set allow_uom_sell field as true for all products + that have already been created. + """ + cr.execute(""" + UPDATE product_template + SET allow_uom_sell=true + WHERE allow_uom_sell IS NULL; + """) diff --git a/website_sale_secondary_unit/i18n/es.po b/website_sale_secondary_unit/i18n/es.po new file mode 100644 index 0000000000..47f94e9cd7 --- /dev/null +++ b/website_sale_secondary_unit/i18n/es.po @@ -0,0 +1,60 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_sale_secondary_unit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-13 16:54+0000\n" +"PO-Revision-Date: 2019-03-13 17:56+0100\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.6\n" + +#. module: website_sale_secondary_unit +#: model:ir.model.fields,field_description:website_sale_secondary_unit.field_product_product_allow_uom_sell +#: model:ir.model.fields,field_description:website_sale_secondary_unit.field_product_template_allow_uom_sell +msgid "Allow to sell in unit of measure" +msgstr "Permitir vender en la unidad de medida" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_product_template +msgid "Product Template" +msgstr "Plantilla de producto" + +#. module: website_sale_secondary_unit +#: model:ir.ui.view,arch_db:website_sale_secondary_unit.cart_popover +msgid "Qty:" +msgstr "Ctdad." + +#. module: website_sale_secondary_unit +#: model:ir.ui.view,arch_db:website_sale_secondary_unit.cart_lines +#: model:ir.ui.view,arch_db:website_sale_secondary_unit.payment +msgid "Quantity" +msgstr "Cantidad" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_sale_order +msgid "Quotation" +msgstr "Presupuesto" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_sale_order_line +msgid "Sales Order Line" +msgstr "Línea de pedido" + +#. module: website_sale_secondary_unit +#: model:ir.model.fields,field_description:website_sale_secondary_unit.field_product_secondary_unit_website_published +msgid "Visible in Website" +msgstr "Visible en website" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_product_secondary_unit +msgid "product.secondary.unit" +msgstr "" diff --git a/website_sale_secondary_unit/i18n/website_sale_secondary_unit.pot b/website_sale_secondary_unit/i18n/website_sale_secondary_unit.pot new file mode 100644 index 0000000000..2980005ec1 --- /dev/null +++ b/website_sale_secondary_unit/i18n/website_sale_secondary_unit.pot @@ -0,0 +1,59 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_sale_secondary_unit +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-13 16:54+0000\n" +"PO-Revision-Date: 2019-03-13 16:54+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: website_sale_secondary_unit +#: model:ir.model.fields,field_description:website_sale_secondary_unit.field_product_product_allow_uom_sell +#: model:ir.model.fields,field_description:website_sale_secondary_unit.field_product_template_allow_uom_sell +msgid "Allow to sell in unit of measure" +msgstr "" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_product_template +msgid "Product Template" +msgstr "" + +#. module: website_sale_secondary_unit +#: model:ir.ui.view,arch_db:website_sale_secondary_unit.cart_popover +msgid "Qty:" +msgstr "" + +#. module: website_sale_secondary_unit +#: model:ir.ui.view,arch_db:website_sale_secondary_unit.cart_lines +#: model:ir.ui.view,arch_db:website_sale_secondary_unit.payment +msgid "Quantity" +msgstr "" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_sale_order +msgid "Quotation" +msgstr "" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: website_sale_secondary_unit +#: model:ir.model.fields,field_description:website_sale_secondary_unit.field_product_secondary_unit_website_published +msgid "Visible in Website" +msgstr "" + +#. module: website_sale_secondary_unit +#: model:ir.model,name:website_sale_secondary_unit.model_product_secondary_unit +msgid "product.secondary.unit" +msgstr "" + diff --git a/website_sale_secondary_unit/models/__init__.py b/website_sale_secondary_unit/models/__init__.py new file mode 100644 index 0000000000..b4c2be4f9d --- /dev/null +++ b/website_sale_secondary_unit/models/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from . import product_template +from . import product_secondary_unit +from . import sale_order diff --git a/website_sale_secondary_unit/models/product_secondary_unit.py b/website_sale_secondary_unit/models/product_secondary_unit.py new file mode 100644 index 0000000000..dd2b1f9f56 --- /dev/null +++ b/website_sale_secondary_unit/models/product_secondary_unit.py @@ -0,0 +1,10 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import models, fields + + +class ProductSecondaryUnit(models.Model): + _inherit = ['product.secondary.unit', 'website.published.mixin'] + _name = 'product.secondary.unit' + + website_published = fields.Boolean(default=True) diff --git a/website_sale_secondary_unit/models/product_template.py b/website_sale_secondary_unit/models/product_template.py new file mode 100644 index 0000000000..c60e43e2f9 --- /dev/null +++ b/website_sale_secondary_unit/models/product_template.py @@ -0,0 +1,12 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import models, fields + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + allow_uom_sell = fields.Boolean( + string='Allow to sell in unit of measure', + default=True, + ) diff --git a/website_sale_secondary_unit/models/sale_order.py b/website_sale_secondary_unit/models/sale_order.py new file mode 100644 index 0000000000..8607c7d4ea --- /dev/null +++ b/website_sale_secondary_unit/models/sale_order.py @@ -0,0 +1,98 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import api, models +from odoo.http import request +from odoo.tools.float_utils import float_round + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + @api.multi + def _cart_find_product_line(self, product_id=None, line_id=None, **kwargs): + """ + Search sale order lines with secondary units + """ + so_lines = super()._cart_find_product_line( + product_id=product_id, line_id=line_id, **kwargs) + if so_lines: + if line_id: + sol = self.env['sale.order.line'].browse(line_id) + secondary_uom_id = sol.secondary_uom_id.id + else: + secondary_uom_id = self.env.context.get( + 'secondary_uom_id', False) + so_lines = so_lines.filtered( + lambda x: x.secondary_uom_id.id == secondary_uom_id) + return so_lines + + @api.multi + def _website_product_id_change(self, order_id, product_id, qty=0): + res = super()._website_product_id_change( + order_id, product_id, qty=qty) + secondary_uom_id = self.env.context.get('secondary_uom_id', False) + res['secondary_uom_id'] = secondary_uom_id + return res + + @api.multi + def _cart_update(self, product_id=None, line_id=None, add_qty=0, set_qty=0, + attributes=None, **kwargs): + if line_id: + sol = self.env['sale.order.line'].browse(line_id) + secondary_uom_id = sol.secondary_uom_id.id + else: + secondary_uom_id = request.session.get('secondary_uom_id', False) + ctx = self.env.context.copy() + if secondary_uom_id: + ctx['secondary_uom_id'] = secondary_uom_id + res = super(SaleOrder, self.with_context(ctx))._cart_update( + product_id=product_id, + line_id=line_id, + add_qty=add_qty, + set_qty=set_qty, + attributes=attributes, **kwargs) + return res + + def _compute_cart_info(self): + super(SaleOrder, self)._compute_cart_info() + for order in self: + secondary_unit_lines = order.website_order_line.filtered( + 'secondary_uom_id') + if secondary_unit_lines: + cart_secondary_quantity = int(sum( + secondary_unit_lines.mapped('secondary_uom_qty'))) + so_lines = order.website_order_line - secondary_unit_lines + cart_quantity = int(sum(so_lines.mapped('product_uom_qty'))) + order.cart_quantity = cart_quantity + cart_secondary_quantity + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + def create(self, vals): + SecondaryUom = self.env['product.secondary.unit'] + secondary_uom = SecondaryUom.browse( + vals.get('secondary_uom_id', False)) + product_uom = self.env['product.uom'].browse(vals['product_uom']) + if secondary_uom: + factor = secondary_uom.factor * product_uom.factor + vals['secondary_uom_qty'] = float_round( + vals['product_uom_qty'] / (factor or 1.0), + precision_rounding=secondary_uom.uom_id.rounding + ) + return super(SaleOrderLine, self).create(vals) + + def write(self, vals): + SecondaryUom = self.env['product.secondary.unit'] + for line in self: + secondary_uom = ('secondary_uom_id' in vals and + SecondaryUom.browse(vals['secondary_uom_id']) or + line.secondary_uom_id) + if 'product_uom_qty' in vals and secondary_uom: + factor = secondary_uom.factor * vals.get( + 'product_uom', line.product_uom.factor) + vals['secondary_uom_qty'] = float_round( + vals['product_uom_qty'] / (factor or 1.0), + precision_rounding=secondary_uom.uom_id.rounding + ) + return super(SaleOrderLine, self).write(vals) diff --git a/website_sale_secondary_unit/readme/CONTRIBUTORS.rst b/website_sale_secondary_unit/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..f24a0b0dc7 --- /dev/null +++ b/website_sale_secondary_unit/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Sergio Teruel diff --git a/website_sale_secondary_unit/readme/DESCRIPTION.rst b/website_sale_secondary_unit/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..9c64f39cc2 --- /dev/null +++ b/website_sale_secondary_unit/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends the functionality of sale_order_secondary_unit module to +allow sell products in online store in secondary units defined. diff --git a/website_sale_secondary_unit/readme/USAGE.rst b/website_sale_secondary_unit/readme/USAGE.rst new file mode 100644 index 0000000000..a7114cb809 --- /dev/null +++ b/website_sale_secondary_unit/readme/USAGE.rst @@ -0,0 +1,9 @@ +To use this module you need to: + +* Go to *'Sales > Catalog > Products'*. +* Create secondary units for a product. +* Go to Website Shop and buy this product, you will see a selectable option + with all secondary units defined in the product and visible in website. +* If you do not want to sell in a base product unit and only allow sell in a + secondary unit you can disable the option *'Allow to sell in unit of + measure'* in a product sale tab. diff --git a/website_sale_secondary_unit/security/ir.model.access.csv b/website_sale_secondary_unit/security/ir.model.access.csv new file mode 100644 index 0000000000..2c3a3e2827 --- /dev/null +++ b/website_sale_secondary_unit/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_product_secondary_unit_public,access_product_second_unit_public,product_secondary_unit.model_product_secondary_unit,base.group_public,1,0,0,0 +access_product_secondary_unit_portal,access_product_second_unit_portal,product_secondary_unit.model_product_secondary_unit,base.group_portal,1,0,0,0 +access_product_uom_public,access_product_uom_public,product.model_product_uom,base.group_public,1,0,0,0 +access_product_uom_portal,access_product_uom_portal,product.model_product_uom,base.group_portal,1,0,0,0 diff --git a/website_sale_secondary_unit/security/website_sale_secondary_unit.xml b/website_sale_secondary_unit/security/website_sale_secondary_unit.xml new file mode 100644 index 0000000000..bed211a681 --- /dev/null +++ b/website_sale_secondary_unit/security/website_sale_secondary_unit.xml @@ -0,0 +1,15 @@ + + + + + Public secondary unit + + [('website_published', '=', True)] + + + + + + + + diff --git a/website_sale_secondary_unit/static/description/icon.png b/website_sale_secondary_unit/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/website_sale_secondary_unit/static/description/index.html b/website_sale_secondary_unit/static/description/index.html new file mode 100644 index 0000000000..ddb338b603 --- /dev/null +++ b/website_sale_secondary_unit/static/description/index.html @@ -0,0 +1,434 @@ + + + + + + +Website Sale Secondary Unit + + + +
+

Website Sale Secondary Unit

+ + +

Beta License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

+

This module extends the functionality of sale_order_secondary_unit module to +allow sell products in online store in secondary units defined.

+

Table of contents

+ +
+

Usage

+

To use this module you need to:

+
    +
  • Go to ‘Sales > Catalog > Products’.
    • +
  • Create secondary units for a product.
    • +
  • Go to Website Shop and buy this product, you will see a selectable option +with all secondary units defined in the product and visible in website.
    • +
  • If you do not want to sell in a base product unit and only allow sell in a +secondary unit you can disable the option ‘Allow to sell in unit of +measure’ in a product sale tab.
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/e-commerce project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + 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 new file mode 100644 index 0000000000..8265d5b22f --- /dev/null +++ b/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit.js @@ -0,0 +1,88 @@ +odoo.define('website_sale_secondary_unit.animation', function (require) { +'use strict'; + +var core = require('web.core'); +var sAnimation = require('website.content.snippets.animation'); + + +sAnimation.registry.sale_secondary_unit = sAnimation.Class.extend({ + selector: ".secondary-unit", + init: function (parent, editableMode) { + this._super.apply(this, arguments); + this.$secondary_uom = null; + this.$secondary_uom_qty = null; + this.$product_qty = null; + this.secondary_uom_qty = null; + this.secondary_uom_factor = null; + this.product_uom_factor = null; + this.product_qty = null; + }, + start: function () { + var self = this; + self.$secondary_uom = $('#secondary_uom'); + self.$secondary_uom_qty = $('.secondary-quantity'); + self.$product_qty = $('.quantity'); + self._setValues(); + this.$target.on('change', '.secondary-quantity', function () { + self._onChangeSecondaryUom(); + }); + this.$target.on('change', '#secondary_uom', function () { + self._onChangeSecondaryUom(); + }); + this.$product_qty.on('change', null, function () { + self._onChangeProductQty(); + }); + if(self.secondary_uom_qty){ + self._onChangeSecondaryUom(); + }; + }, + _setValues: function(){ + this.secondary_uom_qty = parseFloat(this.$target.find('.secondary-quantity').val()); + this.secondary_uom_factor = parseFloat($('option:selected', this.$secondary_uom).data('secondary-uom-factor')); + this.product_uom_factor = parseFloat($('option:selected', this.$secondary_uom).data('product-uom-factor')); + this.product_qty = parseFloat($('.quantity').val()); + }, + + _onChangeSecondaryUom: function(){ + this._setValues() + var factor = this.secondary_uom_factor * this.product_uom_factor; + this.$product_qty.val(this.secondary_uom_qty * factor) + }, + _onChangeProductQty: function(){ + this._setValues(); + var factor = this.secondary_uom_factor * this.product_uom_factor; + this.$secondary_uom_qty.val(this.product_qty / factor); + }, +}); + +sAnimation.registry.sale_secondary_unit_cart = sAnimation.Class.extend({ + selector: ".oe_cart", + init: function (parent, editableMode) { + this._super.apply(this, arguments); + this.$product_qty = null; + this.secondary_uom_qty = null; + this.secondary_uom_factor = null; + this.product_uom_factor = null; + this.product_qty = null; + }, + start: function () { + var self = this; + this.$target.on('change', 'input.js_secondary_quantity[data-line-id]', function () { + self._onChangeSecondaryUom(this); + }); + }, + _setValues: function(order_line){ + this.$product_qty = this.$target.find('.quantity[data-line-id='+ order_line.dataset.lineId +']') + this.secondary_uom_qty = parseFloat(order_line.value); + this.secondary_uom_factor = parseFloat(order_line.dataset.secondaryUomFactor); + this.product_uom_factor = parseFloat(order_line.dataset.productUomFactor); + }, + _onChangeSecondaryUom: function(order_line){ + this._setValues(order_line); + var factor = this.secondary_uom_factor * this.product_uom_factor; + this.$product_qty.val(this.secondary_uom_qty * factor); + this.$product_qty.trigger('change'); + }, +}); + +}); diff --git a/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit_tour.js b/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit_tour.js new file mode 100644 index 0000000000..d0d8098259 --- /dev/null +++ b/website_sale_secondary_unit/static/src/js/website_sale_secondary_unit_tour.js @@ -0,0 +1,62 @@ +/* Copyright 2019 Sergio Teruel + * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */ + +odoo.define("website_sale_secondary_unit.tour", function (require) { + "use strict"; + + var tour = require("web_tour.tour"); + var base = require("web_editor.base"); + + var steps = [ + { + trigger: "a:contains('iPod')", + }, + { + trigger: "#secondary_uom", + run: "text 1", + }, + { + trigger: "#add_to_cart", + extra_trigger: ".js_product:has(input[name='add_qty']:propValueContains(5))", + }, + { + trigger: "a[href='/shop']", + extra_trigger: "span:contains(Box 5 Unit(s))" + }, + { + trigger: "a:contains('iPod')", + }, + { + trigger: "#add_to_cart", + extra_trigger: ".js_product:has(input[name='add_qty']:propValueContains(1))", + }, + { + trigger: "a[href='/shop/checkout']", + extra_trigger: "span:containsExact(Unit(s))" + }, + { + trigger: "a[href='/shop/confirm_order']", + }, + { + trigger: "#o_payment_form_pay", + extra_trigger: "table:has(span:contains(Box 5 Unit(s)):has(span:contains(Unit(s)))" + }, + { + trigger: "a[href='/shop']", + extra_trigger: "table:has(span:contains(Box 5 Unit(s)):has(span:contains(Unit(s)))" + }, + ]; + + tour.register("website_sale_secondary_unit", + { + url: "/shop", + test: true, + wait_for: base.ready(), + }, + steps + ); + + return { + steps: steps, + }; +}); diff --git a/website_sale_secondary_unit/static/src/less/website_sale_secondary_unit.less b/website_sale_secondary_unit/static/src/less/website_sale_secondary_unit.less new file mode 100644 index 0000000000..6a89719af7 --- /dev/null +++ b/website_sale_secondary_unit/static/src/less/website_sale_secondary_unit.less @@ -0,0 +1,3 @@ +.css_secondary_quantity { + max-width: 150px; +} diff --git a/website_sale_secondary_unit/tests/__init__.py b/website_sale_secondary_unit/tests/__init__.py new file mode 100644 index 0000000000..e6063c833b --- /dev/null +++ b/website_sale_secondary_unit/tests/__init__.py @@ -0,0 +1 @@ +from . import test_website_sale_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 new file mode 100644 index 0000000000..c17e0d0b98 --- /dev/null +++ b/website_sale_secondary_unit/tests/test_website_sale_secondary_unit.py @@ -0,0 +1,18 @@ +# Copyright 2019 Tecnativa - Sergio Teruel +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo.tests.common import HttpCase + + +class WebsiteSaleSecondaryUnitHttpCase(HttpCase): + + def test_ui_website(self): + """Test frontend tour.""" + tour = ( + "odoo.__DEBUG__.services['web_tour.tour']", + "website_sale_secondary_unit", + ) + self.phantom_js( + url_path="/", + code="%s.run('%s')" % tour, + ready="%s.tours['%s'].ready" % tour, + login="admin") diff --git a/website_sale_secondary_unit/views/assets.xml b/website_sale_secondary_unit/views/assets.xml new file mode 100644 index 0000000000..0af2522c19 --- /dev/null +++ b/website_sale_secondary_unit/views/assets.xml @@ -0,0 +1,13 @@ + + +