internal fixes

backend/routes/admin.py

@@ -4,3 +4,4 @@ from .models import *
 admin.site.register(Country)
 admin.site.register(City)
 admin.site.register(Route)
+admin.site.register(Leads)

backend/routes/migrations/0004_leads.py

@@ -1,5 +1,7 @@
-# Generated by Django 5.2.1 on 2025-05-24 11:12
+# Generated by Django 5.2.1 on 2025-05-24 12:05
 
+import django.db.models.deletion
+from django.conf import settings
 from django.db import migrations, models
 
 
@@ -7,6 +9,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('routes', '0003_alter_route_owner_type'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -14,9 +17,12 @@ class Migration(migrations.Migration):
             name='Leads',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('moving_price', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
                 ('moving_date', models.DateField()),
                 ('comment', models.CharField(blank=True, max_length=500, null=True)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('moving_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Перевозчик')),
+                ('route', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='routes.route', verbose_name='Маршрут')),
             ],
             options={
                 'verbose_name': 'Заявка',

backend/routes/migrations/0005_alter_leads_moving_price.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.1 on 2025-05-24 12:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('routes', '0004_leads'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='leads',
+            name='moving_price',
+            field=models.DecimalField(decimal_places=2, max_digits=10),
+        ),
+    ]

backend/routes/models.py

@@ -103,10 +103,9 @@ class Route(models.Model):
     )
     
     def __str__(self):
-        if self.owner:
-            return f'{self.owner}'
-        else:
-            return str(self.owner_type)
+        from_city_name = self.from_city.name if self.from_city else 'Не указан'
+        to_city_name = self.to_city.name if self.to_city else 'Не указан'
+        return f"Маршрут #{self.id}: {from_city_name} → {to_city_name}"
         
     class Meta:
         verbose_name = (u'Маршрут')
@@ -114,9 +113,9 @@ class Route(models.Model):
         ordering = ('id',)
 
 class Leads(models.Model):
-    route = models.ForeignKey(Route, verbose_name="Маршрут", on_delete=models.CASCADE),
-    moving_user = models.ForeignKey(User, verbose_name="Перевозчик", on_delete=models.CASCADE),
-    moving_price = models.DecimalField(max_digits=10, decimal_places=2),
+    route = models.ForeignKey(Route, verbose_name="Маршрут", on_delete=models.CASCADE)
+    moving_user = models.ForeignKey(User, verbose_name="Перевозчик", on_delete=models.CASCADE)
+    moving_price = models.DecimalField(max_digits=10, decimal_places=2)
     moving_date = models.DateField()
     comment = models.CharField(max_length=500, null=True, blank=True)
     created_at = models.DateTimeField(auto_now_add=True)
@@ -127,4 +126,4 @@ class Leads(models.Model):
         ordering = ['-created_at']
         
     def __str__(self):
-        return f"Заявка по маршруту ${self.route}"
+        return f"Заявка по маршруту {self.route}"