From 8dfff3a64d96be950db005c4a5d80bc9e7b4fcaf Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Wed, 10 Feb 2016 17:00:48 +0100 Subject: [PATCH 1/4] [NEW][8.0] portal_welcome_email_template: Customize portal access email message with a email template --- portal_welcome_email_template/README.rst | 72 +++++++++++++++ portal_welcome_email_template/__init__.py | 6 ++ portal_welcome_email_template/__openerp__.py | 23 +++++ .../data/email_template_data.xml | 41 +++++++++ portal_welcome_email_template/i18n/es.po | 86 ++++++++++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../wizards/__init__.py | 6 ++ .../wizards/portal_wizard.py | 52 +++++++++++ 8 files changed, 286 insertions(+) create mode 100644 portal_welcome_email_template/README.rst create mode 100644 portal_welcome_email_template/__init__.py create mode 100644 portal_welcome_email_template/__openerp__.py create mode 100644 portal_welcome_email_template/data/email_template_data.xml create mode 100644 portal_welcome_email_template/i18n/es.po create mode 100644 portal_welcome_email_template/static/description/icon.png create mode 100644 portal_welcome_email_template/wizards/__init__.py create mode 100644 portal_welcome_email_template/wizards/portal_wizard.py diff --git a/portal_welcome_email_template/README.rst b/portal_welcome_email_template/README.rst new file mode 100644 index 00000000..091183d5 --- /dev/null +++ b/portal_welcome_email_template/README.rst @@ -0,0 +1,72 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================= +Portal Welcome Email Template +============================= + +This module extends the functionality of portal module to allow customize the +email message sent to customer in email template section. +The email sent is sent to queue. + +Usage +===== + +To modify the email sent go to *Settings > Email > Email Template* and search +'Portal Welcome Email'. You can rewrite the template. +Variables are stored into ctx, example: *ctx['portal_url']* + +Variables list: + +* ctx['login'] +* ctx['portal_url'] +* ctx['db'] +* ctx['portal'] +* ctx['signup_url'] +* ctx['welcome_message'] + + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/205/8.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed `feedback +`_. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Carlos Dauden +* Sergio Teruel + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/portal_welcome_email_template/__init__.py b/portal_welcome_email_template/__init__.py new file mode 100644 index 00000000..9712c2f6 --- /dev/null +++ b/portal_welcome_email_template/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Incaser Informatica S.L. - Sergio Teruel +# (c) 2015 Incaser Informatica S.L. - Carlos Dauden +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import wizards diff --git a/portal_welcome_email_template/__openerp__.py b/portal_welcome_email_template/__openerp__.py new file mode 100644 index 00000000..deacd31d --- /dev/null +++ b/portal_welcome_email_template/__openerp__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Incaser Informatica S.L. - Sergio Teruel +# (c) 2015 Incaser Informatica S.L. - Carlos Dauden +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +{ + "name": "Portal Welcome Email Template", + "summary": "Use an email template for send portal invitation", + "version": "8.0.1.0.0", + "category": "Tools", + "website": "https://odoo-community.org/", + 'author': 'Incaser Informatica S.L., ' + 'Odoo Community Association (OCA)', + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "portal", + ], + "data": [ + "data/email_template_data.xml", + ], +} diff --git a/portal_welcome_email_template/data/email_template_data.xml b/portal_welcome_email_template/data/email_template_data.xml new file mode 100644 index 00000000..8654a8fa --- /dev/null +++ b/portal_welcome_email_template/data/email_template_data.xml @@ -0,0 +1,41 @@ + + + + + + Portal Welcome Email + ${object.company_id.name}<${object.company_id.email}> + Your account at ${object.company_id.name} + ${object.email} + ${object.lang} + + + + Dear ${object.name}, 

+

You have been given access to ${object.company_id.name}'s ${ctx['portal']}.

+

Your login account data is:

+
+
+ Username: ${ctx['login']}  +
+
+ Portal: ${ctx['portal_url']}  +
+
+ Database: ${ctx['db']}  +
+
+
+You can set or change your password via the following url:
+${ctx['signup_url']}
+

${ctx['welcome_message']}

+
+--
+Automatic Email.
+${object.company_id.name or ''}
+
]]> + + + + diff --git a/portal_welcome_email_template/i18n/es.po b/portal_welcome_email_template/i18n/es.po new file mode 100644 index 00000000..c24f7e76 --- /dev/null +++ b/portal_welcome_email_template/i18n/es.po @@ -0,0 +1,86 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * portal_welcome_email_template +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-02-09 08:29+0000\n" +"PO-Revision-Date: 2016-02-09 09:30+0100\n" +"Last-Translator: Sergio Teruel \n" +"Language-Team: \n" +"Language: es_ES\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" + +#. module: portal_welcome_email_template +#: model:email.template,body_html:portal_welcome_email_template.portal_welcome_email +msgid "" +" \n" +"

Dear ${object.name}, 

\n" +"

You have been given access to ${object.company_id.name}'s " +"${ctx['portal']}.

\n" +"

Your login account data is:

\n" +"
\n" +"
\n" +" Username: ${ctx['login']} \n" +"
\n" +"
\n" +" Portal: ${ctx['portal_url']} \n" +"
\n" +"
\n" +" Database: ${ctx['db']} \n" +"
\n" +"
\n" +"
\n" +"You can set or change your password via the following url:
\n" +"${ctx['signup_url']}
\n" +"

${ctx['welcome_message']}

\n" +"
\n"
+"--\n"
+"Automatic Email.\n"
+"${object.company_id.name or ''}\n"
+"
\n" +" " +msgstr "" +" \n" +" \n" +"

Estimado ${object.name}, 

\n" +"

Se le ha dado acceso al ${ctx['portal']} de ${object.company_id.name}.\n" +"

Las credenciales de su cuenta son:

\n" +"
\n" +"
\n" +" Usuario: ${ctx['login']} \n" +"
\n" +"
\n" +" Portal: ${ctx['portal_url']} \n" +"
\n" +"
\n" +" Base de datos: ${ctx['db']} \n" +"
\n" +"
\n" +"
\n" +"Usted puede establecer ocambiar su contraseña pinchando en el siguiente " +"enlace:
\n" +"${ctx['signup_url']}
\n" +"

${ctx['welcome_message']}

\n" +"
\n"
+"--\n"
+"Email automático .\n"
+"${object.company_id.name or ''}\n"
+"
\n" +" " + +#. module: portal_welcome_email_template +#: model:ir.model,name:portal_welcome_email_template.model_portal_wizard_user +msgid "Portal User Config" +msgstr "Configuración del portal de usuario" + +#. module: portal_welcome_email_template +#: model:email.template,subject:portal_welcome_email_template.portal_welcome_email +msgid "Your account at ${object.company_id.name}" +msgstr "Su cuenta en ${object.company_id.name}" diff --git a/portal_welcome_email_template/static/description/icon.png b/portal_welcome_email_template/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/portal_welcome_email_template/wizards/__init__.py b/portal_welcome_email_template/wizards/__init__.py new file mode 100644 index 00000000..9601b867 --- /dev/null +++ b/portal_welcome_email_template/wizards/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Incaser Informatica S.L. - Sergio Teruel +# (c) 2015 Incaser Informatica S.L. - Carlos Dauden +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import portal_wizard diff --git a/portal_welcome_email_template/wizards/portal_wizard.py b/portal_welcome_email_template/wizards/portal_wizard.py new file mode 100644 index 00000000..c9a3ab16 --- /dev/null +++ b/portal_welcome_email_template/wizards/portal_wizard.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Incaser Informatica S.L. - Sergio Teruel +# (c) 2015 Incaser Informatica S.L. - Carlos Dauden +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp import models, api +from openerp import exceptions +from openerp.tools.translate import _ + + +class WizardUser(models.TransientModel): + """ + A model to configure users in the portal wizard. + """ + _inherit = 'portal.wizard.user' + + @api.model + def _send_email(self, wizard_user): + """ send notification email to a new portal user + @param wizard_user: browse record of model portal.wizard.user + @return: the id of the created mail.mail record + """ + this_context = self._context + this_user = self.env['res.users'].sudo().browse(self._uid) + if not this_user.email: + raise exceptions.Warning( + _('Email Required'), + _('You must have an email address in your User Preferences to ' + 'send emails.')) + + # determine subject and body in the portal user's language + user = self.sudo()._retrieve_user(wizard_user) + context = dict(this_context or {}, lang=user.lang) + ctx_portal_url = dict(context, signup_force_type_in_url='') + portal_url = user.partner_id.with_context( + ctx_portal_url)._get_signup_url_for_action()[user.partner_id.id] + user.partner_id.with_context(context).signup_prepare() + + template = self.env.ref( + 'portal_welcome_email_template.portal_welcome_email') + ctx = this_context.copy() + ctx.update({ + 'login': user.login, + 'portal_url': portal_url, + 'db': self._cr.dbname, + 'portal': wizard_user.wizard_id.portal_id.name, + 'signup_url': user.signup_url, + 'welcome_message': wizard_user.wizard_id.welcome_message or "", + }) + result = template.with_context(ctx).generate_email_batch( + template.id, [user.id])[user.id] + return self.env['mail.mail'].with_context(this_context).create(result) From 5ba6653be354d71ecb10385f9e0c252cbac26544 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Thu, 11 Feb 2016 10:13:17 +0100 Subject: [PATCH 2/4] [NEW][8.0] portal_welcome_email_template: Changes suggested by OCA --- portal_welcome_email_template/README.rst | 2 +- portal_welcome_email_template/__openerp__.py | 3 +- .../wizards/portal_wizard.py | 39 ++++++------------- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/portal_welcome_email_template/README.rst b/portal_welcome_email_template/README.rst index 091183d5..0e57bb83 100644 --- a/portal_welcome_email_template/README.rst +++ b/portal_welcome_email_template/README.rst @@ -8,7 +8,7 @@ Portal Welcome Email Template This module extends the functionality of portal module to allow customize the email message sent to customer in email template section. -The email sent is sent to queue. +The sent email is enqueued instead of being directly processed. Usage ===== diff --git a/portal_welcome_email_template/__openerp__.py b/portal_welcome_email_template/__openerp__.py index deacd31d..796b6012 100644 --- a/portal_welcome_email_template/__openerp__.py +++ b/portal_welcome_email_template/__openerp__.py @@ -5,7 +5,8 @@ { "name": "Portal Welcome Email Template", - "summary": "Use an email template for send portal invitation", + "summary": "Adds an customizable email template for portal user " + "invitation", "version": "8.0.1.0.0", "category": "Tools", "website": "https://odoo-community.org/", diff --git a/portal_welcome_email_template/wizards/portal_wizard.py b/portal_welcome_email_template/wizards/portal_wizard.py index c9a3ab16..16d54b68 100644 --- a/portal_welcome_email_template/wizards/portal_wizard.py +++ b/portal_welcome_email_template/wizards/portal_wizard.py @@ -4,49 +4,32 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from openerp import models, api -from openerp import exceptions -from openerp.tools.translate import _ class WizardUser(models.TransientModel): - """ - A model to configure users in the portal wizard. - """ _inherit = 'portal.wizard.user' @api.model def _send_email(self, wizard_user): - """ send notification email to a new portal user - @param wizard_user: browse record of model portal.wizard.user - @return: the id of the created mail.mail record - """ - this_context = self._context - this_user = self.env['res.users'].sudo().browse(self._uid) - if not this_user.email: - raise exceptions.Warning( - _('Email Required'), - _('You must have an email address in your User Preferences to ' - 'send emails.')) - # determine subject and body in the portal user's language - user = self.sudo()._retrieve_user(wizard_user) - context = dict(this_context or {}, lang=user.lang) - ctx_portal_url = dict(context, signup_force_type_in_url='') + user = self._retrieve_user(wizard_user) portal_url = user.partner_id.with_context( - ctx_portal_url)._get_signup_url_for_action()[user.partner_id.id] - user.partner_id.with_context(context).signup_prepare() + lang=user.lang, + signup_force_type_in_url='' + )._get_signup_url_for_action()[user.partner_id.id] + user.partner_id.with_context( + lang=user.lang, signup_force_type_in_url='').signup_prepare() template = self.env.ref( 'portal_welcome_email_template.portal_welcome_email') - ctx = this_context.copy() + + ctx = self.env.context.copy() ctx.update({ 'login': user.login, 'portal_url': portal_url, - 'db': self._cr.dbname, + 'db': self.env.cr.dbname, 'portal': wizard_user.wizard_id.portal_id.name, 'signup_url': user.signup_url, - 'welcome_message': wizard_user.wizard_id.welcome_message or "", + 'welcome_message': wizard_user.wizard_id.welcome_message or '', }) - result = template.with_context(ctx).generate_email_batch( - template.id, [user.id])[user.id] - return self.env['mail.mail'].with_context(this_context).create(result) + return template.with_context(ctx).send_mail(user.id) From 4876c0e73b32046198bb5ec4b3c6374ea3ee0ef8 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Thu, 11 Feb 2016 12:40:53 +0100 Subject: [PATCH 3/4] [NEW][8.0] portal_welcome_email_template: Add test --- .../tests/__init__.py | 6 ++++ .../test_portal_welcome_email_template.py | 32 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 portal_welcome_email_template/tests/__init__.py create mode 100644 portal_welcome_email_template/tests/test_portal_welcome_email_template.py diff --git a/portal_welcome_email_template/tests/__init__.py b/portal_welcome_email_template/tests/__init__.py new file mode 100644 index 00000000..e0deade8 --- /dev/null +++ b/portal_welcome_email_template/tests/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Incaser Informatica S.L. - Sergio Teruel +# (c) 2015 Incaser Informatica S.L. - Carlos Dauden +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import test_portal_welcome_email_template diff --git a/portal_welcome_email_template/tests/test_portal_welcome_email_template.py b/portal_welcome_email_template/tests/test_portal_welcome_email_template.py new file mode 100644 index 00000000..cbc00a6b --- /dev/null +++ b/portal_welcome_email_template/tests/test_portal_welcome_email_template.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Incaser Informatica S.L. - Sergio Teruel +# (c) 2015 Incaser Informatica S.L. - Carlos Dauden +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp.tests.common import TransactionCase + + +class TestWelcomeEmailTemplate(TransactionCase): + + def setUp(self): + super(TestWelcomeEmailTemplate, self).setUp() + self.partner_obj = self.env['res.partner'] + self.partner = self.env.ref('base.res_partner_address_4') + + self.wiz_portal_access = self.env['portal.wizard'].create({ + 'user_ids': [(0, 0, { + 'partner_id': self.partner.id, + 'in_portal': True, + })], + }) + + def test_send_mail(self): + self.wiz_portal_access.user_ids.action_apply() + portal_user = self.env['res.users'].search( + [('partner_id', '=', self.partner.id)]) + self.assertTrue(portal_user) + mail = self.env['mail.mail'].search([ + ('model', '=', 'res.users'), + ('res_id', '=', portal_user.id) + ]) + self.assertTrue(mail) From ecfe114eb5141d8dfbcd936c773f6afef6cb0bfc Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Thu, 11 Feb 2016 13:43:50 +0100 Subject: [PATCH 4/4] [NEW][8.0] portal_welcome_email_template: fix test --- .../tests/test_portal_welcome_email_template.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/portal_welcome_email_template/tests/test_portal_welcome_email_template.py b/portal_welcome_email_template/tests/test_portal_welcome_email_template.py index cbc00a6b..90ea93fa 100644 --- a/portal_welcome_email_template/tests/test_portal_welcome_email_template.py +++ b/portal_welcome_email_template/tests/test_portal_welcome_email_template.py @@ -10,12 +10,16 @@ class TestWelcomeEmailTemplate(TransactionCase): def setUp(self): super(TestWelcomeEmailTemplate, self).setUp() - self.partner_obj = self.env['res.partner'] - self.partner = self.env.ref('base.res_partner_address_4') + partner_obj = self.env['res.partner'] + self.partner = partner_obj.create({ + 'name': 'partner_test', + 'email': 'test@example.com', + }) self.wiz_portal_access = self.env['portal.wizard'].create({ 'user_ids': [(0, 0, { 'partner_id': self.partner.id, + 'email': self.partner.email, 'in_portal': True, })], })