diff --git a/apps/notification/tasks.py b/apps/notification/tasks.py index 791ed307..0e0ca590 100644 --- a/apps/notification/tasks.py +++ b/apps/notification/tasks.py @@ -92,12 +92,12 @@ def send_certificates(email=None, date_end=None, dry_run=False): for child in un.user.childs.all(): file_names.append(draw_cert(fn, un.user.email, child.first_name, child.last_name)) else: - file_names.append(staticfiles_storage.path(path_pattern % un.certificate_number)) + file_names.append(staticfiles_storage.path(signed_path_pattern % un.certificate_number)) files = [open(fn, 'rb') for fn in file_names] try: send_email('Грамота от Lil School', un.user.email, 'notification/email/certificate.html', attachments=[(f.name, f.read(), 'image/jpeg') for f in files], user_notification=un, - many_childs=un.user.childs.all().count() > 1) + many_childs=un.user.childs.all().count() > 1, child_filled=un.user.child_filled) except: print('Not OK') continue diff --git a/apps/notification/templates/notification/email/certificate.html b/apps/notification/templates/notification/email/certificate.html index 277817e0..2e9b2f29 100644 --- a/apps/notification/templates/notification/email/certificate.html +++ b/apps/notification/templates/notification/email/certificate.html @@ -6,7 +6,8 @@ {% if not user_notification or user_notification.certificate_number == 1 %}

Поздравляем! Вы прошли месяц обучения в Lil School.
-К письму {% if many_childs %}прикреплены грамоты. Распечатайте их{% else %}прикреплена грамота. Распечатайте её{% endif %} и вручите вашим детям.
+К письму {% if many_childs %}прикреплены грамоты. Распечатайте их и вручите вашим детям. + {% else %}прикреплена грамота. Распечатайте её{% if not child_filled %}, подпишите{% endif %} и вручите вашему ребенку.{% endif %}
Ждём вас в следующем месяце на наших творческих занятиях!

{% endif %} diff --git a/project/settings.py b/project/settings.py index 6bfa82bd..a56c9463 100644 --- a/project/settings.py +++ b/project/settings.py @@ -329,7 +329,7 @@ CELERY_BEAT_SCHEDULE = { }, 'send_certificates': { 'task': 'apps.notification.tasks.send_certificates', - 'schedule': crontab(minute=0, hour=21), + 'schedule': crontab(minute=0, hour=19), 'args': (), }, 'sendgrid_update_recipients': { diff --git a/web/src/img/signed-user-certificates/1.jpg b/web/src/img/signed-user-certificates/1.jpg index 87b0f30d..add975e5 100644 Binary files a/web/src/img/signed-user-certificates/1.jpg and b/web/src/img/signed-user-certificates/1.jpg differ diff --git a/web/src/img/signed-user-certificates/2.jpg b/web/src/img/signed-user-certificates/2.jpg index b455e789..f6992e29 100644 Binary files a/web/src/img/signed-user-certificates/2.jpg and b/web/src/img/signed-user-certificates/2.jpg differ diff --git a/web/src/img/signed-user-certificates/3.jpg b/web/src/img/signed-user-certificates/3.jpg index f89fe8ff..be7abd9d 100644 Binary files a/web/src/img/signed-user-certificates/3.jpg and b/web/src/img/signed-user-certificates/3.jpg differ diff --git a/web/src/img/signed-user-certificates/4.jpg b/web/src/img/signed-user-certificates/4.jpg index b8d50fac..997129e5 100644 Binary files a/web/src/img/signed-user-certificates/4.jpg and b/web/src/img/signed-user-certificates/4.jpg differ diff --git a/web/src/img/signed-user-certificates/5.jpg b/web/src/img/signed-user-certificates/5.jpg index 4d6ead4a..969f67d2 100644 Binary files a/web/src/img/signed-user-certificates/5.jpg and b/web/src/img/signed-user-certificates/5.jpg differ diff --git a/web/src/img/signed-user-certificates/6.jpg b/web/src/img/signed-user-certificates/6.jpg index 6be097b4..c4439eb6 100644 Binary files a/web/src/img/signed-user-certificates/6.jpg and b/web/src/img/signed-user-certificates/6.jpg differ diff --git a/web/src/img/signed-user-certificates/7.jpg b/web/src/img/signed-user-certificates/7.jpg index fc5c690c..305f5592 100644 Binary files a/web/src/img/signed-user-certificates/7.jpg and b/web/src/img/signed-user-certificates/7.jpg differ diff --git a/web/src/img/signed-user-certificates/8.jpg b/web/src/img/signed-user-certificates/8.jpg index 432ef169..8a37cc81 100644 Binary files a/web/src/img/signed-user-certificates/8.jpg and b/web/src/img/signed-user-certificates/8.jpg differ diff --git a/web/src/img/signed-user-certificates/9.jpg b/web/src/img/signed-user-certificates/9.jpg index 9e36a703..a0443218 100644 Binary files a/web/src/img/signed-user-certificates/9.jpg and b/web/src/img/signed-user-certificates/9.jpg differ