diff --git a/pos_table_merge_orders/README.rst b/pos_table_merge_orders/README.rst new file mode 100644 index 000000000..600f37dc5 --- /dev/null +++ b/pos_table_merge_orders/README.rst @@ -0,0 +1,46 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.svg + :target: https://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) +(https://www.gnu.org/licenses/agpl.html) + +Credits +------- +* Developer: (V17) Nikhil M, 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..e7d27e805 --- /dev/null +++ b/pos_table_merge_orders/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Nikhil M () +# 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..9a9752705 --- /dev/null +++ b/pos_table_merge_orders/__manifest__.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Nikhil M () +# 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': '17.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': ['pos_restaurant'], + 'data': [ + 'views/res_config_settings_views.xml', + ], + 'assets': { + 'point_of_sale._assets_pos': [ + 'pos_table_merge_orders/static/src/**/*', + ], + }, + 'license': 'AGPL-3', + 'installable': True, + 'auto_install': False, + 'application': False, +} 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..57937a8ef --- /dev/null +++ b/pos_table_merge_orders/doc/RELEASE_NOTES.md @@ -0,0 +1,6 @@ +## Module + +#### 21.02.2024 +#### Version 17.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..823c1ddb2 --- /dev/null +++ b/pos_table_merge_orders/models/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Nikhil M () +# 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 pos_config +from . import res_config_settings diff --git a/pos_table_merge_orders/models/pos_config.py b/pos_table_merge_orders/models/pos_config.py new file mode 100644 index 000000000..4bfc4741c --- /dev/null +++ b/pos_table_merge_orders/models/pos_config.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Nikhil M () +# 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') 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..ec733d1d1 --- /dev/null +++ b/pos_table_merge_orders/models/res_config_settings.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Nikhil M () +# 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 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/Cybrosys_new.png b/pos_table_merge_orders/static/description/assets/misc/Cybrosys_new.png new file mode 100644 index 000000000..da4058087 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/misc/Cybrosys_new.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.jpeg b/pos_table_merge_orders/static/description/assets/modules/1.jpeg new file mode 100644 index 000000000..d704eb313 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/1.jpeg differ diff --git a/pos_table_merge_orders/static/description/assets/modules/2.jpeg b/pos_table_merge_orders/static/description/assets/modules/2.jpeg new file mode 100644 index 000000000..a68431b9d Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/2.jpeg differ diff --git a/pos_table_merge_orders/static/description/assets/modules/3.jpeg b/pos_table_merge_orders/static/description/assets/modules/3.jpeg new file mode 100644 index 000000000..a5299d338 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/3.jpeg differ diff --git a/pos_table_merge_orders/static/description/assets/modules/4.jpeg b/pos_table_merge_orders/static/description/assets/modules/4.jpeg new file mode 100644 index 000000000..5d47bad17 Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/4.jpeg 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..535b8aa14 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.jpeg b/pos_table_merge_orders/static/description/assets/modules/6.jpeg new file mode 100644 index 000000000..a1209a01f Binary files /dev/null and b/pos_table_merge_orders/static/description/assets/modules/6.jpeg 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..46dd1e4f0 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..b44469a22 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..e14348375 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..0b9dcbede 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..76b6eb71a 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..233abf354 --- /dev/null +++ b/pos_table_merge_orders/static/description/index.html @@ -0,0 +1,712 @@ + + + + + + + Odoo App 3 Index + + + + + + + + +
+
+
+
+
+ +
+
+
+ Community +
+
+ Enterprise +
+
+ Odoo.sh +
+
+
+
+
+
+

+ POS Table Merge Orders

+

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

+
+ +
+
+
+
+
+

+ Key Highlights +

+
+
+
+
+
+ +
+
+

+ 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

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

+ Allow merge table order.

+

The + By enabling this user can merge multi table orders.

+
+
+
+
+
+
+ +
+
+

+ Choose which table you want to merge.

+

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

+
+
+
+
+
+
+ +
+
+

+ Button to merge the table's order.

+

The second + Merge table order button.

+
+
+
+
+
+
+ +
+
+

+ Choose the tables you want to combine.

+

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

+
+
+
+
+
+
+
    +
  • + 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. +
  • +
+
+
+
+
+
+
Version + 17.0.1.0.0|Released on:22nd February 2024 +
+

+ Initial Commit for POS Table Merge Orders.

+
+
+
+
+
+
+
+

+ Related Products

+
+
+ +
+
+

+ Our Services

+ +
+
+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Customization

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Implementation

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Support

+
+
+
+
+
+
+ service-icon +
+
+

Hire + Odoo Developer

+
+
+
+
+ +
+
+ service-icon +
+
+

Odoo + Integration

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Migration

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Consultancy

+
+
+
+
+
+
+ service-icon +
+
+

Odoo + Implementation

+
+
+
+
+
+
+ service-icon +
+
+

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 + 99456767686 +
+
+
+
+
+
+
+
+
+ + + + + + diff --git a/pos_table_merge_orders/static/src/css/table.css b/pos_table_merge_orders/static/src/css/table.css new file mode 100644 index 000000000..7e4e77aaa --- /dev/null +++ b/pos_table_merge_orders/static/src/css/table.css @@ -0,0 +1,7 @@ +.product.table-merge{ + height: 50px; + display: flex; + align-items: center; + justify-content: center; + border: 1px solid #aeaeae; +} 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..16c46f6d3 --- /dev/null +++ b/pos_table_merge_orders/static/src/js/table_merge_orders.js @@ -0,0 +1,52 @@ +/** @odoo-module **/ + +import { _t } from "@web/core/l10n/translation"; +import { ProductScreen } from "@point_of_sale/app/screens/product_screen/product_screen"; +import { useService } from "@web/core/utils/hooks"; +import { Component } from "@odoo/owl"; +import { usePos } from "@point_of_sale/app/store/pos_hook"; +import { MergeTablePopup } from "@pos_table_merge_orders/js/table_popup"; + +export class PosTableButton extends Component { + static template = "pos_table_merge_orders.PosTableButton"; + + setup() { + this.pos = usePos(); + this.popup = useService("popup"); + } + +// function to merge the tableOrders + async onClick() { + const { confirmed, payload } = await this.popup.add(MergeTablePopup, { + title: _t("Merge Table"), + tables: this.pos.currentFloor.tables, + confirmText: 'Merge', + cancelText: 'Cancel', + currentTable:this.pos.table.id, + }); + + if(confirmed){ + if(payload.length > 0){ + const order = this.pos.get_order(); + const orders = this.pos.get_order_list(); + const tableOrders = orders.filter( + (order) => payload.includes(order.tableId) && !order.finalized && order.tableId !== this.pos.table.id + ); + tableOrders.forEach(item => { + item.orderlines.forEach(line => { + order.orderlines.add(line); + }); + this.pos.removeOrder(item) + }); + } + } + } +} + +ProductScreen.addControlButton({ + component: PosTableButton, + position: ["before", "OrderlineNoteButton"], + condition: function () { + return this.pos.config.allow_merge_tables; + }, +}); diff --git a/pos_table_merge_orders/static/src/js/table_popup.js b/pos_table_merge_orders/static/src/js/table_popup.js new file mode 100644 index 000000000..f14c25ed5 --- /dev/null +++ b/pos_table_merge_orders/static/src/js/table_popup.js @@ -0,0 +1,50 @@ +/** @odoo-module */ + +import { AbstractAwaitablePopup } from "@point_of_sale/app/popup/abstract_awaitable_popup"; +import { _t } from "@web/core/l10n/translation"; + +export class MergeTablePopup extends AbstractAwaitablePopup { + static template = "pos_table_merge_orders.MergeTablePopup"; + static defaultProps = { + confirmText: _t("Add"), + cancelText: _t("Discard"), + title: "", + body: "", + }; + setup() { + super.setup(); + this.selectedTable = []; + } +// return the selected tables to the productscreen + getPayload() { + return this.selectedTable; + } + +// get the current tables from this floor + get tables() { + var tables = []; + var floors = this.pos.floors + 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"); // css for showing selected tables. + var index = this.selectedTable.indexOf($(event.target).data('table_id')); + if (index !== -1) { + 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"); + } + } +} 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..6b86da6ab --- /dev/null +++ b/pos_table_merge_orders/static/src/xml/table_merge_orders.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + 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..dd36d0a83 --- /dev/null +++ b/pos_table_merge_orders/views/res_config_settings_views.xml @@ -0,0 +1,19 @@ + + + + + + res.config.settings.form.pos.table.merge.orders + res.config.settings + + + + + + + + + + +