Moved Checkin model to pretixbase

This commit is contained in:
Raphael Michel
2016-12-08 17:51:23 +01:00
parent 3c96e631da
commit fa0bd5e89e
5 changed files with 57 additions and 2 deletions
@@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-08 16:47
from __future__ import unicode_literals
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('pretixbase', '0048_auto_20161129_1330'),
('pretixdroid', '0002_auto_20161208_1644'),
]
state_operations = [
migrations.CreateModel(
name='Checkin',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('datetime', models.DateTimeField(auto_now_add=True)),
('position', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pretixdroid_checkins', to='pretixbase.OrderPosition')),
],
),
]
operations = [
migrations.SeparateDatabaseAndState(state_operations=state_operations)
]
+1
View File
@@ -1,5 +1,6 @@
from .auth import U2FDevice, User from .auth import U2FDevice, User
from .base import CachedFile, LoggedModel, cachedfile_name from .base import CachedFile, LoggedModel, cachedfile_name
from .checkin import Checkin
from .event import Event, EventLock, EventPermission, EventSetting from .event import Event, EventLock, EventPermission, EventSetting
from .invoices import Invoice, InvoiceLine, invoice_filename from .invoices import Invoice, InvoiceLine, invoice_filename
from .items import ( from .items import (
@@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-08 16:44
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('pretixdroid', '0001_initial'),
]
database_operations = [
migrations.AlterModelTable('Checkin', 'pretixbase_checkin')
]
state_operations = [
migrations.DeleteModel('Checkin')
]
operations = [
migrations.SeparateDatabaseAndState(
database_operations=database_operations,
state_operations=state_operations)
]
+1 -2
View File
@@ -12,10 +12,9 @@ from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from django.views.generic import TemplateView, View from django.views.generic import TemplateView, View
from pretix.base.models import Event, Order, OrderPosition from pretix.base.models import Checkin, Event, Order, OrderPosition
from pretix.control.permissions import EventPermissionRequiredMixin from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.helpers.urls import build_absolute_uri from pretix.helpers.urls import build_absolute_uri
from pretix.plugins.pretixdroid.models import Checkin
logger = logging.getLogger('pretix.plugins.pretixdroid') logger = logging.getLogger('pretix.plugins.pretixdroid')
API_VERSION = 2 API_VERSION = 2