Merge branch 'bruno' of https://git.vontor.cz/Brunobrno/vontor-cz into bruno
This commit is contained in:
@@ -48,7 +48,7 @@ class Category(models.Model):
|
|||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
#TODO: přidate brand model pro produkty (značky)
|
||||||
|
|
||||||
class Product(models.Model):
|
class Product(models.Model):
|
||||||
name = models.CharField(max_length=200)
|
name = models.CharField(max_length=200)
|
||||||
@@ -90,6 +90,7 @@ class Product(models.Model):
|
|||||||
#časový limit (volitelné)
|
#časový limit (volitelné)
|
||||||
limited_to = models.DateTimeField(null=True, blank=True)
|
limited_to = models.DateTimeField(null=True, blank=True)
|
||||||
|
|
||||||
|
#TODO: delete
|
||||||
default_carrier = models.ForeignKey(
|
default_carrier = models.ForeignKey(
|
||||||
"Carrier", on_delete=models.SET_NULL, null=True, blank=True, related_name="default_for_products"
|
"Carrier", on_delete=models.SET_NULL, null=True, blank=True, related_name="default_for_products"
|
||||||
)
|
)
|
||||||
@@ -202,6 +203,7 @@ class Order(models.Model):
|
|||||||
|
|
||||||
invoice = models.OneToOneField("Invoice", on_delete=models.CASCADE, related_name="order", null=True, blank=True)
|
invoice = models.OneToOneField("Invoice", on_delete=models.CASCADE, related_name="order", null=True, blank=True)
|
||||||
|
|
||||||
|
#FIXME: změnnit název na discount_code
|
||||||
discount = models.ManyToManyField("DiscountCode", blank=True, related_name="orders")
|
discount = models.ManyToManyField("DiscountCode", blank=True, related_name="orders")
|
||||||
|
|
||||||
def calculate_total_price(self):
|
def calculate_total_price(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user