Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
561c18ff
Commit
561c18ff
authored
Feb 05, 2020
by
Sébastiaan Versteeg
Browse files
Merge branch 'pushCheck' into 'master'
Add push notifications for newsletters Closes
#922
See merge request
!1426
parents
e7219730
023fb71a
Changes
2
Hide whitespace changes
Inline
Side-by-side
website/newsletters/emails.py
View file @
561c18ff
...
...
@@ -20,7 +20,9 @@ def send_newsletter(newsletter):
Sends the newsletter as HTML and plaintext email
:param newsletter: the newsletter to be send
"""
events
=
None
if
newsletter
.
date
:
datetime
=
(
...
...
website/newsletters/services.py
View file @
561c18ff
...
...
@@ -7,6 +7,7 @@ from django.utils import translation, timezone
from
events.models
import
Event
from
newsletters
import
emails
from
partners.models
import
Partner
from
pushnotifications.models
import
Message
,
Category
def
write_to_file
(
pk
,
lang
,
html_message
):
...
...
@@ -66,3 +67,11 @@ def send_newsletter(newsletter):
emails
.
send_newsletter
(
newsletter
)
newsletter
.
sent
=
True
newsletter
.
save
()
Message
.
objects
.
create
(
title_nl
=
newsletter
.
title_nl
,
title_en
=
newsletter
.
title_en
,
body_nl
=
"Tik om te bekijken"
,
body_en
=
"Tap to view"
,
url
=
settings
.
BASE_URL
+
newsletter
.
get_absolute_url
(),
category
=
Category
.
objects
.
get
(
key
=
Category
.
NEWSLETTER
),
).
send
()
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment