|
|
|
@ -34,7 +34,6 @@ class Buyable(models.Model):
|
|
|
|
|
|
|
|
|
|
class Order(models.Model):
|
|
|
|
|
user = models.ForeignKey(User)
|
|
|
|
|
purchase = models.ManyToManyField('Purchase')
|
|
|
|
|
price = models.FloatField()
|
|
|
|
|
dateTime = models.DateTimeField()
|
|
|
|
|
|
|
|
|
@ -54,10 +53,23 @@ class Order(models.Model):
|
|
|
|
|
return "Price %s, User %s" % (self.price, self.user)
|
|
|
|
|
|
|
|
|
|
class Purchase(models.Model):
|
|
|
|
|
order = models.ForeignKey(Order)
|
|
|
|
|
price = models.FloatField()
|
|
|
|
|
isDeposit = models.BooleanField()
|
|
|
|
|
buyable = models.ForeignKey(Buyable)
|
|
|
|
|
|
|
|
|
|
def create(order, buyable):
|
|
|
|
|
p = Purchase()
|
|
|
|
|
p.order = order
|
|
|
|
|
if isDeposit:
|
|
|
|
|
p.price = self.deposit
|
|
|
|
|
else:
|
|
|
|
|
p.price = self.price
|
|
|
|
|
p.dateTime = datetime.datetime.now()
|
|
|
|
|
p.buyable = buyable
|
|
|
|
|
|
|
|
|
|
return p
|
|
|
|
|
|
|
|
|
|
def __unicode__(self):
|
|
|
|
|
return "%s%s, %s" % (self.buyable.name, self.isDeposit and " (deposit)" or "", self.price)
|
|
|
|
|
|
|
|
|
|