Changing to mysql finished. Added new Model Information to warppay

www/web/warpapi/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-10-12 00:34
+# Generated by Django 1.9 on 2017-03-14 22:06
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -18,7 +18,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('key', models.CharField(max_length=100)),
-                ('value', models.CharField(max_length=250)),
+                ('value', models.CharField(blank=True, max_length=250, null=True)),
+                ('category', models.CharField(blank=True, max_length=100, null=True)),
             ],
         ),
     ]

www/web/warpapi/migrations/0002_information_category.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-10-12 00:39
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warpapi', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='information',
-            name='category',
-            field=models.CharField(default='', max_length=100),
-            preserve_default=False,
-        ),
-    ]

www/web/warpapi/migrations/0003_auto_20161012_0058.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-10-12 00:58
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warpapi', '0002_information_category'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='information',
-            name='category',
-            field=models.CharField(max_length=100, null=True),
-        ),
-    ]

www/web/warpapi/migrations/0004_auto_20161012_0058.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-10-12 00:58
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warpapi', '0003_auto_20161012_0058'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='information',
-            name='value',
-            field=models.CharField(max_length=250, null=True),
-        ),
-    ]

www/web/warpapi/migrations/0005_auto_20161012_0059.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2016-10-12 00:59
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warpapi', '0004_auto_20161012_0058'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='information',
-            name='category',
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-        migrations.AlterField(
-            model_name='information',
-            name='value',
-            field=models.CharField(blank=True, max_length=250, null=True),
-        ),
-    ]

www/web/warpauth/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-03-14 21:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import ldapdb.models.fields
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ActivationToken',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user', models.CharField(max_length=100)),
+                ('email', models.CharField(max_length=100)),
+                ('token', models.CharField(max_length=100)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='LdapGroup',
+            fields=[
+                ('dn', models.CharField(max_length=200, primary_key=True, serialize=False)),
+                ('gid', ldapdb.models.fields.IntegerField(db_column='gidNumber', unique=True)),
+                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, primary_key=True, serialize=False)),
+                ('members', ldapdb.models.fields.ListField(db_column='uniqueMember')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='LdapUser',
+            fields=[
+                ('dn', models.CharField(max_length=200, primary_key=True, serialize=False)),
+                ('uid', ldapdb.models.fields.CharField(db_column='uid', max_length=200, primary_key=True, serialize=False, unique=True)),
+                ('first_name', ldapdb.models.fields.CharField(db_column='givenName', max_length=200)),
+                ('last_name', ldapdb.models.fields.CharField(db_column='sn', max_length=200)),
+                ('email', ldapdb.models.fields.CharField(db_column='mail', max_length=200)),
+                ('cn', ldapdb.models.fields.CharField(db_column='cn', max_length=200)),
+                ('card_id', ldapdb.models.fields.CharField(db_column='employeeNumber', max_length=200)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='PasswordResetToken',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user', models.CharField(max_length=100)),
+                ('email', models.CharField(max_length=100)),
+                ('hash', models.CharField(max_length=100)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+    ]

www/web/warpfood/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-03-14 21:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='FoodCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=250)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='FoodOrder',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user', models.CharField(max_length=100, null=True)),
+                ('article', models.CharField(max_length=100, null=True)),
+                ('size', models.CharField(max_length=100, null=True)),
+                ('comment', models.CharField(max_length=100, null=True)),
+                ('price', models.FloatField()),
+                ('paid', models.BooleanField(default=False)),
+                ('product_id', models.IntegerField(default=0)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='FoodProduct',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=250)),
+                ('size', models.CharField(max_length=100, null=True)),
+                ('price', models.FloatField()),
+                ('last_edited', models.DateTimeField(auto_now=True)),
+                ('food_category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='warpfood.FoodCategory')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='FoodService',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=250)),
+                ('homepage', models.CharField(max_length=250)),
+                ('phone', models.CharField(max_length=250)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='FoodSheet',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateTimeField(default=django.utils.timezone.now)),
+                ('estimated_order_time', models.DateTimeField()),
+                ('closed', models.BooleanField(default=False)),
+                ('order_user', models.CharField(max_length=100, null=True)),
+                ('order_time', models.DateTimeField(null=True)),
+                ('food_service', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='warpfood.FoodService')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='foodproduct',
+            name='food_service',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='warpfood.FoodService'),
+        ),
+        migrations.AddField(
+            model_name='foodorder',
+            name='sheet',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='warpfood.FoodSheet'),
+        ),
+    ]

www/web/warpmain/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-03-14 21:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='News',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user', models.CharField(max_length=100, null=True)),
+                ('title', models.CharField(max_length=100)),
+                ('message', models.TextField()),
+                ('created', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+    ]

www/web/warppay/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-14 17:27
+# Generated by Django 1.9 on 2017-03-14 21:49
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('uid', models.CharField(max_length=100, unique=True)),
-                ('card_id', models.CharField(max_length=10, null=True, unique=True)),
+                ('card_id', models.CharField(max_length=10, null=True)),
                 ('credit', models.FloatField()),
             ],
         ),

www/web/warppay/migrations/0002_auto_20170314_1732.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-14 17:32
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warppay', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='usercredit',
-            name='card_id',
-            field=models.CharField(default='', max_length=10, unique=True),
-            preserve_default=False,
-        ),
-    ]

www/web/warppay/migrations/0002_auto_20170314_2208.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-03-14 22:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('warppay', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Transaction',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateTimeField(auto_now_add=True)),
+                ('price_ek', models.FloatField()),
+                ('price_vk', models.FloatField()),
+                ('cash_paid', models.BooleanField(default=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TransactionLog',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('uid', models.CharField(max_length=100)),
+                ('transaction', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='warppay.Transaction')),
+            ],
+        ),
+        migrations.RenameField(
+            model_name='product',
+            old_name='price',
+            new_name='price_ek',
+        ),
+        migrations.RenameField(
+            model_name='product',
+            old_name='count',
+            new_name='stock_count',
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='barcode',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='price_vk',
+            field=models.FloatField(default=0.0),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='transaction',
+            name='product',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='warppay.Product'),
+        ),
+    ]

www/web/warppay/migrations/0003_auto_20170314_1738.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-14 17:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warppay', '0002_auto_20170314_1732'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='usercredit',
-            name='card_id',
-            field=models.CharField(max_length=10, null=True, unique=True),
-        ),
-    ]

www/web/warppay/migrations/0004_auto_20170314_1739.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-14 17:39
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warppay', '0003_auto_20170314_1738'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='usercredit',
-            name='card_id',
-            field=models.CharField(default='None', max_length=10, null=True, unique=True),
-        ),
-    ]

www/web/warppay/migrations/0005_auto_20170314_1741.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-14 17:41
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warppay', '0004_auto_20170314_1739'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='usercredit',
-            name='card_id',
-            field=models.CharField(max_length=10, null=True, unique=True),
-        ),
-    ]

www/web/warppay/migrations/0006_auto_20170314_1748.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2017-03-14 17:48
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('warppay', '0005_auto_20170314_1741'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='usercredit',
-            name='card_id',
-            field=models.CharField(max_length=10, null=True),
-        ),
-    ]

www/web/warppay/models.py

@@ -11,9 +11,11 @@ class ProductCategory(models.Model):
         
 class Product(models.Model):
     name = models.CharField(max_length=100, null=True)
-    price = models.FloatField()
+    price_ek = models.FloatField()
+    price_vk = models.FloatField()
     category = models.ForeignKey(ProductCategory, on_delete=models.CASCADE, null=True)
-    count = models.IntegerField()
+    stock_count = models.IntegerField()
+    barcode = models.CharField(max_length=100, null=True)
 
     def __str__(self):
         return self.name
@@ -24,7 +26,17 @@ class ProductSerializer(serializers.ModelSerializer):
         model = Product
         fields = ['id', 'name', 'price', 'category', 'count']
 
-        
+class Transaction(models.Model):
+    date  = models.DateTimeField(auto_now_add=True)
+    product = models.ForeignKey(Product, on_delete=models.CASCADE, null=True)
+    price_ek = models.FloatField()
+    price_vk = models.FloatField()
+    cash_paid = models.BooleanField(default=False)
+
+class TransactionLog(models.Model):
+    uid = models.CharField(max_length=100)
+    transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE, null=True)
+
 class UserCredit(models.Model):
     uid = models.CharField(max_length=100,unique=True)
     card_id = models.CharField(max_length=10, null=True) # Unique only with django 1.11
@@ -32,6 +44,7 @@ class UserCredit(models.Model):
     def __str__(self):
         return self.uid
 
+
 class UserCreditSerializer(serializers.ModelSerializer):
     class Meta:
         model = UserCredit