Merge branch 'develop' into MM/197/mobile_view

COS301-SE-2023 · Oct 26, 2023 · 692fa0f · 692fa0f
2 parents ca21e33 + d727775
commit 692fa0f
Show file tree

Hide file tree

Showing 62 changed files with 3,685 additions and 285 deletions.
diff --git a/api/custom_profile/views.py b/api/custom_profile/views.py
@@ -158,6 +158,8 @@ def get_followed_seller_details(request):
                     for seller in followed_seller
                 ]
                 return Response(res)
+            else:
+                return Response([])
 
         else:
             raise Exception("User is seller")

diff --git a/api/inventory/views.py b/api/inventory/views.py
@@ -37,8 +37,8 @@ def getProd(request):
         sort_fields = {
             "name": "product__name",
             "-name": "-product__name",
-            "date": "-created_at",
-            "-date": "created_at",
+            "date": "created_at",
+            "-date": "-created_at",
             "price": "price",
             "-price": "-price",
             "discount": "discount",

diff --git a/api/product/management/commands/products.json b/api/product/management/commands/products.json
diff --git a/api/product/models.py b/api/product/models.py
@@ -13,6 +13,7 @@ class Product(models.Model):
         ("sports and outdoors", "Sports and Outdoors"),
         ("toys and games", "Toys and Games"),
         ("books", "Books"),
+        ("food","Food")
     ]
 
     id = models.AutoField(primary_key=True)