Merge 4d76614 into 27f943a

liqd_product/apps/account/forms.py

@@ -14,5 +14,6 @@ class Meta:
             'homepage',
             'facebook_handle',
             'twitter_handle',
-            'get_notifications'
+            'get_notifications',
+            'get_newsletters'
         ]

liqd_product/apps/account/templates/liqd_product_account/profile.html

@@ -20,6 +20,8 @@ <h1 class="u-first-heading">{% trans 'Your profile' %}</h1>
 
         {% include 'liqd_product_contrib/includes/form_checkbox_field.html' with field=form.get_notifications %}
 
+        {% include 'liqd_product_contrib/includes/form_checkbox_field.html' with field=form.get_newsletters %}
+
         <div class="u-spacer-bottom">
             <button type="submit" class="btn btn--primary">{% trans 'Save changes'%}</button>
         </div>

liqd_product/apps/users/forms.py

@@ -20,4 +20,4 @@ def signup(self, request, user):
     class Meta:
         model = User
         fields = ('email', 'username', 'password1', 'password2',
-                  'terms_of_use')
+                  'terms_of_use', 'get_newsletters')

liqd_product/apps/users/migrations/0005_user_get_newsletters.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-05-15 14:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('liqd_product_users', '0004_use_url_field_for_homepage'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='get_newsletters',
+            field=models.BooleanField(default=False, help_text='Designates whether you want to receive newsletters. Unselect if you do not want to receive newsletters.', verbose_name='Send me newsletters'),
+        ),
+    ]

liqd_product/apps/users/models.py

@@ -61,6 +61,14 @@ class User(auth_models.AbstractBaseUser, auth_models.PermissionsMixin):
             'Unselect if you do not want to receive notifications.')
     )
 
+    get_newsletters = models.BooleanField(
+        verbose_name=_('Send me newsletters'),
+        default=False,
+        help_text=_(
+            'Designates whether you want to receive newsletters. '
+            'Unselect if you do not want to receive newsletters.')
+    )
+
     bio = models.TextField(
         blank=True,
         max_length=255,

liqd_product/templates/account/signup.html

@@ -13,7 +13,7 @@ <h1>{% trans "Register" %}</h1>
         {{ form.non_field_errors }}
         {% csrf_token %}
         {% for field in form %}
-            {% if not forloop.last %}
+            {% if field is not form.terms_of_use and field is not form.get_newsletters %}
                 {% include 'liqd_product_contrib/includes/form_field.html' with field=field %}
             {% endif %}
         {% endfor %}
@@ -26,6 +26,15 @@ <h1>{% trans "Register" %}</h1>
             </label>
             {{ form.terms_of_use.errors }}
         </div>
+        <div class="form-check">
+            <label class="form-check__label">
+                {{ form.get_newsletters }}
+                {% blocktrans %}
+                Send me newsletters
+                {% endblocktrans %}
+            </label>
+            {{ form.get_newsletters.errors }}
+        </div>
         {% if redirect_field_value %}
             <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
         {% endif %}