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

Correctly display payment fee on the order detail page

Browse Source
This commit is contained in:
Raphael Michel
2016-06-06 23:56:26 +02:00
parent a7fc8e19fb
commit fd2c293521
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/presale/views/__init__.py
View File

@@ -24,7 +24,7 @@ class CartMixin:
'item__questions', 'answers'
))
def get_cart(self, answers=False, queryset=None, payment_fee=None):
def get_cart(self, answers=False, queryset=None, payment_fee=None, payment_fee_tax_rate=None):
queryset = queryset or CartPosition.objects.filter(
cart_id=self.request.session.session_key, event=self.request.event
)
@@ -65,6 +65,7 @@ class CartMixin:
total = sum(p.total for p in positions)
payment_fee = payment_fee or self.get_payment_fee(total)
payment_fee_tax_rate = payment_fee_tax_rate or self.request.event.settings.tax_rate_default
try:
minutes_left = max(min(p.expires for p in positions) - now(), timedelta()).seconds // 60 if positions else 0
@@ -76,6 +77,7 @@ class CartMixin:
'raw': cartpos,
'total': total + payment_fee,
'payment_fee': payment_fee,
'payment_fee_tax_rate': payment_fee_tax_rate,
'answers': answers,
'minutes_left': minutes_left,
}