forked from CGM_Public/pretix_original
Upgrade to Django 2.1 (#710)
* Upgrade to Django 2.0 * more models * i18n foo * Update setup.py * Fix Sentry exception PRETIXEU-JC * Enforce slug uniqueness * Import sorting * Upgrade to Django 2.1 * Travis config * Try to fix PostgreSQL failure * Smaller test matrix * staticfiles→static * Include request in all authenticate() calls
This commit is contained in:
@@ -47,7 +47,7 @@ class BankImportJobSerializer(serializers.ModelSerializer):
|
||||
|
||||
|
||||
class JobFilter(FilterSet):
|
||||
event = django_filters.CharFilter(name='event', lookup_expr='slug')
|
||||
event = django_filters.CharFilter(field_name='event', lookup_expr='slug')
|
||||
|
||||
class Meta:
|
||||
model = BankImportJob
|
||||
@@ -58,7 +58,7 @@ class BankImportJobViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
|
||||
serializer_class = BankImportJobSerializer
|
||||
queryset = BankImportJob.objects.none()
|
||||
filter_backends = (DjangoFilterBackend,)
|
||||
filter_class = JobFilter
|
||||
filterset_class = JobFilter
|
||||
permission = 'can_view_orders'
|
||||
|
||||
def get_queryset(self):
|
||||
|
||||
@@ -16,8 +16,8 @@ class BankImportJob(models.Model):
|
||||
(STATE_COMPLETED, 'completed'),
|
||||
)
|
||||
|
||||
event = models.ForeignKey('pretixbase.Event', null=True)
|
||||
organizer = models.ForeignKey('pretixbase.Organizer', null=True)
|
||||
event = models.ForeignKey('pretixbase.Event', null=True, on_delete=models.CASCADE)
|
||||
organizer = models.ForeignKey('pretixbase.Organizer', null=True, on_delete=models.CASCADE)
|
||||
created = models.DateTimeField(auto_now_add=True)
|
||||
state = models.CharField(max_length=32, choices=STATES, default=STATE_PENDING)
|
||||
|
||||
@@ -48,9 +48,9 @@ class BankTransaction(models.Model):
|
||||
(STATE_DISCARDED, 'manually discarded'),
|
||||
)
|
||||
|
||||
event = models.ForeignKey('pretixbase.Event', null=True)
|
||||
organizer = models.ForeignKey('pretixbase.Organizer', null=True)
|
||||
import_job = models.ForeignKey('BankImportJob', related_name='transactions')
|
||||
event = models.ForeignKey('pretixbase.Event', null=True, on_delete=models.CASCADE)
|
||||
organizer = models.ForeignKey('pretixbase.Organizer', null=True, on_delete=models.CASCADE)
|
||||
import_job = models.ForeignKey('BankImportJob', related_name='transactions', on_delete=models.CASCADE)
|
||||
state = models.CharField(max_length=32, choices=STATES, default=STATE_UNCHECKED)
|
||||
message = models.TextField()
|
||||
checksum = models.CharField(max_length=190, db_index=True)
|
||||
@@ -58,7 +58,7 @@ class BankTransaction(models.Model):
|
||||
reference = models.TextField(blank=True)
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
date = models.CharField(max_length=50)
|
||||
order = models.ForeignKey('pretixbase.Order', null=True, blank=True)
|
||||
order = models.ForeignKey('pretixbase.Order', null=True, blank=True, on_delete=models.CASCADE)
|
||||
comment = models.TextField(blank=True)
|
||||
|
||||
def calculate_checksum(self):
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from django.core.urlresolvers import resolve, reverse
|
||||
from django.dispatch import receiver
|
||||
from django.template.loader import get_template
|
||||
from django.urls import resolve, reverse
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from pretix.base.signals import register_payment_providers
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% load staticfiles %}
|
||||
{% load static %}
|
||||
{% load compress %}
|
||||
|
||||
{% compress css %}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends basetpl %}
|
||||
{% load i18n %}
|
||||
{% load staticfiles %}
|
||||
{% load static %}
|
||||
{% block inner %}
|
||||
<h2>{% trans "Import result" %}</h2>
|
||||
{% if job.state == "running" or job.state == "pending" %}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% load i18n %}
|
||||
{% load rich_text %}
|
||||
{% load money %}
|
||||
{% load staticfiles %}
|
||||
{% load static %}
|
||||
<div class="table-responsive">
|
||||
{% csrf_token %}
|
||||
<table class="table table-condensed transaction-list" data-url="{% if request.event %}{% url "plugins:banktransfer:import.action" event=request.event.slug organizer=request.organizer.slug %}{% else %}{% url "plugins:banktransfer:import.action" organizer=request.organizer.slug %}{% endif %}">
|
||||
|
||||
@@ -4,11 +4,11 @@ import logging
|
||||
from datetime import timedelta
|
||||
|
||||
from django.contrib import messages
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.db.models import Count, Q
|
||||
from django.db.models.functions import Concat
|
||||
from django.http import JsonResponse
|
||||
from django.shortcuts import get_object_or_404, redirect, render
|
||||
from django.urls import reverse
|
||||
from django.utils.functional import cached_property
|
||||
from django.utils.timezone import now
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
Reference in New Issue
Block a user