diff --git a/apps/notification/tasks.py b/apps/notification/tasks.py index 32f5db6d..714392ba 100644 --- a/apps/notification/tasks.py +++ b/apps/notification/tasks.py @@ -165,14 +165,17 @@ def send_child_birthday_email_and_bonuses(): @app.task def send_camp_certificates(email=None, dry_run=False, certificate_number=None): path_pattern = 'img/camp-certificates/%d.jpg' - color = (35, 59, 227) + signed_path_pattern = 'img/signed-camp-certificates/%d.jpg' + color = (0, 27, 94) if certificate_number is None: certificate_number = 1 if certificate_number == 2: - color = (0, 27, 94) + color = (106, 5, 163) + if certificate_number == 3: + color = (24, 57, 220) if email: - fn = draw_cert(staticfiles_storage.path(path_pattern % certificate_number), email, 'Имя', 'Фамилия', - font_size=70, y=550, color=color) + fn = draw_cert(staticfiles_storage.path(signed_path_pattern % certificate_number), email, 'Имя', 'Фамилия', + font_size=120, y=1000, color=color) file = open(fn, 'rb') try: pass @@ -203,9 +206,9 @@ def send_camp_certificates(email=None, dry_run=False, certificate_number=None): continue if un.user.child_first_name: - fn = staticfiles_storage.path(path_pattern % certificate_number) + fn = staticfiles_storage.path(signed_path_pattern % certificate_number) fn = draw_cert(fn, un.user.email, un.user.child_first_name, un.user.child_last_name, - font_size=70, y=550, color=color) + font_size=120, y=1000, color=color) else: fn = staticfiles_storage.path(path_pattern % certificate_number) file = open(fn, 'rb') diff --git a/web/src/img/camp-certificates/1.jpg b/web/src/img/camp-certificates/1.jpg index ac240fe5..900c4dfa 100644 Binary files a/web/src/img/camp-certificates/1.jpg and b/web/src/img/camp-certificates/1.jpg differ diff --git a/web/src/img/camp-certificates/2.jpg b/web/src/img/camp-certificates/2.jpg index 21cfe9d7..19ea5fa7 100644 Binary files a/web/src/img/camp-certificates/2.jpg and b/web/src/img/camp-certificates/2.jpg differ diff --git a/web/src/img/camp-certificates/3.jpg b/web/src/img/camp-certificates/3.jpg new file mode 100644 index 00000000..a0ad05d6 Binary files /dev/null and b/web/src/img/camp-certificates/3.jpg differ diff --git a/web/src/img/signed-camp-certificates/1.jpg b/web/src/img/signed-camp-certificates/1.jpg new file mode 100644 index 00000000..ad86aad2 Binary files /dev/null and b/web/src/img/signed-camp-certificates/1.jpg differ diff --git a/web/src/img/signed-camp-certificates/2.jpg b/web/src/img/signed-camp-certificates/2.jpg new file mode 100644 index 00000000..f6ef6765 Binary files /dev/null and b/web/src/img/signed-camp-certificates/2.jpg differ diff --git a/web/src/img/signed-camp-certificates/3.jpg b/web/src/img/signed-camp-certificates/3.jpg new file mode 100644 index 00000000..e5bdcfc9 Binary files /dev/null and b/web/src/img/signed-camp-certificates/3.jpg differ diff --git a/web/webpack.config.js b/web/webpack.config.js index 1cb88186..7e3590a3 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -94,7 +94,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/signed-user-certificates'), path.resolve(__dirname, 'src/img/camp-certificates')], + path.resolve(__dirname, 'src/img/signed-user-certificates'), path.resolve(__dirname, 'src/img/camp-certificates'), + path.resolve(__dirname, 'src/img/signed-camp-certificates')], loader: 'file-loader?name=[name].[ext]&outputPath=./img/' }, { @@ -117,6 +118,11 @@ module.exports = { include: path.resolve(__dirname, 'src/img/camp-certificates'), loader: 'file-loader?name=[name].[ext]&outputPath=./img/camp-certificates/' }, + { + test: /\.(png|jpg)$/, + include: path.resolve(__dirname, 'src/img/signed-camp-certificates'), + loader: 'file-loader?name=[name].[ext]&outputPath=./img/signed-camp-certificates/' + }, { test: /\.(png|jpg)$/, include: path.resolve(__dirname, 'src/img/reviews'),