Merge branch 'main' into storefront-nuxt

# Conflicts:
#	storefront/public/robots.txt

.gitignore

@@ -91,6 +91,7 @@ share/python-wheels/
 pip-log.txt
 pip-delete-this-directory.txt
 desktop.ini
+*.iml
 
 # Node build artifacts
 npm-debug.log*

core/admin.py

@@ -81,7 +81,7 @@ class FieldsetsMixin:
             meta_fields.append("sku")
 
         if any(f.name == "human_readable_id" for f in opts.fields):
-            meta_fields.append("sku")
+            meta_fields.append("human_readable_id")
 
         if meta_fields:
             fieldsets.append((_("metadata"), {"fields": meta_fields}))

core/api_urls.py

@@ -1,7 +1,7 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
-from core.sitemaps import BrandSitemap, CategorySitemap, ProductSitemap
+from core.sitemaps import BrandSitemap, CategorySitemap, ProductSitemap, StaticPagesSitemap
 from core.views import (
     CacheOperatorView,
     ContactUsView,
@@ -49,6 +49,7 @@ core_router.register(r"product_tags", ProductTagViewSet, basename="product_tags"
 core_router.register(r"order_products", OrderProductViewSet, basename="order_products")
 
 sitemaps = {
+    "static": StaticPagesSitemap,
     "products": ProductSitemap,
     "categories": CategorySitemap,
     "brands": BrandSitemap,

core/filters.py

@@ -416,18 +416,49 @@ class CategoryFilter(FilterSet):
             return queryset
 
         if field == "?":
-            parent_order = "?"
+            order_expression = "?"
-            child_order = "?"
         else:
-            parent_order = f"-{field}" if desc else field
+            order_expression = f"-{field}" if desc else field
-            child_order = parent_order
 
-        qs = queryset.order_by(parent_order).prefetch_related(None)
+        qs = queryset.order_by(order_expression).prefetch_related(None)
 
-        children_qs = (
+        def create_ordered_tree_prefetch(max_depth=10):
-            Category.objects.all().order_by(child_order) if child_order != "?" else Category.objects.all().order_by("?")
+            if field == "?":
-        )
+
-        return qs.prefetch_related(Prefetch("children", queryset=children_qs))
+                def build_random_prefetch(depth):
+                    if depth <= 0:
+                        return None
+
+                    children_qs = Category.objects.all().order_by("?")
+                    nested_prefetch = build_random_prefetch(depth - 1)
+
+                    if nested_prefetch:
+                        children_qs = children_qs.prefetch_related(nested_prefetch)
+
+                    return Prefetch("children", queryset=children_qs)
+
+                return build_random_prefetch(max_depth)
+            else:
+
+                def build_ordered_prefetch(depth):
+                    if depth <= 0:
+                        return None
+
+                    children_qs = Category.objects.all().order_by(order_expression, "tree_id", "lft")
+                    nested_prefetch = build_ordered_prefetch(depth - 1)
+
+                    if nested_prefetch:
+                        children_qs = children_qs.prefetch_related(nested_prefetch)
+
+                    return Prefetch("children", queryset=children_qs)
+
+                return build_ordered_prefetch(max_depth)
+
+        tree_prefetch = create_ordered_tree_prefetch()
+        if tree_prefetch:
+            qs = qs.prefetch_related(tree_prefetch)
+
+        return qs
 
     def filter_name(self, queryset, _name, value):
         search_results = process_query(query=value, request=self.request)["categories"]

core/locale/ar_AR/LC_MESSAGES/django.po

@@ -2338,7 +2338,7 @@ msgstr "{config.PROJECT_NAME} | طلبية تم تسليمها"
 #: core/utils/emailing.py:187
 #, python-brace-format
 msgid "{config.PROJECT_NAME} | promocode granted"
-msgstr "{config.PROJECT_NAME______} | الرمز الترويجي الممنوح"
+msgstr "{config.PROJECT_NAME} | الرمز الترويجي الممنوح"
 
 #: core/utils/messages.py:3
 msgid "you do not have permission to perform this action."

core/sitemaps.py

@@ -1,9 +1,85 @@
+from django.conf import settings
 from django.contrib.sitemaps import Sitemap
-
+from django.utils.translation import gettext_lazy as _
 from core.models import Brand, Category, Product
+from core.utils.seo_builders import any_non_digital
 from evibes.settings import LANGUAGE_CODE
 
 
+class StaticPagesSitemap(Sitemap):
+    protocol = "https"
+    changefreq = "monthly"
+    priority = 0.8
+    limit = 1000
+
+    PAGES = [
+        {
+            "name": _("Home"),
+            "path": f"/{LANGUAGE_CODE}",
+            "lastmod": settings.RELEASE_DATE,
+        },
+        {
+            "name": _("Contact Us"),
+            "path": f"/{LANGUAGE_CODE}/contact-us",
+            "lastmod": settings.RELEASE_DATE,
+        },
+        {
+            "name": _("About Us"),
+            "path": f"/{LANGUAGE_CODE}/about-us",
+            "lastmod": settings.RELEASE_DATE,
+        },
+        {
+            "name": _("Payment Information"),
+            "path": f"/{LANGUAGE_CODE}/help/payments",
+            "lastmod": settings.RELEASE_DATE,
+        },
+    ]
+
+    if any_non_digital():
+        PAGES.append(
+            {
+                "name": _("Delivery"),
+                "path": f"/{LANGUAGE_CODE}/help/delivery",
+                "lastmod": settings.RELEASE_DATE,
+            }
+        )
+
+    def items(self):
+        return self.PAGES
+
+    def location(self, obj):
+        return obj["path"]
+
+    def lastmod(self, obj):
+        return obj.get("lastmod")
+
+
+# class FeaturedProductsSitemap(Sitemap):
+#     protocol = "https"
+#     changefreq = "daily"
+#     priority = 0.9
+#     limit = 25000
+#
+#     def items(self):
+#         return (
+#             Product.objects.filter(
+#                 is_active=True,
+#                 brand__is_active=True,
+#                 category__is_active=True,
+#                 stocks__isnull=False,
+#                 stocks__vendor__is_active=True,
+#             )
+#             .only("uuid", "name", "modified", "slug")
+#             .order_by("-modified")
+#         )
+#
+#     def lastmod(self, obj):
+#         return obj.modified
+#
+#     def location(self, obj):
+#         return f"/{LANGUAGE_CODE}/product/{obj.slug}"
+
+
 class ProductSitemap(Sitemap):
     protocol = "https"
     changefreq = "daily"

core/utils/seo_builders.py

@@ -1,6 +1,8 @@
 from constance import config
 from django.conf import settings
 
+from core.models import Product
+
 
 def org_schema():
     return {
@@ -96,3 +98,7 @@ def brand_schema(brand, url, logo_url=None):
     if logo_url:
         data["logo"] = logo_url
     return data
+
+
+def any_non_digital() -> bool:
+    return Product.objects.filter(is_digital=False).exists()

evibes/settings/base.py

@@ -1,8 +1,10 @@
 import logging
+from datetime import datetime
 from os import getenv, name
 from pathlib import Path
 
 EVIBES_VERSION = "3.0.0"
+RELEASE_DATE = datetime(2025, 9, 13)
 
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 

storefront/public/robots.txt

@@ -2,7 +2,11 @@ User-agent: *
 Disallow: /admin/
 Disallow: /static/
 Disallow: /media/
-Disallow: /profile/
+Disallow: /public/wishlist/
+Disallow: /public/cart/
+Disallow: /public/checkout/
+Disallow: /auth/sign-in/
+Disallow: /auth/sign-up/
 
 Allow: /