diff --git a/geoip_website_redirect/README.rst b/geoip_website_redirect/README.rst index fa6311ef4..9236d62c5 100644 --- a/geoip_website_redirect/README.rst +++ b/geoip_website_redirect/README.rst @@ -1,9 +1,9 @@ .. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg - :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :target: https://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 -Website GeoIP Based Language and Currency -======================= +Website Geolocation Based Language and Currency +=============================================== This module allow to view the website content according to login user's country details Company diff --git a/geoip_website_redirect/__manifest__.py b/geoip_website_redirect/__manifest__.py index 0338176d5..884e70bef 100644 --- a/geoip_website_redirect/__manifest__.py +++ b/geoip_website_redirect/__manifest__.py @@ -20,9 +20,9 @@ # ############################################################################# { - 'name': 'Website GeoIP Based Language and Currency', + 'name': 'Website Geolocation Based Language and Currency', 'version': '16.0.1.0.0', - 'summary': 'Website GeoIP Based Language and Currency Application ' + 'summary': 'Website Geolocation Based Language and Currency Application ' 'for Odoo 16', 'description': """The module helps you to map currency and language based on Customer's IP address""", diff --git a/geoip_website_redirect/controllers/geoip_website_redirect.py b/geoip_website_redirect/controllers/geoip_website_redirect.py index 160cd766e..1626c3a32 100644 --- a/geoip_website_redirect/controllers/geoip_website_redirect.py +++ b/geoip_website_redirect/controllers/geoip_website_redirect.py @@ -21,11 +21,12 @@ ############################################################################# import requests from odoo import http +from countryinfo import CountryInfo from odoo.http import request from odoo.addons.web.controllers.home import Home -class GeoIP(Home): +class Geolocation(Home): """ controller for selecting login user's datas """ def get_location(self, ip_address): @@ -36,8 +37,7 @@ class GeoIP(Home): @http.route() def web_login(self, redirect=None, **kw): """ on login access customer country information """ - from countryinfo import CountryInfo - result = super(GeoIP, self).web_login(redirect=redirect, **kw) + result = super(Geolocation, self).web_login(redirect=redirect, **kw) request.env.user.write({'ip_address': kw.get('user_ip')}) datas = self.get_location(kw.get('user_ip')) if datas: diff --git a/geoip_website_redirect/doc/RELEASE_NOTES.md b/geoip_website_redirect/doc/RELEASE_NOTES.md index fba4f6f1a..e9b3242fa 100644 --- a/geoip_website_redirect/doc/RELEASE_NOTES.md +++ b/geoip_website_redirect/doc/RELEASE_NOTES.md @@ -4,4 +4,4 @@ #### Version 16.0.1.0.0 #### ADD -- Initial commit for Website GeoIP Based Language and Currency +- Initial commit for Website Geolocation Based Language and Currency diff --git a/geoip_website_redirect/static/description/banner.png b/geoip_website_redirect/static/description/banner.png index e703ae21b..26d850643 100644 Binary files a/geoip_website_redirect/static/description/banner.png and b/geoip_website_redirect/static/description/banner.png differ diff --git a/geoip_website_redirect/static/description/icon.png b/geoip_website_redirect/static/description/icon.png index 450eecbf5..bad605f35 100644 Binary files a/geoip_website_redirect/static/description/icon.png and b/geoip_website_redirect/static/description/icon.png differ diff --git a/geoip_website_redirect/static/description/index.html b/geoip_website_redirect/static/description/index.html index 5a938c862..2bc42727d 100644 --- a/geoip_website_redirect/static/description/index.html +++ b/geoip_website_redirect/static/description/index.html @@ -5,7 +5,7 @@

- Website GeoIP Based Language and Currency + Website Geolocation Based Language and Currency

- Website GeoIP Based Language and Currency is an application which is fetch - the IP address of customer's device and allow them to + Website Geolocation Based Language and Currency is an application which is fetch + the IP address of customer's device `and allow them to see website in their native language and see the currency as per the geolocation. @@ -53,50 +53,6 @@ style="color:#fff; font-size:16px; vertical-align:middle">What's App

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -238,60 +194,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Website GeoIP Based Language and Currency

+ Website Geolocation Based Language and Currency

@@ -377,111 +279,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -514,7 +311,7 @@

- Website GeoIP Based Language and Currency

+ Website Geolocation Based Language and Currency

@@ -576,336 +373,7 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -930,7 +398,7 @@

- Website GeoIP Based Language and Currency

+ Website Geolocation Based Language and Currency