pull/13/head
JamesRamm 2017-02-06 09:50:01 +00:00
rodzic ac07c0d049
commit ea533a3462
9 zmienionych plików z 23 dodań i 137 usunięć

Wyświetl plik

@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-14 14:11
# Generated by Django 1.10.4 on 2017-02-06 09:49
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
@ -10,6 +11,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('products', '0001_initial'),
]
operations = [
@ -20,6 +22,7 @@ class Migration(migrations.Migration):
('basket_id', models.CharField(max_length=32)),
('date_added', models.DateTimeField(auto_now_add=True)),
('quantity', models.IntegerField(default=1)),
('variant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.ProductVariant')),
],
options={
'ordering': ['date_added'],

Wyświetl plik

@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-14 14:11
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
('products', '0001_initial'),
('basket', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='basketitem',
name='product',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.ProductVariant'),
),
]

Wyświetl plik

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2017-01-06 09:38
# Generated by Django 1.10.4 on 2017-02-06 09:49
from __future__ import unicode_literals
from django.db import migrations, models
@ -17,6 +17,7 @@ class Migration(migrations.Migration):
name='ShippingCountry',
fields=[
('country_code', models.CharField(max_length=3, primary_key=True, serialize=False)),
('country_name', models.CharField(max_length=32)),
('standard_rate', models.DecimalField(decimal_places=2, max_digits=12)),
('standard_rate_carrier', models.CharField(default='Royal Mail', max_length=64)),
('standard_rate_description', models.CharField(default='Royal Mail standard shipping', max_length=128)),

Wyświetl plik

@ -1,21 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2017-01-16 08:24
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('checkout', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='shippingcountry',
name='country_name',
field=models.CharField(default='United Kingdom', max_length=32),
preserve_default=False,
),
]

Wyświetl plik

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2017-01-07 15:33
# Generated by Django 1.10.4 on 2017-02-06 09:49
from __future__ import unicode_literals
from django.db import migrations, models
@ -31,11 +31,11 @@ class Migration(migrations.Migration):
name='Order',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('payment_date', models.DateTimeField()),
('payment_date', models.DateTimeField(auto_now_add=True)),
('status', models.IntegerField(choices=[(1, 'Submitted'), (2, 'Fulfilled'), (3, 'Cancelled')], default=1)),
('status_note', models.CharField(max_length=128)),
('email', models.EmailField(max_length=128)),
('ip_address', models.GenericIPAddressField()),
('status_note', models.CharField(blank=True, max_length=128, null=True)),
('email', models.EmailField(blank=True, max_length=128, null=True)),
('ip_address', models.GenericIPAddressField(blank=True, null=True)),
('billing_address', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='orders_billing_address', to='orders.Address')),
('shipping_address', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orders_shipping_address', to='orders.Address')),
],
@ -45,8 +45,8 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('quantity', models.IntegerField(default=1)),
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orders.Order')),
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.ProductVariant')),
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='orders.Order')),
('product', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='products.ProductVariant')),
],
),
]

Wyświetl plik

@ -1,26 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2017-01-07 16:16
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('orders', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='orderitem',
name='order',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='orders.Order'),
),
migrations.AlterField(
model_name='orderitem',
name='product',
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='products.ProductVariant'),
),
]

Wyświetl plik

@ -1,30 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2017-01-07 16:31
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('orders', '0002_auto_20170107_1616'),
]
operations = [
migrations.AlterField(
model_name='order',
name='ip_address',
field=models.GenericIPAddressField(blank=True, null=True),
),
migrations.AlterField(
model_name='order',
name='payment_date',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name='order',
name='status_note',
field=models.CharField(blank=True, max_length=128, null=True),
),
]

Wyświetl plik

@ -1,20 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2017-01-07 16:32
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('orders', '0003_auto_20170107_1631'),
]
operations = [
migrations.AlterField(
model_name='order',
name='email',
field=models.EmailField(blank=True, max_length=128, null=True),
),
]

Wyświetl plik

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-14 14:11
# Generated by Django 1.10.4 on 2017-02-06 09:49
from __future__ import unicode_literals
from django.db import migrations, models
@ -15,9 +15,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('taggit', '0002_auto_20150616_2121'),
('wagtailcore', '0030_index_on_pagerevision_created_at'),
('wagtailimages', '0015_fill_filter_spec_field'),
('taggit', '0002_auto_20150616_2121'),
]
operations = [
@ -39,7 +39,7 @@ class Migration(migrations.Migration):
('sort_order', models.IntegerField(blank=True, editable=False, null=True)),
('caption', models.CharField(blank=True, max_length=255)),
('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailimages.Image')),
('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='products.Product')),
('product', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='products.Product')),
],
options={
'ordering': ['sort_order'],
@ -71,13 +71,16 @@ class Migration(migrations.Migration):
name='ProductVariant',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('ref', models.CharField(max_length=32)),
('description', wagtail.wagtailcore.fields.RichTextField()),
('price', models.DecimalField(decimal_places=2, max_digits=12)),
('ref', models.CharField(max_length=32)),
('slug', django_extensions.db.fields.AutoSlugField(blank=True, editable=False, populate_from=('product', 'ref'), separator='')),
('description', wagtail.wagtailcore.fields.RichTextField()),
('stock', models.IntegerField(default=0)),
('slug', django_extensions.db.fields.AutoSlugField(blank=True, editable=False, populate_from=('page', 'ref'), separator='')),
('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='variants', to='products.Product')),
('product', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='variants', to='products.Product')),
],
options={
'abstract': False,
},
),
migrations.AddField(
model_name='product',