From ba286d96cb33bf238deff59881d5ebd24e702413 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 17 Oct 2019 13:51:52 +0200 Subject: [PATCH] Rebase and manually squash migrations --- .../migrations/0135_auto_20190910_2020.py | 48 -------- .../migrations/0136_auto_20190918_1537.py | 29 ----- .../migrations/0137_auto_20190918_1820.py | 26 ----- .../migrations/0138_auto_20190918_1910.py | 20 ---- .../migrations/0138_auto_20191017_1151.py | 106 ++++++++++++++++++ 5 files changed, 106 insertions(+), 123 deletions(-) delete mode 100644 src/pretix/base/migrations/0135_auto_20190910_2020.py delete mode 100644 src/pretix/base/migrations/0136_auto_20190918_1537.py delete mode 100644 src/pretix/base/migrations/0137_auto_20190918_1820.py delete mode 100644 src/pretix/base/migrations/0138_auto_20190918_1910.py create mode 100644 src/pretix/base/migrations/0138_auto_20191017_1151.py diff --git a/src/pretix/base/migrations/0135_auto_20190910_2020.py b/src/pretix/base/migrations/0135_auto_20190910_2020.py deleted file mode 100644 index ec4803180..000000000 --- a/src/pretix/base/migrations/0135_auto_20190910_2020.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 2.2.1 on 2019-09-10 20:20 - -import django.db.models.deletion -from django.db import migrations, models - -import pretix.base.models.fields -import pretix.base.models.giftcards - - -class Migration(migrations.Migration): - - dependencies = [ - ('pretixbase', '0134_auto_20190909_1042'), - ] - - operations = [ - migrations.CreateModel( - name='GiftCard', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), - ('issuance', models.DateTimeField(auto_now_add=True)), - ('secret', models.CharField(db_index=True, default=pretix.base.models.giftcards.gen_giftcard_secret, max_length=190, unique=True)), - ('currency', models.CharField(max_length=10)), - ('issued_in', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='issued_gift_cards', to='pretixbase.OrderPosition', null=True, blank=True)), - ('issuer', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='issued_gift_cards', to='pretixbase.Organizer')), - ], - ), - migrations.CreateModel( - name='GiftCardTransaction', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), - ('datetime', models.DateTimeField(auto_now_add=True)), - ('value', models.DecimalField(decimal_places=2, max_digits=10)), - ('card', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='transactions', to='pretixbase.GiftCard')), - ('order', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='gift_card_transactions', to='pretixbase.Order')), - ('payment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='gift_card_transactions', to='pretixbase.OrderPayment')), - ('refund', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='gift_card_transactions', to='pretixbase.OrderRefund')), - ], - ), - migrations.CreateModel( - name='GiftCardAcceptance', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), - ('collector', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gift_card_issuer_acceptance', to='pretixbase.Organizer')), - ('issuer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gift_card_collector_acceptance', to='pretixbase.Organizer')), - ], - ), - ] diff --git a/src/pretix/base/migrations/0136_auto_20190918_1537.py b/src/pretix/base/migrations/0136_auto_20190918_1537.py deleted file mode 100644 index fe5602602..000000000 --- a/src/pretix/base/migrations/0136_auto_20190918_1537.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2.1 on 2019-09-18 15:37 - -import django.db.models.deletion -from django.db import migrations, models - -import pretix.base.models.fields - - -def fwd(app, schema_editor): - Team = app.get_model('pretixbase', 'Team') - Team.objects.filter(can_change_organizer_settings=True).update(can_manage_gift_cards=True) - - -class Migration(migrations.Migration): - - dependencies = [ - ('pretixbase', '0135_auto_20190910_2020'), - ] - - operations = [ - migrations.AddField( - model_name='team', - name='can_manage_gift_cards', - field=models.BooleanField(default=False), - ), - migrations.RunPython( - fwd, migrations.RunPython.noop - ), - ] diff --git a/src/pretix/base/migrations/0137_auto_20190918_1820.py b/src/pretix/base/migrations/0137_auto_20190918_1820.py deleted file mode 100644 index 56e5f6608..000000000 --- a/src/pretix/base/migrations/0137_auto_20190918_1820.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.1 on 2019-09-18 18:20 - -import django.db.models.deletion -from django.db import migrations, models - -import pretix.base.models.fields -import pretix.base.models.giftcards - - -class Migration(migrations.Migration): - - dependencies = [ - ('pretixbase', '0136_auto_20190918_1537'), - ] - - operations = [ - migrations.AlterField( - model_name='giftcard', - name='secret', - field=models.CharField(db_index=True, default=pretix.base.models.giftcards.gen_giftcard_secret, max_length=190), - ), - migrations.AlterUniqueTogether( - name='giftcard', - unique_together={('secret', 'issuer')}, - ), - ] diff --git a/src/pretix/base/migrations/0138_auto_20190918_1910.py b/src/pretix/base/migrations/0138_auto_20190918_1910.py deleted file mode 100644 index d25ead671..000000000 --- a/src/pretix/base/migrations/0138_auto_20190918_1910.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2.1 on 2019-09-18 19:10 - -from django.db import migrations, models -import django.db.models.deletion -import pretix.base.models.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('pretixbase', '0137_auto_20190918_1820'), - ] - - operations = [ - migrations.AddField( - model_name='item', - name='issue_giftcard', - field=models.BooleanField(default=False), - ), - ] diff --git a/src/pretix/base/migrations/0138_auto_20191017_1151.py b/src/pretix/base/migrations/0138_auto_20191017_1151.py new file mode 100644 index 000000000..dfc79d512 --- /dev/null +++ b/src/pretix/base/migrations/0138_auto_20191017_1151.py @@ -0,0 +1,106 @@ +# Generated by Django 2.2.4 on 2019-10-17 11:51 + +import django.db.models.deletion +from django.db import migrations, models + +import pretix.base.models.base +import pretix.base.models.fields +import pretix.base.models.giftcards + + +def fwd(app, schema_editor): + Team = app.get_model('pretixbase', 'Team') + Team.objects.filter(can_change_organizer_settings=True).update(can_manage_gift_cards=True) + + +class Migration(migrations.Migration): + dependencies = [ + ('pretixbase', '0137_auto_20191015_1141'), + ] + + operations = [ + migrations.CreateModel( + name='GiftCard', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('issuance', models.DateTimeField(auto_now_add=True)), + ('secret', models.CharField(db_index=True, default=pretix.base.models.giftcards.gen_giftcard_secret, + max_length=190)), + ('currency', models.CharField(max_length=10)), + ('issued_in', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, + related_name='issued_gift_cards', to='pretixbase.OrderPosition')), + ('issuer', + models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='issued_gift_cards', + to='pretixbase.Organizer')), + ], + options={ + 'unique_together': {('secret', 'issuer')}, + }, + bases=(models.Model, pretix.base.models.base.LoggingMixin), + ), + migrations.AddField( + model_name='item', + name='issue_giftcard', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='team', + name='can_manage_gift_cards', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='question', + name='dependency_values', + field=pretix.base.models.fields.MultiStringField(default=[]), + ), + migrations.AlterField( + model_name='voucher', + name='item', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vouchers', + to='pretixbase.Item'), + ), + migrations.AlterField( + model_name='voucher', + name='quota', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vouchers', + to='pretixbase.Quota'), + ), + migrations.AlterField( + model_name='voucher', + name='variation', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vouchers', + to='pretixbase.ItemVariation'), + ), + migrations.CreateModel( + name='GiftCardTransaction', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('datetime', models.DateTimeField(auto_now_add=True)), + ('value', models.DecimalField(decimal_places=2, max_digits=10)), + ('card', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='transactions', + to='pretixbase.GiftCard')), + ('order', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, + related_name='gift_card_transactions', to='pretixbase.Order')), + ('payment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, + related_name='gift_card_transactions', to='pretixbase.OrderPayment')), + ('refund', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, + related_name='gift_card_transactions', to='pretixbase.OrderRefund')), + ], + options={ + 'ordering': ('datetime',), + }, + ), + migrations.CreateModel( + name='GiftCardAcceptance', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('collector', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, + related_name='gift_card_issuer_acceptance', to='pretixbase.Organizer')), + ('issuer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, + related_name='gift_card_collector_acceptance', to='pretixbase.Organizer')), + ], + ), + migrations.RunPython( + fwd, migrations.RunPython.noop + ), + ]