From 00693a4b461da5e2092c869239c9c4cdef85cc38 Mon Sep 17 00:00:00 2001 From: cristinamartinrod Date: Tue, 9 Apr 2019 11:26:36 +0200 Subject: [PATCH 1/2] [ADD][11.0] mass_mailing_newsletter_welcome_mail --- .../README.rst | 69 ++++++++++++++++++ .../__init__.py | 0 .../__manifest__.py | 21 ++++++ .../data/base_automation_data.xml | 32 ++++++++ .../i18n/mass_mailing_welcome_mail.pot | 30 ++++++++ .../readme/CONFIGURE.rst | 9 +++ .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes 9 files changed, 168 insertions(+) create mode 100644 mass_mailing_newsletter_welcome_mail/README.rst create mode 100644 mass_mailing_newsletter_welcome_mail/__init__.py create mode 100644 mass_mailing_newsletter_welcome_mail/__manifest__.py create mode 100644 mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml create mode 100644 mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot create mode 100755 mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst create mode 100755 mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst create mode 100755 mass_mailing_newsletter_welcome_mail/readme/DESCRIPTION.rst create mode 100644 mass_mailing_newsletter_welcome_mail/static/description/icon.png diff --git a/mass_mailing_newsletter_welcome_mail/README.rst b/mass_mailing_newsletter_welcome_mail/README.rst new file mode 100644 index 00000000..22987577 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/README.rst @@ -0,0 +1,69 @@ +============================================= +Welcome mail for new suscribers on newsletter +============================================= + +This module was written to extend the functionality of the website popup newsletter subscription form +to support sending to new subscribers an automatic welcome email and allow +you to customize it. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure this module, you need to: + +#. Go to **Settings > Technical > Automation > Automated actions > Welcome mail to newsletter subscribers** and edit anything there. + +Quicker way to just change the email template (something that most likely you +will want to do): + +#. Go to **Settings > Technical > Email > Templates** +#. Edit the template called **Welcome mail - Newsletter**. + + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + + +* `Tecnativa `__: + + * Cristina Martin R. + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +This module is part of the `OCA/website `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mass_mailing_newsletter_welcome_mail/__init__.py b/mass_mailing_newsletter_welcome_mail/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/mass_mailing_newsletter_welcome_mail/__manifest__.py b/mass_mailing_newsletter_welcome_mail/__manifest__.py new file mode 100644 index 00000000..04d42342 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2019 Tecnativa - Cristina Martin R. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + 'name': "Welcome mail to new subscribers", + "summary": "Send an automated welcome mail to new newsletter subscribers", + 'license': 'AGPL-3', + 'author': 'Tecnativa, ' + 'Odoo Community Association (OCA)', + 'category': 'Social', + 'version': '11.0.1.0.0', + 'website': 'https://github.com/OCA/social', + 'depends': [ + 'mass_mailing', + 'base_automation', + ], + 'data': [ + "data/base_automation_data.xml", + ], + 'application': False, + 'installable': True, +} diff --git a/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml b/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml new file mode 100644 index 00000000..07103f23 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml @@ -0,0 +1,32 @@ + + + + + Welcome mail to newsletter subscribers + + + ${object.env.context.get("lang")} + Welcome to the mailing list ${object.list_id.name} + +
Dear ${object.name}, +
+

Thanks for signing up for our newsletter!

+

Regards,

+
+ + + + + + + Send Welcome Mail to new subscribers on Newsletter + + email + on_create + + + + + + + diff --git a/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot b/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot new file mode 100644 index 00000000..c0b01b4c --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_welcome_mail +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mass_mailing_welcome_mail +#: model:mail.template,body_html:mass_mailing_welcome_mail.email_template +msgid "
Dear ${object.name}, +
+

Thanks for signing up for our newsletter!

+

Regards,

+
\n" +" " +msgstr "" + +#. module: mass_mailing_welcome_mail +#: model:base.automation,name:mass_mailing_welcome_mail.automated_action +#: model:ir.actions.server,name:mass_mailing_welcome_mail.automated_action +msgid "Send Welcome Mail to new subscribers" +msgstr "" diff --git a/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst b/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst new file mode 100755 index 00000000..134ebe50 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst @@ -0,0 +1,9 @@ +To configure this module, you need to: + +#. Go to **Settings > Technical > Automation > Automated actions > Welcome mail to New subscribers in Nesletter Mailing List** and edit anything there. + +Quicker way to just change the email template (something that most likely you +will want to do): + +#. Go to **Settings > Technical > Email > Templates** +#. Edit the template called **Welcome mail - Newsletter Mailing List**. diff --git a/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst b/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst new file mode 100755 index 00000000..e81b810d --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ + +* `Tecnativa `__: + + * Cristina Martin R. diff --git a/mass_mailing_newsletter_welcome_mail/readme/DESCRIPTION.rst b/mass_mailing_newsletter_welcome_mail/readme/DESCRIPTION.rst new file mode 100755 index 00000000..37477214 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module was written to extend the functionality of the website popup +newsletter subscription form to support sending to new subscribers an +automatic welcome email and allow you to customize it. diff --git a/mass_mailing_newsletter_welcome_mail/static/description/icon.png b/mass_mailing_newsletter_welcome_mail/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From fc857fbed188b995d1abd3505583425d5a7c633d Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 2 May 2019 13:02:15 +0100 Subject: [PATCH 2/2] [IMP] mass_mailing_welcome_mail: More logical workflow - Allow user to customize template. - Only react when someone subscribes from the website. Not when creating a contact from the backend. - Proper usage of context values. - Full instructions. --- .../README.rst | 80 ++- .../__init__.py | 2 + .../__manifest__.py | 6 +- .../controllers/__init__.py | 1 + .../controllers/main.py | 31 ++ .../data/base_automation_data.xml | 32 -- .../data/mail_template.xml | 21 + .../i18n/es.po | 40 ++ .../i18n/mass_mailing_welcome_mail.pot | 29 +- .../models/__init__.py | 1 + .../models/mail_mass_mailing_list.py | 16 + .../readme/CONFIGURE.rst | 23 +- .../readme/CONTRIBUTORS.rst | 1 + .../readme/ROADMAP.rst | 1 + .../readme/USAGE.rst | 7 + .../static/description/index.html | 470 ++++++++++++++++++ .../views/mail_mass_mailing_list.xml | 20 + 17 files changed, 713 insertions(+), 68 deletions(-) create mode 100644 mass_mailing_newsletter_welcome_mail/controllers/__init__.py create mode 100644 mass_mailing_newsletter_welcome_mail/controllers/main.py delete mode 100644 mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml create mode 100644 mass_mailing_newsletter_welcome_mail/data/mail_template.xml create mode 100644 mass_mailing_newsletter_welcome_mail/i18n/es.po create mode 100644 mass_mailing_newsletter_welcome_mail/models/__init__.py create mode 100644 mass_mailing_newsletter_welcome_mail/models/mail_mass_mailing_list.py create mode 100644 mass_mailing_newsletter_welcome_mail/readme/ROADMAP.rst create mode 100644 mass_mailing_newsletter_welcome_mail/readme/USAGE.rst create mode 100644 mass_mailing_newsletter_welcome_mail/static/description/index.html create mode 100644 mass_mailing_newsletter_welcome_mail/views/mail_mass_mailing_list.xml diff --git a/mass_mailing_newsletter_welcome_mail/README.rst b/mass_mailing_newsletter_welcome_mail/README.rst index 22987577..8212ec7f 100644 --- a/mass_mailing_newsletter_welcome_mail/README.rst +++ b/mass_mailing_newsletter_welcome_mail/README.rst @@ -1,10 +1,33 @@ -============================================= -Welcome mail for new suscribers on newsletter -============================================= - -This module was written to extend the functionality of the website popup newsletter subscription form -to support sending to new subscribers an automatic welcome email and allow -you to customize it. +=============================== +Welcome mail to new subscribers +=============================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github + :target: https://github.com/OCA/social/tree/11.0/mass_mailing_newsletter_welcome_mail + :alt: OCA/social +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/social-11-0/social-11-0-mass_mailing_newsletter_welcome_mail + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/205/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module was written to extend the functionality of the website popup +newsletter subscription form to support sending to new subscribers an +automatic welcome email and allow you to customize it. **Table of contents** @@ -16,14 +39,42 @@ Configuration To configure this module, you need to: -#. Go to **Settings > Technical > Automation > Automated actions > Welcome mail to newsletter subscribers** and edit anything there. +#. Go to *Email Marketing > Contacts > Mailing Lists*. +#. Edit or create one. +#. Set a *Welcome mail template* to enable this module's special behavior when + somebody subscribes to this mailing list. You can use one shipped with + this module, called *Welcome mail to newsletter subscribers*, + as a starting point. +#. You can also customize this template as you prefer. + +To be used, you also must make sure a subscription snippet for this list exists +somewhere in your website: + +#. Go to your website. +#. Navigate to a page where you want to include the subscription widget. +#. *Edit* the webpage. +#. Drag and drop any *Structure* or *Features* block you like. +#. Drag and drop the *Inner content > Newsletter* block inside it. +#. Choose the same mailing list you configured above. + +Of course, outgoing mail must be properly configured in your instance, or +emails will never be sent. + +Usage +===== + +After you have followed the configuration instructions: -Quicker way to just change the email template (something that most likely you -will want to do): +#. Enter as an anonymous user (you can use a browser private window for that). +#. Navigate to the page where the newsletter subscription snippet is found. +#. Enter your email. +#. Hit *Subscribe*. +#. Check your inbox, you have new mail! -#. Go to **Settings > Technical > Email > Templates** -#. Edit the template called **Welcome mail - Newsletter**. +Known issues / Roadmap +====================== +* Add tests. Bug Tracker =========== @@ -31,7 +82,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -50,6 +101,7 @@ Contributors * `Tecnativa `__: * Cristina Martin R. + * Jairo Llopis Maintainers ~~~~~~~~~~~ @@ -64,6 +116,6 @@ 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. -This module is part of the `OCA/website `_ project on GitHub. +This module is part of the `OCA/social `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mass_mailing_newsletter_welcome_mail/__init__.py b/mass_mailing_newsletter_welcome_mail/__init__.py index e69de29b..91c5580f 100644 --- a/mass_mailing_newsletter_welcome_mail/__init__.py +++ b/mass_mailing_newsletter_welcome_mail/__init__.py @@ -0,0 +1,2 @@ +from . import controllers +from . import models diff --git a/mass_mailing_newsletter_welcome_mail/__manifest__.py b/mass_mailing_newsletter_welcome_mail/__manifest__.py index 04d42342..e97550b6 100644 --- a/mass_mailing_newsletter_welcome_mail/__manifest__.py +++ b/mass_mailing_newsletter_welcome_mail/__manifest__.py @@ -10,11 +10,11 @@ 'version': '11.0.1.0.0', 'website': 'https://github.com/OCA/social', 'depends': [ - 'mass_mailing', - 'base_automation', + 'website_mass_mailing', ], 'data': [ - "data/base_automation_data.xml", + "data/mail_template.xml", + "views/mail_mass_mailing_list.xml", ], 'application': False, 'installable': True, diff --git a/mass_mailing_newsletter_welcome_mail/controllers/__init__.py b/mass_mailing_newsletter_welcome_mail/controllers/__init__.py new file mode 100644 index 00000000..12a7e529 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/controllers/__init__.py @@ -0,0 +1 @@ +from . import main diff --git a/mass_mailing_newsletter_welcome_mail/controllers/main.py b/mass_mailing_newsletter_welcome_mail/controllers/main.py new file mode 100644 index 00000000..32e2119d --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/controllers/main.py @@ -0,0 +1,31 @@ +# Copyright 2019 Tecnativa - Jairo Llopis +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.http import request, route +from odoo.addons.website_mass_mailing.controllers import main + + +class MassMailController(main.MassMailController): + @route() + def subscribe(self, list_id, email, **post): + """Send welcome email to subscribers.""" + result = super().subscribe(list_id, email, **post) + list_ = request.env["mail.mass_mailing.list"] \ + .sudo().browse(int(list_id)) + template = list_.welcome_mail_template_id + if not template: + return result + # Welcome new subscribers + contact = request.env["mail.mass_mailing.contact"].sudo().search([ + ('list_ids', 'in', list_.ids), + ('email', '=', email), + ("opt_out", "=", False), + ], limit=1) + template.with_context(list_name=list_.name).send_mail( + contact.id, + # Must send now to use context + force_send=True, + # If we cannot notify, the visitor shouldn't be bothered + raise_exception=False, + ) + return result diff --git a/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml b/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml deleted file mode 100644 index 07103f23..00000000 --- a/mass_mailing_newsletter_welcome_mail/data/base_automation_data.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Welcome mail to newsletter subscribers - - - ${object.env.context.get("lang")} - Welcome to the mailing list ${object.list_id.name} - -
Dear ${object.name}, -
-

Thanks for signing up for our newsletter!

-

Regards,

-
- - - - - - - Send Welcome Mail to new subscribers on Newsletter - - email - on_create - - - - - - - diff --git a/mass_mailing_newsletter_welcome_mail/data/mail_template.xml b/mass_mailing_newsletter_welcome_mail/data/mail_template.xml new file mode 100644 index 00000000..cdf95ec0 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/data/mail_template.xml @@ -0,0 +1,21 @@ + + + + + + Welcome mail to newsletter subscribers + + + ${ctx.get("lang")} + Welcome to the mailing list ${ctx.get("list_name")} + +
Dear ${object.name or object.email}, +
+

Thanks for signing up for our newsletter!

+

Regards,

+
+ + + + diff --git a/mass_mailing_newsletter_welcome_mail/i18n/es.po b/mass_mailing_newsletter_welcome_mail/i18n/es.po new file mode 100644 index 00000000..db2c37ee --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/i18n/es.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_newsletter_welcome_mail +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-05-02 11:06+0000\n" +"PO-Revision-Date: 2019-05-02 12:08+0100\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.2.1\n" +"Last-Translator: Jairo Llopis \n" +"Language: es_ES\n" + +#. module: mass_mailing_newsletter_welcome_mail +#: model:mail.template,body_html:mass_mailing_newsletter_welcome_mail.email_template +msgid "" +"
Dear ${object.name or object.email},\n" +"
\n" +"

Thanks for signing up for our newsletter!

\n" +"

Regards,

\n" +"
\n" +" " +msgstr "" +"
Estimado/a ${object.name or object.email},\n" +"
\n" +"

¡Gracias por suscribirse a nuestro boletín!

\n" +"

Saludos,

\n" +"
\n" +" " + +#. module: mass_mailing_newsletter_welcome_mail +#: model:mail.template,subject:mass_mailing_newsletter_welcome_mail.email_template +msgid "Welcome to the mailing list ${ctx.get(\"list_name\")}" +msgstr "Bienvenido/a a la lista de correo ${ctx.get(\"list_name\")}" diff --git a/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot b/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot index c0b01b4c..97da8a56 100644 --- a/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot +++ b/mass_mailing_newsletter_welcome_mail/i18n/mass_mailing_welcome_mail.pot @@ -1,11 +1,13 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * mass_mailing_welcome_mail +# * mass_mailing_newsletter_welcome_mail # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-05-02 11:06+0000\n" +"PO-Revision-Date: 2019-05-02 11:06+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -13,18 +15,17 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: mass_mailing_welcome_mail -#: model:mail.template,body_html:mass_mailing_welcome_mail.email_template -msgid "
Dear ${object.name}, -
-

Thanks for signing up for our newsletter!

-

Regards,

-
\n" -" " +#. module: mass_mailing_newsletter_welcome_mail +#: model:mail.template,body_html:mass_mailing_newsletter_welcome_mail.email_template +msgid "
Dear ${object.name or object.email},\n" +"
\n" +"

Thanks for signing up for our newsletter!

\n" +"

Regards,

\n" +"
\n" +" " msgstr "" -#. module: mass_mailing_welcome_mail -#: model:base.automation,name:mass_mailing_welcome_mail.automated_action -#: model:ir.actions.server,name:mass_mailing_welcome_mail.automated_action -msgid "Send Welcome Mail to new subscribers" +#. module: mass_mailing_newsletter_welcome_mail +#: model:mail.template,subject:mass_mailing_newsletter_welcome_mail.email_template +msgid "Welcome to the mailing list ${ctx.get(\"list_name\")}" msgstr "" diff --git a/mass_mailing_newsletter_welcome_mail/models/__init__.py b/mass_mailing_newsletter_welcome_mail/models/__init__.py new file mode 100644 index 00000000..70461d6d --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/models/__init__.py @@ -0,0 +1 @@ +from . import mail_mass_mailing_list diff --git a/mass_mailing_newsletter_welcome_mail/models/mail_mass_mailing_list.py b/mass_mailing_newsletter_welcome_mail/models/mail_mass_mailing_list.py new file mode 100644 index 00000000..c3c65757 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/models/mail_mass_mailing_list.py @@ -0,0 +1,16 @@ +# Copyright 2019 Tecnativa - Jairo Llopis +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class MailMassMailingList(models.Model): + _inherit = 'mail.mass_mailing.list' + + welcome_mail_template_id = fields.Many2one( + string="Welcome mail template", + comodel_name='mail.template', + ondelete='set null', + help="Mail template to be sent when a contact is subscribed from " + "the website." + ) diff --git a/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst b/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst index 134ebe50..58a41b6e 100755 --- a/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst +++ b/mass_mailing_newsletter_welcome_mail/readme/CONFIGURE.rst @@ -1,9 +1,22 @@ To configure this module, you need to: -#. Go to **Settings > Technical > Automation > Automated actions > Welcome mail to New subscribers in Nesletter Mailing List** and edit anything there. +#. Go to *Email Marketing > Contacts > Mailing Lists*. +#. Edit or create one. +#. Set a *Welcome mail template* to enable this module's special behavior when + somebody subscribes to this mailing list. You can use one shipped with + this module, called *Welcome mail to newsletter subscribers*, + as a starting point. +#. You can also customize this template as you prefer. -Quicker way to just change the email template (something that most likely you -will want to do): +To be used, you also must make sure a subscription snippet for this list exists +somewhere in your website: -#. Go to **Settings > Technical > Email > Templates** -#. Edit the template called **Welcome mail - Newsletter Mailing List**. +#. Go to your website. +#. Navigate to a page where you want to include the subscription widget. +#. *Edit* the webpage. +#. Drag and drop any *Structure* or *Features* block you like. +#. Drag and drop the *Inner content > Newsletter* block inside it. +#. Choose the same mailing list you configured above. + +Of course, outgoing mail must be properly configured in your instance, or +emails will never be sent. diff --git a/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst b/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst index e81b810d..9bf68672 100755 --- a/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst +++ b/mass_mailing_newsletter_welcome_mail/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * `Tecnativa `__: * Cristina Martin R. + * Jairo Llopis diff --git a/mass_mailing_newsletter_welcome_mail/readme/ROADMAP.rst b/mass_mailing_newsletter_welcome_mail/readme/ROADMAP.rst new file mode 100644 index 00000000..c6d3728c --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/readme/ROADMAP.rst @@ -0,0 +1 @@ +* Add tests. diff --git a/mass_mailing_newsletter_welcome_mail/readme/USAGE.rst b/mass_mailing_newsletter_welcome_mail/readme/USAGE.rst new file mode 100644 index 00000000..db3a3ab1 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/readme/USAGE.rst @@ -0,0 +1,7 @@ +After you have followed the configuration instructions: + +#. Enter as an anonymous user (you can use a browser private window for that). +#. Navigate to the page where the newsletter subscription snippet is found. +#. Enter your email. +#. Hit *Subscribe*. +#. Check your inbox, you have new mail! diff --git a/mass_mailing_newsletter_welcome_mail/static/description/index.html b/mass_mailing_newsletter_welcome_mail/static/description/index.html new file mode 100644 index 00000000..67e4f59d --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/static/description/index.html @@ -0,0 +1,470 @@ + + + + + + +Welcome mail to new subscribers + + + +
+

Welcome mail to new subscribers

+ + +

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

This module was written to extend the functionality of the website popup +newsletter subscription form to support sending to new subscribers an +automatic welcome email and allow you to customize it.

+

Table of contents

+ +
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Go to Email Marketing > Contacts > Mailing Lists.
    2. +
  2. Edit or create one.
    3. +
  3. Set a Welcome mail template to enable this module’s special behavior when +somebody subscribes to this mailing list. You can use one shipped with +this module, called Welcome mail to newsletter subscribers, +as a starting point.
    4. +
  4. You can also customize this template as you prefer.
    5. +
+

To be used, you also must make sure a subscription snippet for this list exists +somewhere in your website:

+
    +
  1. Go to your website.
    2. +
  2. Navigate to a page where you want to include the subscription widget.
    3. +
  3. Edit the webpage.
    4. +
  4. Drag and drop any Structure or Features block you like.
    5. +
  5. Drag and drop the Inner content > Newsletter block inside it.
    6. +
  6. Choose the same mailing list you configured above.
    7. +
+

Of course, outgoing mail must be properly configured in your instance, or +emails will never be sent.

+
+
+

Usage

+

After you have followed the configuration instructions:

+
    +
  1. Enter as an anonymous user (you can use a browser private window for that).
    2. +
  2. Navigate to the page where the newsletter subscription snippet is found.
    3. +
  3. Enter your email.
    4. +
  4. Hit Subscribe.
    5. +
  5. Check your inbox, you have new mail!
    6. +
+
+
+

Known issues / Roadmap

+
    +
  • Add tests.
    • +
+
+
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+
    +
  • Tecnativa:
      +
    • Cristina Martin R.
      • +
    • Jairo Llopis
      • +
    +
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

This module is part of the OCA/social project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/mass_mailing_newsletter_welcome_mail/views/mail_mass_mailing_list.xml b/mass_mailing_newsletter_welcome_mail/views/mail_mass_mailing_list.xml new file mode 100644 index 00000000..a0c4c9c4 --- /dev/null +++ b/mass_mailing_newsletter_welcome_mail/views/mail_mass_mailing_list.xml @@ -0,0 +1,20 @@ + + + + + + + Add welcome mail template field + mail.mass_mailing.list + + +
+ + + +
+ + + +