Merge branch 'hotfix/send-cert-fix-24-04-19' into 'master'

письма с грамотами отправляются слишком многим

See merge request lilschool/site!291
remotes/origin/feature/live-lesson-materials-25-04-19
Danil 7 years ago
commit b73e7a1a77
  1. 2
      apps/notification/tasks.py
  2. 3
      apps/payment/models.py

@ -61,7 +61,7 @@ def send_certificates(email=None, date=None, dry_run=False):
date = datetime.strptime(date, '%d-%m-%Y').date() if date else now().date()
today = now().date()
users = set(list(SchoolPayment.objects.filter(date_end=date, add_days=False).values_list('user_id', flat=True)))
users = set(list(SchoolPayment.objects.paid().filter(date_end=date, add_days=False).values_list('user_id', flat=True)))
user_notifications_qs = UserNotification.objects.filter(user_id__in=users)
user_notifications = {un.user_id: un for un in user_notifications_qs}
notified_users = user_notifications_qs.filter(certificate_last_email__date=today).values_list(

@ -83,6 +83,9 @@ class PaymentManger(PolymorphicManager):
def all(self):
return self.filter(status__isnull=False)
def paid(self):
return self.filter(status__in=Payment.PW_PAID_STATUSES)
class Payment(PolymorphicModel):
PW_PAID_STATUSES = [

Loading…
Cancel
Save