diff --git a/EDMS/db.sqlite3 b/EDMS/db.sqlite3 index 66abaf1..8997b35 100644 Binary files a/EDMS/db.sqlite3 and b/EDMS/db.sqlite3 differ diff --git a/EDMS/shoppingCart/__pycache__/admin.cpython-38.pyc b/EDMS/shoppingCart/__pycache__/admin.cpython-38.pyc index d15f9f1..ca82d1f 100644 Binary files a/EDMS/shoppingCart/__pycache__/admin.cpython-38.pyc and b/EDMS/shoppingCart/__pycache__/admin.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/__pycache__/models.cpython-38.pyc b/EDMS/shoppingCart/__pycache__/models.cpython-38.pyc index 58fcce4..f821668 100644 Binary files a/EDMS/shoppingCart/__pycache__/models.cpython-38.pyc and b/EDMS/shoppingCart/__pycache__/models.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/__pycache__/urls.cpython-38.pyc b/EDMS/shoppingCart/__pycache__/urls.cpython-38.pyc index f0e9e24..57cf7c1 100644 Binary files a/EDMS/shoppingCart/__pycache__/urls.cpython-38.pyc and b/EDMS/shoppingCart/__pycache__/urls.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/__pycache__/views.cpython-38.pyc b/EDMS/shoppingCart/__pycache__/views.cpython-38.pyc index aa934b3..ff02869 100644 Binary files a/EDMS/shoppingCart/__pycache__/views.cpython-38.pyc and b/EDMS/shoppingCart/__pycache__/views.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/admin.py b/EDMS/shoppingCart/admin.py index 27ee9d8..58c315c 100644 --- a/EDMS/shoppingCart/admin.py +++ b/EDMS/shoppingCart/admin.py @@ -6,4 +6,5 @@ admin.site.register(Customer) admin.site.register(Product) admin.site.register(Order) admin.site.register(OrderItem) -admin.site.register(Store) \ No newline at end of file +admin.site.register(Store) +admin.site.register(StoreOrder) \ No newline at end of file diff --git a/EDMS/shoppingCart/filters.py b/EDMS/shoppingCart/filters.py new file mode 100644 index 0000000..e0710bd --- /dev/null +++ b/EDMS/shoppingCart/filters.py @@ -0,0 +1,10 @@ +import django_filters +from .models import * + + + +class OrderFilter(django_filters.FilterSet): + class Meta: + model = Order + fields = '__all__' + exclude = ['store', 'date_created'] \ No newline at end of file diff --git a/EDMS/shoppingCart/forms.py b/EDMS/shoppingCart/forms.py new file mode 100644 index 0000000..16b1de9 --- /dev/null +++ b/EDMS/shoppingCart/forms.py @@ -0,0 +1,7 @@ +from django.forms import ModelForm +from .models import Store, Order + +class OrderForm(ModelForm): + class Meta: + model = Order + fields = '__all__' \ No newline at end of file diff --git a/EDMS/shoppingCart/migrations/0007_store_order.py b/EDMS/shoppingCart/migrations/0007_store_order.py new file mode 100644 index 0000000..bf2c0fa --- /dev/null +++ b/EDMS/shoppingCart/migrations/0007_store_order.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.14 on 2020-10-17 13:25 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0006_store_available'), + ] + + operations = [ + migrations.CreateModel( + name='Store_Order', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date_created', models.DateTimeField(auto_now_add=True, null=True)), + ('status', models.CharField(choices=[('Pending', 'Pending'), ('Out for delivery', 'Out for delivery'), ('Delivered', 'Delivered')], max_length=200, null=True)), + ('product', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='shoppingCart.Product')), + ('store', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='shoppingCart.Store')), + ], + ), + ] diff --git a/EDMS/shoppingCart/migrations/0008_auto_20201017_1504.py b/EDMS/shoppingCart/migrations/0008_auto_20201017_1504.py new file mode 100644 index 0000000..199e726 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0008_auto_20201017_1504.py @@ -0,0 +1,37 @@ +# Generated by Django 2.2.14 on 2020-10-17 14:04 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0007_store_order'), + ] + + operations = [ + migrations.RemoveField( + model_name='store_order', + name='date_created', + ), + migrations.RemoveField( + model_name='store_order', + name='status', + ), + migrations.AddField( + model_name='store_order', + name='order', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='shoppingCart.Order'), + ), + migrations.AddField( + model_name='store_order', + name='quantity', + field=models.IntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='store_order', + name='product', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='shoppingCart.Product'), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0009_auto_20201017_1526.py b/EDMS/shoppingCart/migrations/0009_auto_20201017_1526.py new file mode 100644 index 0000000..ab758f5 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0009_auto_20201017_1526.py @@ -0,0 +1,22 @@ +# Generated by Django 2.2.14 on 2020-10-17 14:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0008_auto_20201017_1504'), + ] + + operations = [ + migrations.RemoveField( + model_name='store_order', + name='order', + ), + migrations.AddField( + model_name='store_order', + name='status', + field=models.CharField(choices=[('Pending', 'Pending'), ('Out for delivery', 'Out for delivery'), ('Delivered', 'Delivered')], max_length=200, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0010_store_order_date_created.py b/EDMS/shoppingCart/migrations/0010_store_order_date_created.py new file mode 100644 index 0000000..c3cb756 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0010_store_order_date_created.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.14 on 2020-10-17 14:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0009_auto_20201017_1526'), + ] + + operations = [ + migrations.AddField( + model_name='store_order', + name='date_created', + field=models.DateTimeField(auto_now_add=True, null=True), + ), + ] diff --git a/EDMS/shoppingCart/migrations/0011_auto_20201019_1709.py b/EDMS/shoppingCart/migrations/0011_auto_20201019_1709.py new file mode 100644 index 0000000..bebe713 --- /dev/null +++ b/EDMS/shoppingCart/migrations/0011_auto_20201019_1709.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.2 on 2020-10-19 16:09 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shoppingCart', '0010_store_order_date_created'), + ] + + operations = [ + migrations.RenameModel( + old_name='Store_Order', + new_name='StoreOrder', + ), + ] diff --git a/EDMS/shoppingCart/migrations/__pycache__/0007_store_order.cpython-38.pyc b/EDMS/shoppingCart/migrations/__pycache__/0007_store_order.cpython-38.pyc new file mode 100644 index 0000000..692a16c Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0007_store_order.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0008_auto_20201017_1504.cpython-38.pyc b/EDMS/shoppingCart/migrations/__pycache__/0008_auto_20201017_1504.cpython-38.pyc new file mode 100644 index 0000000..4790b77 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0008_auto_20201017_1504.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0009_auto_20201017_1526.cpython-38.pyc b/EDMS/shoppingCart/migrations/__pycache__/0009_auto_20201017_1526.cpython-38.pyc new file mode 100644 index 0000000..ac3e413 Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0009_auto_20201017_1526.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/migrations/__pycache__/0010_store_order_date_created.cpython-38.pyc b/EDMS/shoppingCart/migrations/__pycache__/0010_store_order_date_created.cpython-38.pyc new file mode 100644 index 0000000..ac80eba Binary files /dev/null and b/EDMS/shoppingCart/migrations/__pycache__/0010_store_order_date_created.cpython-38.pyc differ diff --git a/EDMS/shoppingCart/models.py b/EDMS/shoppingCart/models.py index 129fef7..cf661c8 100644 --- a/EDMS/shoppingCart/models.py +++ b/EDMS/shoppingCart/models.py @@ -23,8 +23,7 @@ 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) - def __str__ (self): - return str(self.id) + class OrderItem(models.Model): product = models.ForeignKey(Product, on_delete=models.SET_NULL, blank=True, null=True) @@ -41,3 +40,19 @@ class Store(models.Model): def __str__(self): return self.name + +class StoreOrder(models.Model): + STATUS = ( + ('Pending', 'Pending'), + ('Out for delivery', 'Out for delivery'), + ('Delivered', 'Delivered'), + ) + + 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) + quantity = models.IntegerField(default=0, null=True, blank=True) + date_created = models.DateTimeField(auto_now_add=True, null=True, blank=True) + + def __str__(self): + return self.product.name \ No newline at end of file diff --git a/EDMS/shoppingCart/templates/shoppingCart/allocate.html b/EDMS/shoppingCart/templates/shoppingCart/allocate.html new file mode 100644 index 0000000..fc927e1 --- /dev/null +++ b/EDMS/shoppingCart/templates/shoppingCart/allocate.html @@ -0,0 +1,14 @@ +{% extends 'shoppingCart/store_dashBoard.html' %} +{% block content %} + + + + +
+Are you sure you want to delete "{{item}}"?
+ +Product | + +Price | +
---|---|
{{product.name}} | + +${{product.price}} | +
Name: {{store.name}}
+Location: {{store.location}}
+Capacity: {{store.name}}
+Available: {{store.location}}
++ | Name | +Location | +Available | +Sent | +
---|---|---|---|---|
+ | {{store}} |
+ {{store.location}} |
+ {{store.available}} | +{{store.capacity}} | +
Stores | +Products | +Orders | +Quantity | +Status | +Allocated | +Update | +Remove | + +
---|---|---|---|---|---|---|---|
{{store}} | +{{store.product}} | +{{store.storeorder}} | +{{store.quantity}} | +{{store.status}} | +{{store.date_created}} | +Update | +Cancel | +