Merge branch 'master' of https://gitlab.discs.ateneo.edu/ErickLopez/pixiedust-lastminutesurpluss

pixie_dust/pixie_dust/static/style.css

@@ -2,8 +2,6 @@
 @import url("https://fonts.googleapis.com/css?family=Open+Sans");
 html,
 body {
-  /* width: 100%; */
-  /* height: 100%; */
   margin: 0px;
   padding: 0px;
   overflow-x: hidden;
@@ -57,16 +55,13 @@ ul {
 }
 
 .card {
-  /* display: flex; */
   height: 78vh;
   width: 23vw;
-  /* background-color: lightblue; */
   background-color: #2aabe4;
   color: #fff;
   font-family: "Open Sans";
   border-radius: 10px;
   text-align: center;
-  /* border: darkcyan solid 0.4rem; */
   align-items: center;
   justify-content: center;
   margin: 2vh 5vh 5vh 5vh;
@@ -78,14 +73,12 @@ ul {
   width: 100%;
   height: 60%;
   display: flex;
-  /* align-items: center; */
   justify-content: center;
   overflow: hidden;
   
 }
 
 .card img {
-  /* border-radius: 5%; */
   object-fit: cover;
   height: 100%;
   width: 100%;

pixie_dust/products/migrations/0001_initial.py

@@ -4,76 +4,6 @@ import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
-def populate_products(apps, schema_editor):                           
-    Folder = apps.get_model('products', 'Folder')
-    PenOrganizer = apps.get_model('products', 'PenOrganizer')
-    Planner = apps.get_model('products', 'Planner')
-    obj = Folder(item_name="Flipper", price=745, personalization_limit=8, length=13.5, width=10.25, thickness=0.75)
-    obj.save()
-    obj = Folder(item_name="Filer", price=995, personalization_limit=8, length=14, width=11, thickness=1.5)
-    obj.save()
-    obj = PenOrganizer(item_name="Slinger", price=95, personalization_limit=5, slots=6)
-    obj.save()
-    obj = PenOrganizer(item_name="Shifter", price=295, personalization_limit=8, slots=15)
-    obj.save()
-    obj = Planner(item_name="Doodler", price=595, personalization_limit=8, length=8, width=6, thickness=0.75)
-    obj.save()
-    obj = Planner(item_name="Scribler", price=595, personalization_limit=8, length=8, width=6, thickness=0.75)
-    obj.save()
-
-    feature_model = apps.get_model('products', 'Feature')
-    features = ["Reversible", "Slim and compact", "Leatherette material", "Magnetic corners", "Magnetic clipboard",
-                    "Envelope pocket", "Pen loop (2)",
-                    "Multi-function portfolio organizer", "Leather exterior", "Magnetic flap", "3-ring binder", 
-                    "Sleeves for papers", "Pen loop" "Concealable handles", 
-                    "Magnetic lock", "Dual ribbon straps with velcro", "Water repellent", "No tear interior lining", 
-                    "Triple zipper", "Expandable bin", "Velcro locked pockets", 
-                    "Smyth sewn hardbound", "Premium 120 gsm paper", "Monthly spread", "Weekly, daily views", 
-                    "Non-lined, colorable pages", "Leisure list", "Money tracker", "Back pocket",
-                    "Premium 100 gsm paper", "Weekly spread", "Lined notes pages", "Monthly watercolor artwork", 
-                    "Leisure activities list", "Optional sleeve (+185)"]
-    for f in features:
-        obj = feature_model(feature=f)
-        obj.save()
-
-def add_feature_to_products(apps, schema_editor):
-    import products.models as product_app
-    Description = product_app.Description
-
-    for x in range(7):
-        obj = Description(feature_id = product_app.Feature.objects.get(pk=x+1), item_id=product_app.Product.objects.get(item_id=1))
-        obj.save()
-    for x in range(7):
-        obj = Description(feature_id = product_app.Feature.objects.get(pk=x+8), item_id=product_app.Product.objects.get(item_id=2))
-        obj.save()
-    for x in range(4):
-        obj = Description(feature_id = product_app.Feature.objects.get(pk=x+15), item_id=product_app.Product.objects.get(item_id=3))
-        obj.save()
-    for x in range(3):
-        obj = Description(feature_id = product_app.Feature.objects.get(pk=x+19), item_id=product_app.Product.objects.get(item_id=4))
-        obj.save()
-    obj = Description(feature_id = product_app.Feature.objects.get(pk=17), item_id=product_app.Product.objects.get(item_id=4))
-    obj.save()
-    for x in range(7):
-        obj = Description(feature_id = product_app.Feature.objects.get(pk=x+22), item_id=product_app.Product.objects.get(item_id=5))
-        obj.save()
-    obj = Description(feature_id = product_app.Feature.objects.get(pk=22), item_id=product_app.Product.objects.get(item_id=6))
-    obj.save()
-    obj = Description(feature_id = product_app.Feature.objects.get(pk=24), item_id=product_app.Product.objects.get(item_id=6))
-    obj.save()
-    for x in range(6):
-        obj = Description(feature_id = product_app.Feature.objects.get(pk=x+29), item_id=product_app.Product.objects.get(item_id=6))
-        obj.save()
-
-def supply_inventory(apps, schema_editor):
-    import products.models as product_app
-    Inventory = product_app.Inventory
-    colors = ["RED", "ORANGE","YELLOW", "GREEN", "BLUE", "PURPLE", "PINK", "BLACK"]
-    for i in range(6):
-        for c in colors:
-            obj = Inventory(item_id=product_app.Product.objects.get(item_id=i+1), color=c, quantity=99)
-            obj.save()
-
 
 
 class Migration(migrations.Migration):
@@ -178,7 +108,4 @@ class Migration(migrations.Migration):
             name='item_id',
             field=models.ForeignKey(db_column='item_id', on_delete=django.db.models.deletion.CASCADE, to='products.product'),
         ),
-        migrations.RunPython(populate_products),
-        migrations.RunPython(add_feature_to_products),
-        migrations.RunPython(supply_inventory),
     ]

pixie_dust/users/migrations/0001_initial.py

@@ -3,25 +3,6 @@
 from django.db import migrations, models
 import django.db.models.deletion
 
-def populate_agents(apps, schema_editor):
-    ag_first_names = ["Bryan Carlo", "Elmo Lenard"]                              
-    ag_last_names = ["Guanlao", "Gumapos"]                              
-    Agent = apps.get_model('users', 'SalesAgent')
-    for i in range(2):
-        obj = Agent(first_name=ag_first_names[i], last_name=ag_last_names[i])
-        obj.save()
-
-
-def populate_customers(apps, schema_editor):
-    import users.models as u
-    cus_first_names = ["Erick Gabriel", "Mikael Giannes", "Luis Mikhael"] 
-    cus_last_names = ["Lopez", "Bernardino", "Gonzales"]                        
-    customer = u.Customer
-    for i in range(3):
-        obj = customer(first_name=cus_first_names[i], last_name=cus_last_names[i])
-        obj.save()
-
-
 class Migration(migrations.Migration):
 
     initial = True
@@ -54,6 +35,4 @@ class Migration(migrations.Migration):
                 'db_table': 'customer',
             },
         ),
-        migrations.RunPython(populate_agents),
-        migrations.RunPython(populate_customers)
     ]

pixie_dust/users/views.py

@@ -59,7 +59,7 @@ def customer_details(request, customer_id):
     start_date = request.GET.get('start-date', '2000-01-01')
     end_date = request.GET.get('end-date', '2100-01-01')
     order_list = Order.objects.filter(customer_id__in=customer_list, order_date__range=[start_date, end_date])
-    order_item_list = OrderItem.objects.filter(order_no__in=order_list)
+    order_item_list = OrderItem.objects.filter(order_no__in=order_list, is_successful=True)
     return render(request, "users/customer_details.html",{"customer": customer, "order_list":order_list, "order_item_list":order_item_list})