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

4
src/pretix/plugins/banktransfer/tasks.py
View File

@@ -35,9 +35,9 @@ def _handle_transaction(event: Event, trans: BankTransaction, code: str):
elif trans.order.status == Order.STATUS_REFUNDED:
trans.state = BankTransaction.STATE_ERROR
trans.message = ugettext_noop('The order has already been refunded.')
elif trans.order.status == Order.STATUS_CANCELLED:
elif trans.order.status == Order.STATUS_CANCELED:
trans.state = BankTransaction.STATE_ERROR
trans.message = ugettext_noop('The order has already been cancelled.')
trans.message = ugettext_noop('The order has already been canceled.')
elif trans.amount != trans.order.total:
trans.state = BankTransaction.STATE_INVALID
trans.message = ugettext_noop('The transaction amount is incorrect.')

4
src/pretix/plugins/banktransfer/views.py
View File

@@ -54,10 +54,10 @@ class ActionView(EventPermissionRequiredMixin, View):
'status': 'error',
'message': _('The order has already been refunded.')
})
elif trans.order.status == Order.STATUS_CANCELLED:
elif trans.order.status == Order.STATUS_CANCELED:
return JsonResponse({
'status': 'error',
'message': _('The order has already been cancelled.')
'message': _('The order has already been canceled.')
})
try: