mirror of
https://github.com/pretix/pretix.git
synced 2026-05-05 15:14:04 +00:00
Fixed #120 -- Explicitly sotre tax values
This commit is contained in:
27
src/pretix/base/migrations/0006_auto_20160211_1630.py
Normal file
27
src/pretix/base/migrations/0006_auto_20160211_1630.py
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.9 on 2016-02-11 16:30
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('pretixbase', '0005_auto_20160211_1459'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='orderposition',
|
||||||
|
name='tax_rate',
|
||||||
|
field=models.DecimalField(decimal_places=2, default=0, max_digits=7, verbose_name='Tax rate'),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='orderposition',
|
||||||
|
name='tax_value',
|
||||||
|
field=models.DecimalField(decimal_places=2, default=0, max_digits=10, verbose_name='Tax value'),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -3,11 +3,12 @@ import string
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
|
|
||||||
from django.db import models, transaction
|
from django.db import models
|
||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from typing import List, Union
|
from typing import List, Union
|
||||||
|
|
||||||
|
from ..decimal import round_decimal
|
||||||
from .base import CachedFile, LoggedModel
|
from .base import CachedFile, LoggedModel
|
||||||
from .event import Event
|
from .event import Event
|
||||||
from .items import Item, ItemVariation, Question, Quota
|
from .items import Item, ItemVariation, Question, Quota
|
||||||
@@ -361,6 +362,14 @@ class OrderPosition(AbstractPosition):
|
|||||||
related_name='positions',
|
related_name='positions',
|
||||||
on_delete=models.PROTECT
|
on_delete=models.PROTECT
|
||||||
)
|
)
|
||||||
|
tax_rate = models.DecimalField(
|
||||||
|
max_digits=7, decimal_places=2,
|
||||||
|
verbose_name=_('Tax rate')
|
||||||
|
)
|
||||||
|
tax_value = models.DecimalField(
|
||||||
|
max_digits=10, decimal_places=2,
|
||||||
|
verbose_name=_('Tax value')
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("Order position")
|
verbose_name = _("Order position")
|
||||||
@@ -381,6 +390,7 @@ class OrderPosition(AbstractPosition):
|
|||||||
cartpos.voucher.redeemed = True
|
cartpos.voucher.redeemed = True
|
||||||
cartpos.voucher.save()
|
cartpos.voucher.save()
|
||||||
cartpos.delete()
|
cartpos.delete()
|
||||||
|
op._calculate_tax()
|
||||||
ops.append(op)
|
ops.append(op)
|
||||||
OrderPosition.objects.bulk_create(ops)
|
OrderPosition.objects.bulk_create(ops)
|
||||||
return ops
|
return ops
|
||||||
@@ -390,6 +400,18 @@ class OrderPosition(AbstractPosition):
|
|||||||
self.item.id, self.variation.id if self.variation else 0, self.order_id
|
self.item.id, self.variation.id if self.variation else 0, self.order_id
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _calculate_tax(self):
|
||||||
|
self.tax_rate = self.item.tax_rate
|
||||||
|
if self.tax_rate:
|
||||||
|
self.tax_value = round_decimal(self.price * (1 - 100 / (100 + self.item.tax_rate)))
|
||||||
|
else:
|
||||||
|
self.tax_value = Decimal('0.00')
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if self.tax_rate is None:
|
||||||
|
self._calculate_tax()
|
||||||
|
return super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class CartPosition(AbstractPosition):
|
class CartPosition(AbstractPosition):
|
||||||
"""
|
"""
|
||||||
@@ -429,3 +451,13 @@ class CartPosition(AbstractPosition):
|
|||||||
return '<CartPosition: item %d, variation %d for cart %s>' % (
|
return '<CartPosition: item %d, variation %d for cart %s>' % (
|
||||||
self.item.id, self.variation.id if self.variation else 0, self.cart_id
|
self.item.id, self.variation.id if self.variation else 0, self.cart_id
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def tax_rate(self):
|
||||||
|
return self.item.tax_rate
|
||||||
|
|
||||||
|
@property
|
||||||
|
def tax_value(self):
|
||||||
|
if not self.tax_rate:
|
||||||
|
return Decimal('0.00')
|
||||||
|
return round_decimal(self.price * (1 - 100 / (100 + self.item.tax_rate)))
|
||||||
|
|||||||
@@ -123,9 +123,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-3 col-xs-6 price">
|
<div class="col-md-3 col-xs-6 price">
|
||||||
<strong>{{ event.currency }} {{ line.total|floatformat:2 }}</strong>
|
<strong>{{ event.currency }} {{ line.total|floatformat:2 }}</strong>
|
||||||
{% if line.item.tax_rate %}
|
{% if line.tax_rate %}
|
||||||
<br/>
|
<br/>
|
||||||
<small>{% blocktrans trimmed with rate=line.item.tax_rate %}
|
<small>{% blocktrans trimmed with rate=line.tax_rate %}
|
||||||
incl. {{ rate }}% taxes
|
incl. {{ rate }}% taxes
|
||||||
{% endblocktrans %}</small>
|
{% endblocktrans %}</small>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@@ -59,8 +59,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-3 col-xs-6 price">
|
<div class="col-md-3 col-xs-6 price">
|
||||||
<strong>{{ event.currency }} {{ line.total|floatformat:2 }}</strong>
|
<strong>{{ event.currency }} {{ line.total|floatformat:2 }}</strong>
|
||||||
{% if line.item.tax_rate %}
|
{% if line.tax_rate %}
|
||||||
<br /><small>{% blocktrans trimmed with rate=line.item.tax_rate %}
|
<br /><small>{% blocktrans trimmed with rate=line.tax_rate %}
|
||||||
incl. {{ rate }}% taxes
|
incl. {{ rate }}% taxes
|
||||||
{% endblocktrans %}</small>
|
{% endblocktrans %}</small>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user