diff --git a/apps/notification/tasks.py b/apps/notification/tasks.py index 506452b3..0a3e09cd 100644 --- a/apps/notification/tasks.py +++ b/apps/notification/tasks.py @@ -25,9 +25,9 @@ def draw_cert(path, email, first_name, last_name): img = Image.open(path) draw = ImageDraw.Draw(img) font = ImageFont.truetype(os.path.join(settings.STATIC_ROOT, 'ProximaNova-Reg.otf'), 170) - text = first_name + text = first_name.capitalize() if last_name: - text += ' ' + last_name + text += ' ' + last_name.capitalize() w, h = draw.textsize(text, font=font) draw.text(((img.width - w) // 2, 900), text, (29, 115, 224), font=font) fn = os.path.join(settings.MEDIA_ROOT, 'tmp') @@ -43,8 +43,9 @@ def draw_cert(path, email, first_name, last_name): @app.task def send_certificates(email=None, date=None, dry_run=False): path_pattern = 'img/user-certificates/%d.jpg' + signed_path_pattern = 'img/signed-user-certificates/%d.jpg' if email: - fn = draw_cert(staticfiles_storage.path(path_pattern % 1), email, 'Имя', 'Фамилия') + fn = draw_cert(staticfiles_storage.path(signed_path_pattern % 1), email, 'Имя', 'Фамилия') file = open(fn, 'rb') try: send_email('Грамота от Lil School', email, 'notification/email/certificate.html', @@ -77,9 +78,11 @@ def send_certificates(email=None, date=None, dry_run=False): un.certificate_number = un.certificate_number + 1 \ if un.certificate_number and staticfiles_storage.exists(path_pattern % (un.certificate_number + 1)) \ else 1 - fn = staticfiles_storage.path(path_pattern % un.certificate_number) if un.user.child_first_name: + fn = staticfiles_storage.path(signed_path_pattern % un.certificate_number) fn = draw_cert(fn, un.user.email, un.user.child_first_name, un.user.child_last_name) + else: + fn = staticfiles_storage.path(path_pattern % un.certificate_number) file = open(fn, 'rb') try: send_email('Грамота от Lil School', un.user.email, 'notification/email/certificate.html', diff --git a/web/src/img/signed-user-certificates/1.jpg b/web/src/img/signed-user-certificates/1.jpg new file mode 100644 index 00000000..87b0f30d Binary files /dev/null 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 new file mode 100644 index 00000000..b455e789 Binary files /dev/null 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 new file mode 100644 index 00000000..f89fe8ff Binary files /dev/null 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 new file mode 100644 index 00000000..b8d50fac Binary files /dev/null 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 new file mode 100644 index 00000000..4d6ead4a Binary files /dev/null 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 new file mode 100644 index 00000000..6be097b4 Binary files /dev/null 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 new file mode 100644 index 00000000..fc5c690c Binary files /dev/null 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 new file mode 100644 index 00000000..432ef169 Binary files /dev/null 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 new file mode 100644 index 00000000..9e36a703 Binary files /dev/null and b/web/src/img/signed-user-certificates/9.jpg differ diff --git a/web/src/img/user-certificates/1.jpg b/web/src/img/user-certificates/1.jpg index 87b0f30d..8a939423 100644 Binary files a/web/src/img/user-certificates/1.jpg and b/web/src/img/user-certificates/1.jpg differ diff --git a/web/src/img/user-certificates/2.jpg b/web/src/img/user-certificates/2.jpg index b455e789..85687bad 100644 Binary files a/web/src/img/user-certificates/2.jpg and b/web/src/img/user-certificates/2.jpg differ diff --git a/web/src/img/user-certificates/3.jpg b/web/src/img/user-certificates/3.jpg index f89fe8ff..ae7f1f76 100644 Binary files a/web/src/img/user-certificates/3.jpg and b/web/src/img/user-certificates/3.jpg differ diff --git a/web/src/img/user-certificates/4.jpg b/web/src/img/user-certificates/4.jpg index b8d50fac..bc09d1ce 100644 Binary files a/web/src/img/user-certificates/4.jpg and b/web/src/img/user-certificates/4.jpg differ diff --git a/web/src/img/user-certificates/5.jpg b/web/src/img/user-certificates/5.jpg index 4d6ead4a..3add7a60 100644 Binary files a/web/src/img/user-certificates/5.jpg and b/web/src/img/user-certificates/5.jpg differ diff --git a/web/src/img/user-certificates/6.jpg b/web/src/img/user-certificates/6.jpg index 6be097b4..cbbd4eaa 100644 Binary files a/web/src/img/user-certificates/6.jpg and b/web/src/img/user-certificates/6.jpg differ diff --git a/web/src/img/user-certificates/7.jpg b/web/src/img/user-certificates/7.jpg index fc5c690c..203e09b8 100644 Binary files a/web/src/img/user-certificates/7.jpg and b/web/src/img/user-certificates/7.jpg differ diff --git a/web/src/img/user-certificates/8.jpg b/web/src/img/user-certificates/8.jpg index 432ef169..3c048f76 100644 Binary files a/web/src/img/user-certificates/8.jpg and b/web/src/img/user-certificates/8.jpg differ diff --git a/web/src/img/user-certificates/9.jpg b/web/src/img/user-certificates/9.jpg index 9e36a703..34e8d728 100644 Binary files a/web/src/img/user-certificates/9.jpg and b/web/src/img/user-certificates/9.jpg differ diff --git a/web/webpack.config.js b/web/webpack.config.js index 21ead790..ddda36cd 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -18,6 +18,7 @@ module.exports = { sprite: glob('./src/icons/*.svg'), images: glob('./src/img/*.*'), imagesCertificates: glob('./src/img/user-certificates/*'), + imagesSignedCertificates: glob('./src/img/signed-user-certificates/*'), imagesGiftCertificates: glob('./src/img/gift-certificates/*'), imagesReviews: glob('./src/img/reviews/*'), fonts: glob('./src/fonts/*'), @@ -90,7 +91,8 @@ 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/gift-certificates'), path.resolve(__dirname, 'src/img/reviews'), + path.resolve(__dirname, 'src/img/signed-user-certificates')], loader: 'file-loader?name=[name].[ext]&outputPath=./img/' }, { @@ -98,6 +100,11 @@ module.exports = { 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'),