Work on the register UI

This commit is contained in:
nikolark committed 2012-01-07 03:36:12 +01:00
1 parent 7a15006455
commit 135fe821e1
16 files changed
+290 -167

No files matched your search

+16 -4
View File
@@ -14,9 +14,9 @@ class Product(models.Model):
description = models.CharField(max_length=256, blank=True)
volume_liter = models.FloatField(null=True)
alcohol_percent = models.FloatField(null=True)
image = models.ImageField(upload_to='uploads', blank=True)
active = models.BooleanField(default=True)
image = models.ImageField(upload_to='products', blank=True)
customer_support = models.CharField(max_length=32, blank=True)
active = models.BooleanField(default=True)
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
@@ -25,12 +25,18 @@ class Order(models.Model):
order_sum = models.FloatField(db_column='sum')
created = models.DateTimeField(auto_now_add=True)
def __unicode__(self):
return "{0}: {1} kr".format(self.user, self.order_sum)
class OrderLine(models.Model):
order = models.ForeignKey(Order)
product = models.ForeignKey(Product)
amount = models.IntegerField()
unit_price = models.FloatField()
def __unicode__(self):
return "{1} {0} ({2} kr per)".format(self.product, self.amount, self.unit_price)
class Meta:
unique_together = ('order', 'product')
@@ -39,13 +45,19 @@ class Transaction(models.Model):
amount = models.FloatField()
created = models.DateTimeField(auto_now_add=True)
def __unicode__(self):
return "{0}: {1}: {2}".format(self.id, self.user, self.amount)
class UserProfile(models.Model):
user = models.ForeignKey(User, unique=True)
balance = models.FloatField(default=0.0)
image = models.ImageField(upload_to='uploads', blank=True)
image = models.ImageField(upload_to='users', blank=True)
def __unicode__(self):
return "{0}".format(self.user)
# Create a new UserProfile object when we create a new User.
@receiver(post_save, sender=User)
@receiver(post_save, sender=User, dispatch_uid='randomz')
def create_user_profile(sender, instance, created, **kwargs):
if created:
UserProfile.objects.create(user=instance)