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

Removed CleanerVersion layer [backwards-incompatible!]

Browse Source
This commit is contained in:
Raphael Michel
2015-12-12 13:08:33 +01:00
parent 0c9c9dd22c
commit d133d2abff
85 changed files with 712 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/plugins/banktransfer/hbci.py
View File

@@ -12,7 +12,7 @@ def hbci_transactions(event, conf):
log = []
data = []
accname = event.identity + '_' + str(int(time.time()))
accname = event.id + '_' + str(int(time.time()))
try:
try:
subprocess.call([

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

@@ -50,8 +50,8 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
return self.process_mt940()
if 'confirm' in self.request.POST:
orders = Order.objects.current.filter(event=self.request.event,
code__in=self.request.POST.getlist('mark_paid'))
orders = Order.objects.filter(event=self.request.event,
code__in=self.request.POST.getlist('mark_paid'))
some_failed = False
for order in orders:
try:
@@ -210,8 +210,7 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
code = match.group(1)
try:
order = Order.objects.current.get(event=self.request.event,
code=code)
order = Order.objects.get(event=self.request.event, code=code)
except Order.DoesNotExist:
row['class'] = 'danger'
row['message'] = _('Unknown order code detected')

1
src/pretix/plugins/paypal/payment.py
View File

@@ -168,7 +168,6 @@ class Paypal(BasePaymentProvider):
if payment.state == 'pending':
messages.warning(request, _('PayPal has not yet approved the payment. We will inform you as soon as the '
'payment completed.'))
order = order.clone()
order.payment_info = json.dumps(payment.to_dict())
order.save()
return

6
src/pretix/plugins/paypal/views.py
View File

@@ -23,7 +23,7 @@ def success(request):
request.session['payment_paypal_token'] = token
request.session['payment_paypal_payer'] = payer
try:
event = Event.objects.current.get(identity=request.session['payment_paypal_event'])
event = Event.objects.get(id=request.session['payment_paypal_event'])
return redirect(eventreverse(event, 'presale:event.checkout', kwargs={'step': 'confirm'}))
except Event.DoesNotExist:
pass # TODO: Handle this
@@ -35,7 +35,7 @@ def success(request):
def abort(request):
messages.error(request, _('It looks like you cancelled the PayPal payment'))
try:
event = Event.objects.current.get(identity=request.session['payment_paypal_event'])
event = Event.objects.get(id=request.session['payment_paypal_event'])
return redirect(eventreverse(event, 'presale:event.checkout', kwargs={'step': 'payment'}))
except Event.DoesNotExist:
pass # TODO: Handle this
@@ -44,7 +44,7 @@ def abort(request):
@login_required
def retry(request, order):
try:
order = Order.objects.current.get(
order = Order.objects.get(
user=request.user,
code=order,
)

6
src/pretix/plugins/pretixdroid/views.py
View File

@@ -42,7 +42,7 @@ class ConfigView(EventPermissionRequiredMixin, TemplateView):
class ApiView(View):
def get(self, request, **kwargs):
try:
event = Event.objects.current.get(
event = Event.objects.get(
slug=self.kwargs['event'],
organizer__slug=self.kwargs['organizer']
)
@@ -53,12 +53,12 @@ class ApiView(View):
or event.settings.get('pretixdroid_key') != request.GET.get('key', '')):
return HttpResponseForbidden('Invalid key')
ops = OrderPosition.objects.current.filter(
ops = OrderPosition.objects.filter(
order__event=event, order__status=Order.STATUS_PAID,
).select_related('item', 'variation')
data = [
{
'id': op.identity,
'id': op.id,
'item': str(op.item),
'variation': str(op.variation) if op.variation else None,
'attendee_name': op.attendee_name

2
src/pretix/plugins/sendmail/views.py
View File

@@ -25,7 +25,7 @@ class SenderView(EventPermissionRequiredMixin, FormView):
return kwargs
def form_valid(self, form):
orders = Order.objects.current.filter(
orders = Order.objects.filter(
event=self.request.event, status__in=form.cleaned_data['sendto']
).select_related("user")
users = set([o.user for o in orders])

20
src/pretix/plugins/statistics/views.py
View File

@@ -27,12 +27,12 @@ class IndexView(EventPermissionRequiredMixin, TemplateView):
ctx['obd_data'] = cache.get('statistics_obd_data')
if not ctx['obd_data']:
ordered_by_day = {}
for o in Order.objects.current.filter(event=self.request.event).values('datetime'):
for o in Order.objects.filter(event=self.request.event).values('datetime'):
day = o['datetime'].date()
ordered_by_day[day] = ordered_by_day.get(day, 0) + 1
paid_by_day = {}
for o in Order.objects.current.filter(event=self.request.event,
payment_date__isnull=False).values('payment_date'):
for o in Order.objects.filter(event=self.request.event,
payment_date__isnull=False).values('payment_date'):
day = o['payment_date'].date()
paid_by_day[day] = paid_by_day.get(day, 0) + 1
@@ -59,21 +59,21 @@ class IndexView(EventPermissionRequiredMixin, TemplateView):
if not ctx['obp_data']:
num_ordered = {
p['item']: p['cnt']
for p in (OrderPosition.objects.current
for p in (OrderPosition.objects
.filter(order__event=self.request.event)
.values('item')
.annotate(cnt=Count('id')))
}
num_paid = {
p['item']: p['cnt']
for p in (OrderPosition.objects.current
for p in (OrderPosition.objects
.filter(order__event=self.request.event, order__status=Order.STATUS_PAID)
.values('item')
.annotate(cnt=Count('id')))
}
item_names = {
i.identity: str(i.name)
for i in Item.objects.current.filter(event=self.request.event)
i.id: str(i.name)
for i in Item.objects.filter(event=self.request.event)
}
ctx['obp_data'] = [
{
@@ -87,9 +87,9 @@ class IndexView(EventPermissionRequiredMixin, TemplateView):
ctx['rev_data'] = cache.get('statistics_rev_data')
if not ctx['rev_data']:
rev_by_day = {}
for o in Order.objects.current.filter(event=self.request.event,
status=Order.STATUS_PAID,
payment_date__isnull=False).values('payment_date', 'total'):
for o in Order.objects.filter(event=self.request.event,
status=Order.STATUS_PAID,
payment_date__isnull=False).values('payment_date', 'total'):
day = o['payment_date'].date()
rev_by_day[day] = rev_by_day.get(day, 0) + o['total']

9
src/pretix/plugins/stripe/payment.py
View File

@@ -83,18 +83,17 @@ class Stripe(BasePaymentProvider):
currency=request.event.currency.lower(),
source=request.session['payment_stripe_token'],
metadata={
'order': order.identity,
'event': self.event.identity,
'order': order.id,
'event': self.event.id,
'code': order.code
},
# TODO: Is this sufficient?
idempotency_key=self.event.identity + order.code + request.session['payment_stripe_token']
idempotency_key=self.event.id + order.code + request.session['payment_stripe_token']
)
except stripe.error.CardError as e:
err = e.json_body['error']
messages.error(request, _('Stripe reported an error with your card: %s' % err['message']))
logger.info('Stripe card error: %s' % str(err))
order = order.clone()
order.payment_info = json.dumps({
'error': True,
'message': err['message'],
@@ -106,7 +105,6 @@ class Stripe(BasePaymentProvider):
messages.error(request, _('We had trouble communicating with Stripe. Please try again and get in touch '
'with us if this problem persists.'))
logger.error('Stripe error: %s' % str(err))
order = order.clone()
order.payment_info = json.dumps({
'error': True,
'message': err['message'],
@@ -121,7 +119,6 @@ class Stripe(BasePaymentProvider):
else:
messages.warning(request, _('Stripe reported an error: %s' % charge.failure_message))
logger.info('Charge failed: %s' % str(charge))
order = order.clone()
order.payment_info = str(charge)
order.save()
del request.session['payment_stripe_token']

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

@@ -30,12 +30,12 @@ def webhook(request):
return HttpResponse('Event not given', status=200)
try:
event = Event.objects.current.get(identity=metadata['event'])
event = Event.objects.get(id=metadata['event'])
except Event.DoesNotExist:
return HttpResponse('Event not found', status=200)
try:
order = Order.objects.current.get(identity=metadata['order'])
order = Order.objects.get(id=metadata['order'])
except Order.DoesNotExist:
return HttpResponse('Order not found', status=200)

4
src/pretix/plugins/ticketoutputpdf/ticketoutput.py
View File

@@ -69,7 +69,7 @@ class PdfTicketOutput(BaseTicketOutput):
qr_s = self.settings.get('qr_s', default=80, as_type=float)
if qr_s:
reqs = qr_s * units.mm
qrw = QrCodeWidget(op.identity, barLevel='H')
qrw = QrCodeWidget(op.id, barLevel='H')
b = qrw.getBounds()
w = b[2] - b[0]
h = b[3] - b[1]
@@ -84,7 +84,7 @@ class PdfTicketOutput(BaseTicketOutput):
p.setFont("Helvetica", code_s)
code_x = self.settings.get('code_x', default=15, as_type=float)
code_y = self.settings.get('code_y', default=130, as_type=float)
p.drawString(code_x * units.mm, code_y * units.mm, op.identity)
p.drawString(code_x * units.mm, code_y * units.mm, op.id)
p.showPage()