From ae475ba3fb5d7a882f0b956a7da7a312a64dc630 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Thu, 14 Jul 2016 18:32:46 +0300 Subject: [PATCH] fix a-b mailing errors --- emencia/django/newsletter/mailer.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py index 9d08d866..b4d062f6 100644 --- a/emencia/django/newsletter/mailer.py +++ b/emencia/django/newsletter/mailer.py @@ -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)