pretix-map 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

pretix_mapplugin/tasks.py

@@ -22,26 +22,48 @@ logger = logging.getLogger(__name__)
 
 
 @app.task(bind=True, max_retries=3, default_retry_delay=60, ignore_result=True)
-def geocode_order_task(self, order_pk: int, nominatim_user_agent: str | None = None):
+# --- Accept organizer_pk as kwarg ---
+def geocode_order_task(self, order_pk: int, organizer_pk: int | None = None, nominatim_user_agent: str | None = None):
     """
     Celery task to geocode the address for a given order PK.
-    Accepts the Nominatim User-Agent as an argument.
-    Activates django-scopes organizer scope before querying scoped models.
+    Accepts organizer_pk and Nominatim User-Agent as arguments.
+    Fetches Organizer first, then activates scope.
     """
-    order = None  # Initialize order to None
+    organizer = None
+    order = None
     try:
+        # --- Step 1: Fetch Organizer (unscoped) ---
+        if organizer_pk is None:
+            # This should ideally not happen if called correctly, but handle defensively
+            logger.error(f"organizer_pk not provided for Order PK {order_pk}. Cannot activate scope.")
+            # Depending on policy, you might retry, skip, or raise an error.
+            # Skipping for now.
+            return
+
         try:
-            order = Order.objects.select_related('event__organizer', 'invoice_address').get(pk=order_pk)
-            organizer = order.event.organizer  # Get organizer from the fetched order
+            organizer = Organizer.objects.get(pk=organizer_pk)
         except ObjectDoesNotExist:
-            logger.error(f"Order with PK {order_pk} not found in geocode_order_task.")
+            logger.error(f"Organizer with PK {organizer_pk} not found (for Order PK {order_pk}).")
+            # Don't retry if organizer doesn't exist
             return
+
+        # --- Step 2: Activate Scope ---
         with scope(organizer=organizer):
+            # --- Step 3: Fetch Order (now within scope) ---
+            try:
+                order = Order.objects.select_related(
+                    'invoice_address'  # Only need this direct relation now
+                ).get(pk=order_pk)
+            except ObjectDoesNotExist:
+                logger.error(f"Order with PK {order_pk} not found within scope of Org {organizer_pk}.")
+                # Don't retry if order doesn't exist in this scope
+                return
+
             logger.info(
                 f"Starting geocoding task for Order {order.code} (PK: {order_pk}) within scope of Organizer '{organizer.slug}'")
 
-            relation_name = 'geocode_data'  # Ensure this matches your model
-            # Check existence within scope (safer)
+            # --- Rest of the logic runs within scope ---
+            relation_name = 'geocode_data'
             if OrderGeocodeData.objects.filter(order_id=order_pk).exists():
                 logger.info(f"Geocode data already exists for Order {order.code} (checked within scope). Skipping.")
                 return
@@ -49,7 +71,6 @@ def geocode_order_task(self, order_pk: int, nominatim_user_agent: str | None = N
             address_str = get_formatted_address_from_order(order)
             if not address_str:
                 logger.info(f"Order {order.code} has no address suitable for geocoding. Storing null coordinates.")
-                # Store null within scope
                 with transaction.atomic():
                     OrderGeocodeData.objects.update_or_create(
                         order=order, defaults={'latitude': None, 'longitude': None}
@@ -59,7 +80,6 @@ def geocode_order_task(self, order_pk: int, nominatim_user_agent: str | None = N
             logger.debug(f"Attempting to geocode address for Order {order.code}: '{address_str}'")
             coordinates = geocode_address(address_str, nominatim_user_agent=nominatim_user_agent)
 
-            # Store result within scope
             with transaction.atomic():
                 if coordinates:
                     latitude, longitude = coordinates
@@ -77,14 +97,17 @@ def geocode_order_task(self, order_pk: int, nominatim_user_agent: str | None = N
                     log_level = logging.INFO if created else logging.DEBUG
                     logger.log(log_level,
                                f"Saved{' new' if created else ' updated'} null geocode data for Order {order.code} after failed attempt.")
-        # --- Scope deactivated automatically here ---
+        # --- Scope deactivated automatically ---
 
-    # Keep outer exception handling
+    # --- Outer exception handling ---
     except ObjectDoesNotExist:
-        # This case is now handled earlier, but keep for safety
-        logger.error(f"Order with PK {order_pk} not found outside scope handling.")
+        # Should be caught earlier now, but keep for safety
+        obj_type = "Organizer" if organizer is None else "Order"
+        obj_pk = organizer_pk if organizer is None else order_pk
+        logger.error(f"{obj_type} with PK {obj_pk} not found.")
     except Exception as e:
-        logger.exception(
-            f"Unexpected error in geocode_order_task for Order PK {order_pk} (potentially outside scope): {e}")
-        # Retry on unexpected errors before scope activation
+        org_info = f" (Org PK: {organizer_pk})" if organizer_pk else ""
+        order_info = f" (Order PK: {order_pk})" if order_pk else ""
+        logger.exception(f"Unexpected error in geocode_order_task{org_info}{order_info}: {e}")
+        # Retry on potentially temporary errors
         raise self.retry(exc=e)

pretix_mapplugin/templates/pretix_mapplugin/map_page.html

@@ -1,44 +1,67 @@
-{% extends "pretixcontrol/event/settings_base.html" %} {# Use Pretix base template #}
+{% extends "pretixcontrol/event/settings_base.html" %}
 {% load i18n %}
-{% load static %} {# To load static files like CSS/JS later #}
-{% load eventurl %} {# Needed for the url template tag #}
+{% load static %}
+{% load eventurl %}
 
 {% block title %}{% trans "Ticket Sales Map" %}{% endblock %}
 
 {% block inside %}
     <h1>{% trans "Ticket Sales Map" %}</h1>
 
-    <div class="form-group">
-        <button id="view-toggle-btn" class="btn btn-default">Switch to Heatmap View</button>
+    {# -- Controls Row -- #}
+    <div class="form-inline" style="margin-bottom: 1em;">
+        <div class="form-group" style="margin-right: 10px;">
+            <button id="view-toggle-btn" class="btn btn-default">Switch to Heatmap View</button>
+        </div>
+        {# -- NEW Cluster Toggle Button -- #}
+        <div class="form-group" style="margin-right: 10px;">
+            <button id="cluster-toggle-btn" class="btn btn-default" disabled>Disable Clustering</button>
+        </div>
+        {# -- End Cluster Toggle Button -- #}
+    </div>
+    {# -- End Controls Row -- #}
+
+    {# -- NEW Heatmap Options Panel (Initially hidden for pins view) -- #}
+    <div id="heatmap-options-panel" class="panel panel-default"
+         style="display: none; padding: 15px; margin-bottom: 1em; max-width: 400px;">
+        <h4>{% trans "Heatmap Options" %}</h4>
+        <div class="form-group">
+            <label for="heatmap-radius">Radius: <span id="radius-value">25</span></label>
+            <input type="range" id="heatmap-radius" class="form-control" min="1" max="100" value="25" step="1" disabled>
+        </div>
+        <div class="form-group">
+            <label for="heatmap-blur">Blur: <span id="blur-value">15</span></label>
+            <input type="range" id="heatmap-blur" class="form-control" min="1" max="50" value="15" step="1" disabled>
+        </div>
+        <div class="form-group">
+            <label for="heatmap-maxZoom">Max Zoom: <span id="maxzoom-value">18</span></label>
+            <input type="range" id="heatmap-maxZoom" class="form-control" min="1" max="18" value="18" step="1" disabled>
+        </div>
+        {# Add more options like gradient if desired later #}
     </div>
+    {# -- End Heatmap Options Panel -- #}
 
-    {# --- Container for Map and Status Overlay --- #}
-    <div style="position: relative; border: 1px solid #ccc;"> {# Wrapper for positioning #}
 
-        {# The container where the map will be rendered #}
-        {# Ensure this has height/width via CSS #}
+    {# -- Map Area -- #}
+    <div style="position: relative; border: 1px solid #ccc;">
         <div id="sales-map-container"
              data-data-url="{% url 'plugins:pretix_mapplugin:event.settings.salesmap.data' organizer=request.organizer.slug event=request.event.slug %}">
-            {# Content inside here will be managed by Leaflet #}
         </div>
-
-        {# --- Status Overlay Element --- #}
-        {# Initially visible, hidden by JS when map loads/errors occur #}
         <div id="map-status-overlay"
              style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 1000; display: flex; justify-content: center; align-items: center; text-align: center;">
             <p>Loading map data...</p>
         </div>
-        {# --- End Status Overlay --- #}
-
     </div>
-    {# --- End Container Wrapper --- #}
+    {# -- End Map Area -- #}
+
 
-    {# === LEAFLET PLUGINS (Loaded via staticfiles) === #}
+    {# === Leaflet & Plugins (Keep as is) === #}
     <script src="{% static 'pretix_mapplugin/libs/leaflet-sales-map/leaflet-heat.js' %}"></script>
     <link rel="stylesheet" href="{% static 'pretix_mapplugin/libs/leaflet-sales-map/MarkerCluster.css' %}"/>
     <link rel="stylesheet" href="{% static 'pretix_mapplugin/libs/leaflet-sales-map/MarkerCluster.Default.css' %}"/>
     <script src="{% static 'pretix_mapplugin/libs/leaflet-sales-map/leaflet.markercluster.js' %}"></script>
 
+    {# === Your JS/CSS (Keep as is) === #}
     <script src="{% static 'pretix_mapplugin/js/salesmap.js' %}"></script>
     <link rel="stylesheet" href="{% static 'pretix_mapplugin/css/salesmap.css' %}"/>