Merge branch 'sales_features' into 'dev'

finance logging

See merge request !263

courses/migrations/0006_auto_20180323_1743.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-23 17:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0005_auto_20180222_1911'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='topic',
+            name='description',
+        ),
+        migrations.RemoveField(
+            model_name='topic',
+            name='icon',
+        ),
+    ]

courses/views.py

@@ -230,8 +230,7 @@ class LessonDetail(APIView):
         course = lesson.topic.course
 
         if payload is None:
-            if not (lesson.free or request.user.is_authenticated and
-                    (request.user.groups.filter(name__in=['supports']).exists() or request.user.is_superuser)):
+            if not (lesson.free or request.user.is_authenticated and request.user.is_staff):
                 return Response("Bad token", status=400)
 
             else:

finance/models.py

@@ -13,6 +13,7 @@ class Bill(models.Model):
     comment = models.TextField(verbose_name='Комментарий продавца', help_text='Будет показано пользователю',
                                blank=True, editable=False)
     description = models.TextField(verbose_name='Внутренняя заметка', blank=True)
+    date = models.DateTimeField(verbose_name="Дата выставления", auto_now_add=True)
 
     def __str__(self):
         return '%s: %s' % (self.id, self.user)