diff --git a/apps/notification/tasks.py b/apps/notification/tasks.py index 791ed307..1e82d59e 100644 --- a/apps/notification/tasks.py +++ b/apps/notification/tasks.py @@ -50,10 +50,10 @@ def draw_cert(path, email, first_name, last_name, x=None, y=900, color=(29, 115, @app.task def send_certificates(email=None, date_end=None, dry_run=False): - path_pattern = 'img/user-certificates/%d.jpg' - signed_path_pattern = 'img/signed-user-certificates/%d.jpg' + path_pattern = 'user-certificates/%d.jpg' + signed_path_pattern = 'signed-user-certificates/%d.jpg' if email: - fn = draw_cert(staticfiles_storage.path(signed_path_pattern % 1), email, 'Имя', 'Фамилия') + fn = draw_cert(os.path.join(settings.RESOURCES_ROOT, signed_path_pattern % 1), email, 'Имя', 'Фамилия') file = open(fn, 'rb') try: send_email('Грамота от Lil School', email, 'notification/email/certificate.html', @@ -85,19 +85,20 @@ def send_certificates(email=None, date_end=None, dry_run=False): file_names = [] un.certificate_number = un.certificate_number + 1 \ - if un.certificate_number and staticfiles_storage.exists(path_pattern % (un.certificate_number + 1)) \ + if un.certificate_number and os.path.isfile(os.path.join(settings.RESOURCES_ROOT, + path_pattern % (un.certificate_number + 1))) \ else 1 if un.user.child_filled: - fn = staticfiles_storage.path(signed_path_pattern % un.certificate_number) + fn = os.path.join(settings.RESOURCES_ROOT, signed_path_pattern % un.certificate_number) 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(os.path.join(settings.RESOURCES_ROOT, 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..80af8675 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=30, hour=19), 'args': (), }, 'sendgrid_update_recipients': { diff --git a/resources/signed-user-certificates/1.jpg b/resources/signed-user-certificates/1.jpg new file mode 100644 index 00000000..add975e5 Binary files /dev/null and b/resources/signed-user-certificates/1.jpg differ diff --git a/resources/signed-user-certificates/2.jpg b/resources/signed-user-certificates/2.jpg new file mode 100644 index 00000000..f6992e29 Binary files /dev/null and b/resources/signed-user-certificates/2.jpg differ diff --git a/resources/signed-user-certificates/3.jpg b/resources/signed-user-certificates/3.jpg new file mode 100644 index 00000000..be7abd9d Binary files /dev/null and b/resources/signed-user-certificates/3.jpg differ diff --git a/resources/signed-user-certificates/4.jpg b/resources/signed-user-certificates/4.jpg new file mode 100644 index 00000000..997129e5 Binary files /dev/null and b/resources/signed-user-certificates/4.jpg differ diff --git a/resources/signed-user-certificates/5.jpg b/resources/signed-user-certificates/5.jpg new file mode 100644 index 00000000..969f67d2 Binary files /dev/null and b/resources/signed-user-certificates/5.jpg differ diff --git a/resources/signed-user-certificates/6.jpg b/resources/signed-user-certificates/6.jpg new file mode 100644 index 00000000..c4439eb6 Binary files /dev/null and b/resources/signed-user-certificates/6.jpg differ diff --git a/resources/signed-user-certificates/7.jpg b/resources/signed-user-certificates/7.jpg new file mode 100644 index 00000000..305f5592 Binary files /dev/null and b/resources/signed-user-certificates/7.jpg differ diff --git a/resources/signed-user-certificates/8.jpg b/resources/signed-user-certificates/8.jpg new file mode 100644 index 00000000..8a37cc81 Binary files /dev/null and b/resources/signed-user-certificates/8.jpg differ diff --git a/resources/signed-user-certificates/9.jpg b/resources/signed-user-certificates/9.jpg new file mode 100644 index 00000000..a0443218 Binary files /dev/null and b/resources/signed-user-certificates/9.jpg differ diff --git a/web/src/img/signed-user-certificates/1.jpg b/web/src/img/signed-user-certificates/1.jpg deleted file mode 100644 index 87b0f30d..00000000 Binary files a/web/src/img/signed-user-certificates/1.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/2.jpg b/web/src/img/signed-user-certificates/2.jpg deleted file mode 100644 index b455e789..00000000 Binary files a/web/src/img/signed-user-certificates/2.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/3.jpg b/web/src/img/signed-user-certificates/3.jpg deleted file mode 100644 index f89fe8ff..00000000 Binary files a/web/src/img/signed-user-certificates/3.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/4.jpg b/web/src/img/signed-user-certificates/4.jpg deleted file mode 100644 index b8d50fac..00000000 Binary files a/web/src/img/signed-user-certificates/4.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/5.jpg b/web/src/img/signed-user-certificates/5.jpg deleted file mode 100644 index 4d6ead4a..00000000 Binary files a/web/src/img/signed-user-certificates/5.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/6.jpg b/web/src/img/signed-user-certificates/6.jpg deleted file mode 100644 index 6be097b4..00000000 Binary files a/web/src/img/signed-user-certificates/6.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/7.jpg b/web/src/img/signed-user-certificates/7.jpg deleted file mode 100644 index fc5c690c..00000000 Binary files a/web/src/img/signed-user-certificates/7.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/8.jpg b/web/src/img/signed-user-certificates/8.jpg deleted file mode 100644 index 432ef169..00000000 Binary files a/web/src/img/signed-user-certificates/8.jpg and /dev/null differ diff --git a/web/src/img/signed-user-certificates/9.jpg b/web/src/img/signed-user-certificates/9.jpg deleted file mode 100644 index 9e36a703..00000000 Binary files a/web/src/img/signed-user-certificates/9.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/1.jpg b/web/src/img/user-certificates/1.jpg deleted file mode 100644 index 8a939423..00000000 Binary files a/web/src/img/user-certificates/1.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/2.jpg b/web/src/img/user-certificates/2.jpg deleted file mode 100644 index 85687bad..00000000 Binary files a/web/src/img/user-certificates/2.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/3.jpg b/web/src/img/user-certificates/3.jpg deleted file mode 100644 index ae7f1f76..00000000 Binary files a/web/src/img/user-certificates/3.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/4.jpg b/web/src/img/user-certificates/4.jpg deleted file mode 100644 index bc09d1ce..00000000 Binary files a/web/src/img/user-certificates/4.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/5.jpg b/web/src/img/user-certificates/5.jpg deleted file mode 100644 index 3add7a60..00000000 Binary files a/web/src/img/user-certificates/5.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/6.jpg b/web/src/img/user-certificates/6.jpg deleted file mode 100644 index cbbd4eaa..00000000 Binary files a/web/src/img/user-certificates/6.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/7.jpg b/web/src/img/user-certificates/7.jpg deleted file mode 100644 index 203e09b8..00000000 Binary files a/web/src/img/user-certificates/7.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/8.jpg b/web/src/img/user-certificates/8.jpg deleted file mode 100644 index 3c048f76..00000000 Binary files a/web/src/img/user-certificates/8.jpg and /dev/null differ diff --git a/web/src/img/user-certificates/9.jpg b/web/src/img/user-certificates/9.jpg deleted file mode 100644 index 34e8d728..00000000 Binary files a/web/src/img/user-certificates/9.jpg and /dev/null differ diff --git a/web/webpack.config.js b/web/webpack.config.js index 24404936..398a934f 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -21,7 +21,6 @@ module.exports = { mixpanel: "./src/js/third_party/mixpanel-2-latest.js", sprite: glob('./src/icons/*.svg'), images: glob('./src/img/*.*'), - imagesCertificates: glob('./src/img/user-certificates/*'), imagesGiftCertificates: glob('./src/img/gift-certificates/*'), imagesReviews: glob('./src/img/reviews/*'), fonts: glob('./src/fonts/*'), @@ -94,21 +93,10 @@ module.exports = { }, { test: /\.(png|gif|jpg|svg)$/, - exclude: [path.resolve(__dirname, 'src/icons'), path.resolve(__dirname, 'src/img/user-certificates'), - path.resolve(__dirname, 'src/img/gift-certificates'), path.resolve(__dirname, 'src/img/reviews'), - path.resolve(__dirname, 'src/img/signed-user-certificates')], + exclude: [path.resolve(__dirname, 'src/icons'), + path.resolve(__dirname, 'src/img/gift-certificates'), path.resolve(__dirname, 'src/img/reviews')], loader: 'file-loader?name=[name].[ext]&outputPath=./img/' }, - { - test: /\.(png|jpg)$/, - include: path.resolve(__dirname, 'src/img/user-certificates'), - loader: 'file-loader?name=[name].[ext]&outputPath=./img/user-certificates/' - }, - { - test: /\.(png|jpg)$/, - include: path.resolve(__dirname, 'src/img/signed-user-certificates'), - loader: 'file-loader?name=[name].[ext]&outputPath=./img/signed-user-certificates/' - }, { test: /\.(png|jpg)$/, include: path.resolve(__dirname, 'src/img/gift-certificates'),