From 98f409a9d463209503ee6b6d213897638cc62cfc Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Thu, 7 Dec 2023 09:56:04 +0530 Subject: [PATCH] Dec 7 : [FIX] Bug Fixed 'website_floating_whatsapp_icon' --- website_floating_whatsapp_icon/README.rst | 13 ++-- website_floating_whatsapp_icon/__init__.py | 4 +- .../__manifest__.py | 8 +- .../doc/{changelog.md => RELEASE_NOTES.md} | 6 +- .../model/__init__.py | 4 +- .../model/website.py | 5 +- .../static/description/index.html | 2 +- .../static/src/css/whatsapp.css | 6 +- .../views/portal_whatsapp_view.xml | 78 +------------------ ...ebsite_inherited.xml => website_views.xml} | 4 +- 10 files changed, 30 insertions(+), 100 deletions(-) rename website_floating_whatsapp_icon/doc/{changelog.md => RELEASE_NOTES.md} (62%) rename website_floating_whatsapp_icon/views/{website_inherited.xml => website_views.xml} (85%) diff --git a/website_floating_whatsapp_icon/README.rst b/website_floating_whatsapp_icon/README.rst index 7d0df4f79..640bff640 100644 --- a/website_floating_whatsapp_icon/README.rst +++ b/website_floating_whatsapp_icon/README.rst @@ -1,6 +1,6 @@ -.. 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 +.. image:: https://img.shields.io/badge/license-LGPL--3-green.svg + :target: https://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 Whatsapp Floating Icon in Website ================================= @@ -14,6 +14,11 @@ Company ------- * `Cybrosys Techno Solutions `__ +License +------- +General Public License, Version 3 (LGPL v3). +(https://www.gnu.org/licenses/lgpl-3.0-standalone.html) + Credits ------- * Developers: Noorjahan @cybrosys @@ -40,5 +45,3 @@ For support and more information, please visit `Our Website `__ - - diff --git a/website_floating_whatsapp_icon/__init__.py b/website_floating_whatsapp_icon/__init__.py index 7e89f58d5..06c4a1f74 100644 --- a/website_floating_whatsapp_icon/__init__.py +++ b/website_floating_whatsapp_icon/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2020-TODAY Cybrosys Technologies() +# Copyright (C) 2022-TODAY Cybrosys Technologies() # Author: Noorjahan N A () # # You can modify it under the terms of the GNU LESSER @@ -20,4 +20,4 @@ # ############################################################################# -from . import model \ No newline at end of file +from . import model diff --git a/website_floating_whatsapp_icon/__manifest__.py b/website_floating_whatsapp_icon/__manifest__.py index 0394219d3..9d21a30a4 100644 --- a/website_floating_whatsapp_icon/__manifest__.py +++ b/website_floating_whatsapp_icon/__manifest__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2020-TODAY Cybrosys Technologies() +# Copyright (C) 2022-TODAY Cybrosys Technologies() # Author: Noorjahan N A () # # You can modify it under the terms of the GNU LESSER @@ -22,7 +22,7 @@ { 'name': 'Whatsapp Floating Icon in Website', - 'version': '16.0.1.0.0', + 'version': '16.0.1.0.1', 'category': 'Extra Tools', 'summary': """Whatsapp Floating Icon in Website""", 'description': """Whatsapp Floating Icon in Website, Website Floating WhatsApp Icon, Whatsapp Odoo Website,Whatsapp Odoo Coonector, Whatsapp website, Whatsapp""", @@ -30,10 +30,10 @@ 'website': "https://www.cybrosys.com", 'company': 'Cybrosys Techno Solutions', 'maintainer': 'Cybrosys Techno Solutions', - 'depends': ['base','website'], + 'depends': ['base', 'website'], 'data': [ 'views/portal_whatsapp_view.xml', - 'views/website_inherited.xml', + 'views/website_views.xml', ], 'images': ['static/description/banner.png'], 'assets': { diff --git a/website_floating_whatsapp_icon/doc/changelog.md b/website_floating_whatsapp_icon/doc/RELEASE_NOTES.md similarity index 62% rename from website_floating_whatsapp_icon/doc/changelog.md rename to website_floating_whatsapp_icon/doc/RELEASE_NOTES.md index 8fcb58370..33a4d0a4a 100644 --- a/website_floating_whatsapp_icon/doc/changelog.md +++ b/website_floating_whatsapp_icon/doc/RELEASE_NOTES.md @@ -3,8 +3,4 @@ #### 16.09.2022 #### Version 16.0.1.0.0 #### ADD -- Initial commit - - - - +- Initial commit for Whatsapp Floating Icon in Website diff --git a/website_floating_whatsapp_icon/model/__init__.py b/website_floating_whatsapp_icon/model/__init__.py index 2691cb3fd..08ece8e9c 100644 --- a/website_floating_whatsapp_icon/model/__init__.py +++ b/website_floating_whatsapp_icon/model/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2020-TODAY Cybrosys Technologies() +# Copyright (C) 2022-TODAY Cybrosys Technologies() # Author: Noorjahan N A () # # You can modify it under the terms of the GNU LESSER @@ -20,4 +20,4 @@ # ############################################################################# -from . import website \ No newline at end of file +from . import website diff --git a/website_floating_whatsapp_icon/model/website.py b/website_floating_whatsapp_icon/model/website.py index b227dd87a..e3dadd893 100644 --- a/website_floating_whatsapp_icon/model/website.py +++ b/website_floating_whatsapp_icon/model/website.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2020-TODAY Cybrosys Technologies() +# Copyright (C) 2022-TODAY Cybrosys Technologies() # Author: Noorjahan N A () # # You can modify it under the terms of the GNU LESSER @@ -26,4 +26,5 @@ from odoo import fields, models class Website(models.Model): _inherit = 'website' - mobile_number = fields.Char(string='Mobile Number') + mobile_number = fields.Char(string='Mobile Number', + help="Your WhatsApp number") diff --git a/website_floating_whatsapp_icon/static/description/index.html b/website_floating_whatsapp_icon/static/description/index.html index 4e232fd14..608b30860 100644 --- a/website_floating_whatsapp_icon/static/description/index.html +++ b/website_floating_whatsapp_icon/static/description/index.html @@ -533,4 +533,4 @@ - \ No newline at end of file + diff --git a/website_floating_whatsapp_icon/static/src/css/whatsapp.css b/website_floating_whatsapp_icon/static/src/css/whatsapp.css index 91dd355b3..50092714f 100644 --- a/website_floating_whatsapp_icon/static/src/css/whatsapp.css +++ b/website_floating_whatsapp_icon/static/src/css/whatsapp.css @@ -2,8 +2,8 @@ position:fixed; width:60px; height:60px; - bottom:40px; - right:40px; + bottom: 95px; + right: 30px; background-color:#25d366; color:#FFF; border-radius:50px; @@ -19,4 +19,4 @@ .fa-whatsapp { color:#FFF; -} \ No newline at end of file +} diff --git a/website_floating_whatsapp_icon/views/portal_whatsapp_view.xml b/website_floating_whatsapp_icon/views/portal_whatsapp_view.xml index 6cbe216bd..5f1d8a1dc 100644 --- a/website_floating_whatsapp_icon/views/portal_whatsapp_view.xml +++ b/website_floating_whatsapp_icon/views/portal_whatsapp_view.xml @@ -1,82 +1,12 @@ -