From 4e188bbfbf56c147f8ee77c4312d1ac76150f2eb Mon Sep 17 00:00:00 2001 From: Stepan Krapivin Date: Tue, 7 Nov 2017 17:15:11 +0500 Subject: [PATCH] add store merged migrations from production --- store/migrations/0045_auto_20151223_1646.py | 19 ++++++++++++++++ store/migrations/0046_merge.py | 15 +++++++++++++ store/migrations/0047_merge.py | 15 +++++++++++++ store/migrations/0048_merge.py | 15 +++++++++++++ store/migrations/0049_merge.py | 15 +++++++++++++ store/migrations/0050_merge.py | 16 +++++++++++++ store/migrations/0051_merge.py | 16 +++++++++++++ store/migrations/0052_merge.py | 16 +++++++++++++ store/migrations/0054_merge.py | 16 +++++++++++++ store/migrations/0055_merge.py | 16 +++++++++++++ store/migrations/0058_merge.py | 16 +++++++++++++ store/migrations/0060_merge.py | 16 +++++++++++++ store/migrations/0061_auto_20170603_0227.py | 25 +++++++++++++++++++++ store/migrations/0062_merge.py | 16 +++++++++++++ store/migrations/0063_merge.py | 16 +++++++++++++ 15 files changed, 248 insertions(+) create mode 100644 store/migrations/0045_auto_20151223_1646.py create mode 100644 store/migrations/0046_merge.py create mode 100644 store/migrations/0047_merge.py create mode 100644 store/migrations/0048_merge.py create mode 100644 store/migrations/0049_merge.py create mode 100644 store/migrations/0050_merge.py create mode 100644 store/migrations/0051_merge.py create mode 100644 store/migrations/0052_merge.py create mode 100644 store/migrations/0054_merge.py create mode 100644 store/migrations/0055_merge.py create mode 100644 store/migrations/0058_merge.py create mode 100644 store/migrations/0060_merge.py create mode 100644 store/migrations/0061_auto_20170603_0227.py create mode 100644 store/migrations/0062_merge.py create mode 100644 store/migrations/0063_merge.py diff --git a/store/migrations/0045_auto_20151223_1646.py b/store/migrations/0045_auto_20151223_1646.py new file mode 100644 index 0000000..b83098b --- /dev/null +++ b/store/migrations/0045_auto_20151223_1646.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0044_auto_20151223_1612'), + ] + + operations = [ + migrations.AlterField( + model_name='orderdata', + name='deliv_type', + field=models.CharField(max_length=2, blank=True, verbose_name='Способ Алемтат', choices=[('E', 'Экспресс-отправления по РК'), ('T', 'Не срочные отправления по РК')], null=True, default=''), + ), + ] diff --git a/store/migrations/0046_merge.py b/store/migrations/0046_merge.py new file mode 100644 index 0000000..c05de18 --- /dev/null +++ b/store/migrations/0046_merge.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0045_auto_20160107_1403'), + ('store', '0045_auto_20151223_1646'), + ] + + operations = [ + ] diff --git a/store/migrations/0047_merge.py b/store/migrations/0047_merge.py new file mode 100644 index 0000000..d4092b5 --- /dev/null +++ b/store/migrations/0047_merge.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0046_merge'), + ('store', '0046_auto_20160202_1121'), + ] + + operations = [ + ] diff --git a/store/migrations/0048_merge.py b/store/migrations/0048_merge.py new file mode 100644 index 0000000..e21af96 --- /dev/null +++ b/store/migrations/0048_merge.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0047_merge'), + ('store', '0047_auto_20160229_1409'), + ] + + operations = [ + ] diff --git a/store/migrations/0049_merge.py b/store/migrations/0049_merge.py new file mode 100644 index 0000000..1210d57 --- /dev/null +++ b/store/migrations/0049_merge.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0048_auto_20160302_0839'), + ('store', '0048_merge'), + ] + + operations = [ + ] diff --git a/store/migrations/0050_merge.py b/store/migrations/0050_merge.py new file mode 100644 index 0000000..322b0df --- /dev/null +++ b/store/migrations/0050_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2016-03-07 20:44 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0049_merge'), + ('store', '0049_auto_20160307_2043'), + ] + + operations = [ + ] diff --git a/store/migrations/0051_merge.py b/store/migrations/0051_merge.py new file mode 100644 index 0000000..4289174 --- /dev/null +++ b/store/migrations/0051_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2016-03-12 16:33 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0050_merge'), + ('store', '0050_auto_20160312_1628'), + ] + + operations = [ + ] diff --git a/store/migrations/0052_merge.py b/store/migrations/0052_merge.py new file mode 100644 index 0000000..c860f87 --- /dev/null +++ b/store/migrations/0052_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2016-03-14 11:41 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0051_cartmodel'), + ('store', '0051_merge'), + ] + + operations = [ + ] diff --git a/store/migrations/0054_merge.py b/store/migrations/0054_merge.py new file mode 100644 index 0000000..788d79d --- /dev/null +++ b/store/migrations/0054_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2016-04-04 10:33 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0053_productvariation_delivery_date'), + ('store', '0052_merge'), + ] + + operations = [ + ] diff --git a/store/migrations/0055_merge.py b/store/migrations/0055_merge.py new file mode 100644 index 0000000..5b21886 --- /dev/null +++ b/store/migrations/0055_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2016-07-15 19:20 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0054_merge'), + ('store', '0054_auto_20160715_1811'), + ] + + operations = [ + ] diff --git a/store/migrations/0058_merge.py b/store/migrations/0058_merge.py new file mode 100644 index 0000000..f8cc25c --- /dev/null +++ b/store/migrations/0058_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-03-07 15:49 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0057_auto_20170306_1933'), + ('store', '0055_merge'), + ] + + operations = [ + ] diff --git a/store/migrations/0060_merge.py b/store/migrations/0060_merge.py new file mode 100644 index 0000000..1a04b95 --- /dev/null +++ b/store/migrations/0060_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-05-07 02:57 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0059_auto_20170506_1116'), + ('store', '0058_merge'), + ] + + operations = [ + ] diff --git a/store/migrations/0061_auto_20170603_0227.py b/store/migrations/0061_auto_20170603_0227.py new file mode 100644 index 0000000..0f26d9a --- /dev/null +++ b/store/migrations/0061_auto_20170603_0227.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-06-03 02:27 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0060_merge'), + ] + + operations = [ + migrations.AlterField( + model_name='orderdata', + name='city', + field=models.CharField(blank=True, max_length=20, null=True, verbose_name='Город Алемтат'), + ), + migrations.AlterField( + model_name='orderdata', + name='deliv_type', + field=models.CharField(blank=True, default='', max_length=2, null=True, verbose_name='Способ Алемтат'), + ), + ] diff --git a/store/migrations/0062_merge.py b/store/migrations/0062_merge.py new file mode 100644 index 0000000..5fb6369 --- /dev/null +++ b/store/migrations/0062_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-06-03 02:28 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0061_auto_20170603_0220'), + ('store', '0061_auto_20170603_0227'), + ] + + operations = [ + ] diff --git a/store/migrations/0063_merge.py b/store/migrations/0063_merge.py new file mode 100644 index 0000000..e19ca49 --- /dev/null +++ b/store/migrations/0063_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-11-07 18:10 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('store', '0062_productvariation_has_discount'), + ('store', '0062_merge'), + ] + + operations = [ + ]