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
4494b6a2
Verified
Commit
4494b6a2
authored
Aug 17, 2018
by
Sébastiaan Versteeg
Browse files
Fix automatic member emails
parent
2ff07609
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/members/emails.py
View file @
4494b6a2
...
...
@@ -8,12 +8,13 @@ from django.utils import translation
from
django.utils.datetime_safe
import
datetime
from
django.utils.translation
import
ugettext
as
_
from
members.models
import
Member
from
members.models
import
Member
,
Membership
def
send_membership_announcement
(
dry_run
=
False
):
members
=
(
Member
.
current_members
.
filter
(
membership__until__isnull
=
True
)
.
exclude
(
membership__type
=
Membership
.
HONORARY
)
.
distinct
())
with
mail
.
get_connection
()
as
connection
:
...
...
@@ -26,7 +27,8 @@ def send_membership_announcement(dry_run=False):
'members/email/membership_announcement.txt'
,
{
'name'
:
member
.
get_full_name
()})
mail
.
EmailMessage
(
_
(
'Membership announcement'
),
'[THALIA] {}'
.
format
(
_
(
'Membership announcement'
)),
email_body
,
settings
.
WEBSITE_FROM_ADDRESS
,
[
member
.
email
],
...
...
@@ -58,7 +60,8 @@ def send_information_request(dry_run=False):
{
'name'
:
member
.
get_full_name
(),
'member'
:
member
})
mail
.
EmailMessage
(
_
(
'Membership information check'
),
'[THALIA] {}'
.
format
(
_
(
'Membership information check'
)),
email_body
,
settings
.
WEBSITE_FROM_ADDRESS
,
[
member
.
email
],
...
...
@@ -80,6 +83,7 @@ def send_expiration_announcement(dry_run=False):
expiry_date
=
datetime
.
now
()
+
timedelta
(
days
=
31
)
members
=
(
Member
.
current_members
.
filter
(
membership__until__lte
=
expiry_date
)
.
exclude
(
membership__until__isnull
=
True
)
.
distinct
())
with
mail
.
get_connection
()
as
connection
:
...
...
@@ -93,12 +97,16 @@ def send_expiration_announcement(dry_run=False):
{
'name'
:
member
.
get_full_name
(),
'membership_price'
:
floatformat
(
settings
.
MEMBERSHIP_PRICES
[
'year'
],
2
settings
.
MEMBERSHIP_PRICES
[
'year'
],
2
),
'renewal_url'
:
reverse
(
'registrations:renew'
)
'renewal_url'
:
'{}{}'
.
format
(
'https://thalia.nu'
,
reverse
(
'registrations:renew'
)
)
})
mail
.
EmailMessage
(
_
(
'Membership expiration announcement'
),
'[THALIA] {}'
.
format
(
_
(
'Membership expiration announcement'
)),
email_body
,
settings
.
WEBSITE_FROM_ADDRESS
,
[
member
.
email
],
...
...
Joren Vrancken
@jvrancken
mentioned in commit
dbedace1
·
Aug 18, 2018
mentioned in commit
dbedace1
mentioned in commit dbedace1100f668246c2ef6e9cdef7056558681f
Toggle commit list
Joren Vrancken
@jvrancken
mentioned in commit
e8ec6a3c
·
Aug 18, 2018
mentioned in commit
e8ec6a3c
mentioned in commit e8ec6a3c8df5bfb8b9fb0a279d1895224de5a015
Toggle commit list
Write
Preview
Markdown
is supported
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