Skip to content
Snippets Groups Projects
Commit a5d9c58f authored by Alexa Valentová's avatar Alexa Valentová
Browse files

Improve newsletter list subscribe function

parent 131083c3
No related branches found
No related tags found
2 merge requests!1281Improve newsletter list subscribe function,!1280Release
Pipeline #20845 passed
This commit is part of merge request !1280. Comments created here will be created in the context of that merge request.
Showing
with 4261 additions and 69 deletions
......@@ -4,15 +4,20 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('district', '0317_alter_districtarticlepage_content_and_more'),
("district", "0317_alter_districtarticlepage_content_and_more"),
]
operations = [
migrations.AddField(
model_name='districthomepage',
name='ecomail_newsletter_list_source',
field=models.CharField(blank=True, default='web-nl-generic', help_text='Není nutno měnit.', null=True, verbose_name='Ecomail newsletter zdroj'),
model_name="districthomepage",
name="ecomail_newsletter_list_source",
field=models.CharField(
blank=True,
default="web-nl-generic",
help_text="Není nutno měnit.",
null=True,
verbose_name="Ecomail newsletter zdroj",
),
),
]
......@@ -4,15 +4,20 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0155_alter_mainarticlepage_content_and_more'),
("main", "0155_alter_mainarticlepage_content_and_more"),
]
operations = [
migrations.AddField(
model_name='mainhomepage',
name='ecomail_newsletter_list_source',
field=models.CharField(blank=True, default='web-nl-generic', help_text='Není nutno měnit.', null=True, verbose_name='Ecomail newsletter zdroj'),
model_name="mainhomepage",
name="ecomail_newsletter_list_source",
field=models.CharField(
blank=True,
default="web-nl-generic",
help_text="Není nutno měnit.",
null=True,
verbose_name="Ecomail newsletter zdroj",
),
),
]
......@@ -311,6 +311,8 @@ MAILTRAIN_API_TOKEN = env.str("MAILTRAIN_API_TOKEN", default="")
ECOMAIL_API_URL = env.str("ECOMAIL_API_URL", default="")
ECOMAIL_API_KEY = env.str("ECOMAIL_API_KEY", default="")
# So Andrej doesn't complain about having to add another env variable.
ECOMAIL_DEFAULT_LIST_ID = env.int("ECOMAIL_DEFAULT_LIST_ID", default=4)
CZECH_INSPIRATIONAL_NEWSLETTER_CID = env.str(
"CZECH_INSPIRATIONAL_NEWSLETTER_CID", default=""
......
......@@ -4,20 +4,27 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('make_a_wish', '0007_makeawishroot_matomo_id'),
("make_a_wish", "0007_makeawishroot_matomo_id"),
]
operations = [
migrations.AddField(
model_name='makeawishroot',
name='ecomail_newsletter_list_id',
field=models.IntegerField(blank=True, null=True, verbose_name='ID Ecomail newsletteru'),
model_name="makeawishroot",
name="ecomail_newsletter_list_id",
field=models.IntegerField(
blank=True, null=True, verbose_name="ID Ecomail newsletteru"
),
),
migrations.AddField(
model_name='makeawishroot',
name='ecomail_newsletter_list_tags',
field=models.CharField(blank=True, help_text="Oddělte čárkou, například 'Tag1,Tag2,Tag3'. Bez mezer.", max_length=128, null=True, verbose_name='Tagy k přidání novým odběratelům na Ecomailu'),
model_name="makeawishroot",
name="ecomail_newsletter_list_tags",
field=models.CharField(
blank=True,
help_text="Oddělte čárkou, například 'Tag1,Tag2,Tag3'. Bez mezer.",
max_length=128,
null=True,
verbose_name="Tagy k přidání novým odběratelům na Ecomailu",
),
),
]
......@@ -4,15 +4,20 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('make_a_wish', '0008_makeawishroot_ecomail_newsletter_list_id_and_more'),
("make_a_wish", "0008_makeawishroot_ecomail_newsletter_list_id_and_more"),
]
operations = [
migrations.AddField(
model_name='makeawishroot',
name='ecomail_newsletter_list_source',
field=models.CharField(blank=True, default='web-nl-generic', help_text='Není nutno měnit.', null=True, verbose_name='Ecomail newsletter zdroj'),
model_name="makeawishroot",
name="ecomail_newsletter_list_source",
field=models.CharField(
blank=True,
default="web-nl-generic",
help_text="Není nutno měnit.",
null=True,
verbose_name="Ecomail newsletter zdroj",
),
),
]
......@@ -4,15 +4,16 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('make_a_wish', '0009_makeawishroot_ecomail_newsletter_list_source'),
("make_a_wish", "0009_makeawishroot_ecomail_newsletter_list_source"),
]
operations = [
migrations.AddField(
model_name='makeawishroot',
name='fbevents_id',
field=models.CharField(blank=True, max_length=64, null=True, verbose_name='Interní ID 1'),
model_name="makeawishroot",
name="fbevents_id",
field=models.CharField(
blank=True, max_length=64, null=True, verbose_name="Interní ID 1"
),
),
]
......@@ -129,9 +129,9 @@ class MakeAWishRoot(
subscribe_to_ecomail_newsletter(
cleaned_data["e_mail"],
self.ecomail_newsletter_list_id,
self.ecomail_newsletter_list_tags,
self.ecomail_newsletter_list_source,
self.ecomail_newsletter_list_id,
custom_data,
)
......
......@@ -1276,16 +1276,12 @@ class MainHomePageMixin(
form.cleaned_data["email"], settings.PIRATICZ_NEWSLETTER_CID
)
if (
hasattr(self, "ecomail_newsletter_list_id")
and self.ecomail_newsletter_list_id is not None
and self.ecomail_newsletter_list_id >= 1
):
if hasattr(self, "ecomail_newsletter_list_id"):
subscribe_to_ecomail_newsletter(
form.cleaned_data["email"],
self.ecomail_newsletter_list_id,
self.ecomail_newsletter_list_tags,
self.ecomail_newsletter_list_source,
self.ecomail_newsletter_list_id,
)
messages.success(
......
......@@ -72,14 +72,17 @@ def subscribe_to_newsletter(email, list_id):
def subscribe_to_ecomail_newsletter(
email: str,
list_id: int,
categories: str,
source: str,
list_id: int | None = None,
custom_data: dict | None = None,
):
if custom_data is None:
custom_data = {}
if not list_id:
list_id = settings.ECOMAIL_DEFAULT_LIST_ID
split_categories = categories.split(",") if categories is not None else []
data = {
......
......@@ -4,15 +4,20 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('uniweb', '0130_uniwebhomepage_newsletter_list_id'),
("uniweb", "0130_uniwebhomepage_newsletter_list_id"),
]
operations = [
migrations.AddField(
model_name='uniwebhomepage',
name='ecomail_newsletter_list_source',
field=models.CharField(blank=True, default='web-nl-generic', help_text='Není nutno měnit.', null=True, verbose_name='Ecomail newsletter zdroj'),
model_name="uniwebhomepage",
name="ecomail_newsletter_list_source",
field=models.CharField(
blank=True,
default="web-nl-generic",
help_text="Není nutno měnit.",
null=True,
verbose_name="Ecomail newsletter zdroj",
),
),
]
......@@ -4,15 +4,18 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('uniweb', '0131_uniwebhomepage_ecomail_newsletter_list_source'),
("uniweb", "0131_uniwebhomepage_ecomail_newsletter_list_source"),
]
operations = [
migrations.AddField(
model_name='uniwebformpage',
name='show_in_parent_page',
field=models.BooleanField(default=False, help_text='Pokud je toto pole zaškrtnuté, formulář se přesune do nadřazené stránky a stránka jemu nadřazená bude nedostupná.', verbose_name='Ukazovat obsah formuláře v nadřazené stránce?'),
model_name="uniwebformpage",
name="show_in_parent_page",
field=models.BooleanField(
default=False,
help_text="Pokud je toto pole zaškrtnuté, formulář se přesune do nadřazené stránky a stránka jemu nadřazená bude nedostupná.",
verbose_name="Ukazovat obsah formuláře v nadřazené stránce?",
),
),
]
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -4,15 +4,16 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('uniweb', '0133_alter_uniwebflexiblepage_content_and_more'),
("uniweb", "0133_alter_uniwebflexiblepage_content_and_more"),
]
operations = [
migrations.AddField(
model_name='uniwebhomepage',
name='fbevents_id',
field=models.CharField(blank=True, max_length=64, null=True, verbose_name='Interní ID 1'),
model_name="uniwebhomepage",
name="fbevents_id",
field=models.CharField(
blank=True, max_length=64, null=True, verbose_name="Interní ID 1"
),
),
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment