CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fixed #23 -- Tax handling for payment fees

Browse Source
This commit is contained in:
Raphael Michel
2016-03-11 21:55:52 +01:00
parent b7c009343b
commit f095cded08
7 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/templates/pretixcontrol/event/settings.html
View File

@@ -36,14 +36,18 @@
{% bootstrap_field sform.last_order_modification_date layout="horizontal" %}
</fieldset>
<fieldset>
<legend>{% trans "Order process settings" %}</legend>
<legend>{% trans "Orders" %}</legend>
{% bootstrap_field sform.reservation_time layout="horizontal" %}
{% bootstrap_field sform.max_items_per_order layout="horizontal" %}
{% bootstrap_field sform.attendee_names_asked layout="horizontal" %}
{% bootstrap_field sform.attendee_names_required layout="horizontal" %}
</fieldset>
<fieldset>
<legend>{% trans "Invoicing" %}</legend>
{% bootstrap_field sform.invoice_address_asked layout="horizontal" %}
{% bootstrap_field sform.invoice_address_required layout="horizontal" %}
{% bootstrap_field sform.invoice_address_vatid layout="horizontal" %}
{% bootstrap_field sform.tax_rate_default layout="horizontal" %}
</fieldset>
<div class="form-group submit-group">
<button type="submit" class="btn btn-primary btn-save">

7
src/pretix/control/templates/pretixcontrol/order/index.html
View File

@@ -134,13 +134,18 @@
</div>
{% endfor %}
{% if items.payment_fee %}
{# TODO: Tax rate? #}
<div class="row-fluid product-row">
<div class="col-md-4 col-xs-6">
<strong>{% trans "Payment method fee" %}</strong>
</div>
<div class="col-md-3 col-xs-6 col-md-offset-5 price">
<strong>{{ event.currency }} {{ items.payment_fee|floatformat:2 }}</strong>
{% if order.payment_fee_tax_rate %}
<br/>
<small>{% blocktrans trimmed with rate=order.payment_fee_tax_rate %}
incl. {{ rate }}% taxes
{% endblocktrans %}</small>
{% endif %}
</div>
<div class="clearfix"></div>
</div>