django-cfg 1.1.69__py3-none-any.whl → 1.1.70__py3-none-any.whl

django_cfg/apps/leads/admin/resources.py

@@ -0,0 +1,119 @@
+"""
+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 ..models import Lead
+
+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',
+        attribute='user__email',
+        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',
+        widget=JSONWidget()
+    )
+
+    class Meta:
+        model = Lead
+        fields = (
+            'id',
+            'name',
+            'email',
+            'company',
+            'company_site',
+            'contact_type',
+            'contact_type_display',
+            'contact_value',
+            'subject',
+            'message',
+            'extra',
+            'site_url',
+            'user_agent',
+            'ip_address',
+            'status',
+            'status_display',
+            'user_email',
+            'admin_notes',
+            'created_at',
+            'updated_at',
+        )
+        export_order = fields
+        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:
+                user = User.objects.get(email=row['user_email'].lower().strip())
+                row['user'] = user.pk
+            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/newsletter/admin/__init__.py

@@ -0,0 +1,12 @@
+"""
+Admin configuration for Newsletter app.
+"""
+
+from .newsletter_admin import EmailLogAdmin, NewsletterAdmin, NewsletterSubscriptionAdmin, NewsletterCampaignAdmin
+
+__all__ = [
+    'EmailLogAdmin',
+    'NewsletterAdmin', 
+    'NewsletterSubscriptionAdmin',
+    'NewsletterCampaignAdmin',
+]

django_cfg/apps/newsletter/{admin.py → admin/newsletter_admin.py}

@@ -7,12 +7,19 @@ from unfold.admin import ModelAdmin
 from unfold.decorators import action
 from unfold.contrib.forms.widgets import WysiwygWidget
 from unfold.enums import ActionVariant
-from .models import EmailLog, Newsletter, NewsletterSubscription, NewsletterCampaign
-from .admin_filters import UserEmailFilter, UserNameFilter, HasUserFilter, EmailOpenedFilter, EmailClickedFilter
+from import_export.admin import ImportExportModelAdmin, ExportMixin
+from unfold.contrib.import_export.forms import ImportForm, ExportForm
+
+from ..models import EmailLog, Newsletter, NewsletterSubscription, NewsletterCampaign
+from .filters import UserEmailFilter, UserNameFilter, HasUserFilter, EmailOpenedFilter, EmailClickedFilter
+from .resources import NewsletterResource, NewsletterSubscriptionResource, EmailLogResource
 
 
 @admin.register(EmailLog)
-class EmailLogAdmin(ModelAdmin):
+class EmailLogAdmin(ModelAdmin, ExportMixin):
+    # Export-only configuration
+    resource_class = EmailLogResource
+    export_form_class = ExportForm
     list_display = ('user', 'recipient', 'subject', 'newsletter_link', 'status', 'created_at', 'sent_at', 'tracking_status')
     list_filter = ('status', 'created_at', 'sent_at', 'newsletter', EmailOpenedFilter, EmailClickedFilter, HasUserFilter, UserEmailFilter, UserNameFilter)
     autocomplete_fields = ('user',)
@@ -55,7 +62,11 @@ class EmailLogAdmin(ModelAdmin):
 
 
 @admin.register(Newsletter)
-class NewsletterAdmin(ModelAdmin):
+class NewsletterAdmin(ModelAdmin, ImportExportModelAdmin):
+    # Import/Export configuration
+    resource_class = NewsletterResource
+    import_form_class = ImportForm
+    export_form_class = ExportForm
     list_display = ('title', 'description', 'is_active', 'auto_subscribe', 'subscribers_count', 'created_at')
     list_filter = ('is_active', 'auto_subscribe', 'created_at')
     search_fields = ('title', 'description')
@@ -70,7 +81,11 @@ class NewsletterSubscriptionInline(admin.TabularInline):
 
 
 @admin.register(NewsletterSubscription)
-class NewsletterSubscriptionAdmin(ModelAdmin):
+class NewsletterSubscriptionAdmin(ModelAdmin, ImportExportModelAdmin):
+    # Import/Export configuration
+    resource_class = NewsletterSubscriptionResource
+    import_form_class = ImportForm
+    export_form_class = ExportForm
     list_display = ('email', 'newsletter', 'user', 'is_active', 'subscribed_at', 'unsubscribed_at')
     list_filter = ('is_active', 'newsletter', 'subscribed_at')
     search_fields = ('email', 'user__email', 'newsletter__title')

django_cfg/apps/newsletter/admin/resources.py

@@ -0,0 +1,241 @@
+"""
+Import/Export resources for Newsletter app.
+"""
+
+from import_export import resources, fields
+from import_export.widgets import ForeignKeyWidget, DateTimeWidget, BooleanWidget
+from django.contrib.auth import get_user_model
+
+from ..models import Newsletter, NewsletterSubscription, EmailLog
+
+User = get_user_model()
+
+
+class NewsletterResource(resources.ModelResource):
+    """Resource for importing/exporting newsletters."""
+    
+    subscribers_count = fields.Field(
+        column_name='subscribers_count',
+        attribute='subscribers_count',
+        readonly=True
+    )
+    
+    is_active = fields.Field(
+        column_name='is_active',
+        attribute='is_active',
+        widget=BooleanWidget()
+    )
+    
+    auto_subscribe = fields.Field(
+        column_name='auto_subscribe',
+        attribute='auto_subscribe',
+        widget=BooleanWidget()
+    )
+    
+    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')
+    )
+
+    class Meta:
+        model = Newsletter
+        fields = (
+            'id',
+            'title',
+            'description',
+            'is_active',
+            'auto_subscribe',
+            'subscribers_count',
+            'created_at',
+            'updated_at',
+        )
+        export_order = fields
+        import_id_fields = ('title',)  # Use title as unique identifier
+        skip_unchanged = True
+        report_skipped = True
+        
+    def before_import_row(self, row, **kwargs):
+        """Process row before import."""
+        # Ensure title is not empty
+        if 'title' in row:
+            row['title'] = row['title'].strip()
+            if not row['title']:
+                raise ValueError("Newsletter title cannot be empty")
+
+
+class NewsletterSubscriptionResource(resources.ModelResource):
+    """Resource for importing/exporting newsletter subscriptions."""
+    
+    newsletter_title = fields.Field(
+        column_name='newsletter_title',
+        attribute='newsletter__title',
+        widget=ForeignKeyWidget(Newsletter, field='title'),
+        readonly=False
+    )
+    
+    user_email = fields.Field(
+        column_name='user_email',
+        attribute='user__email',
+        widget=ForeignKeyWidget(User, field='email'),
+        readonly=False
+    )
+    
+    is_active = fields.Field(
+        column_name='is_active',
+        attribute='is_active',
+        widget=BooleanWidget()
+    )
+    
+    subscribed_at = fields.Field(
+        column_name='subscribed_at',
+        attribute='subscribed_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+    
+    unsubscribed_at = fields.Field(
+        column_name='unsubscribed_at',
+        attribute='unsubscribed_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+
+    class Meta:
+        model = NewsletterSubscription
+        fields = (
+            'id',
+            'newsletter_title',
+            'user_email',
+            'email',
+            'is_active',
+            'subscribed_at',
+            'unsubscribed_at',
+        )
+        export_order = fields
+        import_id_fields = ('newsletter_title', 'email')  # 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 newsletter assignment by title
+        if 'newsletter_title' in row and row['newsletter_title']:
+            try:
+                newsletter = Newsletter.objects.get(title=row['newsletter_title'].strip())
+                row['newsletter'] = newsletter.pk
+            except Newsletter.DoesNotExist:
+                raise ValueError(f"Newsletter '{row['newsletter_title']}' not found")
+                
+        # Handle user assignment by email (optional)
+        if 'user_email' in row and row['user_email']:
+            try:
+                user = User.objects.get(email=row['user_email'].lower().strip())
+                row['user'] = user.pk
+            except User.DoesNotExist:
+                # Clear user field if email not found
+                row['user'] = None
+                
+    def get_queryset(self):
+        """Optimize queryset for export."""
+        return super().get_queryset().select_related('newsletter', 'user')
+
+
+class EmailLogResource(resources.ModelResource):
+    """Resource for exporting email logs (export only)."""
+    
+    user_email = fields.Field(
+        column_name='user_email',
+        attribute='user__email',
+        readonly=True
+    )
+    
+    newsletter_title = fields.Field(
+        column_name='newsletter_title',
+        attribute='newsletter__title',
+        readonly=True
+    )
+    
+    campaign_subject = fields.Field(
+        column_name='campaign_subject',
+        attribute='campaign__subject',
+        readonly=True
+    )
+    
+    status_display = fields.Field(
+        column_name='status_display',
+        attribute='get_status_display',
+        readonly=True
+    )
+    
+    is_opened = fields.Field(
+        column_name='is_opened',
+        attribute='is_opened',
+        widget=BooleanWidget(),
+        readonly=True
+    )
+    
+    is_clicked = fields.Field(
+        column_name='is_clicked',
+        attribute='is_clicked',
+        widget=BooleanWidget(),
+        readonly=True
+    )
+    
+    created_at = fields.Field(
+        column_name='created_at',
+        attribute='created_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+    
+    sent_at = fields.Field(
+        column_name='sent_at',
+        attribute='sent_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+    
+    opened_at = fields.Field(
+        column_name='opened_at',
+        attribute='opened_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+    
+    clicked_at = fields.Field(
+        column_name='clicked_at',
+        attribute='clicked_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+
+    class Meta:
+        model = EmailLog
+        fields = (
+            'id',
+            'user_email',
+            'newsletter_title',
+            'campaign_subject',
+            'recipient',
+            'subject',
+            'status',
+            'status_display',
+            'is_opened',
+            'is_clicked',
+            'created_at',
+            'sent_at',
+            'opened_at',
+            'clicked_at',
+            'error_message',
+        )
+        export_order = fields
+        # No import - this is export only
+        
+    def get_queryset(self):
+        """Optimize queryset for export."""
+        return super().get_queryset().select_related('user', 'newsletter', 'campaign')

django_cfg/apps/support/admin/__init__.py

@@ -0,0 +1,10 @@
+"""
+Admin configuration for Support app.
+"""
+
+from .support_admin import TicketAdmin, MessageAdmin
+
+__all__ = [
+    'TicketAdmin',
+    'MessageAdmin',
+]

django_cfg/apps/support/admin/resources.py

@@ -0,0 +1,183 @@
+"""
+Import/Export resources for Support app.
+"""
+
+from import_export import resources, fields
+from import_export.widgets import ForeignKeyWidget, DateTimeWidget, BooleanWidget
+from django.contrib.auth import get_user_model
+
+from ..models import Ticket, Message
+
+User = get_user_model()
+
+
+class TicketResource(resources.ModelResource):
+    """Resource for exporting tickets (export only)."""
+    
+    user_email = fields.Field(
+        column_name='user_email',
+        attribute='user__email',
+        readonly=True
+    )
+    
+    user_full_name = fields.Field(
+        column_name='user_full_name',
+        attribute='user__get_full_name',
+        readonly=True
+    )
+    
+    status_display = fields.Field(
+        column_name='status_display',
+        attribute='get_status_display',
+        readonly=True
+    )
+    
+    messages_count = fields.Field(
+        column_name='messages_count',
+        readonly=True
+    )
+    
+    last_message_text = fields.Field(
+        column_name='last_message_text',
+        readonly=True
+    )
+    
+    last_message_at = fields.Field(
+        column_name='last_message_at',
+        readonly=True,
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+    
+    unanswered_messages_count = fields.Field(
+        column_name='unanswered_messages_count',
+        attribute='unanswered_messages_count',
+        readonly=True
+    )
+    
+    created_at = fields.Field(
+        column_name='created_at',
+        attribute='created_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+
+    class Meta:
+        model = Ticket
+        fields = (
+            'uuid',
+            'user_email',
+            'user_full_name',
+            'subject',
+            'status',
+            'status_display',
+            'messages_count',
+            'last_message_text',
+            'last_message_at',
+            'unanswered_messages_count',
+            'created_at',
+        )
+        export_order = fields
+        # No import - this is export only
+        
+    def dehydrate_messages_count(self, ticket):
+        """Calculate messages count for export."""
+        return ticket.messages.count()
+        
+    def dehydrate_last_message_text(self, ticket):
+        """Get last message text for export."""
+        last_message = ticket.last_message
+        if last_message:
+            # Truncate long messages
+            text = last_message.text
+            return text[:100] + '...' if len(text) > 100 else text
+        return ''
+        
+    def dehydrate_last_message_at(self, ticket):
+        """Get last message timestamp for export."""
+        last_message = ticket.last_message
+        return last_message.created_at if last_message else None
+        
+    def get_queryset(self):
+        """Optimize queryset for export."""
+        return super().get_queryset().select_related('user').prefetch_related('messages')
+
+
+class MessageResource(resources.ModelResource):
+    """Resource for exporting messages (export only)."""
+    
+    ticket_uuid = fields.Field(
+        column_name='ticket_uuid',
+        attribute='ticket__uuid',
+        readonly=True
+    )
+    
+    ticket_subject = fields.Field(
+        column_name='ticket_subject',
+        attribute='ticket__subject',
+        readonly=True
+    )
+    
+    sender_email = fields.Field(
+        column_name='sender_email',
+        attribute='sender__email',
+        readonly=True
+    )
+    
+    sender_full_name = fields.Field(
+        column_name='sender_full_name',
+        attribute='sender__get_full_name',
+        readonly=True
+    )
+    
+    is_from_author = fields.Field(
+        column_name='is_from_author',
+        attribute='is_from_author',
+        widget=BooleanWidget(),
+        readonly=True
+    )
+    
+    is_from_staff = fields.Field(
+        column_name='is_from_staff',
+        readonly=True,
+        widget=BooleanWidget()
+    )
+    
+    text_preview = fields.Field(
+        column_name='text_preview',
+        readonly=True
+    )
+    
+    created_at = fields.Field(
+        column_name='created_at',
+        attribute='created_at',
+        widget=DateTimeWidget(format='%Y-%m-%d %H:%M:%S')
+    )
+
+    class Meta:
+        model = Message
+        fields = (
+            'uuid',
+            'ticket_uuid',
+            'ticket_subject',
+            'sender_email',
+            'sender_full_name',
+            'is_from_author',
+            'is_from_staff',
+            'text',
+            'text_preview',
+            'created_at',
+        )
+        export_order = fields
+        # No import - this is export only
+        
+    def dehydrate_is_from_staff(self, message):
+        """Check if message is from staff member."""
+        return message.sender.is_staff
+        
+    def dehydrate_text_preview(self, message):
+        """Get truncated text preview for export."""
+        text = message.text
+        return text[:200] + '...' if len(text) > 200 else text
+        
+    def get_queryset(self):
+        """Optimize queryset for export."""
+        return super().get_queryset().select_related('ticket', 'sender')

django_cfg/apps/support/{admin.py → admin/support_admin.py}

@@ -7,8 +7,12 @@ from django.urls import reverse
 from django.shortcuts import redirect
 from django.http import HttpRequest
 from django.utils.translation import gettext_lazy as _
-from .models import Ticket, Message
-from .admin_filters import TicketUserEmailFilter, TicketUserNameFilter, MessageSenderEmailFilter
+from import_export.admin import ExportMixin
+from unfold.contrib.import_export.forms import ExportForm
+
+from ..models import Ticket, Message
+from .filters import TicketUserEmailFilter, TicketUserNameFilter, MessageSenderEmailFilter
+from .resources import TicketResource, MessageResource
 from django import forms
 
 class MessageInline(TabularInline):
@@ -50,7 +54,10 @@ class MessageInline(TabularInline):
 
 
 @admin.register(Ticket)
-class TicketAdmin(ModelAdmin):
+class TicketAdmin(ModelAdmin, ExportMixin):
+    # Export-only configuration
+    resource_class = TicketResource
+    export_form_class = ExportForm
     list_display = ("user_avatar", "uuid_link", "subject", "status", "last_message_short", "last_message_ago", "chat_link", "created_at")
     list_display_links = ("subject",)
     list_editable = ("status",)
@@ -133,7 +140,7 @@ class TicketAdmin(ModelAdmin):
 
     def chat_link(self, obj):
         """Display chat link button in list view."""
-        chat_url = reverse('ticket-chat', kwargs={'ticket_uuid': obj.uuid})
+        chat_url = reverse('cfg_support:ticket-chat', kwargs={'ticket_uuid': obj.uuid})
         return format_html(
             '<a href="{}" target="_blank" class="btn btn-sm btn-primary" '
             'style="background: #0d6efd; color: white; padding: 4px 8px; '
@@ -154,11 +161,14 @@ class TicketAdmin(ModelAdmin):
     def open_chat(self, request: HttpRequest, object_id: int):
         """Open the beautiful chat interface for this ticket."""
         ticket = Ticket.objects.get(pk=object_id)
-        chat_url = reverse('ticket-chat', kwargs={'ticket_uuid': ticket.uuid})
+        chat_url = reverse('cfg_support:ticket-chat', kwargs={'ticket_uuid': ticket.uuid})
         return redirect(chat_url)
 
 @admin.register(Message)
-class MessageAdmin(ModelAdmin):
+class MessageAdmin(ModelAdmin, ExportMixin):
+    # Export-only configuration
+    resource_class = MessageResource
+    export_form_class = ExportForm
     list_display = ("sender_avatar", "uuid", "ticket", "text_short", "created_at")
     list_display_links = ("uuid", "ticket")
     search_fields = ("uuid", "ticket__subject", "sender__username", "sender__email", "text")

django_cfg/apps/support/templates/support/chat/ticket_chat.html

@@ -197,7 +197,7 @@
             submitBtn.disabled = true;
 
             try {
-                const response = await fetch(`{% url 'send-message-ajax' ticket_uuid=ticket.uuid %}`, {
+                const response = await fetch(`{% url 'cfg_support:send-message-ajax' ticket_uuid=ticket.uuid %}`, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/json',

django_cfg/apps/urls.py

@@ -28,8 +28,7 @@ def get_django_cfg_urlpatterns() -> List[URLPattern]:
         # Use BaseModule to check enabled applications
         base_module = BaseModule()
         
-        # All business logic apps are handled by Django Revolution zones
-        # to maintain consistency and enable client generation
+        # Support URLs - needed for admin interface chat links
         # if base_module.is_support_enabled():
         #     patterns.append(path('support/', include('django_cfg.apps.support.urls')))
         #