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

Fixed #94 -- Improved UI for bankdata import

Browse Source
This commit is contained in:
Raphael Michel
2015-08-20 22:26:32 +02:00
parent bec407f32e
commit 4f28c01692
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,7 +199,7 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
row['ok'] = False row['ok'] = False
match = pattern.search(row['reference'].upper()) match = pattern.search(row['reference'].upper())
if not match: if not match:
row['class'] = '' row['class'] = 'warning'
row['message'] = _('No order code detected') row['message'] = _('No order code detected')
continue continue
@@ -208,24 +208,23 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
order = Order.objects.current.get(event=self.request.event, order = Order.objects.current.get(event=self.request.event,
code=code) code=code)
except Order.DoesNotExist: except Order.DoesNotExist:
row['class'] = 'error' row['class'] = 'danger'
row['message'] = _('Unknown order code detected') row['message'] = _('Unknown order code detected')
else: else:
row['order'] = order row['order'] = order
if order.status == Order.STATUS_PENDING: if order.status == Order.STATUS_PENDING:
amount = Decimal(amount_pattern.sub("", row['amount'].replace(",", "."))) amount = Decimal(amount_pattern.sub("", row['amount'].replace(",", ".")))
if amount != order.total: if amount != order.total:
row['class'] = 'error' row['class'] = 'danger'
row['message'] = _('Found wrong amount. Expected: %s' % str(order.total)) row['message'] = _('Found wrong amount. Expected: %s' % str(order.total))
else: else:
row['class'] = 'success' row['class'] = 'success'
row['message'] = _('Valid payment') row['message'] = _('Valid payment')
row['ok'] = True row['ok'] = True
elif order.status == Order.STATUS_CANCELLED: elif order.status == Order.STATUS_CANCELLED:
row['class'] = 'error' row['class'] = 'danger'
row['message'] = _('Order has been cancelled') row['message'] = _('Order has been cancelled')
elif order.status == Order.STATUS_PAID: elif order.status == Order.STATUS_PAID:
# TODO: Do a plausibility check to tell duplicate payments from overlapping import files
row['class'] = '' row['class'] = ''
row['message'] = _('Order already has been paid') row['message'] = _('Order already has been paid')
elif order.status == Order.STATUS_REFUNDED: elif order.status == Order.STATUS_REFUNDED: