ChaoticByte/drinks-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

Release 8 (devel -> main) #30

Merged
ChaoticByte merged 8 commits from devel into main 2022-06-16 09:06:19 +00:00
Conversation 3 Commits 8 Files changed 12 +2 -2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f406757468 - Show all commits

4
application/app/models.py
View file

@ -51,7 +51,7 @@ class Drink(models.Model):
self.deleted = True self.deleted = True
super().save() super().save()
def __str__(self): return f"{self.product_name} ({str(self.content_litres).rstrip('0')}l) - {self.price}{settings.CURRENCY_SUFFIX}" def __str__(self): return f"{self.product_name} ({float(self.content_litres):.2f}l) - {self.price}{settings.CURRENCY_SUFFIX}"
class RegisterTransaction(models.Model): class RegisterTransaction(models.Model):
@ -145,7 +145,7 @@ class Order(models.Model):
drink.save() drink.save()
super().delete(*args, **kwargs) super().delete(*args, **kwargs)
def __str__(self): return f"{self.drink.product_name} ({str(self.drink.content_litres).rstrip('0')}l) x {self.amount} - {self.price_sum}{settings.CURRENCY_SUFFIX}" def __str__(self): return f"{self.drink.product_name} ({float(self.drink.content_litres):.2f}l) x {self.amount} - {self.price_sum}{settings.CURRENCY_SUFFIX}"
class Global(models.Model): class Global(models.Model):