').html(content),
+ buttons: [
+ {text: _t("Re-send letter"), classes: 'btn-primary', close: true, click: _.bind(message.resendLetter, message)},
+ {text: _t("Cancel letter"), close: true, click: _.bind(message.cancelLetter, message)},
+ {text: _t("Close"), close: true},
+ ],
+ }).open();
+ },
+ /**
+ * @private
+ * @param {integer} messageID
+ * @param {string} content
+ */
+ _openGenericErrorDialog: function (messageID, content) {
+ var message = _.find(this._messages, function (message) {
+ return message.getID() === messageID;
+ });
+ new Dialog(this, {
+ size: 'medium',
+ title: _t("Failed letter"),
+ $content: $('
').html(content),
+ buttons: [
+ {text: _t("Cancel letter"), classes: 'btn-primary', close: true, click: _.bind(message.cancelLetter, message)},
+ {text: _t("Close"), close: true},
+ ],
+ }).open();
+ },
+ /**
+ * Render the popover when mouse-hovering on the mail icon of a message
+ * in the thread. There is at most one such popover at any given time.
+ *
+ * @private
+ * @param {mail.model.AbstractMessage[]} messages list of messages in the
+ * rendered thread, for which popover on mouseover interaction is
+ * permitted.
+ */
+ _renderMessageSnailmailPopover: function () {
+ var self = this;
+ if (this._messageSnailmailPopover) {
+ this._messageSnailmailPopover.popover('hide');
+ }
+ if (!this.$('.o_thread_snailmail_tooltip').length) {
+ return;
+ }
+ this._messageSnailmailPopover = this.$('.o_thread_snailmail_tooltip').popover({
+ html: true,
+ boundary: 'viewport',
+ placement: 'auto',
+ trigger: 'hover',
+ offset: '0, 1',
+ content: function () {
+ var messageID = $(this).data('message-id');
+ var message = _.find(self._messages, function (message) {
+ return message.getID() === messageID;
+ });
+ return QWeb.render('snailmail.widget.Thread.Message.SnailmailTooltip', {
+ status: message.getSnailmailStatus()
+ });
+ },
+ });
+ },
+
+ //--------------------------------------------------------------------------
+ // Handlers
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ * @param {MouseEvent} event
+ */
+ _onClickCreditError: function (ev) {
+ var self = this;
+ var messageID = $(ev.currentTarget).data('message-id');
+ this._rpc({
+ model: 'iap.account',
+ method: 'get_credits_url',
+ args: ['snailmail'],
+ }).then(function (link) {
+ var content = _.str.sprintf(_t(
+ '
The letter could not be sent due to insufficient credits on your IAP account.
' +
+ '
'
+ ), link);
+ self._openCreditErrorDialog(messageID, content);
+ });
+ },
+ /**
+ * @private
+ * @param {MouseEvent} event
+ */
+ _onClickFormatError: function (ev) {
+ var messageID = $(ev.currentTarget).data('message-id');
+ this.do_action('snailmail.snailmail_letter_format_error_action', {
+ additional_context: {
+ message_id: messageID,
+ }
+ });
+ },
+ /**
+ * @private
+ * @param {MouseEvent} event
+ */
+ _onClickMissingRequiredFields: function (ev) {
+ var self = this;
+
+ var messageID = $(ev.currentTarget).data('message-id');
+ var domain = [['message_id', '=', messageID]];
+ this._rpc({
+ model: 'snailmail.letter',
+ method: 'search',
+ args: [domain],
+ }).then(function (letterIds) {
+ self.do_action('snailmail.snailmail_letter_missing_required_fields_action', {
+ additional_context: {
+ letter_id: letterIds[0]
+ },
+ on_close: function () {
+ self.trigger_up('reload');
+ }
+ });
+ });
+ },
+ /**
+ * @private
+ * @param {MouseEvent} event
+ */
+ _onClickNoPriceAvailable: function (ev) {
+ var messageID = $(ev.currentTarget).data('message-id');
+ var content = _t('
The country to which you want to send the letter is not supported by our service.
');
+ this._openGenericErrorDialog(messageID, content);
+ },
+ /**
+ * @private
+ * @param {MouseEvent} event
+ */
+ _onClickTrialError: function (ev) {
+ var self = this;
+ var messageID = $(ev.currentTarget).data('message-id');
+ this._rpc({
+ model: 'iap.account',
+ method: 'get_credits_url',
+ args: ['snailmail', '', 0, true],
+ }).then(function (link) {
+ var content = _.str.sprintf(_t(
+ '
You need credits on your IAP account to send a letter.
' +
+ '
'
+ ), link);
+ self._openCreditErrorDialog(messageID, content);
+ });
+ },
+ /**
+ * @private
+ * @param {MouseEvent} event
+ */
+ _onClickUnknownError: function (ev) {
+ var messageID = $(ev.currentTarget).data('message-id');
+ var content = _t('
An unknown error occured. Please contact our support for further assistance.
');
+ this._openGenericErrorDialog(messageID, content);
+ },
+});
+
+});
diff --git a/addons/snailmail/static/src/scss/thread.scss b/addons/snailmail/static/src/scss/thread.scss
new file mode 100644
index 00000000000..ecf42cef033
--- /dev/null
+++ b/addons/snailmail/static/src/scss/thread.scss
@@ -0,0 +1,17 @@
+.o_thread_message_snailmail {
+ padding: 4px;
+
+ &:not(.o_thread_message_snailmail_error) {
+ color: grey;
+ }
+
+ &.o_thread_message_snailmail_error {
+ color: red;
+ opacity: 1;
+ cursor: pointer;
+ }
+}
+
+.o_thread_tooltip_snailmail_icon {
+ min-width: 1rem;
+}
diff --git a/addons/snailmail/static/src/xml/thread.xml b/addons/snailmail/static/src/xml/thread.xml
new file mode 100644
index 00000000000..aeda07445be
--- /dev/null
+++ b/addons/snailmail/static/src/xml/thread.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sent
+
+
+
+ Canceled
+
+
+
+ Awaiting Dispatch
+
+
+
+ Error
+
+
+
+
+
diff --git a/addons/snailmail/static/tests/chatter_snailmail_tests.js b/addons/snailmail/static/tests/chatter_snailmail_tests.js
new file mode 100644
index 00000000000..312a77727c3
--- /dev/null
+++ b/addons/snailmail/static/tests/chatter_snailmail_tests.js
@@ -0,0 +1,503 @@
+odoo.define('snailmail.chatter_snailmail_tests', function (require) {
+"use strict";
+
+var mailTestUtils = require('mail.testUtils');
+var ThreadWidget = require('mail.widget.Thread');
+
+var FormView = require('web.FormView');
+var testUtils = require('web.test_utils');
+
+var createView = testUtils.createView;
+
+var getArch = function () {
+ return '
';
+};
+
+QUnit.module('snailmail', {}, function () {
+QUnit.module('Chatter', {
+ before: function () {
+ this.services = mailTestUtils.getMailServices();
+ this.data = {
+ 'account.invoice': {
+ fields: {
+ display_name: { string: "Displayed name", type: "char" },
+ foo: {string: "Foo", type: "char", default: "My little Foo Value"},
+ message_ids: {
+ string: "messages",
+ type: "one2many",
+ relation: 'mail.message',
+ relation_field: "res_id",
+ },
+ message_attachment_count: {
+ string: 'Attachment count',
+ type: 'integer',
+ },
+ },
+ records: [{
+ id: 1,
+ display_name: "Invoice 1",
+ foo: "HELLO",
+ message_ids: [11],
+ message_attachment_count: 0,
+ }]
+ },
+ 'mail.message': {
+ fields: {
+ author_id: {
+ string: "Author",
+ relation: 'res.partner',
+ },
+ body: {
+ string: "Contents",
+ type: 'html',
+ },
+ date: {
+ string: "Date",
+ type: 'datetime',
+ },
+ model: {
+ string: "Related Document Model",
+ type: 'char',
+ },
+ res_id: {
+ string: "Related Document ID",
+ type: 'integer',
+ },
+ snailmail_status: {
+ string: "Snailmail Status",
+ type: "char"
+ },
+ snailmail_error: {
+ string: "Snailmail Error",
+ type: "boolean",
+ },
+ message_type: {
+ string: "Type",
+ type: 'selection',
+ },
+ },
+ records: [{
+ id: 11,
+ author_id: ["1", "John Doe"],
+ body: 'Message Body',
+ date: "2018-12-11 12:34:00",
+ model: 'account.invoice',
+ res_id: 1,
+ message_type: 'snailmail',
+ }],
+ }
+ };
+ },
+ afterEach: function () {
+ $('.popover').remove();
+ $('.modal').remove();
+ }
+});
+
+QUnit.test('Sent', function (assert) {
+ assert.expect(7);
+
+ this.data['mail.message'].records[0].snailmail_status = 'sent';
+ this.data['mail.message'].records[0].snailmail_error = false;
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_sent',
+ "Snailmail status of message should be 'sent'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_sent'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-check').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Sent")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_sent'));
+ assert.containsNone($('.modal'), "No modal should open on click");
+
+ form.destroy();
+});
+
+QUnit.test('Canceled', function (assert) {
+ assert.expect(7);
+
+ this.data['mail.message'].records[0].snailmail_status = 'canceled';
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_canceled',
+ "Snailmail status of message should be 'canceled'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_canceled'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-trash-o').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Canceled")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_canceled'));
+ assert.containsNone($('.modal'), "No modal should open on click");
+
+ form.destroy();
+});
+
+QUnit.test('Pending', function (assert) {
+ assert.expect(7);
+
+ this.data['mail.message'].records[0].snailmail_status = 'pending';
+ this.data['mail.message'].records[0].snailmail_error = false;
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_pending',
+ "Snailmail status of message should be 'pending'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_pending'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-clock-o').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Awaiting Dispatch")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_pending'));
+ assert.containsNone($('.modal'), "No modal should open on click");
+
+ form.destroy();
+});
+
+QUnit.test('No Price Available', function (assert) {
+ assert.expect(11);
+
+ this.data['mail.message'].records[0].snailmail_status = 'no_price_available';
+ this.data['mail.message'].records[0].snailmail_error = true;
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ mockRPC: function (route, args) {
+ if (args.method === 'cancel_letter' && args.model === 'mail.message' && args.args[0][0] === 11) {
+ assert.step(args.method);
+ return $.when();
+ }
+ return this._super.apply(this, arguments);
+ }
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_no_price_available',
+ "Snailmail status of message should be 'no_price_available'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_no_price_available'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-exclamation').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Error")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_no_price_available'));
+ var $modal = $('.modal');
+ assert.ok($modal.length, "A modal should open on click");
+
+ assert.containsOnce($modal, 'button:contains("Cancel letter")',
+ "Modal should have a 'Cancel letter' button");
+ var $cancelButton = $('.modal').find('button:contains("Cancel letter")');
+ testUtils.dom.click($cancelButton);
+ assert.notOk($('.modal').length,
+ "The modal should be closed after click on 'Cancel letter'");
+
+ assert.verifySteps(['cancel_letter'],
+ "Should have made a RPC call to 'cancel_letter'");
+
+ form.destroy();
+});
+
+QUnit.test('Format Error', function (assert) {
+ assert.expect(8);
+
+ this.data['mail.message'].records[0].snailmail_status = 'format_error';
+ this.data['mail.message'].records[0].snailmail_error = true;
+
+ testUtils.mock.patch(ThreadWidget, {
+ do_action: function (action, options) {
+ assert.step("do_action");
+ },
+ });
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ mockRPC: function (route, args) {
+ if (args.method === 'cancel_letter' && args.model === 'mail.message' && args.args[0][0] === 11) {
+ assert.step(args.method);
+ return $.when();
+ }
+ return this._super.apply(this, arguments);
+ }
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_format_error',
+ "Snailmail status of message should be 'format_error'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_format_error'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-exclamation').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Error")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_format_error'));
+ assert.verifySteps(['do_action'], "'do_action' should have been called");
+
+ form.destroy();
+ testUtils.mock.unpatch(ThreadWidget);
+});
+
+QUnit.test('Credit Error', function (assert) {
+ assert.expect(14);
+
+ this.data['mail.message'].records[0].snailmail_status = 'credit_error';
+ this.data['mail.message'].records[0].snailmail_error = true;
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ mockRPC: function (route, args) {
+ if (args.model === 'mail.message') {
+ if ((args.method === 'cancel_letter' && args.args[0][0] === 11) || args.method === 'send_letter') {
+ assert.step(args.method);
+ return $.when();
+ }
+ }
+ if (args.method === 'get_credits_url' && args.model === 'iap.account') {
+ return $.when('credits_url');
+ }
+ return this._super.apply(this, arguments);
+ }
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_credit_error',
+ "Snailmail status of message should be 'credit_error'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_credit_error'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-exclamation').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Error")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_credit_error'));
+ var $modal = $('.modal');
+ assert.ok($modal.length, "A modal should open on click");
+
+ assert.containsOnce($modal, 'button:contains("Re-send letter")',
+ "Modal should have a 'Re-send letter' button");
+ var $resendButton = $('.modal').find('button:contains("Re-send letter")');
+ testUtils.dom.click($resendButton);
+ assert.notOk($('.modal').length,
+ "The modal should be closed after click on 'Re-send letter'");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_credit_error'));
+
+ assert.containsOnce($modal, 'button:contains("Cancel letter")',
+ "Modal should have a 'Cancel letter' button");
+ var $cancelButton = $('.modal').find('button:contains("Cancel letter")');
+ testUtils.dom.click($cancelButton);
+ assert.containsNone($('.modal'),
+ "The modal should be closed after click on 'Cancel letter'");
+
+ assert.verifySteps(['send_letter', 'cancel_letter'],
+ "Should have made RPC calls to 'send_letter' and 'cancel_letter'");
+
+ form.destroy();
+});
+
+QUnit.test('Trial Error', function (assert) {
+ assert.expect(14);
+
+ this.data['mail.message'].records[0].snailmail_status = 'trial_error';
+ this.data['mail.message'].records[0].snailmail_error = true;
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ mockRPC: function (route, args) {
+ if (args.model === 'mail.message') {
+ if ((args.method === 'cancel_letter' && args.args[0][0] === 11) || args.method === 'send_letter') {
+ assert.step(args.method);
+ return $.when();
+ }
+ }
+ if (args.method === 'get_credits_url' && args.model === 'iap.account') {
+ return $.when('credits_url');
+ }
+ return this._super.apply(this, arguments);
+ }
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_trial_error',
+ "Snailmail status of message should be 'trial_error'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_trial_error'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-exclamation').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Error")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_trial_error'));
+ var $modal = $('.modal');
+ assert.ok($modal.length, "A modal should open on click");
+
+ assert.containsOnce($modal, 'button:contains("Re-send letter")',
+ "Modal should have a 'Re-send letter' button");
+ var $resendButton = $('.modal').find('button:contains("Re-send letter")');
+ testUtils.dom.click($resendButton);
+ assert.containsNone($('.modal'),
+ "The modal should be closed after click on 'Re-send letter'");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_trial_error'));
+
+ $modal = $('.modal');
+ assert.containsOnce($modal, 'button:contains("Cancel letter")',
+ "Modal should have a 'Cancel letter' button");
+ var $cancelButton = $modal.find('button:contains("Cancel letter")');
+ testUtils.dom.click($cancelButton);
+ assert.containsNone($('.modal'),
+ "The modal should be closed after click on 'Cancel letter'");
+
+ assert.verifySteps(['send_letter', 'cancel_letter'],
+ "Should have made RPC calls to 'send_letter' and 'cancel_letter'");
+
+ form.destroy();
+});
+
+QUnit.test('Missing Required Fields', function (assert) {
+ assert.expect(8);
+
+ this.data['mail.message'].records[0].snailmail_status = 'missing_required_fields';
+ this.data['mail.message'].records[0].snailmail_error = true;
+
+ testUtils.mock.patch(ThreadWidget, {
+ do_action: function (action, options) {
+ assert.step("do_action");
+ },
+ });
+
+ var form = createView({
+ View: FormView,
+ model: 'account.invoice',
+ res_id: 1,
+ data: this.data,
+ services: this.services,
+ arch: getArch(),
+ mockRPC: function (route, args) {
+ if (args.model === 'snailmail.letter' && args.method === 'search') {
+ return $.when([2]);
+ }
+ return this._super.apply(this, arguments);
+ }
+ });
+
+ assert.containsOnce(form, '.o_thread_snailmail_tooltip_container',
+ "Snailmail icon should appear on message");
+ assert.containsOnce(form, '.o_thread_message_snailmail_missing_required_fields',
+ "Snailmail status of message should be 'missing_required_fields'");
+ assert.containsNone(form, '.o_thread_tooltip_snailmail',
+ "No tooltip should be present");
+
+ testUtils.dom.triggerMouseEvent(form.$('.o_thread_message_snailmail_missing_required_fields'), 'mouseenter');
+ assert.ok($('.o_thread_tooltip_snailmail:visible').length,
+ "Tooltip should appear when hovering the Snailmail Icon");
+ assert.ok($('.o_thread_tooltip_snailmail_icon.fa-exclamation').length,
+ "Tooltip should show correct icon");
+ assert.ok($('.o_thread_tooltip_snailmail:contains("Error")').length,
+ "Tooltip should show correct text");
+
+ testUtils.dom.click(form.$('.o_thread_message_snailmail_missing_required_fields'));
+ assert.verifySteps(['do_action'], "'do_action' should have been called");
+
+ form.destroy();
+ testUtils.mock.unpatch(ThreadWidget);
+});
+
+});
+
+});
diff --git a/addons/snailmail/views/assets.xml b/addons/snailmail/views/assets.xml
new file mode 100644
index 00000000000..1dca06c355c
--- /dev/null
+++ b/addons/snailmail/views/assets.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/snailmail/wizard/__init__.py b/addons/snailmail/wizard/__init__.py
new file mode 100644
index 00000000000..86a507b287b
--- /dev/null
+++ b/addons/snailmail/wizard/__init__.py
@@ -0,0 +1,3 @@
+from . import snailmail_letter_cancel
+from . import snailmail_letter_format_error
+from . import snailmail_letter_missing_required_fields
diff --git a/addons/snailmail/wizard/snailmail_letter_cancel.py b/addons/snailmail/wizard/snailmail_letter_cancel.py
new file mode 100644
index 00000000000..3cb5aa1621c
--- /dev/null
+++ b/addons/snailmail/wizard/snailmail_letter_cancel.py
@@ -0,0 +1,28 @@
+
+from odoo import _, api, fields, models
+
+class SnailmailLetterCancel(models.TransientModel):
+ _name = 'snailmail.letter.cancel'
+ _description = 'Dismiss notification for resend by model'
+
+ model = fields.Char(string='Model')
+ help_message = fields.Char(string='Help message', compute='_compute_help_message')
+
+ @api.multi
+ @api.depends('model')
+ def _compute_help_message(self):
+ for wizard in self:
+ wizard.help_message = _("Are you sure you want to discard %s snailmail delivery failures. You won't be able to re-send these letters later!") % (wizard._context.get('unread_counter'))
+
+ @api.multi
+ def cancel_resend_action(self):
+ author_id = self.env.user.id
+ for wizard in self:
+ letters = self.env['snailmail.letter'].search([
+ ('state', 'not in', ['sent', 'canceled', 'pending']),
+ ('user_id', '=', author_id),
+ ('model', '=', wizard.model)
+ ])
+ for letter in letters:
+ letter.cancel()
+ return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/snailmail/wizard/snailmail_letter_cancel_views.xml b/addons/snailmail/wizard/snailmail_letter_cancel_views.xml
new file mode 100644
index 00000000000..d244985b147
--- /dev/null
+++ b/addons/snailmail/wizard/snailmail_letter_cancel_views.xml
@@ -0,0 +1,28 @@
+
+
+
+ snailmail.letter.cancel.form
+ snailmail.letter.cancel
+
+
+
+
+
+
+
+ Discard snailmail delivery failures
+ snailmail.letter.cancel
+ ir.actions.act_window
+ form
+ form
+ new
+
+
diff --git a/addons/snailmail/wizard/snailmail_letter_format_error.py b/addons/snailmail/wizard/snailmail_letter_format_error.py
new file mode 100644
index 00000000000..1eb92654e42
--- /dev/null
+++ b/addons/snailmail/wizard/snailmail_letter_format_error.py
@@ -0,0 +1,34 @@
+
+from odoo import api, fields, models
+
+class SnailmailLetterFormatError(models.TransientModel):
+ _name = 'snailmail.letter.format.error'
+ _description = 'Format Error Sending a Snailmail Letter'
+
+ message_id = fields.Many2one('mail.message')
+ snailmail_cover = fields.Boolean(string='Add a Cover Page')
+
+ @api.model
+ def default_get(self, fields):
+ res = super(SnailmailLetterFormatError, self).default_get(fields)
+ snailmail_cover = self.env.user.company_id.snailmail_cover
+ res.update({
+ 'message_id': self.env.context.get('message_id'),
+ 'snailmail_cover': snailmail_cover,
+ })
+ return res
+
+ @api.multi
+ def update_resend_action(self):
+ self.env.user.company_id.write({'snailmail_cover': self.snailmail_cover})
+ letters_to_resend = self.env['snailmail.letter'].search([
+ ('error_code', '=', 'FORMAT_ERROR'),
+ ])
+ for letter in letters_to_resend:
+ letter.attachment_id.unlink()
+ letter.write({'cover': self.snailmail_cover})
+ letter.snailmail_print()
+
+ @api.multi
+ def cancel_letter_action(self):
+ self.message_id.cancel_letter()
diff --git a/addons/snailmail/wizard/snailmail_letter_format_error_views.xml b/addons/snailmail/wizard/snailmail_letter_format_error_views.xml
new file mode 100644
index 00000000000..35ba55047fe
--- /dev/null
+++ b/addons/snailmail/wizard/snailmail_letter_format_error_views.xml
@@ -0,0 +1,31 @@
+
+
+
+ snailmail.letter.format.error.form
+ snailmail.letter.format.error
+
+
+
+
+
+
+
+ Format Error
+ snailmail.letter.format.error
+ ir.actions.act_window
+ form
+ form
+ new
+
+
diff --git a/addons/snailmail/wizard/snailmail_letter_missing_required_fields.py b/addons/snailmail/wizard/snailmail_letter_missing_required_fields.py
new file mode 100644
index 00000000000..a6b82807be9
--- /dev/null
+++ b/addons/snailmail/wizard/snailmail_letter_missing_required_fields.py
@@ -0,0 +1,54 @@
+
+from odoo import _, api, fields, models
+
+class SnailmailLetterMissingRequiredFields(models.TransientModel):
+ _name = 'snailmail.letter.missing.required.fields'
+ _description = 'Update address of partner'
+
+ partner_id = fields.Many2one('res.partner')
+ letter_id = fields.Many2one('snailmail.letter')
+
+ street = fields.Char('Street')
+ street2 = fields.Char('Street2')
+ zip = fields.Char('Zip')
+ city = fields.Char('City')
+ state_id = fields.Many2one("res.country.state", string='State')
+ country_id = fields.Many2one('res.country', string='Country')
+
+ @api.model
+ def default_get(self, fields):
+ rec = super(SnailmailLetterMissingRequiredFields, self).default_get(fields)
+ letter_id = self.env['snailmail.letter'].browse(self.env.context.get('letter_id'))
+ rec.update({
+ 'partner_id': letter_id.partner_id.id,
+ 'letter_id': letter_id.id,
+ 'street': letter_id.street,
+ 'street2': letter_id.street2,
+ 'zip': letter_id.zip,
+ 'city': letter_id.city,
+ 'state_id': letter_id.state_id.id,
+ 'country_id': letter_id.country_id.id,
+ })
+ return rec
+
+ @api.multi
+ def update_address_cancel(self):
+ self.letter_id.cancel()
+
+ @api.multi
+ def update_address_save(self):
+ address_data = {
+ 'street': self.street,
+ 'street2': self.street2,
+ 'zip': self.zip,
+ 'city': self.city,
+ 'state_id': self.state_id.id,
+ 'country_id': self.country_id.id,
+ }
+ self.partner_id.write(address_data)
+ letters_to_resend = self.env['snailmail.letter'].search([
+ ('partner_id', '=', self.partner_id.id),
+ ('error_code', '=', 'MISSING_REQUIRED_FIELDS'),
+ ])
+ letters_to_resend.write(address_data)
+ letters_to_resend.snailmail_print()
diff --git a/addons/snailmail/wizard/snailmail_letter_missing_required_fields_views.xml b/addons/snailmail/wizard/snailmail_letter_missing_required_fields_views.xml
new file mode 100644
index 00000000000..b4be9c7d74a
--- /dev/null
+++ b/addons/snailmail/wizard/snailmail_letter_missing_required_fields_views.xml
@@ -0,0 +1,38 @@
+
+
+
+ snailmail.letter.missing.required.fields.form
+ snailmail.letter.missing.required.fields
+
+
+
+
+
+
+ Failed letter
+ snailmail.letter.missing.required.fields
+ ir.actions.act_window
+ form
+ form
+ new
+
+
diff --git a/addons/snailmail_account/static/src/js/snailmail_account_notification_manager.js b/addons/snailmail_account/static/src/js/snailmail_account_notification_manager.js
index 8c42b17c6be..0309930351b 100644
--- a/addons/snailmail_account/static/src/js/snailmail_account_notification_manager.js
+++ b/addons/snailmail_account/static/src/js/snailmail_account_notification_manager.js
@@ -4,7 +4,7 @@ odoo.define('snailmail_account.NotificationManager', function (require) {
var AbstractService = require('web.AbstractService');
var core = require("web.core");
-var SnailmailNotificationManager = AbstractService.extend({
+var SnailmailAccountNotificationManager = AbstractService.extend({
dependencies: ['bus_service'],
/**
@@ -28,8 +28,8 @@ var SnailmailNotificationManager = AbstractService.extend({
});
-core.serviceRegistry.add('snailmail_notification_service', SnailmailNotificationManager);
+core.serviceRegistry.add('snailmail_account_notification_service', SnailmailAccountNotificationManager);
-return SnailmailNotificationManager;
+return SnailmailAccountNotificationManager;
});
diff --git a/addons/snailmail_account/views/res_config_settings_views.xml b/addons/snailmail_account/views/res_config_settings_views.xml
index 167b5ee0d09..eb80ae4b860 100644
--- a/addons/snailmail_account/views/res_config_settings_views.xml
+++ b/addons/snailmail_account/views/res_config_settings_views.xml
@@ -27,6 +27,11 @@