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

Add a user guide on payments

Browse Source
This commit is contained in:
Raphael Michel
2017-05-02 18:59:18 +02:00
parent f95b77fd7a
commit 2fcd561ff7
32 changed files with 250 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/payment.py
View File

@@ -150,9 +150,9 @@ class BasePaymentProvider:
forms.BooleanField(
label=_('Calculate the fee from the total value including the fee.'),
help_text=_('We recommend you to enable this if you want your users to pay the payment fees of your '
'payment provider. <a href="/control/help/payment/fee_reverse" target="_blank">Click here '
'payment provider. <a href="{docs_url}" target="_blank">Click here '
'for detailled information on what this does.</a> Don\'t forget to set the correct fees '
'above!'),
'above!').format(docs_url='https://docs.pretix.eu/en/latest/user/payments/fees.html'),
required=False
)),
('_invoice_text',

7
src/pretix/control/templates/pretixcontrol/help/base.html
View File

@@ -1,7 +0,0 @@
{% extends "pretixcontrol/base.html" %}
{% load i18n %}
{% block content %}
<h1>{% trans "Help center" %}</h1>
{% block inner %}
{% endblock %}
{% endblock %}

68
src/pretix/control/templates/pretixcontrol/help/payment/fee_reverse.html
View File

@@ -1,68 +0,0 @@
{% extends "pretixcontrol/help/base.html" %}
{% block title %}Payment fee calculation{% endblock %}
{% block inner %}
<h2>Payment fee calculation</h2>
<p>
If you configure a fee for a payment method, there are two possible ways for us to calculate this. Let's
assume that your payment provider, e.g. PayPal, charges you 5 % fees and you want to charge your users the
same 5 %, such that for a ticket with a list price of 100 € you will get your full 100 €.
</p>
<ul>
<li>
<strong>Method A: Calculate the fee from the subtotal and add it to the bill.</strong> For a ticket price of
100 €, this will lead to the following calculation:
<table class="table helper-width-auto">
<tr>
<td>Ticket price</td>
<td class="text-right">100.00 €</td>
</tr>
<tr>
<td>pretix calculates the fee as 5% of 100 €</td>
<td class="text-right">+ 5.00 €</td>
</tr>
<tr>
<td>Subtotal that will be paid by the customer</td>
<td class="text-right">105.00 €</td>
</tr>
<tr>
<td>PayPal calculates its fee as 5% of 105 €</td>
<td class="text-right">- 5.25 €</td>
</tr>
<tr>
<td>End total that is on your bank account</td>
<td class="text-right"><strong>99.75 €</strong></td>
</tr>
</table>
</li>
<li>
<strong>Method B (default): Calculate the fee from the total value including the fee.</strong> For a ticket
price of 100 €, this will lead to the following calculation:
<table class="table helper-width-auto">
<tr>
<td>Ticket price</td>
<td class="text-right">100.00 €</td>
</tr>
<tr>
<td>pretix calculates the fee as 100/(100 - 5)% of 100 €</td>
<td class="text-right">+ 5.26 €</td>
</tr>
<tr>
<td>Subtotal that will be paid by the customer</td>
<td class="text-right">105.26 €</td>
</tr>
<tr>
<td>PayPal calculates its fee as 5% of 105.26 €</td>
<td class="text-right">- 5.26 €</td>
</tr>
<tr>
<td>End total that is on your bank account</td>
<td class="text-right"><strong>100.00 €</strong></td>
</tr>
</table>
<div class="alert-warning alert">
Due to the various rounding steps performed by us and by the payment provider, the end total on
your bank account might stil vary by one cent.
</div>
</li>
</ul>
{% endblock %}

5
src/pretix/control/urls.py
View File

@@ -1,8 +1,8 @@
from django.conf.urls import include, url
from pretix.control.views import (
auth, dashboards, event, global_settings, help, item, main, orders,
organizer, user, vouchers, waitinglist,
auth, dashboards, event, global_settings, item, main, orders, organizer,
user, vouchers, waitinglist,
)
urlpatterns = [
@@ -132,5 +132,4 @@ urlpatterns = [
url(r'^waitinglist/$', waitinglist.WaitingListView.as_view(), name='event.orders.waitinglist'),
url(r'^waitinglist/auto_assign$', waitinglist.AutoAssign.as_view(), name='event.orders.waitinglist.auto'),
])),
url(r'^help/(?P<topic>[a-zA-Z0-9_/]+)$', help.HelpView.as_view(), name='help'),
]

27
src/pretix/control/views/help.py
View File

@@ -1,27 +0,0 @@
from django import template
from django.http import Http404
from django.shortcuts import render
from django.views.generic import View
from pretix.base.models import Organizer
class HelpView(View):
model = Organizer
context_object_name = 'organizers'
template_name = 'pretixcontrol/organizers/index.html'
paginate_by = 30
def get(self, request, *args, **kwargs):
# In a security review, this came up as a possible path traversal issue. However, the URL regex
# does not allow any dots in the argument (which forbids traversing upwards in the directory tree).
# Even if it *was* possbile, it'd be loaded through django's template loader and therefore limited
# to TEMPLATE_DIR.
try:
locale = request.LANGUAGE_CODE
return render(request, 'pretixcontrol/help/%s.%s.html' % (kwargs.get('topic'), locale), {})
except template.TemplateDoesNotExist:
try:
return render(request, 'pretixcontrol/help/%s.html' % kwargs.get('topic'), {})
except template.TemplateDoesNotExist:
raise Http404('')

21
src/pretix/locale/de/LC_MESSAGES/django.po
View File

@@ -4,8 +4,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-02 08:59+0000\n"
"PO-Revision-Date: 2017-05-02 11:01+0200\n"
"POT-Creation-Date: 2017-05-02 15:55+0000\n"
"PO-Revision-Date: 2017-05-02 17:56+0200\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: Raphael Michel <michel@rami.io>\n"
"Language: de\n"
@@ -1287,17 +1287,17 @@ msgid "Calculate the fee from the total value including the fee."
msgstr "Berechne die Gebühr als Anteil vom Endbetrag."
#: pretix/base/payment.py:152
#, python-brace-format
msgid ""
"We recommend you to enable this if you want your users to pay the payment "
"fees of your payment provider. <a href=\"/control/help/payment/fee_reverse\" "
"target=\"_blank\">Click here for detailled information on what this does.</"
"a> Don't forget to set the correct fees above!"
"fees of your payment provider. <a href=\"{docs_url}\" target=\"_blank"
"\">Click here for detailled information on what this does.</a> Don't forget "
"to set the correct fees above!"
msgstr ""
"Wir empfehlen, diese Option zu aktivieren, wenn Sie die Gebühren Ihres "
"Zahlungsdienstleisters an Ihre Kunden weitergeben wollen. Denken Sie daran, "
"oben die richtigen Gebührensätze des Zahlungsanbieters einzustellen. <a href="
"\"/control/help/payment/fee_reverse\" target=\"_blank\">Weitere "
"Informationen</a>."
"\"{docs_url}\" target=\"_blank\">Weitere Informationen</a>."
#: pretix/base/payment.py:160
msgid "Text on invoices"
@@ -4407,10 +4407,6 @@ msgstr "Neuste Version"
msgid "Update check settings"
msgstr "Update-Check-Einstellungen"
#: pretix/control/templates/pretixcontrol/help/base.html:4
msgid "Help center"
msgstr "Hilfe"
#: pretix/control/templates/pretixcontrol/item/addons.html:7
msgid ""
"With add-ons, you can specify products that can be bought as an addition to "
@@ -8412,6 +8408,9 @@ msgstr "Deutsch"
msgid "German (informal)"
msgstr "Deutsch (Du)"
#~ msgid "Help center"
#~ msgstr "Hilfe"
#~ msgid "Team"
#~ msgstr "Team"

2
src/pretix/locale/de/LC_MESSAGES/djangojs.po
View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-02 08:59+0000\n"
"POT-Creation-Date: 2017-05-02 15:55+0000\n"
"PO-Revision-Date: 2017-04-17 17:10+0200\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: \n"

23
src/pretix/locale/de_Informal/LC_MESSAGES/django.po
View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-02 08:59+0000\n"
"PO-Revision-Date: 2017-05-02 11:01+0200\n"
"POT-Creation-Date: 2017-05-02 15:55+0000\n"
"PO-Revision-Date: 2017-05-02 17:56+0200\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: Raphael Michel <michel@rami.io>\n"
"Language: de\n"
@@ -1287,17 +1287,17 @@ msgid "Calculate the fee from the total value including the fee."
msgstr "Berechne die Gebühr als Anteil vom Endbetrag."
#: pretix/base/payment.py:152
#, python-brace-format
msgid ""
"We recommend you to enable this if you want your users to pay the payment "
"fees of your payment provider. <a href=\"/control/help/payment/fee_reverse\" "
"target=\"_blank\">Click here for detailled information on what this does.</"
"a> Don't forget to set the correct fees above!"
"fees of your payment provider. <a href=\"{docs_url}\" target=\"_blank"
"\">Click here for detailled information on what this does.</a> Don't forget "
"to set the correct fees above!"
msgstr ""
"Wir empfehlen, diese Option zu aktivieren, wenn du die Gebühren deines "
"Zahlungsdienstleisters an deine Kunden weitergeben willst. Denke daran, oben "
"die richtigen Gebührensätze des Zahlungsanbieters einzustellen. <a href=\"/"
"control/help/payment/fee_reverse\" target=\"_blank\">Weitere Informationen</"
"a>."
"die richtigen Gebührensätze des Zahlungsanbieters einzustellen. <a href="
"\"{docs_url}\" target=\"_blank\">Weitere Informationen</a>."
#: pretix/base/payment.py:160
msgid "Text on invoices"
@@ -4396,10 +4396,6 @@ msgstr "Neuste Version"
msgid "Update check settings"
msgstr "Update-Check-Einstellungen"
#: pretix/control/templates/pretixcontrol/help/base.html:4
msgid "Help center"
msgstr "Hilfe"
#: pretix/control/templates/pretixcontrol/item/addons.html:7
msgid ""
"With add-ons, you can specify products that can be bought as an addition to "
@@ -8387,6 +8383,9 @@ msgstr "Deutsch"
msgid "German (informal)"
msgstr "Deutsch (Du)"
#~ msgid "Help center"
#~ msgstr "Hilfe"
#~ msgid "Team"
#~ msgstr "Team"

2
src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po
View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-02 08:59+0000\n"
"POT-Creation-Date: 2017-05-02 15:55+0000\n"
"PO-Revision-Date: 2017-04-17 17:09+0200\n"
"Last-Translator: Raphael Michel <michel@rami.io>\n"
"Language-Team: \n"