mirror of
https://github.com/pretix/pretix.git
synced 2025-12-12 04:42:28 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92addff5d3 | ||
|
|
585578edf2 | ||
|
|
12271047e6 | ||
|
|
8413269c32 | ||
|
|
1f01ef6e37 |
@@ -18,3 +18,5 @@ recursive-include pretix/plugins/stripe/templates *
|
|||||||
recursive-include pretix/plugins/stripe/static *
|
recursive-include pretix/plugins/stripe/static *
|
||||||
recursive-include pretix/plugins/ticketoutputpdf/templates *
|
recursive-include pretix/plugins/ticketoutputpdf/templates *
|
||||||
recursive-include pretix/plugins/ticketoutputpdf/static *
|
recursive-include pretix/plugins/ticketoutputpdf/static *
|
||||||
|
recursive-include pretix/plugins/badges/templates *
|
||||||
|
recursive-include pretix/plugins/badges/static *
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
__version__ = "1.15.0"
|
__version__ = "1.15.1"
|
||||||
|
|||||||
@@ -465,7 +465,7 @@ class ItemVariation(models.Model):
|
|||||||
return self.default_price if self.default_price is not None else self.item.default_price
|
return self.default_price if self.default_price is not None else self.item.default_price
|
||||||
|
|
||||||
def tax(self, price=None):
|
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:
|
if not self.item.tax_rule:
|
||||||
return TaxedPrice(gross=price, net=price, tax=Decimal('0.00'), rate=Decimal('0.00'), name='')
|
return TaxedPrice(gross=price, net=price, tax=Decimal('0.00'), rate=Decimal('0.00'), name='')
|
||||||
return self.item.tax_rule.tax(price)
|
return self.item.tax_rule.tax(price)
|
||||||
|
|||||||
@@ -16,6 +16,9 @@
|
|||||||
<a href="{% url "control:event.subevents.add" organizer=request.event.organizer.slug event=request.event.slug %}"
|
<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>
|
class="btn btn-primary btn-lg"><i class="fa fa-plus"></i>
|
||||||
{% trans "Create a new date" context "subevent" %}</a>
|
{% 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>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<form class="row filter-form" action="" method="get">
|
<form class="row filter-form" action="" method="get">
|
||||||
|
|||||||
@@ -167,7 +167,7 @@
|
|||||||
{% blocktrans trimmed with time=ev.date_from|date:"TIME_FORMAT" %}
|
{% blocktrans trimmed with time=ev.date_from|date:"TIME_FORMAT" %}
|
||||||
Begin: {{ time }}
|
Begin: {{ time }}
|
||||||
{% endblocktrans %}
|
{% endblocktrans %}
|
||||||
{% if event.settings.show_date_to %}
|
{% if event.settings.show_date_to and ev.date_to %}
|
||||||
<br>
|
<br>
|
||||||
{% blocktrans trimmed with time=ev.date_to|date:"TIME_FORMAT" %}
|
{% blocktrans trimmed with time=ev.date_to|date:"TIME_FORMAT" %}
|
||||||
End: {{ time }}
|
End: {{ time }}
|
||||||
|
|||||||
Reference in New Issue
Block a user