diff --git a/pos_table_merge_orders/README.rst b/pos_table_merge_orders/README.rst new file mode 100644 index 000000000..0f9887e61 --- /dev/null +++ b/pos_table_merge_orders/README.rst @@ -0,0 +1,46 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +POS Table Merge Orders +======================= +* Multiple table orders can be easily merged into a single order. + +Configuration +============= +* No additional configurations needed + +Company +------- +* `Cybrosys Techno Solutions `__ + +License +======= +GNU AFFERO GENERAL PUBLIC LICENSE, Version 3 (AGPLv3) +(http://www.gnu.org/licenses/agpl.html) + +Credits +------- +* Developer: (v16) Saleekha, odoo@cybrosys.com + +Contacts +-------- +* Mail Contact : odoo@cybrosys.com +* Website : https://cybrosys.com + +Bug Tracker +----------- +Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. + +Maintainer +========== +.. image:: https://cybrosys.com/images/logo.png + :target: https://cybrosys.com + +This module is maintained by Cybrosys Technologies. + +For support and more information, please visit `Our Website `__ + +Further information +=================== +HTML Description: ``__ diff --git a/pos_table_merge_orders/__init__.py b/pos_table_merge_orders/__init__.py new file mode 100644 index 000000000..f303f3301 --- /dev/null +++ b/pos_table_merge_orders/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Saleekha () +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################# +from . import models diff --git a/pos_table_merge_orders/__manifest__.py b/pos_table_merge_orders/__manifest__.py new file mode 100644 index 000000000..434bf2b9e --- /dev/null +++ b/pos_table_merge_orders/__manifest__.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Saleekha () +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################# +{ + 'name': 'POS Table Merge Orders', + 'version': '16.0.1.0.0', + 'category': 'Point of Sale', + 'summary': """ + Multiple table orders can be easily merged into a single + order. + """, + 'description': """ + This app easily allows us to merge multiple table orders into + a single order. + """, + 'author': 'Cybrosys Techno Solutions', + 'company': 'Cybrosys Techno Solutions', + 'maintainer': 'Cybrosys Techno Solutions', + 'images': ['static/description/banner.jpg'], + 'website': 'https://www.cybrosys.com', + 'depends': ['base', 'point_of_sale'], + 'data': [ + 'views/res_config_settings_views.xml', + ], + 'assets': { + 'point_of_sale.assets': [ + 'pos_table_merge_orders/static/src/js/table_merge_orders.js', + 'pos_table_merge_orders/static/src/js/PosTablePopupWidget.js', + 'pos_table_merge_orders/static/src/xml/table_merge_orders.xml', + ], + }, + 'license': 'AGPL-3', + 'installable': True, + 'auto_install': False, + 'application': True, +} diff --git a/pos_table_merge_orders/doc/RELEASE_NOTES.md b/pos_table_merge_orders/doc/RELEASE_NOTES.md new file mode 100644 index 000000000..4d65e6818 --- /dev/null +++ b/pos_table_merge_orders/doc/RELEASE_NOTES.md @@ -0,0 +1,6 @@ +## Module + +#### 13.4.2023 +#### Version 16.0.1.0.0 +##### ADD +- Initial Commit for POS Table Merge Orders diff --git a/pos_table_merge_orders/models/__init__.py b/pos_table_merge_orders/models/__init__.py new file mode 100644 index 000000000..d3466ff43 --- /dev/null +++ b/pos_table_merge_orders/models/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Saleekha () +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################# +from . import res_config_settings diff --git a/pos_table_merge_orders/models/res_config_settings.py b/pos_table_merge_orders/models/res_config_settings.py new file mode 100644 index 000000000..131fee4bc --- /dev/null +++ b/pos_table_merge_orders/models/res_config_settings.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2023-TODAY Cybrosys Technologies(). +# Author: Saleekha () +# You can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# (AGPL v3) along with this program. +# If not, see . +# +############################################################################# +from odoo import fields, models + + +class PosConfig(models.Model): + """ + This class inherited to add a boolean field to check the merge table orders + """ + _inherit = 'pos.config' + + allow_merge_tables = fields.Boolean(string='Allow Merge Table Orders', + help='Used to check the merge table orders') + + +class ResConfigSettings(models.TransientModel): + """ + This class inherited to add a related field to check the merge table orders + """ + _inherit = 'res.config.settings' + + allow_merge_tables = fields.Boolean( + related='pos_config_id.allow_merge_tables', readonly=False, + string='Allow Merge Table Orders', + help='Used to check the merge table orders') diff --git a/pos_table_merge_orders/static/description/assets/icons/check.png b/pos_table_merge_orders/static/description/assets/icons/check.png new file mode 100644 index 000000000..c8e85f51d Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/check.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/chevron.png b/pos_table_merge_orders/static/description/assets/icons/chevron.png new file mode 100644 index 000000000..2089293d6 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/chevron.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/cogs.png b/pos_table_merge_orders/static/description/assets/icons/cogs.png new file mode 100644 index 000000000..95d0bad62 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/cogs.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/consultation.png b/pos_table_merge_orders/static/description/assets/icons/consultation.png new file mode 100644 index 000000000..8319d4baa Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/consultation.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/ecom-black.png b/pos_table_merge_orders/static/description/assets/icons/ecom-black.png new file mode 100644 index 000000000..a9385ff13 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/ecom-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/education-black.png b/pos_table_merge_orders/static/description/assets/icons/education-black.png new file mode 100644 index 000000000..3eb09b27b Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/education-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/hotel-black.png b/pos_table_merge_orders/static/description/assets/icons/hotel-black.png new file mode 100644 index 000000000..130f613be Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/hotel-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/license.png b/pos_table_merge_orders/static/description/assets/icons/license.png new file mode 100644 index 000000000..a5869797e Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/license.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/lifebuoy.png b/pos_table_merge_orders/static/description/assets/icons/lifebuoy.png new file mode 100644 index 000000000..658d56ccc Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/lifebuoy.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/manufacturing-black.png b/pos_table_merge_orders/static/description/assets/icons/manufacturing-black.png new file mode 100644 index 000000000..697eb0e9f Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/manufacturing-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/pos-black.png b/pos_table_merge_orders/static/description/assets/icons/pos-black.png new file mode 100644 index 000000000..97c0f90c1 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/pos-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/puzzle.png b/pos_table_merge_orders/static/description/assets/icons/puzzle.png new file mode 100644 index 000000000..65cf854e7 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/puzzle.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/restaurant-black.png b/pos_table_merge_orders/static/description/assets/icons/restaurant-black.png new file mode 100644 index 000000000..4a35eb939 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/restaurant-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/service-black.png b/pos_table_merge_orders/static/description/assets/icons/service-black.png new file mode 100644 index 000000000..301ab51cb Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/service-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/trading-black.png b/pos_table_merge_orders/static/description/assets/icons/trading-black.png new file mode 100644 index 000000000..9398ba2f1 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/trading-black.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/training.png b/pos_table_merge_orders/static/description/assets/icons/training.png new file mode 100644 index 000000000..884ca024d Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/training.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/update.png b/pos_table_merge_orders/static/description/assets/icons/update.png new file mode 100644 index 000000000..ecbc5a01a Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/update.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/user.png b/pos_table_merge_orders/static/description/assets/icons/user.png new file mode 100644 index 000000000..6ffb23d9f Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/user.png differ diff --git a/pos_table_merge_orders/static/description/assets/icons/wrench.png b/pos_table_merge_orders/static/description/assets/icons/wrench.png new file mode 100644 index 000000000..6c04dea0f Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/icons/wrench.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/categories.png b/pos_table_merge_orders/static/description/assets/misc/categories.png new file mode 100644 index 000000000..bedf1e0b1 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/categories.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/check-box.png b/pos_table_merge_orders/static/description/assets/misc/check-box.png new file mode 100644 index 000000000..42caf24b9 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/check-box.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/compass.png b/pos_table_merge_orders/static/description/assets/misc/compass.png new file mode 100644 index 000000000..d5fed8faa Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/compass.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/corporate.png b/pos_table_merge_orders/static/description/assets/misc/corporate.png new file mode 100644 index 000000000..2eb13edbf Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/corporate.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/customer-support.png b/pos_table_merge_orders/static/description/assets/misc/customer-support.png new file mode 100644 index 000000000..79efc72ed Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/customer-support.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/cybrosys-logo.png b/pos_table_merge_orders/static/description/assets/misc/cybrosys-logo.png new file mode 100644 index 000000000..cc3cc0ccf Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/cybrosys-logo.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/features.png b/pos_table_merge_orders/static/description/assets/misc/features.png new file mode 100644 index 000000000..b41769f77 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/features.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/logo.png b/pos_table_merge_orders/static/description/assets/misc/logo.png new file mode 100644 index 000000000..478462d3e Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/logo.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/pictures.png b/pos_table_merge_orders/static/description/assets/misc/pictures.png new file mode 100644 index 000000000..56d255fe9 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/pictures.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/pie-chart.png b/pos_table_merge_orders/static/description/assets/misc/pie-chart.png new file mode 100644 index 000000000..426e05244 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/pie-chart.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/right-arrow.png b/pos_table_merge_orders/static/description/assets/misc/right-arrow.png new file mode 100644 index 000000000..730984a06 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/right-arrow.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/star.png b/pos_table_merge_orders/static/description/assets/misc/star.png new file mode 100644 index 000000000..2eb9ab29f Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/star.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/support.png b/pos_table_merge_orders/static/description/assets/misc/support.png new file mode 100644 index 000000000..4f18b8b82 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/support.png differ diff --git a/pos_table_merge_orders/static/description/assets/misc/whatsapp.png b/pos_table_merge_orders/static/description/assets/misc/whatsapp.png new file mode 100644 index 000000000..d513a5356 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/whatsapp.png differ diff --git a/pos_table_merge_orders/static/description/assets/modules/1.png b/pos_table_merge_orders/static/description/assets/modules/1.png new file mode 100644 index 000000000..af96cc10a Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/1.png differ diff --git a/pos_table_merge_orders/static/description/assets/modules/2.png b/pos_table_merge_orders/static/description/assets/modules/2.png new file mode 100644 index 000000000..489f44e86 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/2.png differ diff --git a/pos_table_merge_orders/static/description/assets/modules/3.png b/pos_table_merge_orders/static/description/assets/modules/3.png new file mode 100644 index 000000000..2c8fbb83f Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/3.png differ diff --git a/pos_table_merge_orders/static/description/assets/modules/4.png b/pos_table_merge_orders/static/description/assets/modules/4.png new file mode 100644 index 000000000..a29119785 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/4.png differ diff --git a/pos_table_merge_orders/static/description/assets/modules/5.png b/pos_table_merge_orders/static/description/assets/modules/5.png new file mode 100644 index 000000000..6d637752d Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/5.png differ diff --git a/pos_table_merge_orders/static/description/assets/modules/6.png b/pos_table_merge_orders/static/description/assets/modules/6.png new file mode 100644 index 000000000..a44d454aa Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/6.png differ diff --git a/pos_table_merge_orders/static/description/assets/screenshots/1.png b/pos_table_merge_orders/static/description/assets/screenshots/1.png new file mode 100644 index 000000000..260c7da63 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/screenshots/1.png differ diff --git a/pos_table_merge_orders/static/description/assets/screenshots/2.png b/pos_table_merge_orders/static/description/assets/screenshots/2.png new file mode 100644 index 000000000..3c733279f Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/screenshots/2.png differ diff --git a/pos_table_merge_orders/static/description/assets/screenshots/3.png b/pos_table_merge_orders/static/description/assets/screenshots/3.png new file mode 100644 index 000000000..46bee86af Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/screenshots/3.png differ diff --git a/pos_table_merge_orders/static/description/assets/screenshots/4.png b/pos_table_merge_orders/static/description/assets/screenshots/4.png new file mode 100644 index 000000000..db1d139f8 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/screenshots/4.png differ diff --git a/pos_table_merge_orders/static/description/assets/screenshots/5.png b/pos_table_merge_orders/static/description/assets/screenshots/5.png new file mode 100644 index 000000000..d63f9d3f9 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/screenshots/5.png differ diff --git a/pos_table_merge_orders/static/description/assets/screenshots/hero.gif b/pos_table_merge_orders/static/description/assets/screenshots/hero.gif new file mode 100644 index 000000000..c3f586fac Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/screenshots/hero.gif differ diff --git a/pos_table_merge_orders/static/description/banner.jpg b/pos_table_merge_orders/static/description/banner.jpg new file mode 100644 index 000000000..47d35e05b Binary files /dev/null and b/pos_table_merge_orders/static/description/banner.jpg differ diff --git a/pos_table_merge_orders/static/description/icon.png b/pos_table_merge_orders/static/description/icon.png new file mode 100644 index 000000000..55fc506a3 Binary files /dev/null and b/pos_table_merge_orders/static/description/icon.png differ diff --git a/pos_table_merge_orders/static/description/images/checked.png b/pos_table_merge_orders/static/description/images/checked.png new file mode 100644 index 000000000..578cedb80 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/checked.png differ diff --git a/pos_table_merge_orders/static/description/images/cybrosys.png b/pos_table_merge_orders/static/description/images/cybrosys.png new file mode 100644 index 000000000..d76b5bafb Binary files /dev/null and b/pos_table_merge_orders/static/description/images/cybrosys.png differ diff --git a/pos_table_merge_orders/static/description/images/odoo-powr-countdown-timer-12.0.1.0.zip b/pos_table_merge_orders/static/description/images/odoo-powr-countdown-timer-12.0.1.0.zip new file mode 100644 index 000000000..54b4beb1f Binary files /dev/null and b/pos_table_merge_orders/static/description/images/odoo-powr-countdown-timer-12.0.1.0.zip differ diff --git a/pos_table_merge_orders/static/description/images/product_brand_ecommerce.png b/pos_table_merge_orders/static/description/images/product_brand_ecommerce.png new file mode 100644 index 000000000..2ac89b363 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/product_brand_ecommerce.png differ diff --git a/pos_table_merge_orders/static/description/images/product_brand_ecommerce.png~ b/pos_table_merge_orders/static/description/images/product_brand_ecommerce.png~ new file mode 100644 index 000000000..4a3246e78 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/product_brand_ecommerce.png~ differ diff --git a/pos_table_merge_orders/static/description/images/scrn1.png b/pos_table_merge_orders/static/description/images/scrn1.png new file mode 100644 index 000000000..462407dbd Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn1.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn10.png b/pos_table_merge_orders/static/description/images/scrn10.png new file mode 100644 index 000000000..5f67bf6a5 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn10.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn2.png b/pos_table_merge_orders/static/description/images/scrn2.png new file mode 100644 index 000000000..54628a8dd Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn2.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn3.png b/pos_table_merge_orders/static/description/images/scrn3.png new file mode 100644 index 000000000..626c16571 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn3.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn4.png b/pos_table_merge_orders/static/description/images/scrn4.png new file mode 100644 index 000000000..01bf06e39 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn4.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn5.png b/pos_table_merge_orders/static/description/images/scrn5.png new file mode 100644 index 000000000..85befd215 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn5.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn6.png b/pos_table_merge_orders/static/description/images/scrn6.png new file mode 100644 index 000000000..263c5679a Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn6.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn7.png b/pos_table_merge_orders/static/description/images/scrn7.png new file mode 100644 index 000000000..fc9ee5ed3 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn7.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn8.png b/pos_table_merge_orders/static/description/images/scrn8.png new file mode 100644 index 000000000..e78a07031 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn8.png differ diff --git a/pos_table_merge_orders/static/description/images/scrn9.png b/pos_table_merge_orders/static/description/images/scrn9.png new file mode 100644 index 000000000..21744894f Binary files /dev/null and b/pos_table_merge_orders/static/description/images/scrn9.png differ diff --git a/pos_table_merge_orders/static/description/images/website_featured_products.jpeg b/pos_table_merge_orders/static/description/images/website_featured_products.jpeg new file mode 100644 index 000000000..9542b3f7a Binary files /dev/null and b/pos_table_merge_orders/static/description/images/website_featured_products.jpeg differ diff --git a/pos_table_merge_orders/static/description/images/website_repeat_sale.jpeg b/pos_table_merge_orders/static/description/images/website_repeat_sale.jpeg new file mode 100644 index 000000000..a749a22d9 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/website_repeat_sale.jpeg differ diff --git a/pos_table_merge_orders/static/description/images/website_repeat_sale.jpeg~ b/pos_table_merge_orders/static/description/images/website_repeat_sale.jpeg~ new file mode 100644 index 000000000..dc8e987fb Binary files /dev/null and b/pos_table_merge_orders/static/description/images/website_repeat_sale.jpeg~ differ diff --git a/pos_table_merge_orders/static/description/images/website_sale_advanced_search.png b/pos_table_merge_orders/static/description/images/website_sale_advanced_search.png new file mode 100644 index 000000000..691f06847 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/website_sale_advanced_search.png differ diff --git a/pos_table_merge_orders/static/description/images/website_sale_product_quick_view.jpeg b/pos_table_merge_orders/static/description/images/website_sale_product_quick_view.jpeg new file mode 100644 index 000000000..6fa520659 Binary files /dev/null and b/pos_table_merge_orders/static/description/images/website_sale_product_quick_view.jpeg differ diff --git a/pos_table_merge_orders/static/description/index.html b/pos_table_merge_orders/static/description/index.html new file mode 100644 index 000000000..30c9b8cd8 --- /dev/null +++ b/pos_table_merge_orders/static/description/index.html @@ -0,0 +1,642 @@ +
+ +
+ +
+
+ Community +
+
+ Enterprise +
+
+ Odoo.sh +
+
+
+ + + +

+ POS Table Merge Orders

+

+ Multiple table orders can be easily merged into a single + order

+ + + +
+ + +
+
+ +
+

+ Explore This + Module

+
+ + + + +
+
+ +
+

+ Overview +

+
+
+
+ This app easily allows us to merge multiple table orders into a single + order. +
+
+ + + +
+
+ +
+

+ Features +

+
+
+
+
+ + Allow to merge multi table orders into a single +
+
+ + Users can Choose which are the tables they want to merge +
+
+ + The selected tables order are merged in to a single order +
+
+
+ + + + +
+
+ +
+

+ Screenshots +

+
+
+
+
+

+ Allow merge table order.

+

+ By enabling this user can merge multi table orders

+ +
+
+

+ Choose which table you want to merge.

+

+ Table T1 can be created by combining tables T3 and T4.

+ +
+
+

+ Button to merge the table's order.

+

+ Merge table order button.

+ +
+
+

+ Choose the tables you want to combine.

+

+ From here you choose the tables you want to combine.

+ +
+
+

+ Merged orders.

+

+ Selected tables order are merged in this order

+ +
+
+
+ + + +
+
+ +
+

+ Related + Products +

+
+
+
+ +
+
+ + + + +
+
+ +
+

+ Our Services +

+
+ +
+
+
+
+ +
+
+ Odoo + Customization
+
+ +
+
+ +
+
+ Odoo + Implementation
+
+ +
+
+ +
+
+ Odoo + Support
+
+ + +
+
+ +
+
+ Hire + Odoo + Developer
+
+ +
+
+ +
+
+ Odoo + Integration
+
+ +
+
+ +
+
+ Odoo + Migration
+
+ + +
+
+ +
+
+ Odoo + Consultancy
+
+ +
+
+ +
+
+ Odoo + Implementation
+
+ +
+
+ +
+
+ Odoo + Licensing Consultancy
+
+
+ +
+ + + + + +
+
+ +
+

+ Our + Industries +

+
+ +
+
+
+
+ +
+ Trading +
+

+ Easily procure + and + sell your products

+
+
+ +
+
+ +
+ POS +
+

+ Easy + configuration + and convivial experience

+
+
+ +
+
+ +
+ Education +
+

+ A platform for + educational management

+
+
+ +
+
+ +
+ Manufacturing +
+

+ Plan, track and + schedule your operations

+
+
+ +
+
+ +
+ E-commerce & Website +
+

+ Mobile + friendly, + awe-inspiring product pages

+
+
+ +
+
+ +
+ Service Management +
+

+ Keep track of + services and invoice

+
+
+ +
+
+ +
+ Restaurant +
+

+ Run your bar or + restaurant methodically

+
+
+ +
+
+ +
+ Hotel Management +
+

+ An + all-inclusive + hotel management application

+
+
+
+
+ + + + +
+
+ +
+

+ Support +

+
+
+
+
+
+
+ +
+
+

Need Help?

+

Got questions or need help? + Get in touch.

+ +

+ odoo@cybrosys.com

+
+
+
+
+
+
+
+ +
+
+

WhatsApp

+

Say hi to us on WhatsApp!

+ +

+ +91 86068 + 27707

+
+
+
+
+
+
+
+ +
+
+
+ \ No newline at end of file diff --git a/pos_table_merge_orders/static/src/js/PosTablePopupWidget.js b/pos_table_merge_orders/static/src/js/PosTablePopupWidget.js new file mode 100644 index 000000000..bd41929cb --- /dev/null +++ b/pos_table_merge_orders/static/src/js/PosTablePopupWidget.js @@ -0,0 +1,60 @@ +odoo.define('pos_table_merge_orders.PosTablePopup', function(require) { + "use strict"; + const Popup = require('point_of_sale.ConfirmPopup'); + const Registries = require('point_of_sale.Registries'); + const PosComponent = require('point_of_sale.PosComponent'); + class PosTablePopup extends Popup { + constructor() { + super(...arguments); + } + setup() { + super.setup(); + this.selectedTable = []; + } + // Floor details can fetch + get floors() { + var tables = []; + var floors = this.env.pos.table.floor + floors.tables.forEach(item => { + tables.push({'id':item.id, 'name':item.name}) + }) + return tables; + } + // Event for selecting the tables + click_on_merge_table(event) { + var self = this; + if($(event.target).data('click') == '1'){ + $(event.target).data('click','0') + $(event.target).css("background-color", "#fff"); + var index = this.selectedTable.indexOf($(event.target).data('table_id')) + this.selectedTable.splice(index,1) + } + else{ + $(event.target).data('click','1') + this.selectedTable.push($(event.target).data('table_id')) + $(event.target).css("background-color", "#90EE90"); + } + } + // Event for adding order lines + merge_orderline(event) { + var self = this; + var select = this.selectedTable + this.selectedTable.forEach(table => { + this.env.pos.orders.forEach(item => { + if(item.tableId == table){ + item.orderlines.forEach(line => { + this.env.pos.get_order().orderlines.add(line); + }); + this.env.pos.removeOrder(item) + } + }); + }); + this.env.pos.get_order().select_orderline(this.env.pos.get_order().get_last_orderline()); + this.env.posbus.trigger('close-popup', { + popupId: this.props.id }); // close popup + } + }; + PosTablePopup.template = 'PosTablePopup'; + Registries.Component.add(PosTablePopup); + return PosTablePopup; +}); diff --git a/pos_table_merge_orders/static/src/js/table_merge_orders.js b/pos_table_merge_orders/static/src/js/table_merge_orders.js new file mode 100644 index 000000000..f996fd4de --- /dev/null +++ b/pos_table_merge_orders/static/src/js/table_merge_orders.js @@ -0,0 +1,28 @@ +odoo.define('pos_table_merge_orders.PosTableButton', function(require) { + "use strict"; + const PosComponent = require('point_of_sale.PosComponent'); + const ProductScreen = require('point_of_sale.ProductScreen'); + const { useListener } = require("@web/core/utils/hooks"); + const Registries = require('point_of_sale.Registries'); + // Extends PosComponents and added a click function + class PosTableButton extends PosComponent { + setup() { + super.setup(); + useListener('click', this.onClick); + } + async onClick(ev) { + let self = this; + this.showPopup('PosTablePopup'); + } + } + // It Shows the PosTableButton when enables the Allow Merge Table Orders field + PosTableButton.template = 'PosTableButton'; + ProductScreen.addControlButton({ + component: PosTableButton, + condition: function() { + return this.env.pos.config.allow_merge_tables; + }, + }); + Registries.Component.add(PosTableButton); + return PosTableButton; +}); diff --git a/pos_table_merge_orders/static/src/xml/table_merge_orders.xml b/pos_table_merge_orders/static/src/xml/table_merge_orders.xml new file mode 100644 index 000000000..e9abcf1a7 --- /dev/null +++ b/pos_table_merge_orders/static/src/xml/table_merge_orders.xml @@ -0,0 +1,43 @@ + + + + + + + Merge Table + + + + + + + diff --git a/pos_table_merge_orders/views/res_config_settings_views.xml b/pos_table_merge_orders/views/res_config_settings_views.xml new file mode 100644 index 000000000..3d5fbe794 --- /dev/null +++ b/pos_table_merge_orders/views/res_config_settings_views.xml @@ -0,0 +1,36 @@ + + + + + + + res.config.settings.view.form.inherit.pos.table.merge.orders + + res.config.settings + + + +

Merge Table

+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+