Merge branch 'release/v2.86'
This commit is contained in:
@@ -20,7 +20,8 @@ def getexpired():
|
|||||||
lijst = []
|
lijst = []
|
||||||
for r in rs:
|
for r in rs:
|
||||||
if r.planexpires < datetime.datetime.now().date():
|
if r.planexpires < datetime.datetime.now().date():
|
||||||
lijst.append(r)
|
if r.rowerplan == 'pro' or r.rowerplan == 'coach':
|
||||||
|
lijst.append(r)
|
||||||
return lijst
|
return lijst
|
||||||
|
|
||||||
|
|
||||||
@@ -28,15 +29,16 @@ class Command(BaseCommand):
|
|||||||
def handle(self, *args, **options):
|
def handle(self, *args, **options):
|
||||||
expiredrowers = getexpired()
|
expiredrowers = getexpired()
|
||||||
|
|
||||||
fullemail = 'roosendaalsander@gmail.com'
|
if len(expiredrowers) > 0:
|
||||||
subject = "Expired rowers report"
|
fullemail = 'roosendaalsander@gmail.com'
|
||||||
message = "Dear Sander,\n\n"
|
subject = "Expired rowers report"
|
||||||
message += "Best Regards, the Rowsandall Team"
|
message = "Dear Sander,\n\n"
|
||||||
message += "Expired rowers report\n\n"
|
message += "Best Regards, the Rowsandall Team"
|
||||||
|
message += "Expired rowers report\n\n"
|
||||||
|
|
||||||
for r in expiredrowers:
|
for r in expiredrowers:
|
||||||
message += r.user.first_name+" "+r.user.last_name+" "+r.user.username
|
message += r.user.first_name+" "+r.user.last_name+" "+r.user.username
|
||||||
message += "\n"
|
message += "\n"
|
||||||
|
|
||||||
email = EmailMessage(subject, message,
|
email = EmailMessage(subject, message,
|
||||||
'Rowsandall <info@rowsandall.com>',
|
'Rowsandall <info@rowsandall.com>',
|
||||||
@@ -44,4 +46,4 @@ class Command(BaseCommand):
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
res = email.send()
|
res = email.send()
|
||||||
|
|||||||
Reference in New Issue
Block a user