|
|
|
|
@ -262,9 +262,9 @@ class NewsLetterSender(object): |
|
|
|
|
'UNIQUE_KEY': ''.join(sample(UNIQUE_KEY_CHAR_SET, |
|
|
|
|
UNIQUE_KEY_LENGTH))}) |
|
|
|
|
if self.newsletter.ab_testing and self.ab_state == Newsletter.A: |
|
|
|
|
content = self.title_template.render(context) |
|
|
|
|
title = self.title_template.render(context) |
|
|
|
|
elif self.newsletter.ab_testing and self.ab_state == Newsletter.B: |
|
|
|
|
content = self.title_template2.render(context) |
|
|
|
|
title = self.title_template2.render(context) |
|
|
|
|
else: |
|
|
|
|
title = self.title_template.render(context) |
|
|
|
|
return title |
|
|
|
|
@ -411,16 +411,17 @@ class NewsLetterSender(object): |
|
|
|
|
'contact': contact, |
|
|
|
|
'status': status, |
|
|
|
|
} |
|
|
|
|
if self.newsletter.ab_testing and self.newsletter.ab_final_stage: |
|
|
|
|
try: |
|
|
|
|
contact = ContactMailingStatus.objects.get( |
|
|
|
|
newsletter=self.newsletter, contact=contact, |
|
|
|
|
status=ContactMailingStatus.AB_WAITING) |
|
|
|
|
contact.status, contact.ab = status, self.ab_state |
|
|
|
|
contact.save() |
|
|
|
|
return |
|
|
|
|
except ContactMailingStatus.DoesNotExist: |
|
|
|
|
print('contactmailing status not found - creating...') |
|
|
|
|
if self.newsletter.ab_testing: |
|
|
|
|
if self.newsletter.ab_final_stage: |
|
|
|
|
try: |
|
|
|
|
contact = ContactMailingStatus.objects.get( |
|
|
|
|
newsletter=self.newsletter, contact=contact, |
|
|
|
|
status=ContactMailingStatus.AB_WAITING) |
|
|
|
|
contact.status, contact.ab = status, self.ab_state |
|
|
|
|
contact.save() |
|
|
|
|
return |
|
|
|
|
except ContactMailingStatus.DoesNotExist: |
|
|
|
|
print('contactmailing status not found - creating...') |
|
|
|
|
params.update({'ab': self.ab_state}) |
|
|
|
|
ContactMailingStatus.objects.create(**params) |
|
|
|
|
|
|
|
|
|
|