From 8efdedbf1b4da60e58e3d7f4edd50d2c73a13be2 Mon Sep 17 00:00:00 2001 From: Julien De Coster Date: Tue, 10 Feb 2015 11:56:28 +0100 Subject: [PATCH] [ADD] Clicks statistics in mass_mailings --- addons/mass_mailing/models/__init__.py | 2 +- addons/mass_mailing/models/mass_mailing.py | 34 +++++-- ...ebsite_links_click.py => website_links.py} | 7 +- .../static/src/css/mass_mailing.css | 2 +- addons/mass_mailing/views/mass_mailing.xml | 93 +++++++++++++------ addons/website_links/models/website_links.py | 26 ++---- 6 files changed, 110 insertions(+), 54 deletions(-) rename addons/mass_mailing/models/{website_links_click.py => website_links.py} (61%) diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py index 7cc1ba680b4..1e9affea3e7 100644 --- a/addons/mass_mailing/models/__init__.py +++ b/addons/mass_mailing/models/__init__.py @@ -6,4 +6,4 @@ import mail_mail import mail_thread import res_config import mass_mailing_report -import website_links_click +import website_links diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 79c12011461..57f8c6059ba 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -493,7 +493,7 @@ class MassMailing(osv.Model): 'email_from': fields.char('From', required=True), 'create_date': fields.datetime('Creation Date'), 'sent_date': fields.datetime('Sent Date', oldname='date', copy=False), - 'schedule_date': fields.datetime('Scheduled Send Date'), + 'schedule_date': fields.datetime('Schedule in the Future'), 'body_html': fields.html('Body'), 'attachment_ids': fields.many2many( 'ir.attachment', 'mass_mailing_ir_attachments_rel', @@ -769,6 +769,10 @@ class MassMailing(osv.Model): comp_ctx = dict(context, active_ids=res_ids) else: comp_ctx = {'active_ids': res_ids} + + # Convert links in absolute URLs before the application of the shortener + self.write(cr, uid, [mailing.id], {'body_html': self.pool['mail.template']._replace_local_links(cr, uid, mailing.body_html, context)}, context=context) + composer_values = { 'author_id': author_id, 'attachment_ids': [(4, attachment.id) for attachment in mailing.attachment_ids], @@ -787,19 +791,32 @@ class MassMailing(osv.Model): composer_id = self.pool['mail.compose.message'].create(cr, uid, composer_values, context=comp_ctx) self.pool['mail.compose.message'].send_mail(cr, uid, [composer_id], auto_commit=True, context=comp_ctx) - self.write(cr, uid, [mailing.id], {'sent_date': fields.datetime.now(), 'state': 'done'}, context=context) + self.write(cr, uid, [mailing.id], {'state': 'done'}, context=context) return True def convert_links(self, cr, uid, ids, context=None): res = {} for mass_mailing in self.browse(cr, uid, ids, context=context): - res[mass_mailing.id] = mass_mailing.body_html if mass_mailing.body_html else '' utm_mixin = mass_mailing.mass_mailing_campaign_id if mass_mailing.mass_mailing_campaign_id else mass_mailing - res[mass_mailing.id] = self.pool['website.links'].convert_links(cr, uid, res[mass_mailing.id], utm_mixin, context=context) + html = mass_mailing.body_html if mass_mailing.body_html else '' + + vals = {'mass_mailing_id': mass_mailing.id} + + if mass_mailing.mass_mailing_campaign_id: + vals['mass_mailing_campaign_id'] = mass_mailing.mass_mailing_campaign_id.id + if utm_mixin.campaign_id: + vals['campaign_id'] = utm_mixin.campaign_id.id + if utm_mixin.source_id: + vals['source_id'] = utm_mixin.source_id.id + if utm_mixin.medium_id: + vals['medium_id'] = utm_mixin.medium_id.id + + res[mass_mailing.id] = self.pool['website.links'].convert_links(cr, uid, html, vals, blacklist=['/unsubscribe_from_list'], context=context) + return res def put_in_queue(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'state': 'in_queue'}, context=context) + self.write(cr, uid, ids, {'sent_date': fields.datetime.now(), 'state': 'in_queue'}, context=context) def cancel_mass_mailing(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state': 'draft'}, context=context) @@ -830,18 +847,19 @@ class MassMailing(osv.Model): class MailMail(models.Model): _inherit = ['mail.mail'] - links_backlist = ['/unsubscribe_from_list'] - @api.model def send_get_mail_body(self, mail, partner=None): """Override to add Statistic_id in shorted urls """ + + links_blacklist = ['/unsubscribe_from_list'] + if mail.mailing_id and mail.body_html and mail.statistics_ids: for match in re.findall(URL_REGEX, mail.body_html): href = match[0] url = match[1] - if not [s for s in self.links_backlist if s in href]: + if not [s for s in links_blacklist if s in href]: new_href = href.replace(url, url + '/m/' + str(mail.statistics_ids[0].id)) mail.body_html = mail.body_html.replace(href, new_href) diff --git a/addons/mass_mailing/models/website_links_click.py b/addons/mass_mailing/models/website_links.py similarity index 61% rename from addons/mass_mailing/models/website_links_click.py rename to addons/mass_mailing/models/website_links.py index 31e93445ef8..f5e10a817d0 100644 --- a/addons/mass_mailing/models/website_links_click.py +++ b/addons/mass_mailing/models/website_links.py @@ -1,10 +1,15 @@ from openerp import fields from openerp import models +class website_links(models.Model): + _inherit = "website.links" + + mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing') + mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign') class website_links_click(models.Model): _inherit = "website.links.click" mail_stat_id = fields.Many2one('mail.mail.statistics', string='Mail Statistics') mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing') - mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign') + mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign') \ No newline at end of file diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css index 697afd9231a..bc95533a983 100644 --- a/addons/mass_mailing/static/src/css/mass_mailing.css +++ b/addons/mass_mailing/static/src/css/mass_mailing.css @@ -4,7 +4,7 @@ } .openerp .oe_kanban_view .oe_kanban_mass_mailing { width: 280px; - min-height: 141px; + min-height: 35px; } .openerp .oe_margin_top_8 { margin-top: 8px; diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml index 30d713d2365..245a4346dcc 100644 --- a/addons/mass_mailing/views/mass_mailing.xml +++ b/addons/mass_mailing/views/mass_mailing.xml @@ -184,12 +184,6 @@ - - Statistics of Clicks - website.links.click - graph - - Mailing List Subscribers mail.mass_mailing.contact @@ -323,6 +317,38 @@ + + website.links.tree + website.links + 10 + + + + + + + + + + + website.links.search + website.links + + + + + + + + + + + Statistics of Clicks + website.links + tree + {'search_default_mass_mailing_id': active_id} + + mail.mass_mailing.form mail.mass_mailing @@ -375,9 +401,9 @@ type="action" class="oe_stat_button"> - - diff --git a/addons/website_links/models/website_links.py b/addons/website_links/models/website_links.py index e254e8fb74c..a174ef29107 100644 --- a/addons/website_links/models/website_links.py +++ b/addons/website_links/models/website_links.py @@ -43,24 +43,15 @@ class website_links(models.Model): short_url_host = fields.Char(string='Host of the short URL', compute='_compute_short_url_host') icon_src = fields.Char(string='Favicon Source', compute='_compute_icon_src') - # List of link's href that will not be converted by the shortener - links_backlist = ['/unsubscribe_from_list'] - @api.model - def convert_links(self, html, utm_mixin): + def convert_links(self, html, vals, blacklist=None): for match in re.findall(URL_REGEX, html): href = match[0] long_url = match[1] - if not [s for s in self.links_backlist if s in long_url]: - vals = {'url': long_url} + vals['url'] = long_url - if utm_mixin.campaign_id: - vals['campaign_id'] = utm_mixin.campaign_id.id - if utm_mixin.source_id: - vals['source_id'] = utm_mixin.source_id.id - if utm_mixin.medium_id: - vals['medium_id'] = utm_mixin.medium_id.id + if not blacklist or blacklist and not [s for s in blacklist if s in long_url]: link = self.create(vals) shorten_url = self.browse(link.id)[0].short_url @@ -68,6 +59,7 @@ class website_links(models.Model): if shorten_url: new_href = href.replace(long_url, shorten_url) html = html.replace(href, new_href) + return html @api.one @@ -159,10 +151,12 @@ class website_links(models.Model): @api.model def create(self, vals): + create_vals = vals.copy() + if 'url' not in vals: raise ValueError('URL field required') else: - vals['url'] = VALIDATE_URL(vals['url']) + create_vals['url'] = VALIDATE_URL(vals['url']) search_domain = [] for fname, value in vals.iteritems(): @@ -174,14 +168,14 @@ class website_links(models.Model): return result if not vals.get('title'): - vals['title'] = self._get_title_from_url(vals['url']) + create_vals['title'] = self._get_title_from_url(vals['url']) # Prevent the UTMs to be set by the values of UTM cookies for (key, fname) in self.env['utm.mixin'].tracking_fields(): if fname not in vals: - vals[fname] = False + create_vals[fname] = False - link = super(website_links, self).create(vals) + link = super(website_links, self).create(create_vals) code = self.env['website.links.code'].get_random_code_string() self.env['website.links.code'].create({'code': code, 'link_id': link.id})