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

Fix #585 -- Creating invoices for refunded orders

Browse Source
This commit is contained in:
Raphael Michel
2017-09-04 20:36:19 +02:00
parent b9b4ccb180
commit ea7ec2b5fc
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,11 @@
action="{% url "control:event.order.reissueinvoice" event=request.event.slug organizer=request.event.organizer.slug code=order.code id=i.pk %}">
{% csrf_token %}
<button class="btn btn-default btn-xs">
{% trans "Cancel and reissue" %}
{% if order.status == "r" or order.status == "c" %}
{% trans "Generate cancellation" %}
{% else %}
{% trans "Cancel and reissue" %}
{% endif %}
</button>
</form>
{% endif %}

7
src/pretix/control/views/orders.py
View File

@@ -366,8 +366,11 @@ class OrderInvoiceReissue(OrderView):
if inv.canceled:
messages.error(self.request, _('The invoice has already been canceled.'))
else:
generate_cancellation(inv)
inv = generate_invoice(self.order)
c = generate_cancellation(inv)
if self.order.status not in (Order.STATUS_CANCELED, Order.STATUS_REFUNDED):
inv = generate_invoice(self.order)
else:
inv = c
self.order.log_action('pretix.event.order.invoice.reissued', user=self.request.user, data={
'invoice': inv.pk
})