Merge branch 'release/v12.96'

rowers/emails.py

@@ -80,7 +80,14 @@ def send_template_email(from_email,to_email,subject,
     text_content = textify(html_content)
     #    html_content = newlinetobr(html_content)
 
-    if 'cc' in kwargs:
+    print(kwargs['bcc'])
+
+    if 'bcc' in kwargs and 'cc' in kwargs:
+        msg = EmailMultiAlternatives(subject, text_content, from_email, to_email,cc=kwargs['cc'],
+                                     bcc=kwargs['bcc'])
+    elif 'bcc' in kwargs:
+        msg = EmailMultiAlternatives(subject, text_content, from_email, to_email,bcc=kwargs['bcc'])
+    elif 'cc' in kwargs:
         msg = EmailMultiAlternatives(subject, text_content, from_email, to_email,cc=kwargs['cc'])
     else:
         msg = EmailMultiAlternatives(subject, text_content, from_email, to_email)

rowers/models.py

@@ -2643,7 +2643,11 @@ class VirtualRaceForm(ModelForm):
             enddatetime
         )
 
-        registration_closure = cd['registration_closure']
+        try:
+            registration_closure = cd['registration_closure']
+        except KeyError:
+            registration_closure = enddatetime+datetime.timedelta(days=1)
+            cd['registration_closure'] = registration_closure
             
         registration_form = cd['registration_form']
 

rowers/tasks.py

@@ -2446,8 +2446,8 @@ def handle_send_template_email(template,email,fromemail,rowername,
         }
 
     res = send_template_email('Rowsandall <info@rowsandall.com>',
-                              fullemail,subject,
+                              ['info@rowsandall.com'],subject,
-                              template,d,cc=[fromemail],**kwargs)
+                              template,d,cc=[fromemail],bcc=fullemail,**kwargs)
 
 @app.task
 def handle_sendemail_message(email,fromemail,rowername,message,teamname,managername,