Compare commits

...

5 Commits

Author SHA1 Message Date
Raphael Michel
92addff5d3 Bump version to 1.15.1 2018-05-11 14:50:44 +02:00
Felix Rindt
585578edf2 Add subevent bulk create button when no exist (#904) 2018-05-11 14:46:06 +02:00
Raphael Michel
12271047e6 Fix #903 -- Incorrect price calculation for variations 2018-05-11 14:46:06 +02:00
robbi5
8413269c32 Add badge plugin support to MANIFEST.in (#902) 2018-05-11 14:46:06 +02:00
Raphael Michel
1f01ef6e37 Do not show end time if not set 2018-05-11 14:46:06 +02:00
5 changed files with 8 additions and 3 deletions

View File

@@ -18,3 +18,5 @@ recursive-include pretix/plugins/stripe/templates *
recursive-include pretix/plugins/stripe/static *
recursive-include pretix/plugins/ticketoutputpdf/templates *
recursive-include pretix/plugins/ticketoutputpdf/static *
recursive-include pretix/plugins/badges/templates *
recursive-include pretix/plugins/badges/static *

View File

@@ -1 +1 @@
__version__ = "1.15.0"
__version__ = "1.15.1"

View File

@@ -465,7 +465,7 @@ class ItemVariation(models.Model):
return self.default_price if self.default_price is not None else self.item.default_price
def tax(self, price=None):
price = price or self.price
price = price if price is not None else self.price
if not self.item.tax_rule:
return TaxedPrice(gross=price, net=price, tax=Decimal('0.00'), rate=Decimal('0.00'), name='')
return self.item.tax_rule.tax(price)

View File

@@ -16,6 +16,9 @@
<a href="{% url "control:event.subevents.add" organizer=request.event.organizer.slug event=request.event.slug %}"
class="btn btn-primary btn-lg"><i class="fa fa-plus"></i>
{% trans "Create a new date" context "subevent" %}</a>
<a href="{% url "control:event.subevents.bulk" organizer=request.event.organizer.slug event=request.event.slug %}"
class="btn btn-primary btn-lg"><i class="fa fa-plus"></i>
{% trans "Create many new dates" context "subevent" %}</a>
</div>
{% else %}
<form class="row filter-form" action="" method="get">

View File

@@ -167,7 +167,7 @@
{% blocktrans trimmed with time=ev.date_from|date:"TIME_FORMAT" %}
Begin: {{ time }}
{% endblocktrans %}
{% if event.settings.show_date_to %}
{% if event.settings.show_date_to and ev.date_to %}
<br>
{% blocktrans trimmed with time=ev.date_to|date:"TIME_FORMAT" %}
End: {{ time }}