diff --git a/django/didgeridoo/webshop/forms.py b/django/didgeridoo/webshop/forms.py index 4e8080e..0a3b273 100644 --- a/django/didgeridoo/webshop/forms.py +++ b/django/didgeridoo/webshop/forms.py @@ -58,4 +58,3 @@ class AddToCartForm(forms.Form): label='Amount in piece.', help_text="Enter a Value between 1 and 99.", initial=1) - print("in AddToCartForm() printing") diff --git a/django/didgeridoo/webshop/models.py b/django/didgeridoo/webshop/models.py index a17e7dc..e06a461 100644 --- a/django/didgeridoo/webshop/models.py +++ b/django/didgeridoo/webshop/models.py @@ -22,7 +22,6 @@ class ArticleStatus(models.Model): return self.name -# Create your models here. class Category(models.Model): name = models.CharField(max_length=200, unique=True) parent_category = models.ForeignKey('self', null=True, blank=True) @@ -50,6 +49,7 @@ class Article(models.Model): class OrderStatus(models.Model): + """ Warehouse Items have Status like ordered or out of Stock """ name = models.CharField(max_length=200, unique=True) def __str__(self): @@ -57,6 +57,7 @@ class OrderStatus(models.Model): class OrderOfGoods(models.Model): + """ Warehouse operations """ article = models.ForeignKey(Article) amount = models.FloatField(max_length=5) delivery_date = models.DateField() @@ -68,6 +69,7 @@ class OrderOfGoods(models.Model): class Picture(models.Model): + """ Pictures in relationship to Articles """ name = models.CharField(max_length=200) article = models.ForeignKey(Article) image = models.ImageField(upload_to="images") @@ -77,13 +79,15 @@ class Picture(models.Model): class Order(models.Model): + """ Submitted Orders """ user = models.ForeignKey(User, on_delete=models.CASCADE) - article = models.ManyToManyField(Article, through='OrderPosition') + # article = models.ManyToManyField(Article, through='OrderPosition') status = models.ForeignKey(OrderStatus) date = models.DateTimeField(default=timezone.now) class OrderPosition(models.Model): + """ Items in Submitted Orders""" article = models.ForeignKey(Article, on_delete=models.CASCADE) order = models.ForeignKey(Order, on_delete=models.CASCADE) amount = models.FloatField(max_length=5) @@ -94,6 +98,7 @@ class OrderPosition(models.Model): class ShoppingCart(models.Model): + """ Cart to User Relationships """ name = models.CharField(max_length=200) user = models.ForeignKey(User, on_delete=models.CASCADE) article = models.ManyToManyField(Article) @@ -102,6 +107,13 @@ class ShoppingCart(models.Model): return self.name +class CartPosition(models.Model): + """ Items in Cart """ + article = models.ForeignKey(Article, on_delete=models.CASCADE) + amount = models.FloatField(max_length=5) + cart = models.ForeignKey(ShoppingCart) + + class City(models.Model): name = models.CharField(max_length=200) zip_code = models.PositiveSmallIntegerField() diff --git a/docs/diagrammes/180102_erd.dia b/docs/diagrammes/180102_erd.dia new file mode 100644 index 0000000..7372b52 Binary files /dev/null and b/docs/diagrammes/180102_erd.dia differ diff --git a/docs/diagrammes/180102_erd.png b/docs/diagrammes/180102_erd.png new file mode 100644 index 0000000..b8193aa Binary files /dev/null and b/docs/diagrammes/180102_erd.png differ