diff --git a/.DS_Store b/.DS_Store index c10ec4f..dc5052e 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.vscode/settings.json b/.vscode/settings.json index 7a73a41..0d4ca9e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,2 +1,6 @@ { +<<<<<<< HEAD +======= + "python.pythonPath": "C:\\Users\\antre\\.virtualenvs\\Equal-Distribution-maintenance-system-0ZHuoetA\\Scripts\\python.exe" +>>>>>>> 3e64449142817115e09393567b9c787f9ffd8d52 } \ No newline at end of file diff --git a/EDMS/.vscode/settings.json b/EDMS/.vscode/settings.json new file mode 100644 index 0000000..4c1277d --- /dev/null +++ b/EDMS/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "/Users/nourelgeziry/.local/share/virtualenvs/Equal_Distribution_maintainance-M-bcKwQz/bin/python" +} \ No newline at end of file diff --git a/EDMS/EDMS/__init__.py b/EDMS/EDMS/__init__.py index e69de29..6944829 100644 --- a/EDMS/EDMS/__init__.py +++ b/EDMS/EDMS/__init__.py @@ -0,0 +1,3 @@ +# This will make sure the app is always imported when + +__all__ = ('celery_app',) \ No newline at end of file diff --git a/EDMS/EDMS/__pycache__/__init__.cpython-37.pyc b/EDMS/EDMS/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..a757e90 Binary files /dev/null and b/EDMS/EDMS/__pycache__/__init__.cpython-37.pyc differ diff --git a/EDMS/EDMS/__pycache__/__init__.cpython-38.pyc b/EDMS/EDMS/__pycache__/__init__.cpython-38.pyc index 7fd00cc..fcdfea2 100644 Binary files a/EDMS/EDMS/__pycache__/__init__.cpython-38.pyc and b/EDMS/EDMS/__pycache__/__init__.cpython-38.pyc differ diff --git a/EDMS/EDMS/__pycache__/settings.cpython-37.pyc b/EDMS/EDMS/__pycache__/settings.cpython-37.pyc new file mode 100644 index 0000000..c937bcd Binary files /dev/null and b/EDMS/EDMS/__pycache__/settings.cpython-37.pyc differ diff --git a/EDMS/EDMS/__pycache__/settings.cpython-38.pyc b/EDMS/EDMS/__pycache__/settings.cpython-38.pyc index 2c1bb6d..5c3afb7 100644 Binary files a/EDMS/EDMS/__pycache__/settings.cpython-38.pyc and b/EDMS/EDMS/__pycache__/settings.cpython-38.pyc differ diff --git a/EDMS/EDMS/__pycache__/urls.cpython-37.pyc b/EDMS/EDMS/__pycache__/urls.cpython-37.pyc new file mode 100644 index 0000000..1eea261 Binary files /dev/null and b/EDMS/EDMS/__pycache__/urls.cpython-37.pyc differ diff --git a/EDMS/EDMS/__pycache__/wsgi.cpython-37.pyc b/EDMS/EDMS/__pycache__/wsgi.cpython-37.pyc new file mode 100644 index 0000000..f83167b Binary files /dev/null and b/EDMS/EDMS/__pycache__/wsgi.cpython-37.pyc differ diff --git a/EDMS/EDMS/settings.py b/EDMS/EDMS/settings.py index f52dfaa..e3e38f7 100644 --- a/EDMS/EDMS/settings.py +++ b/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' \ No newline at end of file +MEDIA_ROOT = BASE_DIR / 'static/images' + diff --git a/EDMS/db.sqlite3 b/EDMS/db.sqlite3 index 844fc11..eea4153 100644 Binary files a/EDMS/db.sqlite3 and b/EDMS/db.sqlite3 differ diff --git a/EDMS/shoppingCart/__pycache__/__init__.cpython-37.pyc b/EDMS/shoppingCart/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..7fb66bd Binary files /dev/null and b/EDMS/shoppingCart/__pycache__/__init__.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/__pycache__/admin.cpython-37.pyc b/EDMS/shoppingCart/__pycache__/admin.cpython-37.pyc new file mode 100644 index 0000000..107ff89 Binary files /dev/null and b/EDMS/shoppingCart/__pycache__/admin.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/__pycache__/models.cpython-37.pyc b/EDMS/shoppingCart/__pycache__/models.cpython-37.pyc new file mode 100644 index 0000000..4fa8da1 Binary files /dev/null and b/EDMS/shoppingCart/__pycache__/models.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/__pycache__/urls.cpython-37.pyc b/EDMS/shoppingCart/__pycache__/urls.cpython-37.pyc new file mode 100644 index 0000000..8ee13aa Binary files /dev/null and b/EDMS/shoppingCart/__pycache__/urls.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/__pycache__/views.cpython-37.pyc b/EDMS/shoppingCart/__pycache__/views.cpython-37.pyc new file mode 100644 index 0000000..6a08ff4 Binary files /dev/null and b/EDMS/shoppingCart/__pycache__/views.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/admin.py b/EDMS/shoppingCart/admin.py index 58c315c..ea80d6d 100644 --- a/EDMS/shoppingCart/admin.py +++ b/EDMS/shoppingCart/admin.py @@ -7,4 +7,7 @@ admin.site.register(Product) admin.site.register(Order) admin.site.register(OrderItem) admin.site.register(Store) -admin.site.register(StoreOrder) \ No newline at end of file +admin.site.register(StoreOrder) +admin.site.register(DisabledID) +admin.site.register(delivery) +#comment or something diff --git a/EDMS/shoppingCart/forms.py b/EDMS/shoppingCart/forms.py index 16b1de9..11561cb 100644 --- a/EDMS/shoppingCart/forms.py +++ b/EDMS/shoppingCart/forms.py @@ -4,4 +4,4 @@ from .models import Store, Order class OrderForm(ModelForm): class Meta: model = Order - fields = '__all__' \ No newline at end of file + fields = '__all__' diff --git a/EDMS/shoppingCart/migrations/0004_auto_20201016_1152.py b/EDMS/shoppingCart/migrations/0004_auto_20201016_1152.py new file mode 100644 index 0000000..7dd980f --- /dev/null +++ b/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), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0004_id.py b/EDMS/shoppingCart/migrations/0004_id.py new file mode 100644 index 0000000..f622ae1 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0004_id.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.2 on 2020-10-18 04:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0003_auto_20201012_1250'), + ] + + operations = [ + migrations.CreateModel( + name='ID', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ID_Cus', models.CharField(max_length=200, null=True)), + ], + ), + ] diff --git a/EDMS/shoppingCart/migrations/0005_deliveries.py b/EDMS/shoppingCart/migrations/0005_deliveries.py new file mode 100644 index 0000000..f18a623 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0005_deliveries.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.2 on 2020-10-18 05:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0004_id'), + ] + + operations = [ + migrations.CreateModel( + name='deliveries', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('TimeSlot1', models.BooleanField(default=False)), + ('TimeSlot2', models.BooleanField(default=False)), + ('TimeSlot3', models.BooleanField(default=False)), + ('TimeSlot4', models.BooleanField(default=False)), + ], + ), + ] diff --git a/EDMS/shoppingCart/migrations/0005_test.py b/EDMS/shoppingCart/migrations/0005_test.py new file mode 100644 index 0000000..645b4d2 --- /dev/null +++ b/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)), + ], + ), + ] diff --git a/EDMS/shoppingCart/migrations/0006_auto_20201018_0602.py b/EDMS/shoppingCart/migrations/0006_auto_20201018_0602.py new file mode 100644 index 0000000..4a429c5 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0006_auto_20201018_0602.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.2 on 2020-10-18 05:02 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0005_deliveries'), + ] + + operations = [ + migrations.RenameModel( + old_name='deliveries', + new_name='DeliveriesSlots', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0006_auto_20201018_1229.py b/EDMS/shoppingCart/migrations/0006_auto_20201018_1229.py new file mode 100644 index 0000000..7277723 --- /dev/null +++ b/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)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0007_auto_20201018_0607.py b/EDMS/shoppingCart/migrations/0007_auto_20201018_0607.py new file mode 100644 index 0000000..cae735b --- /dev/null +++ b/EDMS/shoppingCart/migrations/0007_auto_20201018_0607.py @@ -0,0 +1,33 @@ +# Generated by Django 3.1.2 on 2020-10-18 05:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0006_auto_20201018_0602'), + ] + + operations = [ + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot1', + field=models.BooleanField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot2', + field=models.BooleanField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot3', + field=models.BooleanField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot4', + field=models.BooleanField(max_length=200, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0007_auto_20201018_1316.py b/EDMS/shoppingCart/migrations/0007_auto_20201018_1316.py new file mode 100644 index 0000000..ba38b4a --- /dev/null +++ b/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)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0008_auto_20201018_0609.py b/EDMS/shoppingCart/migrations/0008_auto_20201018_0609.py new file mode 100644 index 0000000..b1adb71 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0008_auto_20201018_0609.py @@ -0,0 +1,33 @@ +# Generated by Django 3.1.2 on 2020-10-18 05:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0007_auto_20201018_0607'), + ] + + operations = [ + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot1', + field=models.BooleanField(null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot2', + field=models.BooleanField(null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot3', + field=models.BooleanField(null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot4', + field=models.BooleanField(null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0008_auto_20201018_1342.py b/EDMS/shoppingCart/migrations/0008_auto_20201018_1342.py new file mode 100644 index 0000000..2862aec --- /dev/null +++ b/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)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0009_auto_20201018_0612.py b/EDMS/shoppingCart/migrations/0009_auto_20201018_0612.py new file mode 100644 index 0000000..1f73c0e --- /dev/null +++ b/EDMS/shoppingCart/migrations/0009_auto_20201018_0612.py @@ -0,0 +1,33 @@ +# Generated by Django 3.1.2 on 2020-10-18 05:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0008_auto_20201018_0609'), + ] + + operations = [ + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot1', + field=models.CharField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot2', + field=models.CharField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot3', + field=models.CharField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='deliveriesslots', + name='TimeSlot4', + field=models.CharField(max_length=200, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0009_auto_20201018_1354.py b/EDMS/shoppingCart/migrations/0009_auto_20201018_1354.py new file mode 100644 index 0000000..0e60faf --- /dev/null +++ b/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)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0010_auto_20201018_1401.py b/EDMS/shoppingCart/migrations/0010_auto_20201018_1401.py new file mode 100644 index 0000000..5d6f795 --- /dev/null +++ b/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(), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0010_auto_20201020_0351.py b/EDMS/shoppingCart/migrations/0010_auto_20201020_0351.py new file mode 100644 index 0000000..c9c85c5 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0010_auto_20201020_0351.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.2 on 2020-10-20 02:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0009_auto_20201018_0612'), + ] + + operations = [ + migrations.CreateModel( + name='DeliverySlots', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('TimeSlot1', models.BooleanField(blank=True, default=False, null=True)), + ], + ), + migrations.DeleteModel( + name='DeliveriesSlots', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0011_auto_20201020_0355.py b/EDMS/shoppingCart/migrations/0011_auto_20201020_0355.py new file mode 100644 index 0000000..3dab369 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0011_auto_20201020_0355.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.2 on 2020-10-20 02:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0010_auto_20201020_0351'), + ] + + operations = [ + migrations.CreateModel( + name='delivery', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('timeslot1', models.BooleanField(blank=True, default=False, null=True)), + ], + ), + migrations.DeleteModel( + name='DeliverySlots', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0011_order_complete.py b/EDMS/shoppingCart/migrations/0011_order_complete.py new file mode 100644 index 0000000..c67ab7f --- /dev/null +++ b/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), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0012_auto_20201018_1430.py b/EDMS/shoppingCart/migrations/0012_auto_20201018_1430.py new file mode 100644 index 0000000..ae676dd --- /dev/null +++ b/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)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0012_auto_20201020_0356.py b/EDMS/shoppingCart/migrations/0012_auto_20201020_0356.py new file mode 100644 index 0000000..4703f50 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0012_auto_20201020_0356.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.2 on 2020-10-20 02:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0011_auto_20201020_0355'), + ] + + operations = [ + migrations.AddField( + model_name='delivery', + name='timeslot2', + field=models.BooleanField(blank=True, default=False, null=True), + ), + migrations.AddField( + model_name='delivery', + name='timeslot3', + field=models.BooleanField(blank=True, default=False, null=True), + ), + migrations.AddField( + model_name='delivery', + name='timeslot4', + field=models.BooleanField(blank=True, default=False, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0013_auto_20201018_1439.py b/EDMS/shoppingCart/migrations/0013_auto_20201018_1439.py new file mode 100644 index 0000000..e712115 --- /dev/null +++ b/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)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0013_auto_20201020_0400.py b/EDMS/shoppingCart/migrations/0013_auto_20201020_0400.py new file mode 100644 index 0000000..112e754 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0013_auto_20201020_0400.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.2 on 2020-10-20 03:00 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0012_auto_20201020_0356'), + ] + + operations = [ + migrations.RenameModel( + old_name='delivery', + new_name='DeliveriesSlot', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0014_auto_20201018_1443.py b/EDMS/shoppingCart/migrations/0014_auto_20201018_1443.py new file mode 100644 index 0000000..f4aaeb4 --- /dev/null +++ b/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, + ), + ] diff --git a/EDMS/shoppingCart/migrations/0014_auto_20201020_0429.py b/EDMS/shoppingCart/migrations/0014_auto_20201020_0429.py new file mode 100644 index 0000000..41203ef --- /dev/null +++ b/EDMS/shoppingCart/migrations/0014_auto_20201020_0429.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.2 on 2020-10-20 03:29 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0013_auto_20201020_0400'), + ] + + operations = [ + migrations.RenameModel( + old_name='DeliveriesSlot', + new_name='delivery', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0015_auto_20201018_1448.py b/EDMS/shoppingCart/migrations/0015_auto_20201018_1448.py new file mode 100644 index 0000000..78ebe02 --- /dev/null +++ b/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)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0015_auto_20201020_0504.py b/EDMS/shoppingCart/migrations/0015_auto_20201020_0504.py new file mode 100644 index 0000000..d142d54 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0015_auto_20201020_0504.py @@ -0,0 +1,33 @@ +# Generated by Django 3.1.2 on 2020-10-20 04:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0014_auto_20201020_0429'), + ] + + operations = [ + migrations.AlterField( + model_name='delivery', + name='timeslot1', + field=models.CharField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot2', + field=models.CharField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot3', + field=models.CharField(max_length=200, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot4', + field=models.CharField(max_length=200, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0016_auto_20201018_1456.py b/EDMS/shoppingCart/migrations/0016_auto_20201018_1456.py new file mode 100644 index 0000000..04fe58a --- /dev/null +++ b/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', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0016_auto_20201020_0505.py b/EDMS/shoppingCart/migrations/0016_auto_20201020_0505.py new file mode 100644 index 0000000..af2ebc9 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0016_auto_20201020_0505.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.2 on 2020-10-20 04:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0015_auto_20201020_0504'), + ] + + operations = [ + migrations.RenameField( + model_name='id', + old_name='ID_Cus', + new_name='ID_Dis', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0017_auto_20201020_1342.py b/EDMS/shoppingCart/migrations/0017_auto_20201020_1342.py new file mode 100644 index 0000000..afccb1d --- /dev/null +++ b/EDMS/shoppingCart/migrations/0017_auto_20201020_1342.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.2 on 2020-10-20 12:42 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0016_auto_20201020_0505'), + ] + + operations = [ + migrations.RenameModel( + old_name='ID', + new_name='DisabledID', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0017_order_orderitem.py b/EDMS/shoppingCart/migrations/0017_order_orderitem.py new file mode 100644 index 0000000..66c1195 --- /dev/null +++ b/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')), + ], + ), + ] diff --git a/EDMS/shoppingCart/migrations/0018_auto_20201018_1522.py b/EDMS/shoppingCart/migrations/0018_auto_20201018_1522.py new file mode 100644 index 0000000..67f9b83 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0018_auto_20201018_1522.py @@ -0,0 +1,24 @@ +# Generated by Django 3.1.2 on 2020-10-18 15:22 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0017_order_orderitem'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='date_created', + field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 15, 22, 1, 700384)), + ), + migrations.AlterField( + model_name='order', + name='expiry_date', + field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 15, 24, 1, 700420)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0018_auto_20201020_1430.py b/EDMS/shoppingCart/migrations/0018_auto_20201020_1430.py new file mode 100644 index 0000000..2972dff --- /dev/null +++ b/EDMS/shoppingCart/migrations/0018_auto_20201020_1430.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.2 on 2020-10-20 13:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0017_auto_20201020_1342'), + ] + + operations = [ + migrations.AddField( + model_name='delivery', + name='timeslot5', + field=models.CharField(max_length=200, null=True), + ), + migrations.AddField( + model_name='delivery', + name='timeslot6', + field=models.CharField(max_length=200, null=True), + ), + migrations.AddField( + model_name='delivery', + name='timeslot7', + field=models.CharField(max_length=200, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0019_auto_20201018_1759.py b/EDMS/shoppingCart/migrations/0019_auto_20201018_1759.py new file mode 100644 index 0000000..95192db --- /dev/null +++ b/EDMS/shoppingCart/migrations/0019_auto_20201018_1759.py @@ -0,0 +1,31 @@ +# Generated by Django 3.1.2 on 2020-10-18 17:59 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0018_auto_20201018_1522'), + ] + + operations = [ + migrations.RemoveField( + model_name='order', + name='expiry_date', + ), + migrations.RemoveField( + model_name='orderitem', + name='date_created', + ), + migrations.RemoveField( + model_name='orderitem', + name='expired', + ), + migrations.AlterField( + model_name='order', + name='date_created', + field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 17, 59, 41, 21325)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0020_auto_20201018_2051.py b/EDMS/shoppingCart/migrations/0020_auto_20201018_2051.py new file mode 100644 index 0000000..87043e8 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0020_auto_20201018_2051.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.2 on 2020-10-18 20:51 + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0019_auto_20201018_1759'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='date_created', + field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 20, 51, 23, 928323, tzinfo=utc)), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0021_auto_20201018_2056.py b/EDMS/shoppingCart/migrations/0021_auto_20201018_2056.py new file mode 100644 index 0000000..84dc0f8 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0021_auto_20201018_2056.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.2 on 2020-10-18 20:56 + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0020_auto_20201018_2051'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='date_created', + field=models.DateTimeField(default=django.utils.timezone.now), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0022_auto_20201020_1443.py b/EDMS/shoppingCart/migrations/0022_auto_20201020_1443.py new file mode 100644 index 0000000..c34ce65 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0022_auto_20201020_1443.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.2 on 2020-10-20 14:43 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0021_auto_20201018_2056'), + ] + + operations = [ + migrations.RenameField( + model_name='order', + old_name='complete', + new_name='isDay', + ), + ] diff --git a/EDMS/shoppingCart/migrations/0023_merge_20201021_1457.py b/EDMS/shoppingCart/migrations/0023_merge_20201021_1457.py new file mode 100644 index 0000000..86bb2a8 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0023_merge_20201021_1457.py @@ -0,0 +1,14 @@ +# Generated by Django 3.1.2 on 2020-10-21 14:57 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0022_auto_20201020_1443'), + ('shoppingCart', '0018_auto_20201020_1430'), + ] + + operations = [ + ] diff --git a/EDMS/shoppingCart/migrations/0024_auto_20201021_1501.py b/EDMS/shoppingCart/migrations/0024_auto_20201021_1501.py new file mode 100644 index 0000000..fc595fe --- /dev/null +++ b/EDMS/shoppingCart/migrations/0024_auto_20201021_1501.py @@ -0,0 +1,48 @@ +# Generated by Django 3.1.2 on 2020-10-21 15:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0023_merge_20201021_1457'), + ] + + operations = [ + migrations.AlterField( + model_name='delivery', + name='timeslot1', + field=models.CharField(default='Available', max_length=15, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot2', + field=models.CharField(default='Available', max_length=15, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot3', + field=models.CharField(default='Available', max_length=15, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot4', + field=models.CharField(default='Available', max_length=15, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot5', + field=models.CharField(default='Available', max_length=15, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot6', + field=models.CharField(default='Available', max_length=15, null=True), + ), + migrations.AlterField( + model_name='delivery', + name='timeslot7', + field=models.CharField(default='Available', max_length=15, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/__pycache__/0001_initial.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0001_initial.cpython-37.pyc new file mode 100644 index 0000000..385264f Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0001_initial.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0002_product_image.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0002_product_image.cpython-37.pyc new file mode 100644 index 0000000..6545253 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0002_product_image.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0003_auto_20201012_1250.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0003_auto_20201012_1250.cpython-37.pyc new file mode 100644 index 0000000..4561bf0 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0003_auto_20201012_1250.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0004_id.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0004_id.cpython-37.pyc new file mode 100644 index 0000000..778a6dd Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0004_id.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0005_deliveries.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0005_deliveries.cpython-37.pyc new file mode 100644 index 0000000..fc5f1ea Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0005_deliveries.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0006_auto_20201018_0602.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0006_auto_20201018_0602.cpython-37.pyc new file mode 100644 index 0000000..e8f4241 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0006_auto_20201018_0602.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0007_auto_20201018_0607.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0007_auto_20201018_0607.cpython-37.pyc new file mode 100644 index 0000000..c1f4b23 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0007_auto_20201018_0607.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0008_auto_20201018_0609.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0008_auto_20201018_0609.cpython-37.pyc new file mode 100644 index 0000000..260debd Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0008_auto_20201018_0609.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0009_auto_20201018_0612.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/0009_auto_20201018_0612.cpython-37.pyc new file mode 100644 index 0000000..eb20c90 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0009_auto_20201018_0612.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/__init__.cpython-37.pyc b/EDMS/shoppingCart/migrations/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..3749c74 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/EDMS/shoppingCart/models.py b/EDMS/shoppingCart/models.py index 2de2a2c..242ba89 100644 --- a/EDMS/shoppingCart/models.py +++ b/EDMS/shoppingCart/models.py @@ -2,8 +2,15 @@ from django.db import models from django.contrib.auth.models import User from datetime import timezone, datetime +from datetime import datetime, timedelta +from django.utils import timezone + + # Create your models here. +class Test(models.Model): + name = models.CharField(max_length=4) + class Customer(models.Model): user = models.OneToOneField(User, on_delete =models.CASCADE, null=True, blank=True) name = models.CharField(max_length=200, null=True) @@ -22,17 +29,21 @@ class Product(models.Model): class Order(models.Model): customer = models.ForeignKey(Customer, on_delete = models.SET_NULL, blank=True, null=True) - complete = models.BooleanField(default=False, null=True, blank=True) - + date_created = models.DateTimeField(default = timezone.now) + expired = models.BooleanField(default=False) + isDay = models.BooleanField(default=False) + def __str__ (self): + return str(self.id) class OrderItem(models.Model): product = models.ForeignKey(Product, on_delete=models.SET_NULL, blank=True, null=True) order = models.ForeignKey(Order, on_delete=models.SET_NULL, blank=True, null=True) quantity = models.IntegerField(default=0, null=True, blank=True) - + def __str__(self): return self.product.name + class Store(models.Model): name = models.CharField(max_length=200, null=True) location = models.CharField(max_length=200, null=True) @@ -49,6 +60,27 @@ class StoreOrder(models.Model): ('Delivered', 'Delivered'), ) + + +class DisabledID(models.Model): + ID_Dis = models.CharField(max_length=200, null=True) + def __str__ (self): + return str(self.ID_Dis) + +class delivery(models.Model): + timeslot1 = models.CharField(max_length=15, null=True, default='Available') + timeslot2 = models.CharField(max_length=15, null=True, default='Available') + timeslot3 = models.CharField(max_length=15, null=True, default='Available') + timeslot4 = models.CharField(max_length=15, null=True, default='Available') + timeslot5 = models.CharField(max_length=15, null=True, default='Available') + timeslot6 = models.CharField(max_length=15, null=True, default='Available') + timeslot7 = models.CharField(max_length=15, null=True, default='Available') + + def __str__ (self): + return str(self.id) + + + store = models.ForeignKey(Store, on_delete= models.SET_NULL, null=True) product = models.ForeignKey(Product, on_delete=models.SET_NULL, blank=True, null=True) status = models.CharField(max_length=200, null=True, choices=STATUS) diff --git a/EDMS/shoppingCart/templates/shoppingCart/deliveries.html b/EDMS/shoppingCart/templates/shoppingCart/deliveries.html new file mode 100644 index 0000000..5324abe --- /dev/null +++ b/EDMS/shoppingCart/templates/shoppingCart/deliveries.html @@ -0,0 +1,120 @@ +{% include 'shoppingCart/nav.html' %} +{%load static%} + + + + +
+ {%csrf_token%} +
+ +
+ +
+
+
+ +

+ Yes + No +

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% if id_match == True %} + + + + + + + + + + + + + + + + + + + + + + + + {% endif %} + +
TimeMondayTuesdayWednesdayThursdayFridaySaturdaySunday
9:00-10:00
10:00-11:00
11:00-12:00
12:00-13:00
13:00-14:00
14:00-15:00
+ + + + + + + + diff --git a/EDMS/shoppingCart/templates/shoppingCart/main.html b/EDMS/shoppingCart/templates/shoppingCart/main.html index 8a10a09..4b2c150 100755 --- a/EDMS/shoppingCart/templates/shoppingCart/main.html +++ b/EDMS/shoppingCart/templates/shoppingCart/main.html @@ -1,58 +1,18 @@ -{% load static %} +{%include 'shoppingCart/nav.html' %} {%load static%} + - - - - - - - Limit Items bought per Week - - - - - - - - - - - - - - - - - - -
-
-
-
-
+
+
+ Today's Basket +