- managerid field

* migrations

store/migrations/0031_alter_checklist_promocode.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.2 on 2023-07-06 12:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('store', '0030_checklist_is_split_payment'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='checklist',
+            name='promocode',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='store.promocode', verbose_name='Промокод'),
+        ),
+    ]

store/migrations/0032_promocode_is_active.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.2 on 2023-07-06 12:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('store', '0031_alter_checklist_promocode'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='promocode',
+            name='is_active',
+            field=models.BooleanField(default=True, verbose_name='Активен'),
+        ),
+    ]

store/migrations/0033_remove_user_manager_id.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.2 on 2023-07-06 13:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('store', '0032_promocode_is_active'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='user',
+            name='manager_id',
+        ),
+    ]

store/models.py

@@ -117,8 +117,6 @@ class User(AbstractUser):
     middle_name = models.CharField("Отчество", max_length=150, blank=True, null=True)
     job_title = models.CharField("Должность", max_length=30, choices=JOB_CHOICES)
 
-    manager_id = models.CharField("ID менеджера", max_length=5, blank=True, null=True)
-
     objects = UserManager()
 
     @property

store/serializers.py

@@ -40,11 +40,10 @@ class UserSerializer(serializers.ModelSerializer):
     name = serializers.CharField(source='first_name', required=False)
     lastname = serializers.CharField(source='middle_name', required=False)
     surname = serializers.CharField(source='last_name', required=False)
-    managerid = serializers.CharField(source='manager_id', required=False)
 
     class Meta:
         model = User
-        fields = ('id', 'login', 'job', 'name', 'lastname', 'surname', 'managerid')
+        fields = ('id', 'login', 'job', 'name', 'lastname', 'surname',)
 
 
 class ImageSerializer(serializers.ModelSerializer):
@@ -65,7 +64,7 @@ class ChecklistImageListSerializer(serializers.ListSerializer):
 
 class ChecklistSerializer(serializers.ModelSerializer):
     id = serializers.CharField(read_only=True)
-    managerid = serializers.CharField(source='manager.manager_id', read_only=True)
+    managerid = serializers.CharField(source='manager.id', read_only=True)
     link = serializers.URLField(source='product_link', required=False)
     category = serializers.SlugRelatedField(slug_field='slug', queryset=Category.objects.all())