From b9e0f571cd8f2ff0be8921061bacfa796d42a261 Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Wed, 9 Nov 2016 19:23:30 +0100 Subject: [PATCH] mass_mailing_event (#127) --- mass_mailing_event/README.rst | 72 ++++++++++ mass_mailing_event/__init__.py | 4 + mass_mailing_event/__openerp__.py | 24 ++++ mass_mailing_event/data/event_state_data.xml | 29 +++++ mass_mailing_event/i18n/es.po | 96 ++++++++++++++ mass_mailing_event/models/__init__.py | 8 ++ .../models/event_registration.py | 20 +++ .../models/event_registration_state.py | 12 ++ .../models/mail_mass_mailing.py | 54 ++++++++ .../models/mail_mass_mailing_contact.py | 20 +++ mass_mailing_event/models/res_partner.py | 20 +++ .../security/ir.model.access.csv | 2 + .../static/description/icon.png | Bin 0 -> 9455 bytes mass_mailing_event/tests/__init__.py | 4 + .../tests/test_mass_mailing_event.py | 123 ++++++++++++++++++ .../views/mass_mailing_view.xml | 33 +++++ 16 files changed, 521 insertions(+) create mode 100644 mass_mailing_event/README.rst create mode 100644 mass_mailing_event/__init__.py create mode 100644 mass_mailing_event/__openerp__.py create mode 100644 mass_mailing_event/data/event_state_data.xml create mode 100644 mass_mailing_event/i18n/es.po create mode 100644 mass_mailing_event/models/__init__.py create mode 100644 mass_mailing_event/models/event_registration.py create mode 100644 mass_mailing_event/models/event_registration_state.py create mode 100644 mass_mailing_event/models/mail_mass_mailing.py create mode 100644 mass_mailing_event/models/mail_mass_mailing_contact.py create mode 100644 mass_mailing_event/models/res_partner.py create mode 100644 mass_mailing_event/security/ir.model.access.csv create mode 100644 mass_mailing_event/static/description/icon.png create mode 100644 mass_mailing_event/tests/__init__.py create mode 100644 mass_mailing_event/tests/test_mass_mailing_event.py create mode 100644 mass_mailing_event/views/mass_mailing_view.xml diff --git a/mass_mailing_event/README.rst b/mass_mailing_event/README.rst new file mode 100644 index 00000000..e053464c --- /dev/null +++ b/mass_mailing_event/README.rst @@ -0,0 +1,72 @@ +.. 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 + +================== +Mass mailing event +================== + +This module links ``mass_mailing`` with ``event`` in order to exclude +recipients that are already registered, confirmed, cancelled, attended, or a +combination of these states, when the mass mailing is sent. + +Usage +===== + +In a mass mailing, users can set an event related and exclude the recipients who +have an email address already registered in that event. + +This is useful in this scenario: + +1. Create a mass mailing for telling to 1000 partners that a new event is +available. +2. During a week some of them (50) have been registered in the event +3. Then, a week after the first mass mailing, duplicate it to get a second +mass mailing. Relate this one to the event and exclude the registered emails. +Change the message body to remember that early bird period is going to expire +soon. +4. Send the second mass mailing and registered emails are automatically excluded, +So it's been only sent to 950 partners the ones who are not registered in the +event yet. + + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/205/8.0 + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Antonio Espinosa + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/mass_mailing_event/__init__.py b/mass_mailing_event/__init__.py new file mode 100644 index 00000000..ec50cfc0 --- /dev/null +++ b/mass_mailing_event/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/mass_mailing_event/__openerp__.py b/mass_mailing_event/__openerp__.py new file mode 100644 index 00000000..aa5885ec --- /dev/null +++ b/mass_mailing_event/__openerp__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Mass mailing event", + "summary": "Link mass mailing with event for excluding recipients", + "version": "8.0.1.0.0", + "category": "Marketing", + "website": "https://odoo-community.org/", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "mass_mailing", + "event", + ], + "data": [ + "security/ir.model.access.csv", + "data/event_state_data.xml", + "views/mass_mailing_view.xml", + ], +} diff --git a/mass_mailing_event/data/event_state_data.xml b/mass_mailing_event/data/event_state_data.xml new file mode 100644 index 00000000..d9d90770 --- /dev/null +++ b/mass_mailing_event/data/event_state_data.xml @@ -0,0 +1,29 @@ + + + + + + + + Unconfirmed + draft + + + + Cancelled + cancel + + + + Confirmed + open + + + + Attended + done + + + + diff --git a/mass_mailing_event/i18n/es.po b/mass_mailing_event/i18n/es.po new file mode 100644 index 00000000..42ba25f7 --- /dev/null +++ b/mass_mailing_event/i18n/es.po @@ -0,0 +1,96 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_event +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-07 11:16+0000\n" +"PO-Revision-Date: 2016-11-07 11:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mass_mailing_event +#: field:event.registration.state,code:0 +msgid "Code" +msgstr "Código" + +#. module: mass_mailing_event +#: field:event.registration.state,create_uid:0 +msgid "Created by" +msgstr "Creado por" + +#. module: mass_mailing_event +#: field:event.registration.state,create_date:0 +msgid "Created on" +msgstr "Creado en" + +#. module: mass_mailing_event +#: field:event.registration.state,display_name:0 +msgid "Display Name" +msgstr "Nombre mostrado" + +#. module: mass_mailing_event +#: model:ir.model,name:mass_mailing_event.model_event_registration +msgid "Event Registration" +msgstr "Registro de evento" + +#. module: mass_mailing_event +#: field:mail.mass_mailing,event_id:0 +msgid "Event related" +msgstr "Evento relacionado" + +#. module: mass_mailing_event +#: field:mail.mass_mailing,exclude_event_state_ids:0 +msgid "Exclude" +msgstr "Excluir" + +#. module: mass_mailing_event +#: field:event.registration.state,id:0 +msgid "ID" +msgstr "ID" + +#. module: mass_mailing_event +#: field:event.registration.state,__last_update:0 +msgid "Last Modified on" +msgstr "Última modificación en" + +#. module: mass_mailing_event +#: field:event.registration.state,write_uid:0 +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: mass_mailing_event +#: field:event.registration.state,write_date:0 +msgid "Last Updated on" +msgstr "Última actualización en" + +#. module: mass_mailing_event +#: model:ir.model,name:mass_mailing_event.model_mail_mass_mailing +msgid "Mass Mailing" +msgstr "Envío masivo" + +#. module: mass_mailing_event +#: model:ir.model,name:mass_mailing_event.model_mail_mass_mailing_contact +msgid "Mass Mailing Contact" +msgstr "Contacto" + +#. module: mass_mailing_event +#: field:event.registration.state,name:0 +msgid "Name" +msgstr "Nombre" + +#. module: mass_mailing_event +#: model:ir.model,name:mass_mailing_event.model_res_partner +msgid "Partner" +msgstr "Empresa" + +#. module: mass_mailing_event +#: view:mail.mass_mailing:mass_mailing_event.view_mail_mass_mailing_form +msgid "{'search_default_not_opt_out': 1, 'exclude_mass_mailing': active_id}" +msgstr "{'search_default_not_opt_out': 1, 'exclude_mass_mailing': active_id}" diff --git a/mass_mailing_event/models/__init__.py b/mass_mailing_event/models/__init__.py new file mode 100644 index 00000000..21ad2bc0 --- /dev/null +++ b/mass_mailing_event/models/__init__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import event_registration_state +from . import mail_mass_mailing +from . import mail_mass_mailing_contact +from . import res_partner +from . import event_registration diff --git a/mass_mailing_event/models/event_registration.py b/mass_mailing_event/models/event_registration.py new file mode 100644 index 00000000..a7f98fa4 --- /dev/null +++ b/mass_mailing_event/models/event_registration.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import models, api +from .mail_mass_mailing import event_filtered_ids + + +class EventRegistration(models.Model): + _inherit = 'event.registration' + + @api.model + def search_count(self, domain): + res = super(EventRegistration, self).search_count(domain) + mass_mailing_id = self.env.context.get('exclude_mass_mailing', False) + if mass_mailing_id: + res_ids = event_filtered_ids( + self, mass_mailing_id, domain, field='email') + return len(res_ids) if res_ids else 0 + return res diff --git a/mass_mailing_event/models/event_registration_state.py b/mass_mailing_event/models/event_registration_state.py new file mode 100644 index 00000000..677d115f --- /dev/null +++ b/mass_mailing_event/models/event_registration_state.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import models, fields + + +class EventRegistrationState(models.Model): + _name = 'event.registration.state' + + name = fields.Char(required=True) + code = fields.Char(required=True) diff --git a/mass_mailing_event/models/mail_mass_mailing.py b/mass_mailing_event/models/mail_mass_mailing.py new file mode 100644 index 00000000..6544ecab --- /dev/null +++ b/mass_mailing_event/models/mail_mass_mailing.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import copy +from openerp import models, fields, api + + +def event_filtered_ids(model, mass_mailing_id, domain, field='email'): + field = field or 'email' + domain = domain or [] + exclude_emails = [] + mass_mailing = model.env['mail.mass_mailing'].browse(mass_mailing_id) + if mass_mailing.event_id: + exclude = mass_mailing.exclude_event_state_ids.mapped('code') + reg_domain = False + registrations = model.env['event.registration'] + if exclude: + reg_domain = [ + ('event_id', '=', mass_mailing.event_id.id), + ('state', 'in', exclude) + ] + if reg_domain: + registrations = registrations.search(reg_domain) + if registrations: + exclude_emails = registrations.mapped('email') + apply_domain = copy.deepcopy(domain) + if exclude_emails: + apply_domain.append((field, 'not in', exclude_emails)) + rows = model.search(apply_domain) + return rows.ids + + +class MailMassMailing(models.Model): + _inherit = 'mail.mass_mailing' + + def _default_exclude_event_state_ids(self): + return self.env['event.registration.state'].search([]) + + event_id = fields.Many2one( + string="Event related", comodel_name='event.event') + exclude_event_state_ids = fields.Many2many( + comodel_name='event.registration.state', + string="Exclude", default=_default_exclude_event_state_ids) + + @api.model + def get_recipients(self, mailing): + res_ids = super(MailMassMailing, self).get_recipients(mailing) + if res_ids: + domain = [('id', 'in', res_ids)] + return event_filtered_ids( + self.env[mailing.mailing_model], mailing.id, domain, + field='email') + return res_ids diff --git a/mass_mailing_event/models/mail_mass_mailing_contact.py b/mass_mailing_event/models/mail_mass_mailing_contact.py new file mode 100644 index 00000000..355e1fc3 --- /dev/null +++ b/mass_mailing_event/models/mail_mass_mailing_contact.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import models, api +from .mail_mass_mailing import event_filtered_ids + + +class MailMassMailingContact(models.Model): + _inherit = 'mail.mass_mailing.contact' + + @api.model + def search_count(self, domain): + res = super(MailMassMailingContact, self).search_count(domain) + mass_mailing_id = self.env.context.get('exclude_mass_mailing', False) + if mass_mailing_id: + res_ids = event_filtered_ids( + self, mass_mailing_id, domain, field='email') + return len(res_ids) if res_ids else 0 + return res diff --git a/mass_mailing_event/models/res_partner.py b/mass_mailing_event/models/res_partner.py new file mode 100644 index 00000000..4c956f17 --- /dev/null +++ b/mass_mailing_event/models/res_partner.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import models, api +from .mail_mass_mailing import event_filtered_ids + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + @api.model + def search_count(self, domain): + res = super(ResPartner, self).search_count(domain) + mass_mailing_id = self.env.context.get('exclude_mass_mailing', False) + if mass_mailing_id: + res_ids = event_filtered_ids( + self, mass_mailing_id, domain, field='email') + return len(res_ids) if res_ids else 0 + return res diff --git a/mass_mailing_event/security/ir.model.access.csv b/mass_mailing_event/security/ir.model.access.csv new file mode 100644 index 00000000..1370f0e0 --- /dev/null +++ b/mass_mailing_event/security/ir.model.access.csv @@ -0,0 +1,2 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_event_registration_state_group_user","event_registration_state group_user","model_event_registration_state","base.group_user",1,0,0,0 diff --git a/mass_mailing_event/static/description/icon.png b/mass_mailing_event/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/mass_mailing_event/tests/__init__.py b/mass_mailing_event/tests/__init__.py new file mode 100644 index 00000000..da8c2601 --- /dev/null +++ b/mass_mailing_event/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_mass_mailing_event diff --git a/mass_mailing_event/tests/test_mass_mailing_event.py b/mass_mailing_event/tests/test_mass_mailing_event.py new file mode 100644 index 00000000..4d62b8ef --- /dev/null +++ b/mass_mailing_event/tests/test_mass_mailing_event.py @@ -0,0 +1,123 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime, timedelta +from openerp.tests.common import TransactionCase + + +class TestMassMailingEvent(TransactionCase): + def setUp(self, *args, **kwargs): + super(TestMassMailingEvent, self).setUp(*args, **kwargs) + + day_1 = (datetime.now() + timedelta(days=1)).strftime( + '%Y-%m-%d 8:00:00') + day_2 = (datetime.now() + timedelta(days=5)).strftime( + '%Y-%m-%d 18:00:00') + self.event = self.env['event.event'].create({ + 'name': 'Test event', + 'date_begin': day_1, + 'date_end': day_2, + }) + self.registration = self.env['event.registration'].create({ + 'event_id': self.event.id, + 'email': 'partner_a@example.org', + 'nb_register': 1, + 'state': 'draft', + }) + self.states_all = self.env['event.registration.state'].search([]) + self.state_confirmed = self.env['event.registration.state'].search([ + ('code', '=', 'open'), + ]) + + def test_mailing_contact(self): + contact_list = self.env['mail.mass_mailing.list'].create({ + 'name': 'Test list', + }) + contact_a = self.env['mail.mass_mailing.contact'].create({ + 'list_id': contact_list.id, + 'name': 'Test contact A', + 'email': 'partner_a@example.org', + }) + contact_b = self.env['mail.mass_mailing.contact'].create({ + 'list_id': contact_list.id, + 'name': 'Test contact B', + 'email': 'partner_b@example.org', + }) + domain = [ + ('list_id', 'in', [contact_list.id]), + ('opt_out', '=', False), + ] + mass_mailing = self.env['mail.mass_mailing'].create({ + 'name': 'Test subject', + 'email_from': 'from@example.com', + 'mailing_model': 'mail.mass_mailing.contact', + 'mailing_domain': str(domain), + 'contact_list_ids': [(6, False, [contact_list.id])], + 'body_html': '

Test email body

', + 'reply_to_mode': 'email', + }) + m_contact = self.env['mail.mass_mailing.contact'].with_context( + exclude_mass_mailing=mass_mailing.id) + self.assertEqual( + [contact_a.id, contact_b.id], + mass_mailing.get_recipients(mass_mailing)) + self.assertEqual(2, m_contact.search_count(domain)) + mass_mailing.write({ + 'event_id': self.event.id, + 'exclude_event_state_ids': [(6, False, self.states_all.ids)], + }) + self.assertEqual( + [contact_b.id], + mass_mailing.get_recipients(mass_mailing)) + self.assertEqual(1, m_contact.search_count(domain)) + mass_mailing.write({ + 'exclude_event_state_ids': [(6, False, self.state_confirmed.ids)], + }) + self.assertEqual( + [contact_a.id, contact_b.id], + mass_mailing.get_recipients(mass_mailing)) + self.assertEqual(2, m_contact.search_count(domain)) + + def test_mailing_partner(self): + partner_a = self.env['res.partner'].create({ + 'name': 'Test partner A', + 'email': 'partner_a@example.org', + }) + partner_b = self.env['res.partner'].create({ + 'name': 'Test partner B', + 'email': 'partner_b@example.org', + }) + domain = [ + ('id', 'in', [partner_a.id, partner_b.id]), + ('opt_out', '=', False), + ] + mass_mailing = self.env['mail.mass_mailing'].create({ + 'name': 'Test subject', + 'email_from': 'from@example.com', + 'mailing_model': 'res.partner', + 'mailing_domain': str(domain), + 'body_html': '

Test email body

', + 'reply_to_mode': 'email', + }) + m_partner = self.env['res.partner'].with_context( + exclude_mass_mailing=mass_mailing.id) + self.assertEqual( + [partner_a.id, partner_b.id], + mass_mailing.get_recipients(mass_mailing)) + self.assertEqual(2, m_partner.search_count(domain)) + mass_mailing.write({ + 'event_id': self.event.id, + 'exclude_event_state_ids': [(6, False, self.states_all.ids)], + }) + self.assertEqual( + [partner_b.id], + mass_mailing.get_recipients(mass_mailing)) + self.assertEqual(1, m_partner.search_count(domain)) + mass_mailing.write({ + 'exclude_event_state_ids': [(6, False, self.state_confirmed.ids)], + }) + self.assertEqual( + [partner_a.id, partner_b.id], + mass_mailing.get_recipients(mass_mailing)) + self.assertEqual(2, m_partner.search_count(domain)) diff --git a/mass_mailing_event/views/mass_mailing_view.xml b/mass_mailing_event/views/mass_mailing_view.xml new file mode 100644 index 00000000..5b71267c --- /dev/null +++ b/mass_mailing_event/views/mass_mailing_view.xml @@ -0,0 +1,33 @@ + + + + + + + + Add event and exclude + mail.mass_mailing + + + + {'search_default_not_opt_out': 1, 'exclude_mass_mailing': active_id} + + + + + + + + + + + + + + + +