Yaltik/social
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] pre-commit run -a

Browse Source
This commit is contained in:
Jairo Llopis 2021-01-26 14:06:17 +00:00 committed by Jasmin Solanki
parent 29afd15f6d
commit c64663944b
13 changed files with 616 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail_tracking/demo/demo.xml
View File

@ -8,7 +8,9 @@
<field name="res_id" ref="base.partner_demo" /> <field name="res_id" ref="base.partner_demo" />
<field name="message_type">comment</field> <field name="message_type">comment</field>
<field name="subtype_id" ref="mail.mt_comment" /> <field name="subtype_id" ref="mail.mt_comment" />
<field name="email_cc">acc@testmail.com,wood.corner26@example.com,toni.rhodes11@example.com</field> <field
name="email_cc"
>acc@testmail.com,wood.corner26@example.com,toni.rhodes11@example.com</field>
<field name="mail_tracking_needs_action">1</field> <field name="mail_tracking_needs_action">1</field>
<field name="body"><![CDATA[<p>This is a message with CC</p>]]></field> <field name="body"><![CDATA[<p>This is a message with CC</p>]]></field>
<field name="email_from">wood.corner26@example.com</field> <field name="email_from">wood.corner26@example.com</field>

9
mail_tracking/security/mail_tracking_email_security.xml
View File

@ -4,10 +4,15 @@
<odoo> <odoo>
<record model="ir.rule" id="mail_tracking_email_portal_public_rule"> <record model="ir.rule" id="mail_tracking_email_portal_public_rule">
<field name="name">mail_tracking_email: portal/public: read access on my email trackings</field> <field
name="name"
>mail_tracking_email: portal/public: read access on my email trackings</field>
<field name="model_id" ref="model_mail_tracking_email" /> <field name="model_id" ref="model_mail_tracking_email" />
<field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field> <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
<field name="groups" eval="[(4, ref('base.group_portal')), (4, ref('base.group_public'))]"/> <field
name="groups"
eval="[(4, ref('base.group_portal')), (4, ref('base.group_public'))]"
/>
<field name="perm_create" eval="False" /> <field name="perm_create" eval="False" />
<field name="perm_unlink" eval="False" /> <field name="perm_unlink" eval="False" />
<field name="perm_write" eval="False" /> <field name="perm_write" eval="False" />

33
mail_tracking/static/src/css/failed_message.scss
View File

@ -31,7 +31,7 @@
} }
i.fa-caret-down:before { i.fa-caret-down:before {
content: '\f0da'; content: "\f0da";
} }
} }
} }
@ -52,7 +52,7 @@
} }
.o_thread_typing_notification_free_space { .o_thread_typing_notification_free_space {
flex-grow: 1, flex-grow: 1;
} }
.o_thread_typing_notification_bar { .o_thread_typing_notification_bar {
@ -60,7 +60,7 @@
background-color: rgba($white, 0.75); background-color: rgba($white, 0.75);
padding: 5px; padding: 5px;
text-align: center; text-align: center;
color: gray('600'); color: gray("600");
&.o_thread_order_asc { &.o_thread_order_asc {
@include o-position-sticky($bottom: 0px); @include o-position-sticky($bottom: 0px);
@ -83,7 +83,7 @@
margin-top: 0px; margin-top: 0px;
margin-bottom: 15px; margin-bottom: 15px;
} }
border-bottom: 1px solid gray('400'); border-bottom: 1px solid gray("400");
text-align: center; text-align: center;
.o_thread_date { .o_thread_date {
@ -116,8 +116,8 @@
margin-bottom: 0px; margin-bottom: 0px;
&.o_mail_not_discussion { &.o_mail_not_discussion {
background-color: rgba(gray('300'), 0.5); background-color: rgba(gray("300"), 0.5);
border-bottom: 1px solid gray('400'); border-bottom: 1px solid gray("400");
} }
.o_thread_message_sidebar { .o_thread_message_sidebar {
@ -155,7 +155,8 @@
} }
} }
&:hover, &.o_thread_selected_message { &:hover,
&.o_thread_selected_message {
.o_thread_message_side_date { .o_thread_message_side_date {
opacity: $o-mail-thread-side-date-opacity; opacity: $o-mail-thread-side-date-opacity;
} }
@ -182,8 +183,6 @@
text-align: justify; text-align: justify;
} }
.o_mail_subject { .o_mail_subject {
font-style: italic; font-style: italic;
} }
@ -193,7 +192,8 @@
color: gray; color: gray;
} }
[summary~=o_mail_notification] { // name conflicts with channel notifications, but is odoo notification buttons to hide in chatter if present [summary~="o_mail_notification"] {
// name conflicts with channel notifications, but is odoo notification buttons to hide in chatter if present
display: none; display: none;
} }
@ -224,7 +224,10 @@
} }
} }
.o_thread_message_star, .o_thread_message_needaction, .o_thread_message_reply, .o_thread_message_email { .o_thread_message_star,
.o_thread_message_needaction,
.o_thread_message_reply,
.o_thread_message_email {
padding: 4px; padding: 4px;
} }
@ -232,14 +235,16 @@
&.o_thread_message_email_ready { &.o_thread_message_email_ready {
color: grey; color: grey;
} }
&.o_thread_message_email_exception, &.o_thread_message_email_bounce { &.o_thread_message_email_exception,
&.o_thread_message_email_bounce {
color: red; color: red;
opacity: 1; opacity: 1;
cursor: pointer; cursor: pointer;
} }
} }
.o_attachments_list, .o_attachments_previews { .o_attachments_list,
.o_attachments_previews {
&:last-child { &:last-child {
margin-bottom: $grid-gutter-width; margin-bottom: $grid-gutter-width;
} }
@ -299,7 +304,7 @@
.o_activity_info { .o_activity_info {
vertical-align: baseline; vertical-align: baseline;
padding: 4px 6px; padding: 4px 6px;
background: theme-color('light'); background: theme-color("light");
border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0;
@include o-hover-opacity(1, 1); @include o-hover-opacity(1, 1);

150
mail_tracking/static/src/js/failed_message/discuss.js
View File

@ -1,6 +1,6 @@
/* Copyright 2019 Alexandre Díaz /* Copyright 2019 Alexandre Díaz
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). */ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). */
odoo.define('mail_tracking.FailedMessageDiscuss', function (require) { odoo.define("mail_tracking.FailedMessageDiscuss", function(require) {
"use strict"; "use strict";
// To be considered: // To be considered:
@ -9,26 +9,22 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
// - A mailbox is a type of thread that is displayed on top of // - A mailbox is a type of thread that is displayed on top of
// the discuss menu, has a counter, etc... // the discuss menu, has a counter, etc...
var MailManagerNotif = require('mail.Manager.Notification'); var MailManagerNotif = require("mail.Manager.Notification");
var AbstractMessage = require('mail.model.AbstractMessage'); var AbstractMessage = require("mail.model.AbstractMessage");
var Message = require('mail.model.Message'); var Message = require("mail.model.Message");
var Discuss = require('mail.Discuss'); var Discuss = require("mail.Discuss");
var MailManager = require('mail.Manager'); var MailManager = require("mail.Manager");
var Mailbox = require('mail.model.Mailbox'); var Mailbox = require("mail.model.Mailbox");
var core = require('web.core'); var core = require("web.core");
var session = require('web.session'); var session = require("web.session");
var QWeb = core.qweb; var QWeb = core.qweb;
var _t = core._t; var _t = core._t;
/* The states to consider a message as failed message */ /* The states to consider a message as failed message */
var FAILED_STATES = [ var FAILED_STATES = ["error", "rejected", "spam", "bounced", "soft-bounced"];
'error', 'rejected', 'spam', 'bounced', 'soft-bounced',
];
AbstractMessage.include({ AbstractMessage.include({
/** /**
* Abstract declaration to know if a message is included in the * Abstract declaration to know if a message is included in the
* failed mailbox. By default it should be false. * failed mailbox. By default it should be false.
@ -41,7 +37,6 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
}); });
Message.include({ Message.include({
/** /**
* Overrides to store information from server * Overrides to store information from server
* *
@ -59,7 +54,7 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
* @override * @override
*/ */
isFailed: function() { isFailed: function() {
return _.contains(this._threadIDs, 'mailbox_failed'); return _.contains(this._threadIDs, "mailbox_failed");
}, },
/** /**
@ -69,9 +64,9 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
*/ */
setFailed: function(failed) { setFailed: function(failed) {
if (failed) { if (failed) {
this._addThread('mailbox_failed'); this._addThread("mailbox_failed");
} else { } else {
this.removeThread('mailbox_failed'); this.removeThread("mailbox_failed");
} }
}, },
@ -87,14 +82,13 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
}); });
MailManagerNotif.include({ MailManagerNotif.include({
/** /**
* Overrides to handle changes in the 'mail_tracking_needs_action' flag * Overrides to handle changes in the 'mail_tracking_needs_action' flag
* *
* @override * @override
*/ */
_handlePartnerNotification: function(data) { _handlePartnerNotification: function(data) {
if (data.type === 'toggle_tracking_status') { if (data.type === "toggle_tracking_status") {
this._handleChangeTrackingNeedsActionNotification(data); this._handleChangeTrackingNeedsActionNotification(data);
} else { } else {
// Workaround to avoid call '_handlePartnerChannelNotification' // Workaround to avoid call '_handlePartnerChannelNotification'
@ -115,7 +109,7 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
*/ */
_handleChangeTrackingNeedsActionNotification: function(data) { _handleChangeTrackingNeedsActionNotification: function(data) {
var self = this; var self = this;
var failed = this.getMailbox('failed'); var failed = this.getMailbox("failed");
_.each(data.message_ids, function(messageID) { _.each(data.message_ids, function(messageID) {
var message = _.find(self._messages, function(msg) { var message = _.find(self._messages, function(msg) {
return msg.getID() === messageID; return msg.getID() === messageID;
@ -123,14 +117,13 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
if (message) { if (message) {
message.setFailed(data.needs_actions); message.setFailed(data.needs_actions);
if (message.isFailed() === false) { if (message.isFailed() === false) {
self._removeMessageFromThread( self._removeMessageFromThread("mailbox_failed", message);
'mailbox_failed', message);
} else { } else {
self._addMessageToThreads(message, []); self._addMessageToThreads(message, []);
var channelFailed = self.getMailbox('failed'); var channelFailed = self.getMailbox("failed");
channelFailed.invalidateCaches(); channelFailed.invalidateCaches();
} }
self._mailBus.trigger('update_message', message, data.type); self._mailBus.trigger("update_message", message, data.type);
} }
}); });
@ -143,14 +136,14 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
} }
// Trigger event to refresh threads // Trigger event to refresh threads
this._mailBus.trigger('update_failed', failed.getMailboxCounter()); this._mailBus.trigger("update_failed", failed.getMailboxCounter());
}, },
}); });
Discuss.include({ Discuss.include({
events: _.extend({}, Discuss.prototype.events, { events: _.extend({}, Discuss.prototype.events, {
'click .o_failed_message_retry': '_onRetryFailedMessage', "click .o_failed_message_retry": "_onRetryFailedMessage",
'click .o_failed_message_reviewed': '_onMarkFailedMessageReviewed', "click .o_failed_message_reviewed": "_onMarkFailedMessageReviewed",
}), }),
/** /**
@ -160,7 +153,7 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
* @returns {Object} * @returns {Object}
*/ */
_sidebarQWebParams: function() { _sidebarQWebParams: function() {
var failed = this.call('mail_service', 'getMailbox', 'failed'); var failed = this.call("mail_service", "getMailbox", "failed");
return { return {
activeThreadID: this._thread ? this._thread.getID() : undefined, activeThreadID: this._thread ? this._thread.getID() : undefined,
failedCounter: failed.getMailboxCounter(), failedCounter: failed.getMailboxCounter(),
@ -177,10 +170,12 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
var $sidebar = this._super.apply(this, arguments); var $sidebar = this._super.apply(this, arguments);
// Because Odoo implementation isn't designed to be inherited // Because Odoo implementation isn't designed to be inherited
// properly, we inject 'failed' button using jQuery. // properly, we inject 'failed' button using jQuery.
var $failed_item = $(QWeb.render('mail_tracking.SidebarFailed', var $failed_item = $(
this._sidebarQWebParams())); QWeb.render("mail_tracking.SidebarFailed", this._sidebarQWebParams())
);
$failed_item.insertAfter( $failed_item.insertAfter(
$sidebar.find(".o_mail_discuss_title_main").filter(":last")); $sidebar.find(".o_mail_discuss_title_main").filter(":last")
);
return $sidebar; return $sidebar;
}, },
@ -192,9 +187,9 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
*/ */
_renderSidebarMailboxes: function() { _renderSidebarMailboxes: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.$('.o_mail_discuss_sidebar_mailboxes').append( this.$(".o_mail_discuss_sidebar_mailboxes").append(
QWeb.render('mail_tracking.SidebarFailed', QWeb.render("mail_tracking.SidebarFailed", this._sidebarQWebParams())
this._sidebarQWebParams())); );
}, },
/** /**
@ -205,9 +200,12 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
_renderButtons: function() { _renderButtons: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.$btn_set_all_reviewed = this.$buttons.find( this.$btn_set_all_reviewed = this.$buttons.find(
'.o_mail_discuss_button_set_all_reviewed'); ".o_mail_discuss_button_set_all_reviewed"
this.$btn_set_all_reviewed );
.on('click', $.proxy(this, "_onSetAllAsReviewedClicked")); this.$btn_set_all_reviewed.on(
"click",
$.proxy(this, "_onSetAllAsReviewedClicked")
);
}, },
/** /**
@ -218,10 +216,10 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
* @override * @override
*/ */
_updateControlPanelButtons: function(thread) { _updateControlPanelButtons: function(thread) {
this.$btn_set_all_reviewed this.$btn_set_all_reviewed.toggleClass(
.toggleClass( "d-none d-md-none",
'd-none d-md-none', thread.getID() !== "mailbox_failed"
thread.getID() !== 'mailbox_failed'); );
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
}, },
@ -234,17 +232,15 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
* @override * @override
*/ */
_updateButtonStatus: function(disabled, type) { _updateButtonStatus: function(disabled, type) {
if (this._thread.getID() === 'mailbox_failed') { if (this._thread.getID() === "mailbox_failed") {
this.$btn_set_all_reviewed this.$btn_set_all_reviewed.toggleClass("disabled", disabled);
.toggleClass('disabled', disabled);
// Display Rainbowman when all failed messages are reviewed // Display Rainbowman when all failed messages are reviewed
// through 'TOGGLE TRACKING STATUS' or marking last failed // through 'TOGGLE TRACKING STATUS' or marking last failed
// message as reviewed // message as reviewed
if (disabled && type === 'toggle_tracking_status') { if (disabled && type === "toggle_tracking_status") {
this.trigger_up('show_effect', { this.trigger_up("show_effect", {
message: _t( message: _t("Congratulations, your failed mailbox is empty"),
"Congratulations, your failed mailbox is empty"), type: "rainbow_man",
type: 'rainbow_man',
}); });
} }
} }
@ -258,15 +254,13 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
_onMessageUpdated: function(message, type) { _onMessageUpdated: function(message, type) {
var self = this; var self = this;
var currentThreadID = this._thread.getID(); var currentThreadID = this._thread.getID();
if (currentThreadID === 'mailbox_failed' && !message.isFailed()) { if (currentThreadID === "mailbox_failed" && !message.isFailed()) {
this._thread.fetchMessages(this.domain) this._thread.fetchMessages(this.domain).then(function() {
.then(function () {
var options = self._getThreadRenderingOptions(); var options = self._getThreadRenderingOptions();
self._threadWidget.removeMessageAndRender( self._threadWidget
message.getID(), self._thread, options) .removeMessageAndRender(message.getID(), self._thread, options)
.then(function() { .then(function() {
self._updateButtonStatus( self._updateButtonStatus(!self._thread.hasMessages(), type);
!self._thread.hasMessages(), type);
}); });
}); });
} else { } else {
@ -285,7 +279,7 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
*/ */
_getThreadRenderingOptions: function() { _getThreadRenderingOptions: function() {
var values = this._super.apply(this, arguments); var values = this._super.apply(this, arguments);
if (this._thread.getID() === 'mailbox_failed') { if (this._thread.getID() === "mailbox_failed") {
values.displayEmailIcons = true; values.displayEmailIcons = true;
values.displayReplyIcons = false; values.displayReplyIcons = false;
values.displayRetryButton = true; values.displayRetryButton = true;
@ -301,8 +295,11 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
*/ */
_startListening: function() { _startListening: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.call('mail_service', 'getMailBus') this.call("mail_service", "getMailBus").on(
.on('update_failed', this, this._throttledUpdateThreads); "update_failed",
this,
this._throttledUpdateThreads
);
}, },
// Handlers // Handlers
@ -314,8 +311,8 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
*/ */
_onRetryFailedMessage: function(event) { _onRetryFailedMessage: function(event) {
event.preventDefault(); event.preventDefault();
var messageID = $(event.currentTarget).data('message-id'); var messageID = $(event.currentTarget).data("message-id");
this.do_action('mail.mail_resend_message_action', { this.do_action("mail.mail_resend_message_action", {
additional_context: { additional_context: {
mail_message_to_resend: messageID, mail_message_to_resend: messageID,
}, },
@ -331,10 +328,10 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
*/ */
_onMarkFailedMessageReviewed: function(event) { _onMarkFailedMessageReviewed: function(event) {
event.preventDefault(); event.preventDefault();
var messageID = $(event.currentTarget).data('message-id'); var messageID = $(event.currentTarget).data("message-id");
return this._rpc({ return this._rpc({
model: 'mail.message', model: "mail.message",
method: 'set_need_action_done', method: "set_need_action_done",
args: [[messageID]], args: [[messageID]],
context: this.getSession().user_context, context: this.getSession().user_context,
}); });
@ -351,7 +348,6 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
}); });
MailManager.include({ MailManager.include({
/** /**
* Add the 'failed' mailbox * Add the 'failed' mailbox
* *
@ -360,7 +356,7 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
_updateMailboxesFromServer: function(data) { _updateMailboxesFromServer: function(data) {
this._super.apply(this, arguments); this._super.apply(this, arguments);
this._addMailbox({ this._addMailbox({
id: 'failed', id: "failed",
name: _t("Failed"), name: _t("Failed"),
mailboxCounter: data.failed_counter || 0, mailboxCounter: data.failed_counter || 0,
}); });
@ -368,20 +364,19 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
}); });
Mailbox.include({ Mailbox.include({
/** /**
* Overrides to add domain for 'failed' mailbox thread * Overrides to add domain for 'failed' mailbox thread
* *
* @override * @override
*/ */
_getThreadDomain: function() { _getThreadDomain: function() {
if (this._id === 'mailbox_failed') { if (this._id === "mailbox_failed") {
return [ return [
['mail_tracking_ids.state', 'in', FAILED_STATES], ["mail_tracking_ids.state", "in", FAILED_STATES],
['mail_tracking_needs_action', '=', true], ["mail_tracking_needs_action", "=", true],
'|', "|",
['partner_ids', 'in', [session.partner_id]], ["partner_ids", "in", [session.partner_id]],
['author_id', '=', session.partner_id], ["author_id", "=", session.partner_id],
]; ];
} }
// Workaround to avoid throw 'Missing domain' exception. Call _super // Workaround to avoid throw 'Missing domain' exception. Call _super
@ -398,14 +393,13 @@ odoo.define('mail_tracking.FailedMessageDiscuss', function (require) {
* reviewed on the server * reviewed on the server
*/ */
setAllMessagesAsReviewed: function() { setAllMessagesAsReviewed: function() {
if (this._id === 'mailbox_failed' && this.getMailboxCounter() > 0) { if (this._id === "mailbox_failed" && this.getMailboxCounter() > 0) {
return this._rpc({ return this._rpc({
model: 'mail.message', model: "mail.message",
method: 'set_all_as_reviewed', method: "set_all_as_reviewed",
}); });
} }
return $.when(); return $.when();
}, },
}); });
}); });

96
mail_tracking/static/src/js/failed_message/thread.js
View File

@ -1,21 +1,20 @@
/* Copyright 2019 Alexandre Díaz /* Copyright 2019 Alexandre Díaz
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). */ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). */
odoo.define('mail_tracking.FailedMessageThread', function (require) { odoo.define("mail_tracking.FailedMessageThread", function(require) {
"use strict"; "use strict";
var AbstractField = require('web.AbstractField'); var AbstractField = require("web.AbstractField");
var BasicModel = require('web.BasicModel'); var BasicModel = require("web.BasicModel");
var BasicView = require('web.BasicView'); var BasicView = require("web.BasicView");
var Chatter = require('mail.Chatter'); var Chatter = require("mail.Chatter");
var MailThread = require('mail.widget.Thread'); var MailThread = require("mail.widget.Thread");
var utils = require('mail.utils'); var utils = require("mail.utils");
var core = require('web.core'); var core = require("web.core");
var field_registry = require('web.field_registry'); var field_registry = require("web.field_registry");
var time = require('web.time'); var time = require("web.time");
var QWeb = core.qweb; var QWeb = core.qweb;
/** /**
* Helper method to fetch failed messages * Helper method to fetch failed messages
* *
@ -29,12 +28,14 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
return $.when([]); return $.when([]);
} }
var context = widget.record && widget.record.getContext(); var context = widget.record && widget.record.getContext();
return widget._rpc({ return widget
model: 'mail.message', ._rpc({
method: 'get_failed_messages', model: "mail.message",
method: "get_failed_messages",
args: [ids], args: [ids],
context: context || widget.getSession().user_context, context: context || widget.getSession().user_context,
}).then(function (messages) { })
.then(function(messages) {
// Convert date to moment // Convert date to moment
_.each(messages, function(msg) { _.each(messages, function(msg) {
msg.date = moment(time.auto_str_to_date(msg.date)); msg.date = moment(time.auto_str_to_date(msg.date));
@ -45,7 +46,6 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
} }
BasicModel.include({ BasicModel.include({
/** /**
* Fetch data for the 'mail_failed_message' field widget in form views. * Fetch data for the 'mail_failed_message' field widget in form views.
* *
@ -55,19 +55,21 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
* @returns {Array} * @returns {Array}
*/ */
_fetchSpecialFailedMessages: function(record, fieldName) { _fetchSpecialFailedMessages: function(record, fieldName) {
var localID = record._changes && fieldName in record._changes var localID =
? record._changes[fieldName] : record.data[fieldName]; record._changes && fieldName in record._changes
? record._changes[fieldName]
: record.data[fieldName];
return _readMessages(this, this.localData[localID].res_ids); return _readMessages(this, this.localData[localID].res_ids);
}, },
}); });
var FailedMessage = AbstractField.extend({ var FailedMessage = AbstractField.extend({
className: 'o_mail_failed_message', className: "o_mail_failed_message",
events: { events: {
'click .o_failed_message_retry': '_onRetryFailedMessage', "click .o_failed_message_retry": "_onRetryFailedMessage",
'click .o_failed_message_reviewed': '_onMarkFailedMessageReviewed', "click .o_failed_message_reviewed": "_onMarkFailedMessageReviewed",
}, },
specialData: '_fetchSpecialFailedMessages', specialData: "_fetchSpecialFailedMessages",
/** /**
* Overrides to reference failed messages in a easy way * Overrides to reference failed messages in a easy way
@ -86,8 +88,7 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
*/ */
start: function() { start: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.call( this.call("bus_service", "onNotification", this, this._onNotification);
'bus_service', 'onNotification', this, this._onNotification);
}, },
/** /**
@ -110,9 +111,12 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
*/ */
_render: function() { _render: function() {
if (this.failed_messages.length) { if (this.failed_messages.length) {
this.$el.html(QWeb.render( this.$el.html(
'mail_tracking.failed_message_items', QWeb.render(
this._failedItemsQWebParams())); "mail_tracking.failed_message_items",
this._failedItemsQWebParams()
)
);
} else { } else {
this.$el.empty(); this.$el.empty();
} }
@ -137,7 +141,7 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
* @param {Array} fieldsToReload * @param {Array} fieldsToReload
*/ */
_reload: function(fieldsToReload) { _reload: function(fieldsToReload) {
this.trigger_up('reload_mail_fields', fieldsToReload); this.trigger_up("reload_mail_fields", fieldsToReload);
}, },
/** /**
@ -149,8 +153,8 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
*/ */
_markFailedMessageReviewed: function(id) { _markFailedMessageReviewed: function(id) {
return this._rpc({ return this._rpc({
model: 'mail.message', model: "mail.message",
method: 'set_need_action_done', method: "set_need_action_done",
args: [[id]], args: [[id]],
context: this.record.getContext(), context: this.record.getContext(),
}); });
@ -169,9 +173,9 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
var self = this; var self = this;
_.each(notifs, function(notif) { _.each(notifs, function(notif) {
var model = notif[0][1]; var model = notif[0][1];
if (model === 'res.partner') { if (model === "res.partner") {
var data = notif[1]; var data = notif[1];
if (data.type === 'toggle_tracking_status') { if (data.type === "toggle_tracking_status") {
// Reload 'mail_failed_message' widget // Reload 'mail_failed_message' widget
self._reload({failed_message: true}); self._reload({failed_message: true});
} }
@ -188,8 +192,8 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
*/ */
_onRetryFailedMessage: function(event) { _onRetryFailedMessage: function(event) {
event.preventDefault(); event.preventDefault();
var messageID = $(event.currentTarget).data('message-id'); var messageID = $(event.currentTarget).data("message-id");
this.do_action('mail.mail_resend_message_action', { this.do_action("mail.mail_resend_message_action", {
additional_context: { additional_context: {
mail_message_to_resend: messageID, mail_message_to_resend: messageID,
}, },
@ -204,17 +208,17 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
*/ */
_onMarkFailedMessageReviewed: function(event) { _onMarkFailedMessageReviewed: function(event) {
event.preventDefault(); event.preventDefault();
var messageID = $(event.currentTarget).data('message-id'); var messageID = $(event.currentTarget).data("message-id");
this._markFailedMessageReviewed(messageID).then( this._markFailedMessageReviewed(messageID).then(
$.proxy(this, "_reload", {failed_message: true})); $.proxy(this, "_reload", {failed_message: true})
);
}, },
}); });
field_registry.add('mail_failed_message', FailedMessage); field_registry.add("mail_failed_message", FailedMessage);
var mailWidgets = ['mail_failed_message']; var mailWidgets = ["mail_failed_message"];
BasicView.include({ BasicView.include({
/** /**
* Overrides to add 'mail_failed_message' widget as "mail widget" used * Overrides to add 'mail_failed_message' widget as "mail widget" used
* in Chatter. * in Chatter.
@ -245,7 +249,6 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
}); });
Chatter.include({ Chatter.include({
/** /**
* Overrides to initialize 'mail_failed_message' widget. * Overrides to initialize 'mail_failed_message' widget.
* *
@ -256,7 +259,11 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
// Initialize mail_failed_message widget // Initialize mail_failed_message widget
if (mailFields.mail_failed_message) { if (mailFields.mail_failed_message) {
this.fields.failed_message = new FailedMessage( this.fields.failed_message = new FailedMessage(
this, mailFields.mail_failed_message, record, options); this,
mailFields.mail_failed_message,
record,
options
);
} }
}, },
@ -271,7 +278,8 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
return this._super.apply(this, arguments).then(function() { return this._super.apply(this, arguments).then(function() {
if (self.fields.failed_message) { if (self.fields.failed_message) {
self.fields.failed_message.$el.insertBefore( self.fields.failed_message.$el.insertBefore(
self.$el.find('.o_mail_thread')); self.$el.find(".o_mail_thread")
);
} }
}); });
}, },
@ -283,7 +291,7 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
*/ */
_onReloadMailFields: function(event) { _onReloadMailFields: function(event) {
if (this.fields.failed_message && event.data.failed_message) { if (this.fields.failed_message && event.data.failed_message) {
this.trigger_up('reload', { this.trigger_up("reload", {
fieldNames: [this.fields.failed_message.name], fieldNames: [this.fields.failed_message.name],
keepChanges: true, keepChanges: true,
}); });
@ -296,7 +304,6 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
}); });
MailThread.include({ MailThread.include({
/** /**
* Show 'retry' & 'Set as reviewed' buttons in the Chatter * Show 'retry' & 'Set as reviewed' buttons in the Chatter
* *
@ -312,5 +319,4 @@ odoo.define('mail_tracking.FailedMessageThread', function (require) {
}); });
return FailedMessage; return FailedMessage;
}); });

62
mail_tracking/static/src/js/mail_tracking.js
View File

@ -2,19 +2,18 @@
Copyright 2018 David Vidal - <david.vidal@tecnativa.com> Copyright 2018 David Vidal - <david.vidal@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). */ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). */
odoo.define('mail_tracking.partner_tracking', function (require) { odoo.define("mail_tracking.partner_tracking", function(require) {
"use strict"; "use strict";
var core = require('web.core'); var core = require("web.core");
var ActionManager = require('web.ActionManager'); var ActionManager = require("web.ActionManager");
var AbstractMessage = require('mail.model.AbstractMessage'); var AbstractMessage = require("mail.model.AbstractMessage");
var Message = require('mail.model.Message'); var Message = require("mail.model.Message");
var ThreadWidget = require('mail.widget.Thread'); var ThreadWidget = require("mail.widget.Thread");
var _t = core._t; var _t = core._t;
AbstractMessage.include({ AbstractMessage.include({
/** /**
* Messages do not have any PartnerTrackings. * Messages do not have any PartnerTrackings.
* *
@ -106,8 +105,8 @@ odoo.define('mail_tracking.partner_tracking', function (require) {
toggleTrackingStatus: function() { toggleTrackingStatus: function() {
return this._rpc({ return this._rpc({
model: 'mail.message', model: "mail.message",
method: 'toggle_tracking_status', method: "toggle_tracking_status",
args: [[this.id]], args: [[this.id]],
}); });
}, },
@ -115,46 +114,45 @@ odoo.define('mail_tracking.partner_tracking', function (require) {
ThreadWidget.include({ ThreadWidget.include({
events: _.extend(ThreadWidget.prototype.events, { events: _.extend(ThreadWidget.prototype.events, {
'click .o_mail_action_tracking_partner': "click .o_mail_action_tracking_partner": "on_tracking_partner_click",
'on_tracking_partner_click', "click .o_mail_action_tracking_status": "on_tracking_status_click",
'click .o_mail_action_tracking_status': 'on_tracking_status_click',
}), }),
on_tracking_partner_click: function(event) { on_tracking_partner_click: function(event) {
var partner_id = this.$el.find(event.currentTarget).data('partner'); var partner_id = this.$el.find(event.currentTarget).data("partner");
var state = { var state = {
'model': 'res.partner', model: "res.partner",
'id': partner_id, id: partner_id,
'title': _t("Tracking partner"), title: _t("Tracking partner"),
}; };
event.preventDefault(); event.preventDefault();
this.action_manager.do_push_state(state); this.action_manager.do_push_state(state);
var action = { var action = {
type:'ir.actions.act_window', type: "ir.actions.act_window",
view_type: 'form', view_type: "form",
view_mode: 'form', view_mode: "form",
res_model: 'res.partner', res_model: "res.partner",
views: [[false, 'form']], views: [[false, "form"]],
target: 'current', target: "current",
res_id: partner_id, res_id: partner_id,
}; };
this.do_action(action); this.do_action(action);
}, },
on_tracking_status_click: function(event) { on_tracking_status_click: function(event) {
var tracking_email_id = $(event.currentTarget).data('tracking'); var tracking_email_id = $(event.currentTarget).data("tracking");
var state = { var state = {
'model': 'mail.tracking.email', model: "mail.tracking.email",
'id': tracking_email_id, id: tracking_email_id,
'title': _t("Message tracking"), title: _t("Message tracking"),
}; };
event.preventDefault(); event.preventDefault();
this.action_manager.do_push_state(state); this.action_manager.do_push_state(state);
var action = { var action = {
type:'ir.actions.act_window', type: "ir.actions.act_window",
view_type: 'form', view_type: "form",
view_mode: 'form', view_mode: "form",
res_model: 'mail.tracking.email', res_model: "mail.tracking.email",
views: [[false, 'form']], views: [[false, "form"]],
target: 'new', target: "new",
res_id: tracking_email_id, res_id: tracking_email_id,
}; };
this.do_action(action); this.do_action(action);

12
mail_tracking/static/src/xml/failed_message/common.xml
View File

@ -3,10 +3,18 @@
<t t-extend="mail.widget.Thread.Message"> <t t-extend="mail.widget.Thread.Message">
<t t-jquery="span[t-attf-class=o_thread_icons]" t-operation="append"> <t t-jquery="span[t-attf-class=o_thread_icons]" t-operation="append">
<a t-if="message.isFailed() &amp;&amp; options.displayRetryButton" class="btn btn-link o_thread_icon btn-default text-muted btn-sm o_failed_message_reviewed o_activity_link mr8" t-att-data-message-id="message.getID()"> <a
t-if="message.isFailed() &amp;&amp; options.displayRetryButton"
class="btn btn-link o_thread_icon btn-default text-muted btn-sm o_failed_message_reviewed o_activity_link mr8"
t-att-data-message-id="message.getID()"
>
<i class="fa fa-check" /> Set as Reviewed <i class="fa fa-check" /> Set as Reviewed
</a> </a>
<a t-if="message.isFailed() &amp;&amp; options.displayReviewedButton" class="btn btn-link o_thread_icon btn-default text-muted btn-sm o_failed_message_retry" t-att-data-message-id="message.getID()"> <a
t-if="message.isFailed() &amp;&amp; options.displayReviewedButton"
class="btn btn-link o_thread_icon btn-default text-muted btn-sm o_failed_message_retry"
t-att-data-message-id="message.getID()"
>
<i class="fa fa-retweet" /> Retry <i class="fa fa-retweet" /> Retry
</a> </a>
</t> </t>

20
mail_tracking/static/src/xml/failed_message/discuss.xml
View File

@ -2,14 +2,18 @@
<templates> <templates>
<t t-name="mail_tracking.SidebarFailedCounter"> <t t-name="mail_tracking.SidebarFailedCounter">
<span t-attf-class="o_mail_sidebar_failed badge badge-pill #{(counter ? '' : 'd-none')}"> <span
t-attf-class="o_mail_sidebar_failed badge badge-pill #{(counter ? '' : 'd-none')}"
>
<t t-esc="counter" /> <t t-esc="counter" />
</span> </span>
</t> </t>
<t t-name="mail_tracking.SidebarFailed"> <t t-name="mail_tracking.SidebarFailed">
<div t-attf-class="o_mail_discuss_title_main o_mail_discuss_item #{(activeThreadID === 'mailbox_failed') ? 'o_active': ''}" <div
data-thread-id="mailbox_failed"> t-attf-class="o_mail_discuss_title_main o_mail_discuss_item #{(activeThreadID === 'mailbox_failed') ? 'o_active': ''}"
data-thread-id="mailbox_failed"
>
<span class="o_thread_name"><i class="fa fa-exclamation mr8" />Failed</span> <span class="o_thread_name"><i class="fa fa-exclamation mr8" />Failed</span>
<t t-set="counter" t-value="failedCounter" /> <t t-set="counter" t-value="failedCounter" />
<t t-call="mail_tracking.SidebarFailedCounter" /> <t t-call="mail_tracking.SidebarFailedCounter" />
@ -19,7 +23,9 @@
<t t-extend="mail.widget.Thread.Empty"> <t t-extend="mail.widget.Thread.Empty">
<t t-jquery="t:last-child" t-operation="after"> <t t-jquery="t:last-child" t-operation="after">
<t t-if="thread.getID() === 'mailbox_failed'"> <t t-if="thread.getID() === 'mailbox_failed'">
<div class="o_thread_title">Congratulations, you don't have any failed messages</div> <div
class="o_thread_title"
>Congratulations, you don't have any failed messages</div>
<div>Failed messages appear here.</div> <div>Failed messages appear here.</div>
</t> </t>
</t> </t>
@ -27,7 +33,11 @@
<t t-extend="mail.discuss.ControlButtons"> <t t-extend="mail.discuss.ControlButtons">
<t t-jquery="div" t-operation="append"> <t t-jquery="div" t-operation="append">
<button type="button" class="btn btn-secondary o_mail_discuss_button_set_all_reviewed d-none d-md-none d-md-inline-block" title="Mark all as reviewed">Set all as reviewed</button> <button
type="button"
class="btn btn-secondary o_mail_discuss_button_set_all_reviewed d-none d-md-none d-md-inline-block"
title="Mark all as reviewed"
>Set all as reviewed</button>
</t> </t>
</t> </t>

57
mail_tracking/static/src/xml/mail_tracking.xml
View File

@ -7,47 +7,50 @@
<t t-name="mail.tracking.status"> <t t-name="mail.tracking.status">
<t t-if="tracking['isCc']"> <t t-if="tracking['isCc']">
<span class="mail_tracking_cc"> <span class="mail_tracking_cc">
<i class="fa fa-cc"></i> <i class="fa fa-cc" />
</span> </span>
</t> </t>
<t t-elif="!tracking['isCc'] &amp;&amp; !tracking['partner_id']"> <t t-elif="!tracking['isCc'] &amp;&amp; !tracking['partner_id']">
<span class="mail_anon_recipient"> <span class="mail_anon_recipient">
<i class="fa fa-low-vision"></i> <i class="fa fa-low-vision" />
</span> </span>
</t> </t>
<t t-elif="tracking['status'] === 'unknown'"> <t t-elif="tracking['status'] === 'unknown'">
<span class="mail_tracking_unknown"> <span class="mail_tracking_unknown">
<i class="fa fa-ban"></i> <i class="fa fa-ban" />
</span> </span>
</t> </t>
<t t-elif="tracking['status'] === 'waiting'"> <t t-elif="tracking['status'] === 'waiting'">
<span class="mail_tracking_waiting mail_tracking_pointer"> <span class="mail_tracking_waiting mail_tracking_pointer">
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o" />
</span> </span>
</t> </t>
<t t-elif="tracking['status'] === 'error'"> <t t-elif="tracking['status'] === 'error'">
<span class="mail_tracking_error mail_tracking_pointer"> <span class="mail_tracking_error mail_tracking_pointer">
<i t-if="tracking['error_type'] === 'no_recipient'" class="fa fa-user-times"></i> <i
<i t-else="" class="fa fa-remove"></i> t-if="tracking['error_type'] === 'no_recipient'"
class="fa fa-user-times"
/>
<i t-else="" class="fa fa-remove" />
</span> </span>
</t> </t>
<t t-elif="tracking['status'] === 'sent'"> <t t-elif="tracking['status'] === 'sent'">
<span class="mail_tracking_sent mail_tracking_pointer"> <span class="mail_tracking_sent mail_tracking_pointer">
<i class="fa fa-check"></i> <i class="fa fa-check" />
</span> </span>
</t> </t>
<t t-elif="tracking['status'] === 'delivered'"> <t t-elif="tracking['status'] === 'delivered'">
<span class="fa-stack mail_tracking_delivered mail_tracking_pointer"> <span class="fa-stack mail_tracking_delivered mail_tracking_pointer">
<i class="fa fa-check fa-stack-1x" style="margin-left:1px"></i> <i class="fa fa-check fa-stack-1x" style="margin-left:1px" />
<i class="fa fa-check fa-inverse fa-stack-1x" style="margin-left:-2px;"></i> <i class="fa fa-check fa-inverse fa-stack-1x" style="margin-left:-2px;" />
<i class="fa fa-check fa-stack-1x" style="margin-left:-3px"></i> <i class="fa fa-check fa-stack-1x" style="margin-left:-3px" />
</span> </span>
</t> </t>
<t t-elif="tracking['status'] === 'opened'"> <t t-elif="tracking['status'] === 'opened'">
<span class="fa-stack mail_tracking_opened mail_tracking_pointer"> <span class="fa-stack mail_tracking_opened mail_tracking_pointer">
<i class="fa fa-check fa-stack-1x" style="margin-left:1px"></i> <i class="fa fa-check fa-stack-1x" style="margin-left:1px" />
<i class="fa fa-check fa-inverse fa-stack-1x" style="margin-left:-2px;"></i> <i class="fa fa-check fa-inverse fa-stack-1x" style="margin-left:-2px;" />
<i class="fa fa-check fa-stack-1x" style="margin-left:-3px"></i> <i class="fa fa-check fa-stack-1x" style="margin-left:-3px" />
</span> </span>
</t> </t>
</t> </t>
@ -62,20 +65,34 @@
- -
</t> </t>
<t t-if="tracking['partner_id']"> <t t-if="tracking['partner_id']">
<a t-attf-class="o_mail_action_tracking_partner #{tracking['isCc'] ? 'o_mail_cc' : ''}" <a
t-attf-class="o_mail_action_tracking_partner #{tracking['isCc'] ? 'o_mail_cc' : ''}"
t-att-data-partner="tracking['partner_id']" t-att-data-partner="tracking['partner_id']"
t-attf-href="#model=res.partner&amp;id=#{tracking['partner_id']}"> t-attf-href="#model=res.partner&amp;id=#{tracking['partner_id']}"
>
<t t-esc="tracking['recipient']" /> <t t-esc="tracking['recipient']" />
</a> </a>
</t> </t>
<t t-else=""> <t t-else="">
<span t-attf-class="#{tracking['isCc'] ? 'o_mail_cc' : ''}"><t t-esc="tracking['recipient']"/></span> <span t-attf-class="#{tracking['isCc'] ? 'o_mail_cc' : ''}"><t
t-esc="tracking['recipient']"
/></span>
</t> </t>
<t t-if="tracking['status'] === 'error' &amp;&amp; tracking['error_type'] === 'no_recipient'" t-set="title_status" t-value="tracking['error_description']" /> <t
<t t-else="" t-set="title_status" t-value="tracking['status_human']" /> t-if="tracking['status'] === 'error' &amp;&amp; tracking['error_type'] === 'no_recipient'"
<span class="mail_tracking o_mail_action_tracking_status" t-set="title_status"
t-value="tracking['error_description']"
/>
<t
t-else=""
t-set="title_status"
t-value="tracking['status_human']"
/>
<span
class="mail_tracking o_mail_action_tracking_status"
t-att-data-tracking="tracking['tracking_id']" t-att-data-tracking="tracking['tracking_id']"
t-att-title="title_status"> t-att-title="title_status"
>
<t t-call="mail.tracking.status" /> <t t-call="mail.tracking.status" />
</span> </span>
</t> </t>

36
mail_tracking/views/assets.xml
View File

@ -2,20 +2,32 @@
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com> <!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
<odoo> <odoo>
<template id="assets_backend" <template
id="assets_backend"
name="mail_tracking assets" name="mail_tracking assets"
inherit_id="web.assets_backend"> inherit_id="web.assets_backend"
>
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" <link
href="/mail_tracking/static/src/css/mail_tracking.scss"/> rel="stylesheet"
<link rel="stylesheet" href="/mail_tracking/static/src/css/mail_tracking.scss"
href="/mail_tracking/static/src/css/failed_message.scss"/> />
<script type="text/javascript" <link
src="/mail_tracking/static/src/js/mail_tracking.js"/> rel="stylesheet"
<script type="text/javascript" href="/mail_tracking/static/src/css/failed_message.scss"
src="/mail_tracking/static/src/js/failed_message/discuss.js"/> />
<script type="text/javascript" <script
src="/mail_tracking/static/src/js/failed_message/thread.js"/> type="text/javascript"
src="/mail_tracking/static/src/js/mail_tracking.js"
/>
<script
type="text/javascript"
src="/mail_tracking/static/src/js/failed_message/discuss.js"
/>
<script
type="text/javascript"
src="/mail_tracking/static/src/js/failed_message/thread.js"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>

88
mail_tracking/views/mail_tracking_email_view.xml
View File

@ -34,18 +34,22 @@
<field name="bounce_description" /> <field name="bounce_description" />
</group> </group>
<group attrs="{'invisible': [('error_type', '=', False)]}"> <group attrs="{'invisible': [('error_type', '=', False)]}">
<field name="error_smtp_server" <field
attrs="{'invisible': [('error_smtp_server', '=', False)]}"/> name="error_smtp_server"
attrs="{'invisible': [('error_smtp_server', '=', False)]}"
/>
<field name="error_type" /> <field name="error_type" />
<field name="error_description" /> <field name="error_description" />
</group> </group>
<label for="tracking_event_ids" /> <label for="tracking_event_ids" />
<div> <div>
<field name="tracking_event_ids"> <field name="tracking_event_ids">
<tree string="Tracking events" <tree
string="Tracking events"
decoration-muted="event_type == 'deferral'" decoration-muted="event_type == 'deferral'"
decoration-danger="event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject')" decoration-danger="event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject')"
decoration-info="event_type in ('unsub', 'click', 'open')"> decoration-info="event_type in ('unsub', 'click', 'open')"
>
<field name="time" /> <field name="time" />
<field name="event_type" /> <field name="event_type" />
<field name="ip" /> <field name="ip" />
@ -65,11 +69,16 @@
<field name="name">mail.tracking.email.tree</field> <field name="name">mail.tracking.email.tree</field>
<field name="model">mail.tracking.email</field> <field name="model">mail.tracking.email</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="MailTracking emails" create="false" edit="false" delete="false" <tree
string="MailTracking emails"
create="false"
edit="false"
delete="false"
decoration-muted="state in (False, 'deferred')" decoration-muted="state in (False, 'deferred')"
decoration-success="state == 'opened'" decoration-success="state == 'opened'"
decoration-danger="state in ('rejected', 'spam', 'bounced', 'soft-bounced', 'error')" decoration-danger="state in ('rejected', 'spam', 'bounced', 'soft-bounced', 'error')"
decoration-info="state == 'unsub'"> decoration-info="state == 'unsub'"
>
<field name="time" /> <field name="time" />
<field name="date" invisible="1" /> <field name="date" invisible="1" />
<field name="name" /> <field name="name" />
@ -85,25 +94,63 @@
<field name="model">mail.tracking.email</field> <field name="model">mail.tracking.email</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="MailTracking email search"> <search string="MailTracking email search">
<field name="display_name" string="Email" <field
filter_domain="['|', ('sender', 'ilike', self), ('recipient', 'ilike', self)]"/> name="display_name"
string="Email"
filter_domain="['|', ('sender', 'ilike', self), ('recipient', 'ilike', self)]"
/>
<field name="sender" string="Sender" /> <field name="sender" string="Sender" />
<field name="recipient" string="Recipient" /> <field name="recipient" string="Recipient" />
<field name="name" string="Subject" /> <field name="name" string="Subject" />
<field name="time" string="Time" /> <field name="time" string="Time" />
<field name="date" string="Date" /> <field name="date" string="Date" />
<filter name="sent" string="Sent" domain="[('state', 'in', ('sent',))]" /> <filter name="sent" string="Sent" domain="[('state', 'in', ('sent',))]" />
<filter name="deferred" string="Deferred" domain="[('state', '=', 'deferred')]"/> <filter
<filter name="delivered" string="Delivered" domain="[('state', 'in', ('delivered', 'opened'))]"/> name="deferred"
<filter name="unsub" string="Unsubscribed" domain="[('state', '=', 'unsub')]"/> string="Deferred"
<filter name="exception" string="Failed" domain="[('state', '=', 'deferred')]"
domain="[('state', 'in', ('error', 'rejected', 'spam', 'bounced', 'soft-bounced'))]"/> />
<filter
name="delivered"
string="Delivered"
domain="[('state', 'in', ('delivered', 'opened'))]"
/>
<filter
name="unsub"
string="Unsubscribed"
domain="[('state', '=', 'unsub')]"
/>
<filter
name="exception"
string="Failed"
domain="[('state', 'in', ('error', 'rejected', 'spam', 'bounced', 'soft-bounced'))]"
/>
<separator /> <separator />
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<filter string="State" name="group_by_state" domain="[]" context="{'group_by': 'state'}"/> <filter
<filter string="Subject" name="group_by_subject" domain="[]" context="{'group_by': 'name'}"/> string="State"
<filter string="Sender" name="group_by_sender" domain="[]" context="{'group_by': 'sender'}"/> name="group_by_state"
<filter string="Month" name="group_by_month" domain="[]" context="{'group_by': 'date'}"/> domain="[]"
context="{'group_by': 'state'}"
/>
<filter
string="Subject"
name="group_by_subject"
domain="[]"
context="{'group_by': 'name'}"
/>
<filter
string="Sender"
name="group_by_sender"
domain="[]"
context="{'group_by': 'sender'}"
/>
<filter
string="Month"
name="group_by_month"
domain="[]"
context="{'group_by': 'date'}"
/>
</group> </group>
</search> </search>
</field> </field>
@ -118,8 +165,11 @@
</record> </record>
<!-- Add menu entry in Settings/Email --> <!-- Add menu entry in Settings/Email -->
<menuitem name="Tracking emails" id="menu_mail_tracking_email" <menuitem
name="Tracking emails"
id="menu_mail_tracking_email"
parent="base.menu_email" parent="base.menu_email"
action="action_view_mail_tracking_email"/> action="action_view_mail_tracking_email"
/>
</odoo> </odoo>

123
mail_tracking/views/mail_tracking_event_view.xml
View File

@ -24,10 +24,14 @@
<group attrs="{'invisible': [('event_type', 'not in', ('sent',))]}"> <group attrs="{'invisible': [('event_type', 'not in', ('sent',))]}">
<field name="smtp_server" /> <field name="smtp_server" />
</group> </group>
<group attrs="{'invisible': [('event_type', 'not in', ('open', 'click'))]}"> <group
attrs="{'invisible': [('event_type', 'not in', ('open', 'click'))]}"
>
<field name="url" /> <field name="url" />
</group> </group>
<group attrs="{'invisible': [('event_type', 'not in', ('open', 'click'))]}"> <group
attrs="{'invisible': [('event_type', 'not in', ('open', 'click'))]}"
>
<group> <group>
<field name="mobile" /> <field name="mobile" />
<field name="ip" /> <field name="ip" />
@ -40,8 +44,10 @@
<field name="os_family" /> <field name="os_family" />
</group> </group>
</group> </group>
<group string="Error" <group
attrs="{'invisible': [('error_type', '=', False)]}"> string="Error"
attrs="{'invisible': [('error_type', '=', False)]}"
>
<field name="error_type" /> <field name="error_type" />
<field name="error_description" /> <field name="error_description" />
<field name="error_details" /> <field name="error_details" />
@ -55,15 +61,23 @@
<field name="name">mail.tracking.event.tree</field> <field name="name">mail.tracking.event.tree</field>
<field name="model">mail.tracking.event</field> <field name="model">mail.tracking.event</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="MailTracking events" create="false" edit="false" delete="false" <tree
string="MailTracking events"
create="false"
edit="false"
delete="false"
decoration-muted="event_type == 'deferred'" decoration-muted="event_type == 'deferred'"
decoration-danger="event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject')" decoration-danger="event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject')"
decoration-info="event_type in ('unsub', 'click', 'open')"> decoration-info="event_type in ('unsub', 'click', 'open')"
>
<field name="time" /> <field name="time" />
<field name="tracking_email_id" /> <field name="tracking_email_id" />
<field name="recipient" /> <field name="recipient" />
<field name="event_type" /> <field name="event_type" />
<field name="error_details" invisible="not context.get('event_error_filter', False)"/> <field
name="error_details"
invisible="not context.get('event_error_filter', False)"
/>
<field name="date" invisible="1" /> <field name="date" invisible="1" />
<field name="ip" /> <field name="ip" />
<field name="url" /> <field name="url" />
@ -79,32 +93,88 @@
<field name="model">mail.tracking.event</field> <field name="model">mail.tracking.event</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="MailTracking event search"> <search string="MailTracking event search">
<field name="tracking_email_id" string="Message" <field
filter_domain="[('tracking_email_id', 'ilike', self)]"/> name="tracking_email_id"
string="Message"
filter_domain="[('tracking_email_id', 'ilike', self)]"
/>
<field name="recipient" string="Recipient" /> <field name="recipient" string="Recipient" />
<field name="time" string="Time" /> <field name="time" string="Time" />
<field name="date" string="Date" /> <field name="date" string="Date" />
<field name="ip" string="IP" /> <field name="ip" string="IP" />
<field name="url" string="URL" /> <field name="url" string="URL" />
<filter name="sent" string="Sent" domain="[('event_type', '=', 'sent')]" /> <filter name="sent" string="Sent" domain="[('event_type', '=', 'sent')]" />
<filter name="delivered" string="Delivered" domain="[('event_type', '=', 'delivered')]"/> <filter
<filter name="click" string="Click" domain="[('event_type', '=', 'click')]"/> name="delivered"
string="Delivered"
domain="[('event_type', '=', 'delivered')]"
/>
<filter
name="click"
string="Click"
domain="[('event_type', '=', 'click')]"
/>
<filter name="open" string="Open" domain="[('event_type', '=', 'open')]" /> <filter name="open" string="Open" domain="[('event_type', '=', 'open')]" />
<filter name="unsub" string="Unsubscribe" domain="[('event_type', '=', 'unsub')]"/> <filter
<filter name="bounce" string="Bounce" name="unsub"
domain="[('event_type', 'in', ('hard_bounce', 'soft_bounce'))]"/> string="Unsubscribe"
<filter name="exception" string="Failed" domain="[('event_type', '=', 'unsub')]"
/>
<filter
name="bounce"
string="Bounce"
domain="[('event_type', 'in', ('hard_bounce', 'soft_bounce'))]"
/>
<filter
name="exception"
string="Failed"
domain="[('event_type', 'in', ('reject', 'spam'))]" domain="[('event_type', 'in', ('reject', 'spam'))]"
context="{'event_error_filter': True}"/> context="{'event_error_filter': True}"
/>
<separator /> <separator />
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<filter string="Type" name="group_by_type" domain="[]" context="{'group_by': 'event_type'}"/> <filter
<filter string="Message" name="group_by_message" domain="[]" context="{'group_by': 'tracking_email_id'}"/> string="Type"
<filter string="OS" name="group_by_os" domain="[('os_family', '!=', False)]" context="{'group_by': 'os_family'}"/> name="group_by_type"
<filter string="User agent" name="group_by_user_agent" domain="[('ua_family', '!=', False)]" context="{'group_by': 'ua_family'}"/> domain="[]"
<filter string="User agent type" name="group_by_user_agent_type" domain="[('ua_type', '!=', False)]" context="{'group_by': 'ua_type'}"/> context="{'group_by': 'event_type'}"
<filter string="Country" name="group_by_country" domain="[('user_country_id', '!=', False)]" context="{'group_by': 'user_country_id'}"/> />
<filter string="Month" name="group_by_date" domain="[]" context="{'group_by': 'date'}"/> <filter
string="Message"
name="group_by_message"
domain="[]"
context="{'group_by': 'tracking_email_id'}"
/>
<filter
string="OS"
name="group_by_os"
domain="[('os_family', '!=', False)]"
context="{'group_by': 'os_family'}"
/>
<filter
string="User agent"
name="group_by_user_agent"
domain="[('ua_family', '!=', False)]"
context="{'group_by': 'ua_family'}"
/>
<filter
string="User agent type"
name="group_by_user_agent_type"
domain="[('ua_type', '!=', False)]"
context="{'group_by': 'ua_type'}"
/>
<filter
string="Country"
name="group_by_country"
domain="[('user_country_id', '!=', False)]"
context="{'group_by': 'user_country_id'}"
/>
<filter
string="Month"
name="group_by_date"
domain="[]"
context="{'group_by': 'date'}"
/>
</group> </group>
</search> </search>
</field> </field>
@ -118,9 +188,12 @@
</record> </record>
<!-- Add menu entry in Settings/Email --> <!-- Add menu entry in Settings/Email -->
<menuitem name="Tracking events" id="menu_mail_tracking_event" <menuitem
name="Tracking events"
id="menu_mail_tracking_event"
parent="base.menu_email" parent="base.menu_email"
action="action_view_mail_tracking_event"/> action="action_view_mail_tracking_event"
/>
</odoo> </odoo>