reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

No need for subtotal

Browse source
This commit is contained in:
Víðir Valberg Guðmundsson 2016-05-16 16:20:01 +02:00
parent f9cea6cdba
commit f4be670301
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shop/models.py
View file

@ -70,10 +70,6 @@ class Order(CreatedUpdatedModel):
sum=Sum('orderproductrelation__quantity') sum=Sum('orderproductrelation__quantity')
)['sum'] )['sum']
@property
def subtotal(self):
return self.total - self.vat
@property @property
def vat(self): def vat(self):
return (self.total/100)*25 return (self.total/100)*25

9
shop/templates/order_detail.html
View file

@ -51,14 +51,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<td> <td>
<strong>Subtotal</strong> <strong>Hereof VAT (25%)</strong>
<td>
{{ order.subtotal }}
<tr>
<td colspan="2">
<td>
<strong>VAT (25%)</strong>
<td> <td>
{{ order.vat }} {{ order.vat }}