diff --git a/hubspot_odoo_connector/__manifest__.py b/hubspot_odoo_connector/__manifest__.py index 468a8926f..423ef1852 100644 --- a/hubspot_odoo_connector/__manifest__.py +++ b/hubspot_odoo_connector/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'HubSpot Odoo Connector', - 'version': '15.0.1.0.0', + 'version': '15.0.1.0.1', 'summary': 'This module integrate Hubspot with odoo', 'description': """ This module integrates HubSpot with Odoo to sync contacts, companies, and deals. It allows seamless integration between diff --git a/hubspot_odoo_connector/doc/RELEASE_NOTES.md b/hubspot_odoo_connector/doc/RELEASE_NOTES.md index 53605794f..470ba20d3 100644 --- a/hubspot_odoo_connector/doc/RELEASE_NOTES.md +++ b/hubspot_odoo_connector/doc/RELEASE_NOTES.md @@ -4,3 +4,9 @@ #### Version 15.0.1.0.0 #### ADD - Initial commit for HubSpot Odoo Connector + +#### 15.04.2024 +#### Version 15.0.1.0.1 +#### FIX + +- Fixed the connection issue between odoo and hubspot \ No newline at end of file diff --git a/hubspot_odoo_connector/models/hubspot_connector.py b/hubspot_odoo_connector/models/hubspot_connector.py index a9f3a9be2..30a4c4dd2 100644 --- a/hubspot_odoo_connector/models/hubspot_connector.py +++ b/hubspot_odoo_connector/models/hubspot_connector.py @@ -26,7 +26,7 @@ from hubspot.crm.deals import BatchInputSimplePublicObjectBatchInput from hubspot.crm.deals import SimplePublicObjectInput import requests from odoo import fields, models, _ -from odoo.exceptions import AccessError +from odoo.exceptions import AccessError, UserError class HubspotConnector(models.Model): @@ -177,23 +177,29 @@ class HubspotConnector(models.Model): Method for testing connection; if credentials are correct connects and shows sync options, if connected disconnects. """ - if not self.connection: - owners_endpoint = 'https://api.hubapi.com/owners/v2/owners' - headers = {'Authorization': f'Bearer {self.access_key}'} - try: - response = requests.get(owners_endpoint, headers=headers) - if response.status_code == 200: - data = response.json() - if str(data[0]['ownerId']) == self.owner_id: + if not self.access_key or not self.owner_id: + raise UserError(_("Access key and owner ID are required")) + + owners_endpoint = 'https://api.hubapi.com/crm/v3/owners' + headers = {'Authorization': f'Bearer {self.access_key}'} + + try: + response = requests.get(owners_endpoint, headers=headers) + if response.status_code == 200: + data = response.json() + owners = data.get('results', []) + if not owners: + raise UserError(_("No owners found in HubSpot account")) + for owner in owners: + if str(owner['id']) == self.owner_id: self.connection = True self.state = "connected" - else: - raise AccessError(_("Error when Fetching account info")) - except requests.exceptions.RequestException: - return None - else: - self.connection = False - self.state = "disconnected" + return + raise UserError(_("Owner ID does not match any HubSpot owner")) + else: + raise UserError(_("Failed to connect to HubSpot: %s") % response.text) + except requests.exceptions.RequestException as e: + raise UserError(_("Network error connecting to HubSpot: %s") % str(e)) def action_contact_sync(self): """ diff --git a/hubspot_odoo_connector/static/description/assets/icons/capture (1).png b/hubspot_odoo_connector/static/description/assets/icons/capture (1).png new file mode 100644 index 000000000..8824deafc Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/icons/capture (1).png differ diff --git a/hubspot_odoo_connector/static/description/assets/icons/img.png b/hubspot_odoo_connector/static/description/assets/icons/img.png new file mode 100644 index 000000000..70197f477 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/icons/img.png differ diff --git a/hubspot_odoo_connector/static/description/assets/icons/photo-capture.png b/hubspot_odoo_connector/static/description/assets/icons/photo-capture.png new file mode 100644 index 000000000..06c111758 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/icons/photo-capture.png differ diff --git a/hubspot_odoo_connector/static/description/assets/misc/Cybrosys R.png b/hubspot_odoo_connector/static/description/assets/misc/Cybrosys R.png new file mode 100644 index 000000000..da4058087 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/misc/Cybrosys R.png differ diff --git a/hubspot_odoo_connector/static/description/assets/misc/email.svg b/hubspot_odoo_connector/static/description/assets/misc/email.svg new file mode 100644 index 000000000..15291cdc3 --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/email.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hubspot_odoo_connector/static/description/assets/misc/phone.svg b/hubspot_odoo_connector/static/description/assets/misc/phone.svg new file mode 100644 index 000000000..b7bd7f251 --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/phone.svg @@ -0,0 +1,3 @@ + + + diff --git a/hubspot_odoo_connector/static/description/assets/misc/star (1) 2.svg b/hubspot_odoo_connector/static/description/assets/misc/star (1) 2.svg new file mode 100644 index 000000000..5ae9f507a --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/star (1) 2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/hubspot_odoo_connector/static/description/assets/misc/support (1) 1.svg b/hubspot_odoo_connector/static/description/assets/misc/support (1) 1.svg new file mode 100644 index 000000000..7d37a8f30 --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/support (1) 1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/hubspot_odoo_connector/static/description/assets/misc/support-email.svg b/hubspot_odoo_connector/static/description/assets/misc/support-email.svg new file mode 100644 index 000000000..eb70370d6 --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/support-email.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/hubspot_odoo_connector/static/description/assets/misc/tick-mark.svg b/hubspot_odoo_connector/static/description/assets/misc/tick-mark.svg new file mode 100644 index 000000000..2dbb40187 --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/tick-mark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/hubspot_odoo_connector/static/description/assets/misc/whatsapp 1.svg b/hubspot_odoo_connector/static/description/assets/misc/whatsapp 1.svg new file mode 100644 index 000000000..0bfaf8fc6 --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/whatsapp 1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/hubspot_odoo_connector/static/description/assets/misc/whatsapp.svg b/hubspot_odoo_connector/static/description/assets/misc/whatsapp.svg new file mode 100644 index 000000000..b618aea1d --- /dev/null +++ b/hubspot_odoo_connector/static/description/assets/misc/whatsapp.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hubspot_odoo_connector/static/description/assets/modules/1.jpg b/hubspot_odoo_connector/static/description/assets/modules/1.jpg new file mode 100644 index 000000000..a094e97b6 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/modules/1.jpg differ diff --git a/hubspot_odoo_connector/static/description/assets/modules/2.jpg b/hubspot_odoo_connector/static/description/assets/modules/2.jpg new file mode 100644 index 000000000..ad21f1ab8 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/modules/2.jpg differ diff --git a/hubspot_odoo_connector/static/description/assets/modules/3.jpg b/hubspot_odoo_connector/static/description/assets/modules/3.jpg new file mode 100644 index 000000000..31f2bc9f5 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/modules/3.jpg differ diff --git a/hubspot_odoo_connector/static/description/assets/modules/4.jpg b/hubspot_odoo_connector/static/description/assets/modules/4.jpg new file mode 100644 index 000000000..641aa46e0 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/modules/4.jpg differ diff --git a/hubspot_odoo_connector/static/description/assets/modules/5.png b/hubspot_odoo_connector/static/description/assets/modules/5.png new file mode 100644 index 000000000..511d4d392 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/modules/5.png differ diff --git a/hubspot_odoo_connector/static/description/assets/modules/6.png b/hubspot_odoo_connector/static/description/assets/modules/6.png new file mode 100644 index 000000000..ddc2956ca Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/modules/6.png differ diff --git a/hubspot_odoo_connector/static/description/assets/screenshots/11.png b/hubspot_odoo_connector/static/description/assets/screenshots/11.png new file mode 100644 index 000000000..0487e4412 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/screenshots/11.png differ diff --git a/hubspot_odoo_connector/static/description/assets/screenshots/12.png b/hubspot_odoo_connector/static/description/assets/screenshots/12.png new file mode 100644 index 000000000..e2bf827de Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/screenshots/12.png differ diff --git a/hubspot_odoo_connector/static/description/assets/screenshots/13.png b/hubspot_odoo_connector/static/description/assets/screenshots/13.png new file mode 100644 index 000000000..729218889 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/screenshots/13.png differ diff --git a/hubspot_odoo_connector/static/description/assets/screenshots/14.png b/hubspot_odoo_connector/static/description/assets/screenshots/14.png new file mode 100644 index 000000000..d21b8d028 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/screenshots/14.png differ diff --git a/hubspot_odoo_connector/static/description/assets/screenshots/15.png b/hubspot_odoo_connector/static/description/assets/screenshots/15.png new file mode 100644 index 000000000..3242d0c8c Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/screenshots/15.png differ diff --git a/hubspot_odoo_connector/static/description/assets/screenshots/3a.png b/hubspot_odoo_connector/static/description/assets/screenshots/3a.png new file mode 100644 index 000000000..ce0906bd8 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/screenshots/3a.png differ diff --git a/hubspot_odoo_connector/static/description/assets/screenshots/9.png b/hubspot_odoo_connector/static/description/assets/screenshots/9.png new file mode 100644 index 000000000..92c446d60 Binary files /dev/null and b/hubspot_odoo_connector/static/description/assets/screenshots/9.png differ diff --git a/hubspot_odoo_connector/static/description/banner.jpg b/hubspot_odoo_connector/static/description/banner.jpg new file mode 100644 index 000000000..9d59e264d Binary files /dev/null and b/hubspot_odoo_connector/static/description/banner.jpg differ diff --git a/hubspot_odoo_connector/views/hubspot_connector_views.xml b/hubspot_odoo_connector/views/hubspot_connector_views.xml index 8521e3a9e..51465aa7c 100644 --- a/hubspot_odoo_connector/views/hubspot_connector_views.xml +++ b/hubspot_odoo_connector/views/hubspot_connector_views.xml @@ -7,7 +7,7 @@
- +