internal fixes

This commit is contained in:
2025-05-24 15:12:37 +03:00
parent b755eda4b5
commit 88dc6932ec
8 changed files with 120 additions and 41 deletions

View File

@@ -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}"