diff --git a/courses/migrations/0002_auto_20171019_1149.py b/courses/migrations/0002_auto_20171019_1149.py new file mode 100644 index 0000000..43fa6c5 --- /dev/null +++ b/courses/migrations/0002_auto_20171019_1149.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-10-19 11:49 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='tutorial', + name='on_comment', + field=models.BooleanField(default=False, verbose_name='Комментарии'), + ), + ] diff --git a/finance/migrations/0002_auto_20171023_1037.py b/finance/migrations/0002_auto_20171023_1037.py new file mode 100644 index 0000000..24b7d80 --- /dev/null +++ b/finance/migrations/0002_auto_20171023_1037.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-10-23 10:37 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0003_auto_20171023_1037'), + ('finance', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Invoice', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('status', models.CharField(choices=[('W', 'Ожидание согласия'), ('P', 'На оплате'), ('F', 'Оплачен'), ('C', 'Отклонен'), ('H', 'Сгорел')], default='W', max_length=1, verbose_name='Статус')), + ('price', models.CharField(blank=True, max_length=255, null=True, verbose_name='Сумма')), + ('real_price', models.CharField(blank=True, help_text='Сумма, минус комиссия', max_length=255, null=True, verbose_name='Полученная сумма')), + ('bill_method', models.CharField(choices=[('C', 'Наличные'), ('H', 'JustClick'), ('A', 'Альфа-Банк'), ('S', 'SimplePay'), ('Y', 'YandexKassa')], default='Y', max_length=2, verbose_name='Способ оплаты')), + ('key', models.CharField(blank=True, default='', editable=False, max_length=255, verbose_name='Ключ платежа')), + ('out_id', models.CharField(blank=True, default='', editable=False, max_length=100, verbose_name='ID внешнего заказа')), + ('comment', models.TextField(blank=True, editable=False, help_text='Будет показано пользователю', verbose_name='Комментарий продавца')), + ], + options={ + 'verbose_name': 'Платёж', + 'verbose_name_plural': 'Платежи', + }, + ), + migrations.RemoveField( + model_name='price', + name='course', + ), + migrations.RemoveField( + model_name='price', + name='vertexes', + ), + migrations.RemoveField( + model_name='bill', + name='bill_method', + ), + migrations.RemoveField( + model_name='bill', + name='inside_data', + ), + migrations.RemoveField( + model_name='bill', + name='key', + ), + migrations.RemoveField( + model_name='bill', + name='out_id', + ), + migrations.RemoveField( + model_name='bill', + name='price', + ), + migrations.RemoveField( + model_name='bill', + name='real_price', + ), + migrations.RemoveField( + model_name='bill', + name='service', + ), + migrations.RemoveField( + model_name='bill', + name='status', + ), + migrations.AddField( + model_name='bill', + name='course', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='courses.Course', verbose_name='Курс'), + ), + migrations.DeleteModel( + name='Price', + ), + migrations.AddField( + model_name='invoice', + name='bill', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='finance.Bill', verbose_name='Связный счёт'), + ), + ] diff --git a/journals/migrations/0002_thread_groups.py b/journals/migrations/0002_thread_groups.py new file mode 100644 index 0000000..052e0ec --- /dev/null +++ b/journals/migrations/0002_thread_groups.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-10-19 11:49 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0008_alter_user_username_max_length'), + ('journals', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='thread', + name='groups', + field=models.ManyToManyField(blank=True, to='auth.Group', verbose_name='Подписчики'), + ), + ] diff --git a/library/migrations/0002_remove_article_all_views.py b/library/migrations/0002_remove_article_all_views.py new file mode 100644 index 0000000..c0272c3 --- /dev/null +++ b/library/migrations/0002_remove_article_all_views.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-10-24 13:52 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='article', + name='all_views', + ), + ]