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

Allow to disables fee in stats module

Browse Source
This commit is contained in:
Raphael Michel
2019-08-09 15:02:44 +02:00
parent a1353b3773
commit 669b438c91
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/services/stats.py
View File

@@ -76,7 +76,7 @@ def dictsum(*dicts) -> dict:
def order_overview( def order_overview(
event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None, fees=False
) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]: ) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]:
items = event.items.all().select_related( items = event.items.all().select_related(
'category', # for re-grouping 'category', # for re-grouping
@@ -189,7 +189,7 @@ def order_overview(
payment_cat_obj.name = _('Fees') payment_cat_obj.name = _('Fees')
payment_items = [] payment_items = []
if not subevent: if not subevent and fees:
qs = OrderFee.all.filter( qs = OrderFee.all.filter(
order__event=event order__event=event
).annotate( ).annotate(

2
src/pretix/control/templates/pretixcontrol/orders/overview.html
View File

@@ -46,7 +46,7 @@
{% if subevent_warning %} {% if subevent_warning %}
<div class="alert alert-info"> <div class="alert alert-info">
{% blocktrans trimmed context "subevent" %} {% blocktrans trimmed context "subevent" %}
If you select a single date, payment method fees will not be listed here as it might not be clear which If you select a single date, fees will not be listed here as it might not be clear which
date they belong to. date they belong to.
{% endblocktrans %} {% endblocktrans %}
</div> </div>