-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5219 from onepercentclub/ticket/user-reminder-mai…
…l-setting Ticket/user reminder mail setting
- Loading branch information
Showing
18 changed files
with
509 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
bluebottle/activities/templates/mails/messages/do-good-hours/reminder-base.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends "base.mail.html" %} | ||
{% load i18n %} | ||
|
||
{% block content %} | ||
<p> | ||
{% blocktrans context 'email' %}Hi {{ recipient_name }},{% endblocktrans %} | ||
</p> | ||
{% block message %}{% endblock %} | ||
{% endblock %} | ||
|
||
{% block action %} | ||
<a href="{{ action_link }}" class="action-email">{{ action_title }}</a> | ||
{% endblock %}` |
8 changes: 8 additions & 0 deletions
8
bluebottle/activities/templates/mails/messages/do-good-hours/reminder-q1.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "mails/messages/do-good-hours/reminder-base.html" %} | ||
{% load i18n %} | ||
|
||
{% block message %} | ||
{% blocktrans context 'email' %} | ||
First reminder | ||
{% endblocktrans %} | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
bluebottle/activities/templates/mails/messages/do-good-hours/reminder-q2.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "mails/messages/do-good-hours/reminder-base.html" %} | ||
{% load i18n %} | ||
|
||
{% block message %} | ||
{% blocktrans context 'email' %} | ||
Second reminder | ||
{% endblocktrans %} | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
bluebottle/activities/templates/mails/messages/do-good-hours/reminder-q3.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "mails/messages/do-good-hours/reminder-base.html" %} | ||
{% load i18n %} | ||
|
||
{% block message %} | ||
{% blocktrans context 'email' %} | ||
Third reminder | ||
{% endblocktrans %} | ||
{% endblock %} |
8 changes: 8 additions & 0 deletions
8
bluebottle/activities/templates/mails/messages/do-good-hours/reminder-q4.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% extends "mails/messages/do-good-hours/reminder-base.html" %} | ||
{% load i18n %} | ||
|
||
{% block message %} | ||
{% blocktrans context 'email' %} | ||
Fourth reminder | ||
{% endblocktrans %} | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Generated by Django 2.2.24 on 2022-08-18 04:37 | ||
|
||
import bluebottle.bb_accounts.models | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('members', '0062_auto_20220815_1751'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='memberplatformsettings', | ||
name='do_good_hours', | ||
field=models.IntegerField( | ||
blank=True, | ||
help_text='The amount of hours users can spend each year. ' | ||
'Leave empty if no restrictions apply.', | ||
null=True | ||
), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Generated by Django 2.2.24 on 2022-08-25 06:40 | ||
|
||
import bluebottle.bb_accounts.models | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('members', '0063_auto_20220818_0637'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='memberplatformsettings', | ||
name='reminder_q1', | ||
field=models.BooleanField(default=False, help_text='This activation mail is send on January 15th.'), | ||
), | ||
migrations.AddField( | ||
model_name='memberplatformsettings', | ||
name='reminder_q2', | ||
field=models.BooleanField(default=False, help_text='This activation mail is send on April 15th.'), | ||
), | ||
migrations.AddField( | ||
model_name='memberplatformsettings', | ||
name='reminder_q3', | ||
field=models.BooleanField(default=False, help_text='This activation mail is send on September 1st.'), | ||
), | ||
migrations.AddField( | ||
model_name='memberplatformsettings', | ||
name='reminder_q4', | ||
field=models.BooleanField(default=False, help_text='This activation mail is send on October 15th.'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2.24 on 2022-08-25 08:55 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('members', '0064_auto_20220825_0840'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='member', | ||
name='receive_reminder_emails', | ||
field=models.BooleanField(default=True, help_text='User receives emails reminding them about their do good hours', verbose_name='Receive reminder emails'), | ||
), | ||
] |
Oops, something went wrong.