diff --git a/aldryn_forms/contrib/email_notifications/cms_plugins.py b/aldryn_forms/contrib/email_notifications/cms_plugins.py index 519308ca..b58d6f32 100644 --- a/aldryn_forms/contrib/email_notifications/cms_plugins.py +++ b/aldryn_forms/contrib/email_notifications/cms_plugins.py @@ -54,6 +54,7 @@ class ExistingEmailNotificationInline(admin.StackedInline): 'to_user', ('to_name', 'to_email'), ('from_name', 'from_email'), + ('reply_name', 'reply_email'), ) }), ) diff --git a/aldryn_forms/contrib/email_notifications/migrations/0005_auto_20190404_1610.py b/aldryn_forms/contrib/email_notifications/migrations/0005_auto_20190404_1610.py new file mode 100644 index 00000000..bfb04a90 --- /dev/null +++ b/aldryn_forms/contrib/email_notifications/migrations/0005_auto_20190404_1610.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.5 on 2019-04-04 16:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('email_notifications', '0004_auto_20190104_1242'), + ] + + operations = [ + migrations.AddField( + model_name='emailnotification', + name='reply_email', + field=models.CharField(blank=True, max_length=200, verbose_name='reply email'), + ), + migrations.AddField( + model_name='emailnotification', + name='reply_name', + field=models.CharField(blank=True, max_length=200, verbose_name='reply name'), + ), + ] diff --git a/aldryn_forms/contrib/email_notifications/models.py b/aldryn_forms/contrib/email_notifications/models.py index 39718f36..f965a968 100644 --- a/aldryn_forms/contrib/email_notifications/models.py +++ b/aldryn_forms/contrib/email_notifications/models.py @@ -94,6 +94,16 @@ class Meta: max_length=200, blank=True ) + reply_name = models.CharField( + verbose_name=_('reply name'), + max_length=200, + blank=True + ) + reply_email = models.CharField( + verbose_name=_('reply email'), + max_length=200, + blank=True + ) subject = models.CharField( verbose_name=_("subject"), max_length=200, @@ -208,7 +218,16 @@ def get_email_kwargs(self, form): from_email = formataddr((from_name, from_email)) kwargs['from_email'] = from_email - kwargs['reply_to'] = [from_email] + + if self.reply_email: + reply_email = render(self.reply_email) + + if self.reply_name: + reply_name = render(self.reply_name) + reply_email = formataddr((reply_name, reply_email)) + + kwargs['reply_to'] = [reply_email] + return kwargs def prepare_email(self, form): diff --git a/aldryn_forms/migrations/0013_auto_20190404_1610.py b/aldryn_forms/migrations/0013_auto_20190404_1610.py new file mode 100644 index 00000000..7f7921dd --- /dev/null +++ b/aldryn_forms/migrations/0013_auto_20190404_1610.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.5 on 2019-04-04 16:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('aldryn_forms', '0012_auto_20190104_1242'), + ] + + operations = [ + migrations.AlterField( + model_name='formplugin', + name='action_backend', + field=models.CharField(choices=[('none', 'None'), ('default', 'Default'), ('email_only', 'Email only')], default='default', max_length=15, verbose_name='Action backend'), + ), + ]