From 573bc979b87139255fdf29e919001b19f77f45c7 Mon Sep 17 00:00:00 2001 From: Katherine Zaoral Date: Mon, 26 Aug 2019 09:52:03 -0300 Subject: [PATCH 1/3] [ADD] mail_tracking_mailgun: manage failed state from mailgun This change let odoo process a state sent from mailgun legacy webhooks that seems to apply when the message is not sent because the related email has been mark us as spam or have bounced before. For solve this add two new states to _mailgun_event_type_mapping_mailgun_event_type_mapping method: * failed: Mailgun could not deliver the email to the recipient email server * rejected: Mailgun rejected the request to send/forward the email source in https://documentation.mailgun.com/en/latest/quickstart-events.html#events. --- mail_tracking_mailgun/models/mail_tracking_email.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mail_tracking_mailgun/models/mail_tracking_email.py b/mail_tracking_mailgun/models/mail_tracking_email.py index f3965572e..a24e993d3 100644 --- a/mail_tracking_mailgun/models/mail_tracking_email.py +++ b/mail_tracking_mailgun/models/mail_tracking_email.py @@ -45,6 +45,8 @@ class MailTrackingEmail(models.Model): 'bounced': 'hard_bounce', 'dropped': 'reject', 'accepted': 'sent', + 'failed': 'error', + 'rejected': 'error', } def _mailgun_event_type_verify(self, event): From b83441394f266a5ace53a4c7c1db2156611ecd59 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 30 Aug 2019 12:29:08 +0000 Subject: [PATCH 2/3] [UPD] Update mail_tracking_mailgun.pot --- mail_tracking_mailgun/i18n/mail_tracking_mailgun.pot | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mail_tracking_mailgun/i18n/mail_tracking_mailgun.pot b/mail_tracking_mailgun/i18n/mail_tracking_mailgun.pot index a6fd01007..b743b3cc8 100644 --- a/mail_tracking_mailgun/i18n/mail_tracking_mailgun.pot +++ b/mail_tracking_mailgun/i18n/mail_tracking_mailgun.pot @@ -32,7 +32,7 @@ msgid "%s is not a valid email address. Please check it in order to avoid sendin msgstr "" #. module: mail_tracking_mailgun -#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:76 +#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:78 #, python-format msgid "A Mailgun domain value is needed!" msgstr "" @@ -53,7 +53,7 @@ msgid "Contact" msgstr "" #. module: mail_tracking_mailgun -#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:240 +#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:242 #, python-format msgid "Couldn't retrieve Mailgun information" msgstr "" @@ -73,7 +73,7 @@ msgid "Error %s trying to check mailof connection" msgstr "" #. module: mail_tracking_mailgun -#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:244 +#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:246 #, python-format msgid "Event information not longer stored" msgstr "" @@ -115,13 +115,13 @@ msgid "Set Bounced" msgstr "" #. module: mail_tracking_mailgun -#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:70 +#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:72 #, python-format msgid "There is no Mailgun API key!" msgstr "" #. module: mail_tracking_mailgun -#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:227 +#: code:addons/mail_tracking_mailgun/models/mail_tracking_email.py:229 #, python-format msgid "There is no tracked message!" msgstr "" From 50ca79e49ed427d79fe19e2e97b38f2e5c1494bd Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 30 Aug 2019 12:40:09 +0000 Subject: [PATCH 3/3] mail_tracking_mailgun 11.0.1.2.0 --- mail_tracking_mailgun/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_tracking_mailgun/__manifest__.py b/mail_tracking_mailgun/__manifest__.py index 36f3dc121..f4285160a 100644 --- a/mail_tracking_mailgun/__manifest__.py +++ b/mail_tracking_mailgun/__manifest__.py @@ -6,7 +6,7 @@ { "name": "Mail tracking for Mailgun", "summary": "Mail tracking and Mailgun webhooks integration", - "version": "11.0.1.1.2", + "version": "11.0.1.2.0", "category": "Social Network", "website": "https://github.com/OCA/social", "author": "Tecnativa, "