ibz
/
web_AI-5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'currency' of git.2li.ch:ibz/web_AI-5 into currency 

* 'currency' of git.2li.ch:ibz/web_AI-5:
  correct the datetimefield on the orders model
This commit is contained in:
Ivan Hörler 2018-01-10 00:59:01 +01:00
parent 6290eb7a6a 9ef8a4371e
commit a4307da75f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/didgeridoo/webshop/models.py
View File

@ -2,7 +2,7 @@ from decimal import Decimal
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
import datetime from django.utils import timezone
class Option(models.Model): class Option(models.Model):
@ -86,7 +86,7 @@ class Order(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE) user = models.ForeignKey(User, on_delete=models.CASCADE)
article = models.ManyToManyField(Article, through='OrderPosition') article = models.ManyToManyField(Article, through='OrderPosition')
status = models.ForeignKey(OrderStatus) status = models.ForeignKey(OrderStatus)
date = models.DateTimeField(default=datetime.datetime.now()) date = models.DateTimeField(default=timezone.now)
class OrderPosition(models.Model): class OrderPosition(models.Model):