Merge pull request #6 from elgezirn/NourElgeziry

Nour elgeziry

EDMS/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/Users/nourelgeziry/.local/share/virtualenvs/Equal_Distribution_maintainance-M-bcKwQz/bin/python"
+}

EDMS/EDMS/__init__.py

@@ -0,0 +1,3 @@
+# This will make sure the app is always imported when
+
+__all__ = ('celery_app',)

EDMS/EDMS/settings.py

@@ -37,6 +37,8 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+
+
     'shoppingCart',
 
 ]
@@ -83,6 +85,9 @@ DATABASES = {
 }
 
 
+
+
+
 # Password validation
 # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
 
@@ -128,4 +133,5 @@ STATICFILES_DIRS = [
 
 ]
 
-MEDIA_ROOT =    BASE_DIR / 'static/images'
+MEDIA_ROOT =    BASE_DIR / 'static/images'
+

EDMS/shoppingCart/migrations/0004_auto_20201016_1152.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.2 on 2020-10-16 11:52
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0003_auto_20201012_1250'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='orderitem',
+            name='date_created',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='orderitem',
+            name='expired',
+            field=models.BooleanField(default=False),
+        ),
+    ]

EDMS/shoppingCart/migrations/0005_test.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.1.2 on 2020-10-16 14:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0004_auto_20201016_1152'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Test',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=4)),
+            ],
+        ),
+    ]

EDMS/shoppingCart/migrations/0006_auto_20201018_1229.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.1.2 on 2020-10-18 12:29
+
+import datetime
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0005_test'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='order',
+            name='date_created',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 12, 30, 18, 872950)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0007_auto_20201018_1316.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.1.2 on 2020-10-18 13:16
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0006_auto_20201018_1229'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='orderitem',
+            name='expired',
+        ),
+        migrations.AddField(
+            model_name='order',
+            name='expired',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 13, 17, 6, 8469)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0008_auto_20201018_1342.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.1.2 on 2020-10-18 13:42
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0007_auto_20201018_1316'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='orderitem',
+            name='expired',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='date_created',
+            field=models.DateTimeField(verbose_name=datetime.datetime(2020, 10, 18, 13, 42, 9, 885618)),
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 13, 43, 9, 885636)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0009_auto_20201018_1354.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.2 on 2020-10-18 13:54
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0008_auto_20201018_1342'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='order',
+            name='date_created',
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 13, 55, 33, 184566)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0010_auto_20201018_1401.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0009_auto_20201018_1354'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='order',
+            name='complete',
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateField(),
+        ),
+    ]

EDMS/shoppingCart/migrations/0011_order_complete.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0010_auto_20201018_1401'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='order',
+            name='complete',
+            field=models.BooleanField(default=False),
+        ),
+    ]

EDMS/shoppingCart/migrations/0012_auto_20201018_1430.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:30
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0011_order_complete'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(verbose_name=datetime.date(2020, 10, 25)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0013_auto_20201018_1439.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:39
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0012_auto_20201018_1430'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(null=True, verbose_name=datetime.date(2020, 10, 25)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0014_auto_20201018_1443.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:43
+
+import datetime
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0013_auto_20201018_1439'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name=datetime.date(2020, 10, 25)),
+            preserve_default=False,
+        ),
+    ]

EDMS/shoppingCart/migrations/0015_auto_20201018_1448.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:48
+
+import datetime
+from django.db import migrations, models
+import django.utils.timezone
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0014_auto_20201018_1443'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='order',
+            name='date_created',
+            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name=datetime.datetime(2020, 10, 18, 14, 47, 51, 354484, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(verbose_name=datetime.datetime(2020, 10, 25, 14, 47, 51, 354511, tzinfo=utc)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0016_auto_20201018_1456.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0015_auto_20201018_1448'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='orderitem',
+            name='order',
+        ),
+        migrations.RemoveField(
+            model_name='orderitem',
+            name='product',
+        ),
+        migrations.DeleteModel(
+            name='Order',
+        ),
+        migrations.DeleteModel(
+            name='OrderItem',
+        ),
+    ]

EDMS/shoppingCart/migrations/0017_order_orderitem.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.1.2 on 2020-10-18 14:57
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0016_auto_20201018_1456'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Order',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date_created', models.DateTimeField(verbose_name=datetime.datetime(2020, 10, 18, 14, 57, 32, 274339, tzinfo=utc))),
+                ('expiry_date', models.DateTimeField(verbose_name=datetime.datetime(2020, 10, 25, 14, 57, 32, 274372, tzinfo=utc))),
+                ('expired', models.BooleanField(default=False)),
+                ('complete', models.BooleanField(default=False)),
+                ('customer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='shoppingCart.customer')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='OrderItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('quantity', models.IntegerField(blank=True, default=0, null=True)),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+                ('expired', models.BooleanField(default=False)),
+                ('order', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='shoppingCart.order')),
+                ('product', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='shoppingCart.product')),
+            ],
+        ),
+    ]