projects
/
matthijs
/
projects
/
dorestad-bookings.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tickets: Use django.utils.format for number formatting.
[matthijs/projects/dorestad-bookings.git]
/
tickets
/
models.py
diff --git
a/tickets/models.py
b/tickets/models.py
index 5c56b0aa82b0d99f2ef88e79215c77f43270e613..cff9f2355b0de7a535d73e42676bf7786bba0860 100644
(file)
--- a/
tickets/models.py
+++ b/
tickets/models.py
@@
-1,6
+1,7
@@
# coding=utf-8
from django.db import models
# coding=utf-8
from django.db import models
+from django.utils.formats import number_format
# Create your models here.
# Create your models here.
@@
-9,15
+10,13
@@
SHOW_CHOICES = [ ("vrijdag", "vrijdag 17 december, 20:00")
, ("zondag", "zondag 19 december, 13:00")
]
, ("zondag", "zondag 19 december, 13:00")
]
-TICKET
S_CHOICES = [ (n, n) for n in range(1, 6)]
+TICKET
_PRICE=7.5
-TICKET
_PRICE=10
+TICKET
S_CHOICES = [ (n, u"%s (€ %s)" % (n, number_format(n * TICKET_PRICE,2))) for n in range(1, 6)]
class Booking(models.Model):
created = models.DateTimeField(auto_now_add=True, editable=False, verbose_name="Datum")
name = models.CharField(max_length=100, verbose_name="Naam")
class Booking(models.Model):
created = models.DateTimeField(auto_now_add=True, editable=False, verbose_name="Datum")
name = models.CharField(max_length=100, verbose_name="Naam")
- address1 = models.CharField(max_length=50, verbose_name="Adres")
- address2 = models.CharField(max_length=50, verbose_name="")
email = models.EmailField(verbose_name="Email adres")
tickets = models.IntegerField(choices=TICKETS_CHOICES, verbose_name="Aantal kaarten")
show = models.CharField(max_length=50, choices=SHOW_CHOICES, verbose_name="Voorstelling")
email = models.EmailField(verbose_name="Email adres")
tickets = models.IntegerField(choices=TICKETS_CHOICES, verbose_name="Aantal kaarten")
show = models.CharField(max_length=50, choices=SHOW_CHOICES, verbose_name="Voorstelling")
@@
-26,3
+25,10
@@
class Booking(models.Model):
def _get_price(self):
return self.tickets * TICKET_PRICE
price = property(_get_price)
def _get_price(self):
return self.tickets * TICKET_PRICE
price = property(_get_price)
+
+ def __unicode__(self):
+ return u'#%s: %s - %s - %s kaart%s (€ %s)' % (
+ self.pk, self.name,
+ self.get_show_display(),
+ self.tickets, "en" if self.tickets != 1 else "",
+ number_format(self.price, 2))