diff --git a/pos_order_remove_line/README.rst b/pos_order_remove_line/README.rst index 3c08e35b4d..e3482ebd77 100644 --- a/pos_order_remove_line/README.rst +++ b/pos_order_remove_line/README.rst @@ -14,13 +14,13 @@ POS Order Remove Line :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/14.0/pos_order_remove_line + :target: https://github.com/OCA/pos/tree/16.0/pos_order_remove_line :alt: OCA/pos .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/pos-14-0/pos-14-0-pos_order_remove_line + :target: https://translation.odoo-community.org/projects/pos-16-0/pos-16-0-pos_order_remove_line :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/14.0 + :target: https://runbot.odoo-community.org/runbot/184/16.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -38,7 +38,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -78,6 +78,6 @@ Current `maintainer `__: |maintainer-robyf70| -This module is part of the `OCA/pos `_ project on GitHub. +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_order_remove_line/__init__.py b/pos_order_remove_line/__init__.py index a11d700bd0..bd06eb177f 100644 --- a/pos_order_remove_line/__init__.py +++ b/pos_order_remove_line/__init__.py @@ -1,2 +1,2 @@ -# Copyright 2019 LevelPrime +# Copyright 2023 LevelPrime # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) diff --git a/pos_order_remove_line/__manifest__.py b/pos_order_remove_line/__manifest__.py index bf70b7581e..4203aa0157 100644 --- a/pos_order_remove_line/__manifest__.py +++ b/pos_order_remove_line/__manifest__.py @@ -1,4 +1,4 @@ -# Copyright 2019 LevelPrime +# Copyright 2023 LevelPrime # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) { @@ -8,9 +8,14 @@ "website": "https://github.com/OCA/pos", "category": "Point of Sale", "maintainers": ["robyf70"], - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "license": "LGPL-3", "depends": ["point_of_sale"], - "data": ["views/assets.xml"], - "qweb": ["static/src/xml/orderline.xml"], + "assets": { + "point_of_sale.assets": [ + "pos_order_remove_line/static/src/js/*.js", + "pos_order_remove_line/static/src/css/*.scss", + "pos_order_remove_line/static/src/xml/*xml", + ] + }, } diff --git a/pos_order_remove_line/static/description/index.html b/pos_order_remove_line/static/description/index.html index ead3c44a24..42841a871c 100644 --- a/pos_order_remove_line/static/description/index.html +++ b/pos_order_remove_line/static/description/index.html @@ -367,7 +367,7 @@

POS Order Remove Line

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

The module adds the possibility to delete a POS Order Line from the POS interface.

Table of contents

@@ -386,7 +386,7 @@

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.

+feedback.

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

@@ -414,7 +414,7 @@

Maintainers

promote its widespread use.

Current maintainer:

robyf70

-

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

+

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_order_remove_line/static/src/css/orderline.scss b/pos_order_remove_line/static/src/css/orderline.scss index 3d705fbc44..3c441b46ae 100644 --- a/pos_order_remove_line/static/src/css/orderline.scss +++ b/pos_order_remove_line/static/src/css/orderline.scss @@ -1,5 +1,5 @@ /* - * Copyright 2019 LevelPrime + * Copyright 2023 LevelPrime * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) */ diff --git a/pos_order_remove_line/static/src/js/orderline.esm.js b/pos_order_remove_line/static/src/js/orderline.esm.js new file mode 100644 index 0000000000..d8efbf1229 --- /dev/null +++ b/pos_order_remove_line/static/src/js/orderline.esm.js @@ -0,0 +1,30 @@ +/** @odoo-module **/ +/* + * Copyright 2023 LevelPrime + * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) + */ + +import Orderline from "point_of_sale.Orderline"; +import Registries from "point_of_sale.Registries"; + +const PosOrderline = (Orderline) => + class extends Orderline { + async removeLine(ev) { + const order = this.env.pos.get_order(); + if (order) { + ev.stopPropagation(); + ev.preventDefault(); + this.selectLine(); + order.remove_orderline(order.get_selected_orderline()); + this.checkRewardLines(order); + } + } + + checkRewardLines(order) { + const anyRewardLine = order.orderlines.some((line) => line.is_reward_line); + if (anyRewardLine) { + order._updateRewards(); + } + } + }; +Registries.Component.extend(Orderline, PosOrderline); diff --git a/pos_order_remove_line/static/src/js/orderline.js b/pos_order_remove_line/static/src/js/orderline.js deleted file mode 100644 index 05d4e1dbf1..0000000000 --- a/pos_order_remove_line/static/src/js/orderline.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2019 LevelPrime - * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) - */ - -odoo.define("pos_order_remove_line.Orderline", function (require) { - "use strict"; - - const Orderline = require("point_of_sale.Orderline"); - const Registries = require("point_of_sale.Registries"); - - const PosOrderline = (Orderline) => - class extends Orderline { - removeLine() { - this.props.line.set_quantity("remove"); - } - }; - Registries.Component.extend(Orderline, PosOrderline); - return Orderline; -}); diff --git a/pos_order_remove_line/static/src/xml/orderline.xml b/pos_order_remove_line/static/src/xml/orderline.xml index ab4d780291..b06f5cc591 100644 --- a/pos_order_remove_line/static/src/xml/orderline.xml +++ b/pos_order_remove_line/static/src/xml/orderline.xml @@ -1,5 +1,5 @@ diff --git a/pos_order_remove_line/views/assets.xml b/pos_order_remove_line/views/assets.xml deleted file mode 100644 index c3afb4a971..0000000000 --- a/pos_order_remove_line/views/assets.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - -