From e3789110e6e8ac30abce54d7cf34f702c23daafc Mon Sep 17 00:00:00 2001 From: eLBati Date: Tue, 28 Jul 2020 11:24:51 +0200 Subject: [PATCH 01/18] ADD pos_fixed_discount --- pos_fixed_discount/__init__.py | 0 pos_fixed_discount/__manifest__.py | 24 +++++++ pos_fixed_discount/i18n/it.po | 52 ++++++++++++++ pos_fixed_discount/readme/CONTRIBUTORS.rst | 1 + pos_fixed_discount/readme/DESCRIPTION.rst | 1 + pos_fixed_discount/readme/USAGE.rst | 1 + pos_fixed_discount/static/src/js/discount.js | 71 +++++++++++++++++++ .../static/src/xml/discount_templates.xml | 18 +++++ pos_fixed_discount/views/pos_templates.xml | 9 +++ 9 files changed, 177 insertions(+) create mode 100644 pos_fixed_discount/__init__.py create mode 100644 pos_fixed_discount/__manifest__.py create mode 100644 pos_fixed_discount/i18n/it.po create mode 100644 pos_fixed_discount/readme/CONTRIBUTORS.rst create mode 100644 pos_fixed_discount/readme/DESCRIPTION.rst create mode 100644 pos_fixed_discount/readme/USAGE.rst create mode 100644 pos_fixed_discount/static/src/js/discount.js create mode 100644 pos_fixed_discount/static/src/xml/discount_templates.xml create mode 100644 pos_fixed_discount/views/pos_templates.xml diff --git a/pos_fixed_discount/__init__.py b/pos_fixed_discount/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pos_fixed_discount/__manifest__.py b/pos_fixed_discount/__manifest__.py new file mode 100644 index 0000000000..524169e63b --- /dev/null +++ b/pos_fixed_discount/__manifest__.py @@ -0,0 +1,24 @@ +# Copyright 2020 Lorenzo Battistini @ TAKOBI +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). +{ + "name": "Point of Sale Fixed Discounts", + "summary": "Allow to apply discounts with fixed amount", + "version": "12.0.1.0.0", + "development_status": "Beta", + "category": "Point of Sale", + "website": "https://github.com/OCA/pos>", + "author": "TAKOBI, Odoo Community Association (OCA)", + "maintainers": ["eLBati"], + "license": "LGPL-3", + "application": False, + "installable": True, + "depends": [ + "pos_discount", + ], + "data": [ + "views/pos_templates.xml", + ], + "qweb": [ + 'static/src/xml/discount_templates.xml', + ] +} diff --git a/pos_fixed_discount/i18n/it.po b/pos_fixed_discount/i18n/it.po new file mode 100644 index 0000000000..d239b6c5e4 --- /dev/null +++ b/pos_fixed_discount/i18n/it.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_fixed_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-28 09:20+0000\n" +"PO-Revision-Date: 2020-07-28 09:20+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: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:7 +#, python-format +msgid "Discount (%)" +msgstr "Sconto (%)" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:14 +#, python-format +msgid "Discount (Amount)" +msgstr "Sconto (importo)" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:15 +#, python-format +msgid "Discount Amount" +msgstr "Importo sconto" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:28 +#, python-format +msgid "No discount product found" +msgstr "Nessun prodotto sconto trovato" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:29 +#, python-format +msgid "The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'." +msgstr "Il prodotto sconto sembra mal configurato. Assicurarsi che sia impostato come 'può essere venduto' e 'disponibile nel punto vendita'." + diff --git a/pos_fixed_discount/readme/CONTRIBUTORS.rst b/pos_fixed_discount/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..356f259b2a --- /dev/null +++ b/pos_fixed_discount/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ + * Lorenzo Battistini - https://takobi.online diff --git a/pos_fixed_discount/readme/DESCRIPTION.rst b/pos_fixed_discount/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..5880c28989 --- /dev/null +++ b/pos_fixed_discount/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +In point of sale allow to apply discount with fixed amount. diff --git a/pos_fixed_discount/readme/USAGE.rst b/pos_fixed_discount/readme/USAGE.rst new file mode 100644 index 0000000000..c1c9ab9e46 --- /dev/null +++ b/pos_fixed_discount/readme/USAGE.rst @@ -0,0 +1 @@ +Just click on "Discount (Amount)" and set the amount. diff --git a/pos_fixed_discount/static/src/js/discount.js b/pos_fixed_discount/static/src/js/discount.js new file mode 100644 index 0000000000..6f7e92d032 --- /dev/null +++ b/pos_fixed_discount/static/src/js/discount.js @@ -0,0 +1,71 @@ +odoo.define('pos_fixed_discount.pos_fixed_discount', function (require) { +"use strict"; + +var core = require('web.core'); +var screens = require('point_of_sale.screens'); +var field_utils = require('web.field_utils'); + +var _t = core._t; + +var FixedDiscountButton = screens.ActionButtonWidget.extend({ + template: 'FixedDiscountButton', + button_click: function(){ + var self = this; + this.gui.show_popup('number',{ + 'title': _t('Discount Amount'), + 'value': 0, + 'confirm': function(val) { + self.apply_discount(val); + }, + }); + }, + apply_discount: function(amount) { + var order = this.pos.get_order(); + var lines = order.get_orderlines(); + var product = this.pos.db.get_product_by_id(this.pos.config.discount_product_id[0]); + if (product === undefined) { + this.gui.show_popup('error', { + title : _t("No discount product found"), + body : _t("The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'."), + }); + return; + } + + // Remove existing discounts + var i = 0; + while ( i < lines.length ) { + if (lines[i].get_product() === product) { + order.remove_orderline(lines[i]); + } else { + i++; + } + } + + // Add discount + // We add the price as manually set to avoid recomputation when changing customer. + var discount = - amount.replace(",", "."); + + if( discount < 0 ){ + order.add_product(product, { + price: discount, + extras: { + price_manually_set: true, + }, + }); + } + }, +}); + +screens.define_action_button({ + 'name': 'fixed_discount', + 'widget': FixedDiscountButton, + 'condition': function(){ + return this.pos.config.module_pos_discount && this.pos.config.discount_product_id; + }, +}); + +return { + FixedDiscountButton: FixedDiscountButton, +} + +}); diff --git a/pos_fixed_discount/static/src/xml/discount_templates.xml b/pos_fixed_discount/static/src/xml/discount_templates.xml new file mode 100644 index 0000000000..eaf07a21be --- /dev/null +++ b/pos_fixed_discount/static/src/xml/discount_templates.xml @@ -0,0 +1,18 @@ + + + + + +
+ Discount (%) +
+ + + + +
+ Discount (Amount) +
+ + + diff --git a/pos_fixed_discount/views/pos_templates.xml b/pos_fixed_discount/views/pos_templates.xml new file mode 100644 index 0000000000..2d0ab851e4 --- /dev/null +++ b/pos_fixed_discount/views/pos_templates.xml @@ -0,0 +1,9 @@ + + + + + From 6c23bf0ded76961597373ed1cf6609875dd64f0c Mon Sep 17 00:00:00 2001 From: oca-travis Date: Mon, 10 Aug 2020 09:15:19 +0000 Subject: [PATCH 02/18] [UPD] Update pos_fixed_discount.pot --- pos_fixed_discount/i18n/it.po | 12 +++-- .../i18n/pos_fixed_discount.pot | 50 +++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 pos_fixed_discount/i18n/pos_fixed_discount.pot diff --git a/pos_fixed_discount/i18n/it.po b/pos_fixed_discount/i18n/it.po index d239b6c5e4..d029ce498d 100644 --- a/pos_fixed_discount/i18n/it.po +++ b/pos_fixed_discount/i18n/it.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * pos_fixed_discount +# * pos_fixed_discount # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2020-07-28 09:20+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -47,6 +48,9 @@ msgstr "Nessun prodotto sconto trovato" #. openerp-web #: code:addons/pos_fixed_discount/static/src/js/discount.js:29 #, python-format -msgid "The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'." -msgstr "Il prodotto sconto sembra mal configurato. Assicurarsi che sia impostato come 'può essere venduto' e 'disponibile nel punto vendita'." - +msgid "" +"The discount product seems misconfigured. Make sure it is flagged as 'Can be " +"Sold' and 'Available in Point of Sale'." +msgstr "" +"Il prodotto sconto sembra mal configurato. Assicurarsi che sia impostato " +"come 'può essere venduto' e 'disponibile nel punto vendita'." diff --git a/pos_fixed_discount/i18n/pos_fixed_discount.pot b/pos_fixed_discount/i18n/pos_fixed_discount.pot new file mode 100644 index 0000000000..5a4f94be80 --- /dev/null +++ b/pos_fixed_discount/i18n/pos_fixed_discount.pot @@ -0,0 +1,50 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_fixed_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \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: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:7 +#, python-format +msgid "Discount (%)" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:14 +#, python-format +msgid "Discount (Amount)" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:15 +#, python-format +msgid "Discount Amount" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:28 +#, python-format +msgid "No discount product found" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:29 +#, python-format +msgid "The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'." +msgstr "" + From b0f1770f13a1dc8609d5637f5514f7e966aa787d Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 10 Aug 2020 09:29:37 +0000 Subject: [PATCH 03/18] [UPD] README.rst --- pos_fixed_discount/README.rst | 86 ++++ .../static/description/index.html | 428 ++++++++++++++++++ 2 files changed, 514 insertions(+) create mode 100644 pos_fixed_discount/README.rst create mode 100644 pos_fixed_discount/static/description/index.html diff --git a/pos_fixed_discount/README.rst b/pos_fixed_discount/README.rst new file mode 100644 index 0000000000..6d7e83e171 --- /dev/null +++ b/pos_fixed_discount/README.rst @@ -0,0 +1,86 @@ +============================= +Point of Sale Fixed Discounts +============================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github + :target: https://github.com/OCA/pos/tree/12.0/pos_fixed_discount + :alt: OCA/pos +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_fixed_discount + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/184/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +In point of sale allow to apply discount with fixed amount. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Just click on "Discount (Amount)" and set the amount. + +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 +~~~~~~~ + +* TAKOBI + +Contributors +~~~~~~~~~~~~ + + * Lorenzo Battistini - https://takobi.online + +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. + +.. |maintainer-eLBati| image:: https://github.com/eLBati.png?size=40px + :target: https://github.com/eLBati + :alt: eLBati + +Current `maintainer `__: + +|maintainer-eLBati| + +This module is part of the `OCA/pos `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_fixed_discount/static/description/index.html b/pos_fixed_discount/static/description/index.html new file mode 100644 index 0000000000..b5c967f9d8 --- /dev/null +++ b/pos_fixed_discount/static/description/index.html @@ -0,0 +1,428 @@ + + + + + + +Codestin Search App + + + +
+

Point of Sale Fixed Discounts

+ + +

Beta License: LGPL-3 OCA/pos Translate me on Weblate Try me on Runbot

+

In point of sale allow to apply discount with fixed amount.

+

Table of contents

+ +
+

Usage

+

Just click on “Discount (Amount)” and set the amount.

+
+
+

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

+
    +
  • TAKOBI
    • +
+
+
+

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.

+

Current maintainer:

+

eLBati

+

This module is part of the OCA/pos project on GitHub.

+

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

+
+
+
+ + From fecb2843afd0d03c3f43448fcef0225ff3809c7e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 10 Aug 2020 09:29:37 +0000 Subject: [PATCH 04/18] [ADD] icon.png --- pos_fixed_discount/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pos_fixed_discount/static/description/icon.png diff --git a/pos_fixed_discount/static/description/icon.png b/pos_fixed_discount/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 1ded5e6d153dd98922e86f2f4020f0f814af21a3 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 10 Aug 2020 09:29:37 +0000 Subject: [PATCH 05/18] pos_fixed_discount 12.0.1.0.1 --- pos_fixed_discount/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_fixed_discount/__manifest__.py b/pos_fixed_discount/__manifest__.py index 524169e63b..7f6970cd32 100644 --- a/pos_fixed_discount/__manifest__.py +++ b/pos_fixed_discount/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Point of Sale Fixed Discounts", "summary": "Allow to apply discounts with fixed amount", - "version": "12.0.1.0.0", + "version": "12.0.1.0.1", "development_status": "Beta", "category": "Point of Sale", "website": "https://github.com/OCA/pos>", From 36c89fd8df3294331049a43b8e68cb11076b847c Mon Sep 17 00:00:00 2001 From: Daniel Martinez Vila Date: Mon, 26 Oct 2020 09:08:04 +0000 Subject: [PATCH 06/18] Added translation using Weblate (Spanish) --- pos_fixed_discount/i18n/es.po | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pos_fixed_discount/i18n/es.po diff --git a/pos_fixed_discount/i18n/es.po b/pos_fixed_discount/i18n/es.po new file mode 100644 index 0000000000..e667126307 --- /dev/null +++ b/pos_fixed_discount/i18n/es.po @@ -0,0 +1,50 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_fixed_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:7 +#, python-format +msgid "Discount (%)" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:14 +#, python-format +msgid "Discount (Amount)" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:15 +#, python-format +msgid "Discount Amount" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:28 +#, python-format +msgid "No discount product found" +msgstr "" + +#. module: pos_fixed_discount +#. openerp-web +#: code:addons/pos_fixed_discount/static/src/js/discount.js:29 +#, python-format +msgid "The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'." +msgstr "" From 0434e2be529402d663007101a7ed6c38f039ee2a Mon Sep 17 00:00:00 2001 From: Daniel Martinez Vila Date: Mon, 26 Oct 2020 09:08:16 +0000 Subject: [PATCH 07/18] Translated using Weblate (Spanish) Currently translated at 100.0% (5 of 5 strings) Translation: pos-12.0/pos-12.0-pos_fixed_discount Translate-URL: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_fixed_discount/es/ --- pos_fixed_discount/i18n/es.po | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pos_fixed_discount/i18n/es.po b/pos_fixed_discount/i18n/es.po index e667126307..e10eca647e 100644 --- a/pos_fixed_discount/i18n/es.po +++ b/pos_fixed_discount/i18n/es.po @@ -6,41 +6,43 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2020-10-26 11:08+0000\n" +"Last-Translator: Daniel Martinez Vila \n" "Language-Team: none\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.10\n" #. module: pos_fixed_discount #. openerp-web #: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:7 #, python-format msgid "Discount (%)" -msgstr "" +msgstr "Descuento (%)" #. module: pos_fixed_discount #. openerp-web #: code:addons/pos_fixed_discount/static/src/xml/discount_templates.xml:14 #, python-format msgid "Discount (Amount)" -msgstr "" +msgstr "Descuento (Importe)" #. module: pos_fixed_discount #. openerp-web #: code:addons/pos_fixed_discount/static/src/js/discount.js:15 #, python-format msgid "Discount Amount" -msgstr "" +msgstr "Importe de descuento" #. module: pos_fixed_discount #. openerp-web #: code:addons/pos_fixed_discount/static/src/js/discount.js:28 #, python-format msgid "No discount product found" -msgstr "" +msgstr "No se ha encontrado ningún producto con descuento" #. module: pos_fixed_discount #. openerp-web @@ -48,3 +50,5 @@ msgstr "" #, python-format msgid "The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'." msgstr "" +"El producto con descuento parece estar mal configurado. Asegúrese de que " +"esté marcado como 'Se puede vender' y 'Disponible en el punto de venta'." From 7e32b7410ecd97d77de283d6ebd83af66a41246b Mon Sep 17 00:00:00 2001 From: fshah Date: Fri, 16 Apr 2021 16:13:20 +0530 Subject: [PATCH 08/18] [IMP] pos_fixed_discount: isort, black, prettier. --- pos_fixed_discount/__manifest__.py | 12 +- pos_fixed_discount/static/src/js/discount.js | 125 +++++++++--------- .../static/src/xml/discount_templates.xml | 5 +- pos_fixed_discount/views/pos_templates.xml | 16 ++- 4 files changed, 78 insertions(+), 80 deletions(-) diff --git a/pos_fixed_discount/__manifest__.py b/pos_fixed_discount/__manifest__.py index 7f6970cd32..87424d52f9 100644 --- a/pos_fixed_discount/__manifest__.py +++ b/pos_fixed_discount/__manifest__.py @@ -12,13 +12,7 @@ "license": "LGPL-3", "application": False, "installable": True, - "depends": [ - "pos_discount", - ], - "data": [ - "views/pos_templates.xml", - ], - "qweb": [ - 'static/src/xml/discount_templates.xml', - ] + "depends": ["pos_discount"], + "data": ["views/pos_templates.xml"], + "qweb": ["static/src/xml/discount_templates.xml"], } diff --git a/pos_fixed_discount/static/src/js/discount.js b/pos_fixed_discount/static/src/js/discount.js index 6f7e92d032..5cf6b7f5cf 100644 --- a/pos_fixed_discount/static/src/js/discount.js +++ b/pos_fixed_discount/static/src/js/discount.js @@ -1,71 +1,76 @@ -odoo.define('pos_fixed_discount.pos_fixed_discount', function (require) { -"use strict"; +odoo.define("pos_fixed_discount.pos_fixed_discount", function(require) { + "use strict"; -var core = require('web.core'); -var screens = require('point_of_sale.screens'); -var field_utils = require('web.field_utils'); + var core = require("web.core"); + var screens = require("point_of_sale.screens"); -var _t = core._t; + var _t = core._t; -var FixedDiscountButton = screens.ActionButtonWidget.extend({ - template: 'FixedDiscountButton', - button_click: function(){ - var self = this; - this.gui.show_popup('number',{ - 'title': _t('Discount Amount'), - 'value': 0, - 'confirm': function(val) { - self.apply_discount(val); - }, - }); - }, - apply_discount: function(amount) { - var order = this.pos.get_order(); - var lines = order.get_orderlines(); - var product = this.pos.db.get_product_by_id(this.pos.config.discount_product_id[0]); - if (product === undefined) { - this.gui.show_popup('error', { - title : _t("No discount product found"), - body : _t("The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'."), + var FixedDiscountButton = screens.ActionButtonWidget.extend({ + template: "FixedDiscountButton", + button_click: function() { + var self = this; + this.gui.show_popup("number", { + title: _t("Discount Amount"), + value: 0, + confirm: function(val) { + self.apply_discount(val); + }, }); - return; - } - - // Remove existing discounts - var i = 0; - while ( i < lines.length ) { - if (lines[i].get_product() === product) { - order.remove_orderline(lines[i]); - } else { - i++; + }, + apply_discount: function(amount) { + var order = this.pos.get_order(); + var lines = order.get_orderlines(); + var product = this.pos.db.get_product_by_id( + this.pos.config.discount_product_id[0] + ); + if (product === undefined) { + this.gui.show_popup("error", { + title: _t("No discount product found"), + body: _t( + "The discount product seems misconfigured. Make sure it is flagged as 'Can be Sold' and 'Available in Point of Sale'." + ), + }); + return; } - } - // Add discount - // We add the price as manually set to avoid recomputation when changing customer. - var discount = - amount.replace(",", "."); + // Remove existing discounts + var i = 0; + while (i < lines.length) { + if (lines[i].get_product() === product) { + order.remove_orderline(lines[i]); + } else { + i++; + } + } - if( discount < 0 ){ - order.add_product(product, { - price: discount, - extras: { - price_manually_set: true, - }, - }); - } - }, -}); + // Add discount + // We add the price as manually set to avoid recomputation when changing customer. + var discount = -amount.replace(",", "."); -screens.define_action_button({ - 'name': 'fixed_discount', - 'widget': FixedDiscountButton, - 'condition': function(){ - return this.pos.config.module_pos_discount && this.pos.config.discount_product_id; - }, -}); + if (discount < 0) { + order.add_product(product, { + price: discount, + extras: { + price_manually_set: true, + }, + }); + } + }, + }); -return { - FixedDiscountButton: FixedDiscountButton, -} + screens.define_action_button({ + name: "fixed_discount", + widget: FixedDiscountButton, + condition: function() { + return ( + this.pos.config.module_pos_discount && + this.pos.config.discount_product_id + ); + }, + }); + return { + FixedDiscountButton: FixedDiscountButton, + }; }); diff --git a/pos_fixed_discount/static/src/xml/discount_templates.xml b/pos_fixed_discount/static/src/xml/discount_templates.xml index eaf07a21be..d29aa7700a 100644 --- a/pos_fixed_discount/static/src/xml/discount_templates.xml +++ b/pos_fixed_discount/static/src/xml/discount_templates.xml @@ -1,6 +1,5 @@ - + -
@@ -8,11 +7,9 @@
-
Discount (Amount)
- diff --git a/pos_fixed_discount/views/pos_templates.xml b/pos_fixed_discount/views/pos_templates.xml index 2d0ab851e4..6bad4f5fb3 100644 --- a/pos_fixed_discount/views/pos_templates.xml +++ b/pos_fixed_discount/views/pos_templates.xml @@ -1,9 +1,11 @@ - + - - +