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

Fix #571 -- Partial payments and refunds

Browse Source
This commit is contained in:
Raphael Michel
2018-06-26 12:09:36 +02:00
parent 8e7af49206
commit 18a378976b
115 changed files with 6026 additions and 1598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/pretix/presale/templates/pretixpresale/event/order.html
View File

@@ -2,6 +2,7 @@
{% load i18n %}
{% load bootstrap3 %}
{% load eventsignal %}
{% load money %}
{% load eventurl %}
{% block title %}{% trans "Order details" %}{% endblock %}
{% block content %}
@@ -29,7 +30,7 @@
Please save the following link if you want to access your order later. We
also sent you an email containing the link to the address you specified.
{% endblocktrans %}<br>
<code>{{ url }}</code></p>
<code>{{ url }}</code></p>
<div class="clearfix"></div>
</div>
{% endif %}
@@ -43,28 +44,35 @@
{% if order.status == "n" %}
<div class="panel panel-danger">
<div class="panel-heading">
{% if can_change_method %}
<div class="pull-right">
<a href="{% eventurl event "presale:event.order.pay.change" secret=order.secret order=order.code %}">
<span class="fa fa-edit"></span>
{% trans "Use different payment method" %}
</a>
</div>
{% endif %}
<h3 class="panel-title">
{% trans "Payment" %}
</h3>
</div>
<div class="panel-body">
{% if can_retry %}
<a href="{% eventurl event "presale:event.order.pay" secret=order.secret order=order.code %}"
class="btn btn-primary pull-right"><i class="fa fa-money"></i> {% trans "Complete payment" %}
</a>
{% endif %}
{{ payment }}
<strong>{% blocktrans trimmed with total=pending_sum|money:request.event.currency %}
A payment of {{ total }} is still pending for this order.
{% endblocktrans %}</strong>
<strong>{% blocktrans trimmed with date=order.expires|date:"SHORT_DATE_FORMAT" %}
Please complete your payment before {{ date }}
{% endblocktrans %}</strong>
{% if last_payment %}
{{ last_payment_info }}
{% if can_pay %}
<div class="text-right">
<a href="{% eventurl event "presale:event.order.pay.change" secret=order.secret order=order.code %}"
class="btn btn-default">
{% trans "Re-try payment or choose another payment method" %}
</a>
</div>
{% endif %}
{% else %}
{% if can_pay %}
<div class="text-right">
<a href="{% eventurl event "presale:event.order.pay.change" secret=order.secret order=order.code %}"
class="btn btn-primary btn-lg">{% trans "Pay now" %}</a>
</div>
{% endif %}
{% endif %}
<div class="clearfix"></div>
</div>

4
src/pretix/presale/templates/pretixpresale/event/order_pay_confirm.html
View File

@@ -19,7 +19,7 @@
<div class="panel-heading">
<div class="pull-right">
<strong>
{% blocktrans trimmed with total=order.total|money:request.event.currency %}
{% blocktrans trimmed with total=payment.amount|money:request.event.currency %}
Total: {{ total }}
{% endblocktrans %}
</strong>
@@ -29,7 +29,7 @@
</h3>
</div>
<div class="panel-body">
{{ payment }}
{{ payment_info }}
</div>
</div>
</div>