CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/flaviabastos/187_unify_canceled_spelling'

Browse Source
This commit is contained in:
Raphael Michel
2016-09-21 18:57:35 +02:00
parent 1faf33d61f 8ef6439c44
commit 84fd7cb166
26 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,7 +237,7 @@ class OrderTransition(OrderView):
messages.success(self.request, _('The order has been marked as paid.'))
elif self.order.status == Order.STATUS_PENDING and to == 'c':
cancel_order(self.order, user=self.request.user)
messages.success(self.request, _('The order has been cancelled.'))
messages.success(self.request, _('The order has been canceled.'))
elif self.order.status == Order.STATUS_PAID and to == 'n':
self.order.status = Order.STATUS_PENDING
self.order.payment_manual = True