django-cfg 1.4.21__py3-none-any.whl → 1.4.24__py3-none-any.whl

django_cfg/apps/leads/admin/leads_admin.py

@@ -5,24 +5,20 @@ Enhanced lead management with Material Icons and optimized queries.
 """
 
 from django.contrib import admin, messages
-from django.urls import reverse
-from django.utils.safestring import mark_safe
-from django.http import HttpResponseRedirect
-from django.db import models
 from django.db.models import Count, Q
 from unfold.admin import ModelAdmin
 from unfold.contrib.filters.admin import AutocompleteSelectFilter
-from django_cfg import ImportExportModelAdmin, ImportForm, ExportForm
 
+from django_cfg import ExportForm, ImportExportModelAdmin, ImportForm
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
-    StatusBadgeConfig,
+    ActionVariant,
     DateTimeDisplayConfig,
+    DisplayMixin,
     Icons,
-    ActionVariant,
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    action,
     display,
-    action
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
@@ -33,17 +29,17 @@ from .resources import LeadResource
 @admin.register(Lead)
 class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModelAdmin):
     """Admin interface for Lead model using Django Admin Utilities."""
-    
+
     # Performance optimization
     select_related_fields = ['user']
-    
+
     # Import/Export configuration
     resource_class = LeadResource
     import_form_class = ImportForm
     export_form_class = ExportForm
-    
+
     list_display = [
-        'name_display', 'email_display', 'company_display', 'contact_type_display', 
+        'name_display', 'email_display', 'company_display', 'contact_type_display',
         'contact_value_display', 'subject_display', 'status_display', 'user_display', 'created_at_display'
     ]
     list_display_links = ['name_display', 'email_display']
@@ -53,14 +49,14 @@ class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModel
         ('user', AutocompleteSelectFilter)
     ]
     search_fields = [
-        'name', 'email', 'company', 'company_site', 
+        'name', 'email', 'company', 'company_site',
         'message', 'subject', 'admin_notes'
     ]
     autocomplete_fields = ['user']
     readonly_fields = [
         'created_at', 'updated_at', 'ip_address', 'user_agent'
     ]
-    
+
     fieldsets = (
         ('👤 Basic Information', {
             'fields': ('name', 'email', 'company', 'company_site'),
@@ -87,57 +83,57 @@ class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModel
             'classes': ('tab', 'collapse')
         }),
     )
-    
+
     list_per_page = 50
     date_hierarchy = 'created_at'
-    
+
     actions = ['mark_as_contacted', 'mark_as_qualified', 'mark_as_converted', 'mark_as_rejected']
-    
+
     @display(description="Name", ordering="name")
     def name_display(self, obj):
         """Display lead name."""
         if not obj.name:
             return "—"
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.PERSON)
         return StatusBadge.create(
             text=obj.name,
             variant="primary",
             config=config
         )
-    
+
     @display(description="Email", ordering="email")
     def email_display(self, obj):
         """Display lead email."""
         if not obj.email:
             return "—"
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.EMAIL)
         return StatusBadge.create(
             text=obj.email,
             variant="info",
             config=config
         )
-    
+
     @display(description="Company", ordering="company")
     def company_display(self, obj):
         """Display company name."""
         if not obj.company:
             return "—"
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.BUSINESS)
         return StatusBadge.create(
             text=obj.company,
             variant="secondary",
             config=config
         )
-    
+
     @display(description="Contact Type")
     def contact_type_display(self, obj):
         """Display contact type with badge."""
         if not obj.contact_type:
             return "—"
-        
+
         type_variants = {
             'email': 'info',
             'phone': 'success',
@@ -146,7 +142,7 @@ class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModel
             'other': 'secondary'
         }
         variant = type_variants.get(obj.contact_type, 'secondary')
-        
+
         type_icons = {
             'email': Icons.EMAIL,
             'phone': Icons.PHONE,
@@ -155,33 +151,33 @@ class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModel
             'other': Icons.CONTACT_PHONE
         }
         icon = type_icons.get(obj.contact_type, Icons.CONTACT_PHONE)
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=icon)
         return StatusBadge.create(
             text=obj.get_contact_type_display(),
             variant=variant,
             config=config
         )
-    
+
     @display(description="Contact Value")
     def contact_value_display(self, obj):
         """Display contact value."""
         if not obj.contact_value:
             return "—"
         return obj.contact_value
-    
+
     @display(description="Subject", ordering="subject")
     def subject_display(self, obj):
         """Display subject with truncation."""
         if not obj.subject:
             return "—"
-        
+
         subject = obj.subject
         if len(subject) > 50:
             subject = subject[:47] + "..."
-        
+
         return subject
-    
+
     @display(description="Status")
     def status_display(self, obj):
         """Display lead status with color coding."""
@@ -197,48 +193,48 @@ class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModel
             icon=Icons.FLAG if obj.status == 'new' else Icons.PHONE if obj.status == 'contacted' else Icons.VERIFIED if obj.status == 'qualified' else Icons.CHECK_CIRCLE if obj.status == 'converted' else Icons.CANCEL
         )
         return self.display_status_auto(obj, 'status', status_config)
-    
+
     @display(description="Assigned User")
     def user_display(self, obj):
         """Display assigned user."""
         if not obj.user:
             return "—"
         return self.display_user_simple(obj.user)
-    
+
     @display(description="Created")
     def created_at_display(self, obj):
         """Created time with relative display."""
         config = DateTimeDisplayConfig(show_relative=True)
         return self.display_datetime_relative(obj, 'created_at', config)
-    
+
     @action(description="Mark as contacted", variant=ActionVariant.WARNING)
     def mark_as_contacted(self, request, queryset):
         """Mark selected leads as contacted."""
         updated = queryset.update(status='contacted')
         messages.warning(request, f"Marked {updated} leads as contacted.")
-    
+
     @action(description="Mark as qualified", variant=ActionVariant.PRIMARY)
     def mark_as_qualified(self, request, queryset):
         """Mark selected leads as qualified."""
         updated = queryset.update(status='qualified')
         messages.info(request, f"Marked {updated} leads as qualified.")
-    
+
     @action(description="Mark as converted", variant=ActionVariant.SUCCESS)
     def mark_as_converted(self, request, queryset):
         """Mark selected leads as converted."""
         updated = queryset.update(status='converted')
         messages.success(request, f"Marked {updated} leads as converted.")
-    
+
     @action(description="Mark as rejected", variant=ActionVariant.DANGER)
     def mark_as_rejected(self, request, queryset):
         """Mark selected leads as rejected."""
         updated = queryset.update(status='rejected')
         messages.error(request, f"Marked {updated} leads as rejected.")
-    
+
     def changelist_view(self, request, extra_context=None):
         """Add lead statistics to changelist."""
         extra_context = extra_context or {}
-        
+
         queryset = self.get_queryset(request)
         stats = queryset.aggregate(
             total_leads=Count('id'),
@@ -248,21 +244,21 @@ class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModel
             converted_leads=Count('id', filter=Q(status='converted')),
             rejected_leads=Count('id', filter=Q(status='rejected'))
         )
-        
+
         # Contact type breakdown
         contact_type_counts = dict(
             queryset.values_list('contact_type').annotate(
                 count=Count('id')
             )
         )
-        
+
         # Company breakdown (top 10)
         company_counts = dict(
             queryset.exclude(company__isnull=True).exclude(company='')
             .values_list('company').annotate(count=Count('id'))
             .order_by('-count')[:10]
         )
-        
+
         extra_context['lead_stats'] = {
             'total_leads': stats['total_leads'] or 0,
             'new_leads': stats['new_leads'] or 0,
@@ -273,5 +269,5 @@ class LeadAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ImportExportModel
             'contact_type_counts': contact_type_counts,
             'company_counts': company_counts
         }
-        
+
         return super().changelist_view(request, extra_context)

django_cfg/apps/leads/admin/resources.py

@@ -2,9 +2,9 @@
 Import/Export resources for Leads app.
 """
 
-from import_export import resources, fields
-from import_export.widgets import ForeignKeyWidget, DateTimeWidget, BooleanWidget, JSONWidget
 from django.contrib.auth import get_user_model
+from import_export import fields, resources
+from import_export.widgets import DateTimeWidget, ForeignKeyWidget, JSONWidget
 
 from ..models import Lead
 
@@ -13,7 +13,7 @@ User = get_user_model()
 
 class LeadResource(resources.ModelResource):
     """Resource for importing/exporting leads."""
-    
+
     # Custom fields for better export/import
     user_email = fields.Field(
         column_name='user_email',
@@ -21,31 +21,31 @@ class LeadResource(resources.ModelResource):
         widget=ForeignKeyWidget(User, field='email'),
         readonly=False
     )
-    
+
     status_display = fields.Field(
         column_name='status_display',
         attribute='get_status_display',
         readonly=True
     )
-    
+
     contact_type_display = fields.Field(
         column_name='contact_type_display',
         attribute='get_contact_type_display',
         readonly=True
     )
-    
+
     created_at = fields.Field(
         column_name='created_at',
         attribute='created_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     updated_at = fields.Field(
         column_name='updated_at',
         attribute='updated_at',
         widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
     )
-    
+
     extra = fields.Field(
         column_name='extra',
         attribute='extra',
@@ -80,13 +80,13 @@ class LeadResource(resources.ModelResource):
         import_id_fields = ('email', 'site_url', 'created_at')  # Composite unique identifier
         skip_unchanged = True
         report_skipped = True
-        
+
     def before_import_row(self, row, **kwargs):
         """Process row before import."""
         # Ensure email is lowercase
         if 'email' in row:
             row['email'] = row['email'].lower().strip()
-            
+
         # Handle user assignment by email
         if 'user_email' in row and row['user_email']:
             try:
@@ -95,25 +95,25 @@ class LeadResource(resources.ModelResource):
             except User.DoesNotExist:
                 # Clear user field if email not found
                 row['user'] = None
-                
+
         # Validate status
         if 'status' in row and row['status']:
             valid_statuses = [choice[0] for choice in Lead.StatusChoices.choices]
             if row['status'] not in valid_statuses:
                 row['status'] = Lead.StatusChoices.NEW
-                
+
         # Validate contact_type
         if 'contact_type' in row and row['contact_type']:
             valid_types = [choice[0] for choice in Lead.ContactTypeChoices.choices]
             if row['contact_type'] not in valid_types:
                 row['contact_type'] = Lead.ContactTypeChoices.EMAIL
-                
+
     def skip_row(self, instance, original, row, import_validation_errors=None):
         """Skip rows with validation errors."""
         if import_validation_errors:
             return True
         return super().skip_row(instance, original, row, import_validation_errors)
-        
+
     def get_queryset(self):
         """Optimize queryset for export."""
         return super().get_queryset().select_related('user')

django_cfg/apps/leads/admin.py

@@ -1,9 +1,7 @@
-from django.contrib import admin, messages
-from django.urls import reverse
+from django.contrib import admin
 from django.utils.html import format_html
-from django.http import HttpResponseRedirect
 from unfold.admin import ModelAdmin
-from unfold.decorators import action
+
 from .models import Lead
 
 
@@ -18,13 +16,13 @@ class LeadAdmin(ModelAdmin):
         'status', 'contact_type', 'company', 'created_at'
     ]
     search_fields = [
-        'name', 'email', 'company', 'company_site', 
+        'name', 'email', 'company', 'company_site',
         'message', 'subject', 'admin_notes'
     ]
     readonly_fields = [
         'created_at', 'updated_at', 'ip_address', 'user_agent'
     ]
-    
+
     fieldsets = (
         ('Basic Information', {
             'fields': ('name', 'email', 'company', 'company_site')
@@ -47,7 +45,7 @@ class LeadAdmin(ModelAdmin):
             'classes': ('collapse',)
         }),
     )
-    
+
     def status_display(self, obj):
         status_colors = {
             'new': '#17a2b8',
@@ -62,9 +60,9 @@ class LeadAdmin(ModelAdmin):
             color, obj.get_status_display()
         )
     status_display.short_description = 'Status'
-    
+
     list_per_page = 50
     date_hierarchy = 'created_at'
-    
+
     def get_queryset(self, request):
         return super().get_queryset(request).select_related('user')

django_cfg/apps/leads/apps.py

@@ -13,4 +13,4 @@ class LeadsConfig(AppConfig):
         try:
             import django_cfg.apps.leads.signals  # noqa
         except ImportError:
-            pass
+            pass

django_cfg/apps/leads/models.py

@@ -1,42 +1,42 @@
+from django.contrib.auth import get_user_model
 from django.db import models
 from django.utils import timezone
-from django.contrib.auth import get_user_model
 
 User = get_user_model()
 
 
 class Lead(models.Model):
     """Universal model for storing leads from all sites"""
-    
+
     class StatusChoices(models.TextChoices):
         NEW = 'new', 'New'
         CONTACTED = 'contacted', 'Contacted'
         QUALIFIED = 'qualified', 'Qualified'
         CONVERTED = 'converted', 'Converted'
         REJECTED = 'rejected', 'Rejected'
-    
+
     class ContactTypeChoices(models.TextChoices):
         EMAIL = 'email', 'Email'
         WHATSAPP = 'whatsapp', 'WhatsApp'
         TELEGRAM = 'telegram', 'Telegram'
         PHONE = 'phone', 'Phone'
         OTHER = 'other', 'Other'
-    
+
     # User relation
     user = models.ForeignKey(
-        User, 
-        on_delete=models.SET_NULL, 
-        null=True, 
-        blank=True, 
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
         verbose_name="User"
     )
-    
+
     # Basic information
     name = models.CharField(max_length=200, verbose_name="Full Name")
     email = models.EmailField(verbose_name="Email")
     company = models.CharField(max_length=200, blank=True, null=True, verbose_name="Company")
     company_site = models.CharField(max_length=200, blank=True, null=True, verbose_name="Company Site")
-    
+
     # Contact information
     contact_type = models.CharField(
         max_length=20,
@@ -45,17 +45,17 @@ class Lead(models.Model):
         verbose_name="Contact Type"
     )
     contact_value = models.CharField(max_length=200, blank=True, null=True, verbose_name="Contact Value")
-    
+
     # Message
     subject = models.CharField(max_length=200, blank=True, null=True, verbose_name="Subject")
     message = models.TextField(verbose_name="Message")
     extra = models.JSONField(blank=True, null=True, verbose_name="Extra Data")
-    
+
     # Metadata
     site_url = models.URLField(verbose_name="Site URL", help_text="Frontend URL where form was submitted")
     user_agent = models.TextField(blank=True, null=True, verbose_name="User Agent")
     ip_address = models.GenericIPAddressField(blank=True, null=True, verbose_name="IP Address")
-    
+
     # Status and processing
     status = models.CharField(
         max_length=20,
@@ -63,14 +63,14 @@ class Lead(models.Model):
         default=StatusChoices.NEW,
         verbose_name="Status"
     )
-    
+
     # Timestamps
     created_at = models.DateTimeField(default=timezone.now, verbose_name="Created At")
     updated_at = models.DateTimeField(auto_now=True, verbose_name="Updated At")
-    
+
     # Additional fields
     admin_notes = models.TextField(blank=True, null=True, verbose_name="Admin Notes")
-    
+
     class Meta:
         app_label = 'django_cfg_leads'
         verbose_name = "Lead"
@@ -81,6 +81,6 @@ class Lead(models.Model):
             models.Index(fields=['created_at']),
             models.Index(fields=['email']),
         ]
-    
+
     def __str__(self):
         return f"{self.name} - {self.site_url} ({self.status})"

django_cfg/apps/leads/serializers.py

@@ -3,19 +3,20 @@ Lead Serializers - API serializers for Lead model.
 """
 
 from rest_framework import serializers
+
 from .models import Lead
 
 
 class LeadSubmissionSerializer(serializers.ModelSerializer):
     """Serializer for lead form submission from frontend."""
-    
+
     class Meta:
         model = Lead
         fields = [
             'name', 'email', 'company', 'company_site',
             'contact_type', 'contact_value', 'subject', 'message', 'extra', 'site_url'
         ]
-    
+
     def validate_email(self, value):
         """Validate email format."""
         import re
@@ -23,7 +24,7 @@ class LeadSubmissionSerializer(serializers.ModelSerializer):
         if not re.match(email_pattern, value):
             raise serializers.ValidationError("Invalid email format")
         return value
-    
+
     def validate(self, data):
         """Validate required fields."""
         required_fields = ['name', 'email', 'message']
@@ -44,4 +45,4 @@ class LeadSubmissionErrorSerializer(serializers.Serializer):
     """Response serializer for lead submission errors."""
     success = serializers.BooleanField()
     error = serializers.CharField()
-    details = serializers.DictField(required=False) 
+    details = serializers.DictField(required=False)

django_cfg/apps/leads/signals.py

@@ -4,11 +4,11 @@ Lead Signals - Django signals for Lead model.
 
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.utils import timezone
 
-from .models import Lead
 from django_cfg.modules.django_telegram import DjangoTelegram
 
+from .models import Lead
+
 
 @receiver(post_save, sender=Lead)
 def notify_new_lead(sender, instance, created, **kwargs):
@@ -35,25 +35,25 @@ def notify_new_lead(sender, instance, created, **kwargs):
                 "Status": instance.get_status_display(),
                 "Created At": instance.created_at.strftime("%Y-%m-%d %H:%M:%S"),
             }
-            
+
             # Add extra data if available
             if instance.extra:
                 notification_data["Extra Data"] = instance.extra
-            
+
             # Add company site if available
             if instance.company_site:
                 notification_data["Company Site"] = instance.company_site
-            
+
             # Truncate message if too long
             message_preview = instance.message[:200] + "..." if len(instance.message) > 200 else instance.message
             notification_data["Message Preview"] = message_preview
-            
+
             # Send success notification
             DjangoTelegram.send_success(
                 f"New lead received from {instance.site_url}",
                 notification_data
             )
-            
+
         except Exception as e:
             # Send error notification if something goes wrong
             DjangoTelegram.send_error(