pretix-map 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

pretix_mapplugin/migrations/0002_remove_ordergeocodedata_geocoded_timestamp_and_more.py

@@ -1,32 +1,32 @@
-# Generated by Django 4.2.20 on 2025-04-16 01:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretix_mapplugin', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='ordergeocodedata',
-            name='geocoded_timestamp',
-        ),
-        migrations.AddField(
-            model_name='ordergeocodedata',
-            name='last_geocoded_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AlterField(
-            model_name='ordergeocodedata',
-            name='latitude',
-            field=models.FloatField(null=True),
-        ),
-        migrations.AlterField(
-            model_name='ordergeocodedata',
-            name='longitude',
-            field=models.FloatField(null=True),
-        ),
-    ]
+# Generated by Django 4.2.20 on 2025-04-16 01:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretix_mapplugin', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ordergeocodedata',
+            name='geocoded_timestamp',
+        ),
+        migrations.AddField(
+            model_name='ordergeocodedata',
+            name='last_geocoded_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AlterField(
+            model_name='ordergeocodedata',
+            name='latitude',
+            field=models.FloatField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='ordergeocodedata',
+            name='longitude',
+            field=models.FloatField(null=True),
+        ),
+    ]

pretix_mapplugin/migrations/0003_mapmilestone.py

@@ -0,0 +1,27 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0001_initial'),
+        ('pretix_mapplugin', '0002_remove_ordergeocodedata_geocoded_timestamp_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MapMilestone',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('date', models.DateField(verbose_name='Date')),
+                ('label', models.CharField(max_length=200, verbose_name='Milestone Label')),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='map_milestones', to='pretixbase.Event')),
+            ],
+            options={
+                'verbose_name': 'Map Milestone',
+                'verbose_name_plural': 'Map Milestones',
+                'ordering': ['date'],
+            },
+        ),
+    ]

pretix_mapplugin/models.py

@@ -1,47 +1,71 @@
-from django.db import models
-from pretix.base.models import LoggedModel, Order
-
-
-class OrderGeocodeData(LoggedModel):  # Keep LoggedModel if you want audit logs
-    """
-    Stores the geocoded coordinates for a Pretix Order's invoice address.
-    Allows null coordinates for failed geocoding attempts.
-    """
-    order = models.OneToOneField(
-        Order,
-        on_delete=models.CASCADE,
-        related_name='geocode_data',
-        primary_key=True  # Keep this if you want order PK as primary key
-    )
-    latitude = models.FloatField(
-        null=True,  # Allow NULL in the database if geocoding fails
-        blank=True  # Allow blank in forms/admin (good practice with null=True)
-    )
-    longitude = models.FloatField(
-        null=True,  # Allow NULL in the database if geocoding fails
-        blank=True  # Allow blank in forms/admin
-    )
-
-    # Change to auto_now to update timestamp on every save (successful or null)
-    last_geocoded_at = models.DateTimeField(
-        auto_now=True,  # Set/Update timestamp every time the record is saved
-        help_text="Timestamp when geocoding was last attempted/updated."
-    )
-
-    class Meta:
-        verbose_name = "Order Geocode Data"
-        verbose_name_plural = "Order Geocode Data"
-        # Optional: Indexing coordinates can speed up map data queries if you have many entries
-        # indexes = [
-        #     models.Index(fields=['latitude', 'longitude']),
-        # ]
-
-    def __str__(self):
-        # Provide more informative string representation
-        if self.latitude is not None and self.longitude is not None:
-            return f"Geocode for Order {self.order.code}: ({self.latitude:.4f}, {self.longitude:.4f})"
-        else:
-            # Indicate if it's pending (never attempted) or failed (null coords stored)
-            # This requires knowing if the record exists but has nulls vs doesn't exist yet
-            # The current __str__ assumes the record exists if called.
-            return f"Geocode data for Order {self.order.code} (Coordinates: None)"
+from django.db import models
+from pretix.base.models import LoggedModel, Order
+
+
+class OrderGeocodeData(LoggedModel):  # Keep LoggedModel if you want audit logs
+    """
+    Stores the geocoded coordinates for a Pretix Order's invoice address.
+    Allows null coordinates for failed geocoding attempts.
+    """
+    order = models.OneToOneField(
+        Order,
+        on_delete=models.CASCADE,
+        related_name='geocode_data',
+        primary_key=True  # Keep this if you want order PK as primary key
+    )
+    latitude = models.FloatField(
+        null=True,  # Allow NULL in the database if geocoding fails
+        blank=True  # Allow blank in forms/admin (good practice with null=True)
+    )
+    longitude = models.FloatField(
+        null=True,  # Allow NULL in the database if geocoding fails
+        blank=True  # Allow blank in forms/admin
+    )
+
+    # Change to auto_now to update timestamp on every save (successful or null)
+    last_geocoded_at = models.DateTimeField(
+        auto_now=True,  # Set/Update timestamp every time the record is saved
+        help_text="Timestamp when geocoding was last attempted/updated."
+    )
+
+    class Meta:
+        verbose_name = "Order Geocode Data"
+        verbose_name_plural = "Order Geocode Data"
+        # Optional: Indexing coordinates can speed up map data queries if you have many entries
+        # indexes = [
+        #     models.Index(fields=['latitude', 'longitude']),
+        # ]
+
+    def __str__(self):
+        # Provide more informative string representation
+        if self.latitude is not None and self.longitude is not None:
+            return f"Geocode for Order {self.order.code}: ({self.latitude:.4f}, {self.longitude:.4f})"
+        else:
+            return f"Geocode data for Order {self.order.code} (Coordinates: None)"
+
+
+class MapMilestone(models.Model):
+    """
+    Stores marketing milestones (e.g., newsletters, ad starts) for an event.
+    Used for visualization in the Sales Map timeline.
+    """
+    event = models.ForeignKey(
+        'pretixbase.Event',
+        on_delete=models.CASCADE,
+        related_name='map_milestones'
+    )
+    date = models.DateField(
+        verbose_name="Date"
+    )
+    label = models.CharField(
+        max_length=200,
+        verbose_name="Milestone Label"
+    )
+
+    class Meta:
+        ordering = ['date']
+        verbose_name = "Map Milestone"
+        verbose_name_plural = "Map Milestones"
+
+    def __str__(self):
+        return f"{self.date}: {self.label} ({self.event.slug})"

pretix_mapplugin/signals.py

@@ -1,92 +1,77 @@
-import logging
-from django.dispatch import receiver
-from django.urls import reverse, NoReverseMatch
-from django.utils.translation import gettext_lazy as _
-from django.http import HttpRequest
-from django.conf import settings
-
-# --- Pretix Signals ---
-from pretix.base.signals import order_paid
-from pretix.control.signals import nav_event
-
-# --- Tasks ---
-from .tasks import geocode_order_task
-# --- Geocoding Default ---
-from .geocoding import DEFAULT_NOMINATIM_USER_AGENT
-
-logger = logging.getLogger(__name__)
-
-# --- Constants ---
-MAP_VIEW_URL_NAME = 'plugins:pretix_mapplugin:event.settings.salesmap.show'
-REQUIRED_MAP_PERMISSION = 'can_view_orders'
-PLUGIN_NAME = 'pretix_mapplugin'
-
-
-# --- Signal Receiver for Geocoding (Passes organizer_pk) ---
-@receiver(order_paid, dispatch_uid="sales_mapper_order_paid_geocode")
-def trigger_geocoding_on_payment(sender, order, **kwargs):
-    """
-    Listens for the order_paid signal, reads geocoding config,
-    and queues the geocoding task with order_pk, organizer_pk, and config.
-    """
-    user_agent = DEFAULT_NOMINATIM_USER_AGENT
-    organizer_pk = None  # Initialize
-    try:
-        # Ensure order has event and organizer before proceeding
-        if not order or not order.event or not order.event.organizer:
-            logger.error(f"Order {order.code} is missing event or organizer information. Cannot queue task.")
-            return
-
-        organizer_pk = order.event.organizer.pk  # Get organizer PK
-
-        # --- Read User-Agent from settings ---
-        if hasattr(settings, 'plugins') and hasattr(settings.plugins, PLUGIN_NAME):
-            plugin_settings = getattr(settings.plugins, PLUGIN_NAME)
-            user_agent = plugin_settings.get('nominatim_user_agent', DEFAULT_NOMINATIM_USER_AGENT)
-        else:
-            logger.warning(f"Could not access settings.plugins.{PLUGIN_NAME}, using default User-Agent.")
-
-        # --- Queue task with user_agent and organizer_pk as keyword arguments ---
-        geocode_order_task.apply_async(
-            args=[order.pk],  # Keep order_pk as positional argument
-            kwargs={
-                'nominatim_user_agent': user_agent,
-                'organizer_pk': organizer_pk  # Pass organizer PK
-            }
-        )
-        logger.info(f"Geocoding task queued for paid order {order.code} (PK: {order.pk}, Org PK: {organizer_pk}).")
-
-    except ImportError:
-        logger.exception("Could not import geocode_order_task. Check tasks.py.")
-    except Exception as e:
-        # Log the organizer PK as well if available
-        org_info = f" (Org PK: {organizer_pk})" if organizer_pk else ""
-        logger.exception(f"Failed to queue geocoding task for order {order.code}{org_info}: {e}")
-
-
-# --- Signal Receiver for Adding Navigation Item (No changes needed) ---
-@receiver(nav_event, dispatch_uid="sales_mapper_nav_event_add_map")
-def add_map_nav_item(sender, request: HttpRequest, **kwargs):
-    """
-    Adds a navigation item for the Sales Map to the event control panel sidebar.
-    """
-    has_permission = request.user.has_event_permission(request.organizer, request.event, REQUIRED_MAP_PERMISSION,
-                                                       request=request)
-    if not has_permission: return []
-    try:
-        map_url = reverse(MAP_VIEW_URL_NAME, kwargs={
-            'organizer': request.organizer.slug,
-            'event': request.event.slug,
-        })
-    except NoReverseMatch:
-        logger.error(f"Could not reverse URL for map view '{MAP_VIEW_URL_NAME}'. Check urls.py.")
-        return []
-    is_active = False
-    if hasattr(request, 'resolver_match') and request.resolver_match:
-        is_active = request.resolver_match.view_name == MAP_VIEW_URL_NAME
-    return [{
-        'label': _('Sales Map'),
-        'url': map_url,
-        'active': is_active,
-        'icon': 'map-o',
-    }]
+import logging
+from django.dispatch import receiver
+from django.urls import reverse, NoReverseMatch
+from django.utils.translation import gettext_lazy as _
+from django.http import HttpRequest
+from django.conf import settings
+from django.utils.timezone import now
+from django.db import transaction
+
+# --- Pretix Signals ---
+from pretix.base.signals import order_placed, periodic_task
+from pretix.control.signals import nav_event
+
+# --- Tasks ---
+from .tasks import geocode_order_task, nightly_reprocess_geocoding
+# --- Geocoding Default ---
+from .geocoding import DEFAULT_NOMINATIM_USER_AGENT
+
+logger = logging.getLogger(__name__)
+
+# --- Constants ---
+MAP_VIEW_URL_NAME = 'plugins:pretix_mapplugin:event.settings.salesmap.show'
+REQUIRED_MAP_PERMISSION = 'can_view_orders'
+PLUGIN_NAME = 'pretix_mapplugin'
+
+
+@receiver(periodic_task, dispatch_uid="sales_mapper_periodic_reprocess")
+def trigger_nightly_geocoding(sender, **kwargs):
+    if now().hour == 3 and now().minute < 10:
+        nightly_reprocess_geocoding.apply_async()
+
+
+@receiver(order_placed, dispatch_uid="sales_mapper_order_placed_geocode")
+def trigger_geocoding_on_placement(sender, order, **kwargs):
+    """
+    Queues geocoding after the current transaction is committed to avoid SQLite locks.
+    """
+    user_agent = DEFAULT_NOMINATIM_USER_AGENT
+    if hasattr(settings, 'CONFIG_FILE') and settings.CONFIG_FILE.has_section('pretix_mapplugin'):
+        user_agent = settings.CONFIG_FILE.get('pretix_mapplugin', 'nominatim_user_agent', fallback=DEFAULT_NOMINATIM_USER_AGENT)
+
+    def run_task():
+        geocode_order_task.apply_async(
+            args=[order.pk],
+            kwargs={
+                'nominatim_user_agent': user_agent,
+                'organizer_pk': order.event.organizer.pk
+            }
+        )
+    
+    # Crucial: Only run AFTER the order has been saved to DB
+    transaction.on_commit(run_task)
+
+
+@receiver(nav_event, dispatch_uid="sales_mapper_nav_event_add_map")
+def add_map_nav_item(sender, request: HttpRequest, **kwargs):
+    has_permission = request.user.has_event_permission(request.organizer, request.event, REQUIRED_MAP_PERMISSION, request=request)
+    if not has_permission: return []
+    try:
+        map_url = reverse(MAP_VIEW_URL_NAME, kwargs={'organizer': request.organizer.slug, 'event': request.event.slug})
+        milestone_url = reverse('plugins:pretix_mapplugin:event.settings.salesmap.milestones', kwargs={'organizer': request.organizer.slug, 'event': request.event.slug})
+    except NoReverseMatch:
+        return []
+    
+    is_active = request.resolver_match.view_name == MAP_VIEW_URL_NAME if request.resolver_match else False
+    is_milestone_active = request.resolver_match.view_name == 'plugins:pretix_mapplugin:event.settings.salesmap.milestones' if request.resolver_match else False
+
+    return [{
+        'label': _('Sales Map'),
+        'url': map_url,
+        'active': is_active or is_milestone_active,
+        'icon': 'map-o',
+        'children': [
+            {'label': _('Map View'), 'url': map_url, 'active': is_active},
+            {'label': _('Milestones'), 'url': milestone_url, 'active': is_milestone_active},
+        ]
+    }]

pretix_mapplugin/static/pretix_mapplugin/css/salesmap.css

@@ -1,52 +1,101 @@
-.plugin-map-content-wrapper {
-    display: flex;
-    flex-direction: column;
-    height: calc(100vh - 100px);
-    min-height: 450px;
-}
-
-.plugin-map-content-wrapper h1,
-.plugin-map-content-wrapper .form-group {
-    flex-shrink: 0;
-    margin-bottom: 1em;
-}
-
-.map-wrapper {
-    flex-grow: 1;
-    position: relative;
-    min-height: 0;
-    border: 1px solid #ccc;
-}
-
-#sales-map-container {
-    height: 100%;
-    width: 100%;
-    display: block;
-    position: relative;
-}
-
-#map-status-overlay {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-}
-
-#map-status-overlay p {
-    padding: 1em;
-    background: #fff;
-    border-radius: 5px;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-}
-
-#heatmap-options-panel input[type=range] {
-    width: 100%;
-    display: block;
-}
-
-#map-status-overlay p.text-danger {
-    color: #a94442;
-    background-color: #f2dede;
-    border-color: #ebccd1;
+.plugin-map-content-wrapper {
+    display: flex;
+    flex-direction: column;
+    height: calc(100vh - 100px);
+    min-height: 450px;
+}
+
+.plugin-map-content-wrapper h1,
+.plugin-map-content-wrapper .form-group {
+    flex-shrink: 0;
+    margin-bottom: 1em;
+}
+
+.map-wrapper {
+    flex-grow: 1;
+    position: relative;
+    min-height: 0;
+    border: 1px solid #ccc;
+    display: flex;
+    flex-direction: column;
+}
+
+#sales-map-container {
+    height: 100%;
+    width: 100%;
+    display: block;
+    position: relative;
+}
+
+/* Side-by-side comparison styles */
+.map-split-container {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    flex-grow: 1;
+    min-height: 500px;
+}
+
+#sales-map-compare-container {
+    width: 50%;
+    height: 100%;
+    border-left: 2px solid #fff;
+    display: none;
+}
+
+.map-split-active #sales-map-container {
+    width: 50% !important;
+}
+
+.map-split-active #sales-map-compare-container {
+    display: block;
+}
+
+.map-label-overlay {
+    position: absolute;
+    top: 10px;
+    left: 50px;
+    z-index: 1000;
+    background: rgba(255, 255, 255, 0.8);
+    padding: 2px 8px;
+    border-radius: 4px;
+    pointer-events: none;
+    font-weight: bold;
+    border: 1px solid #ccc;
+}
+
+#timeline-chart-container {
+    box-shadow: inset 0 1px 3px rgba(0,0,0,0.1);
+}
+
+.timeline-milestone-marker:hover span {
+    background: rgba(255, 255, 255, 1) !important;
+    z-index: 10;
+    border: 1px solid #ccc;
+}
+
+#map-status-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+#map-status-overlay p {
+    padding: 1em;
+    background: #fff;
+    border-radius: 5px;
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+}
+
+#heatmap-options-panel input[type=range] {
+    width: 100%;
+    display: block;
+}
+
+#map-status-overlay p.text-danger {
+    color: #a94442;
+    background-color: #f2dede;
+    border-color: #ebccd1;
 }