Merge branch 'feature/new-certs-1-10-19' into 'master'

Feature/new certs 1 10 19

See merge request lilschool/site!418

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

apps/notification/templates/notification/email/certificate.html

@@ -6,7 +6,8 @@
     {% if not user_notification or user_notification.certificate_number == 1 %}
     <p>
       Поздравляем! Вы прошли месяц обучения в Lil School.<br>
-К письму {% if many_childs %}прикреплены грамоты. Распечатайте их{% else %}прикреплена грамота. Распечатайте её{% endif %} и вручите вашим детям.<br>
+К письму {% if many_childs %}прикреплены грамоты. Распечатайте их и вручите вашим детям.
+      {% else %}прикреплена грамота. Распечатайте её{% if not child_filled %}, подпишите{% endif %} и вручите вашему ребенку.{% endif %}<br>
 Ждём вас в следующем месяце на наших творческих занятиях!
     </p>
     {% endif %}

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': {

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'),