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

django_cfg/apps/payments/admin/subscriptions_admin.py

@@ -5,22 +5,21 @@ Clean subscription management with plan icons and status tracking.
 """
 
 from django.contrib import admin
-from django.db.models import Count
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
+    ActionVariant,
     DisplayMixin,
+    Icons,
     MoneyDisplayConfig,
+    OptimizedModelAdmin,
     StatusBadgeConfig,
-    DateTimeDisplayConfig,
-    Icons,
-    ActionVariant,
+    action,
     display,
-    action
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 from django_cfg.modules.django_logging import get_logger
+
 from ..models import Subscription
 
 logger = get_logger("subscriptions_admin")
@@ -29,9 +28,9 @@ logger = get_logger("subscriptions_admin")
 @admin.register(Subscription)
 class SubscriptionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     """Subscription admin using Django Admin Utilities with plan icons."""
-    
+
     select_related_fields = ['user']
-    
+
     list_display = [
         'user_display',
         'plan_display',
@@ -39,52 +38,52 @@ class SubscriptionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'status_display',
         'expires_display'
     ]
-    
+
     list_filter = ['status', 'tier', 'created_at']
     search_fields = ['user__username', 'user__email']
     readonly_fields = ['created_at', 'updated_at']
-    
+
     # Register actions
     actions = ['activate_subscriptions', 'cancel_subscriptions', 'extend_trial']
-    
+
     @display(description="User", header=True)
     def user_display(self, obj):
         """User display with avatar."""
         return self.display_user_with_avatar(obj, 'user')
-    
+
     @display(description="Plan")
     def plan_display(self, obj):
         """Plan display with tier-specific icons."""
         # Plan type to icon and variant mapping
         plan_config = {
             'basic': {'variant': 'secondary', 'icon': Icons.PERSON},
-            'premium': {'variant': 'primary', 'icon': Icons.STAR}, 
+            'premium': {'variant': 'primary', 'icon': Icons.STAR},
             'enterprise': {'variant': 'success', 'icon': Icons.BUSINESS},
             'pro': {'variant': 'info', 'icon': Icons.WORKSPACE_PREMIUM},
         }
-        
+
         tier = getattr(obj, 'tier', '').lower()
         config_data = plan_config.get(tier, {'variant': 'info', 'icon': Icons.SUBSCRIPTIONS})
-        
+
         tier_name = obj.get_tier_display() if hasattr(obj, 'get_tier_display') else obj.tier.title()
-        
+
         badge_config = StatusBadgeConfig(
             show_icons=True,
             icon=config_data['icon']
         )
-        
+
         return StatusBadge.create(
             text=tier_name,
             variant=config_data['variant'],
             config=badge_config
         )
-    
+
     @display(description="Amount")
     def amount_display(self, obj):
         """Amount display with currency."""
         config = MoneyDisplayConfig(currency="USD", show_sign=False)
         return self.display_money_amount(obj, 'monthly_cost_usd', config)
-    
+
     @display(description="Status", label=True)
     def status_display(self, obj):
         """Status display with subscription-specific icons."""
@@ -95,7 +94,7 @@ class SubscriptionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'pending': 'warning',
             'trial': 'info'
         }
-        
+
         # Status-specific icons
         status_icons = {
             'active': Icons.CHECK_CIRCLE,
@@ -104,55 +103,54 @@ class SubscriptionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             'pending': Icons.PENDING,
             'trial': Icons.TIMER
         }
-        
+
         status = getattr(obj, 'status', 'unknown').lower()
         icon = status_icons.get(status, Icons.HELP)
-        
+
         config = StatusBadgeConfig(
             custom_mappings=subscription_mappings,
             show_icons=True,
             icon=icon
         )
-        
+
         return self.display_status_auto(obj, 'status', config)
-    
+
     @display(description="Expires")
     def expires_display(self, obj):
         """Expiry date display."""
         if not hasattr(obj, 'expires_at') or not obj.expires_at:
             config = StatusBadgeConfig(show_icons=True, icon=Icons.ALL_INCLUSIVE)
             return StatusBadge.create(text="No Expiry", variant="info", config=config)
-        
+
         return self.display_datetime_relative(obj, 'expires_at')
-    
+
     @action(description="Activate subscriptions", variant=ActionVariant.SUCCESS)
     def activate_subscriptions(self, request, queryset):
         """Activate selected subscriptions."""
         updated = queryset.update(status='active')
         self.message_user(request, f"Activated {updated} subscription(s).", level='SUCCESS')
-    
+
     @action(description="Cancel subscriptions", variant=ActionVariant.WARNING)
     def cancel_subscriptions(self, request, queryset):
         """Cancel selected subscriptions."""
         updated = queryset.update(status='cancelled')
         self.message_user(request, f"Cancelled {updated} subscription(s).", level='WARNING')
-    
+
     @action(description="Extend trial period", variant=ActionVariant.INFO)
     def extend_trial(self, request, queryset):
         """Extend trial period for selected subscriptions."""
-        from django.utils import timezone
         from datetime import timedelta
-        
+
         trial_subs = queryset.filter(status='trial')
         updated_count = 0
-        
+
         for sub in trial_subs:
             if hasattr(sub, 'expires_at') and sub.expires_at:
                 # Extend by 7 days
                 sub.expires_at = sub.expires_at + timedelta(days=7)
                 sub.save()
                 updated_count += 1
-        
+
         self.message_user(
             request,
             f"Extended trial period for {updated_count} subscription(s).",

django_cfg/apps/payments/admin/tariffs_admin.py

@@ -4,24 +4,19 @@ Tariffs Admin interface using Django Admin Utilities.
 Clean tariff management with pricing and limits display.
 """
 
+
 from django.contrib import admin
-from django.db.models import Count, Q
-from django.utils import timezone
 from django.utils.html import format_html
-from datetime import timedelta
-
 from unfold.admin import ModelAdmin
 
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
+    DateTimeDisplayConfig,
     DisplayMixin,
+    Icons,
     MoneyDisplayConfig,
-    DateTimeDisplayConfig,
+    OptimizedModelAdmin,
     StatusBadgeConfig,
-    Icons,
-    ActionVariant,
     display,
-    action
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
@@ -40,11 +35,11 @@ class TariffAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     - Automatic query optimization
     - Type-safe configuration
     """
-    
+
     # Performance optimization
     select_related_fields = []
     annotations = {}
-    
+
     # List configuration
     list_display = [
         'name_display',
@@ -55,7 +50,7 @@ class TariffAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'status_display',
         'created_at_display'
     ]
-    
+
     list_filter = [
         'is_active',
         'is_public',
@@ -63,69 +58,69 @@ class TariffAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'priority_support',
         'created_at'
     ]
-    
+
     search_fields = ['name', 'code', 'description']
-    
+
     readonly_fields = [
         'created_at',
         'updated_at',
         'yearly_discount_percentage'
     ]
-    
+
     # Display methods using Unfold features
     @display(description="Name", ordering="name")
     def name_display(self, obj):
         """Tariff name display."""
         return obj.name
-    
+
     @display(description="Code", ordering="code")
     def code_display(self, obj):
         """Tariff code display."""
         return obj.code
-    
+
     @display(description="Pricing", ordering="monthly_price_usd")
     def pricing_display(self, obj):
         """Pricing display using utilities."""
         monthly = self.display_money_amount(
-            obj, 
+            obj,
             'monthly_price_usd',
             MoneyDisplayConfig(currency="USD", show_sign=False)
         )
-        
+
         if obj.yearly_price_usd:
             yearly = self.display_money_amount(
                 obj,
-                'yearly_price_usd', 
+                'yearly_price_usd',
                 MoneyDisplayConfig(currency="USD", show_sign=False)
             )
             discount = f"{obj.yearly_discount_percentage:.0f}% off"
             return format_html("{}/mo • {}/yr ({})", monthly, yearly, discount)
-        
+
         return format_html("{}/mo", monthly)
-    
+
     @display(description="Rate Limits")
     def rate_limits_display(self, obj):
         """Rate limits display."""
         return f"{obj.requests_per_hour:,}/hr • {obj.requests_per_day:,}/day • {obj.requests_per_month:,}/mo"
-    
+
     @display(description="Features")
     def features_display(self, obj):
         """Features display."""
         features = []
-        
+
         features.append(f"{obj.max_api_keys} API keys")
-        
+
         if obj.supports_webhooks:
             features.append("Webhooks")
-        
+
         if obj.priority_support:
             features.append("Priority Support")
-        
+
         return " • ".join(features)
-    
+
     @display(description="Status", label={
         "Active": "success",
-        "Private": "warning", 
+        "Private": "warning",
         "Inactive": "danger"
     })
     def status_display(self, obj):
@@ -136,7 +131,7 @@ class TariffAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             return "Private"
         else:
             return "Inactive"
-    
+
     @display(description="Created")
     def created_at_display(self, obj):
         """Created at display."""
@@ -157,11 +152,11 @@ class TariffEndpointGroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
     - Custom rate limit display
     - Clean utilities integration
     """
-    
+
     # Performance optimization
     select_related_fields = ['tariff', 'endpoint_group']
     annotations = {}
-    
+
     # List configuration
     list_display = [
         'tariff_display',
@@ -170,24 +165,24 @@ class TariffEndpointGroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
         'status_display',
         'created_at_display'
     ]
-    
+
     list_filter = [
         'is_enabled',
         'tariff__is_active',
         'created_at'
     ]
-    
+
     search_fields = [
         'tariff__name',
         'endpoint_group__name'
     ]
-    
+
     readonly_fields = [
         'created_at',
         'updated_at',
         'effective_rate_limit'
     ]
-    
+
     # Display methods
     @display(description="Tariff")
     def tariff_display(self, obj):
@@ -198,7 +193,7 @@ class TariffEndpointGroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="primary",
             config=config
         )
-    
+
     @display(description="Endpoint Group")
     def endpoint_group_display(self, obj):
         """Endpoint group display."""
@@ -208,17 +203,17 @@ class TariffEndpointGroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             variant="info",
             config=config
         )
-    
+
     @display(description="Rate Limit")
     def rate_limit_display(self, obj):
         """Rate limit display."""
         effective = obj.effective_rate_limit
-        
+
         if obj.custom_rate_limit:
             return f"{effective:,}/hr (custom)"
         else:
             return f"{effective:,}/hr (default)"
-    
+
     @display(description="Status")
     def status_display(self, obj):
         """Status display."""
@@ -230,14 +225,14 @@ class TariffEndpointGroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
             status = "Disabled"
             variant = "danger"
             icon = Icons.CANCEL
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=icon)
         return StatusBadge.create(
             text=status,
             variant=variant,
             config=config
         )
-    
+
     @display(description="Created")
     def created_at_display(self, obj):
         """Created at display."""

django_cfg/apps/payments/admin_interface/serializers/__init__.py

@@ -4,21 +4,20 @@ Admin Interface Serializers for Universal Payment System v2.0.
 DRF serializers for admin dashboard API endpoints.
 """
 
-from .webhook_serializers import (
-    WebhookEventSerializer,
-    WebhookEventListSerializer,
-    WebhookStatsSerializer,
-    WebhookActionSerializer,
-    WebhookActionResultSerializer,
-)
-
 from .payment_serializers import (
-    AdminUserSerializer,
-    AdminPaymentListSerializer,
-    AdminPaymentDetailSerializer,
     AdminPaymentCreateSerializer,
-    AdminPaymentUpdateSerializer,
+    AdminPaymentDetailSerializer,
+    AdminPaymentListSerializer,
     AdminPaymentStatsSerializer,
+    AdminPaymentUpdateSerializer,
+    AdminUserSerializer,
+)
+from .webhook_serializers import (
+    WebhookActionResultSerializer,
+    WebhookActionSerializer,
+    WebhookEventListSerializer,
+    WebhookEventSerializer,
+    WebhookStatsSerializer,
 )
 
 __all__ = [
@@ -28,7 +27,7 @@ __all__ = [
     'WebhookStatsSerializer',
     'WebhookActionSerializer',
     'WebhookActionResultSerializer',
-    
+
     # Payment serializers
     'AdminUserSerializer',
     'AdminPaymentListSerializer',

django_cfg/apps/payments/admin_interface/serializers/payment_serializers.py

@@ -4,9 +4,9 @@ Payment Serializers for Admin Interface.
 DRF serializers for payment management in admin dashboard.
 """
 
-from rest_framework import serializers
 from django.contrib.auth import get_user_model
 from django.contrib.humanize.templatetags.humanize import naturaltime
+from rest_framework import serializers
 
 from ...models import UniversalPayment
 
@@ -29,6 +29,7 @@ class AdminPaymentListSerializer(serializers.Serializer):
     Uses UniversalPayment only for data extraction.
     """
     id = serializers.UUIDField(read_only=True)
+    internal_payment_id = serializers.CharField(read_only=True)
     user = AdminUserSerializer(read_only=True)
     amount_usd = serializers.FloatField(read_only=True)
     currency_code = serializers.SerializerMethodField()
@@ -44,23 +45,23 @@ class AdminPaymentListSerializer(serializers.Serializer):
     updated_at = serializers.DateTimeField(read_only=True)
     description = serializers.CharField(read_only=True)
     age = serializers.SerializerMethodField()
-    
+
     def get_currency_code(self, obj):
         """Get currency code from related Currency model."""
         return obj.currency.code if obj.currency else None
-    
+
     def get_currency_name(self, obj):
         """Get currency name from related Currency model."""
         return obj.currency.name if obj.currency else None
-    
+
     def get_provider_display(self, obj):
         """Get human-readable provider name."""
         return obj.get_provider_display()
-    
+
     def get_status_display(self, obj):
         """Get human-readable status."""
         return obj.get_status_display()
-    
+
     def get_age(self, obj):
         """Get human-readable age of payment."""
         from django.contrib.humanize.templatetags.humanize import naturaltime
@@ -101,23 +102,23 @@ class AdminPaymentDetailSerializer(serializers.Serializer):
     created_at = serializers.DateTimeField(read_only=True)
     updated_at = serializers.DateTimeField(read_only=True)
     age = serializers.SerializerMethodField()
-    
+
     def get_currency_code(self, obj):
         """Get currency code from related Currency model."""
         return obj.currency.code if obj.currency else None
-    
+
     def get_currency_name(self, obj):
         """Get currency name from related Currency model."""
         return obj.currency.name if obj.currency else None
-    
+
     def get_provider_display(self, obj):
         """Get human-readable provider name."""
         return obj.get_provider_display()
-    
+
     def get_status_display(self, obj):
         """Get human-readable status."""
         return obj.get_status_display()
-    
+
     def get_age(self, obj):
         """Get human-readable age of payment."""
         return naturaltime(obj.created_at)
@@ -135,7 +136,7 @@ class AdminPaymentCreateSerializer(serializers.Serializer):
     description = serializers.CharField(required=False, allow_blank=True)
     callback_url = serializers.URLField(required=False, allow_blank=True)
     cancel_url = serializers.URLField(required=False, allow_blank=True)
-    
+
     def validate_amount_usd(self, value):
         """Validate USD amount."""
         if value <= 0:
@@ -143,16 +144,16 @@ class AdminPaymentCreateSerializer(serializers.Serializer):
         if value > 100000:  # Max $100k per payment
             raise serializers.ValidationError("Amount exceeds maximum limit")
         return value
-    
+
     def create(self, validated_data):
         """Create payment using PaymentService for proper provider integration."""
+        from django_cfg.apps.payments.models import ProviderCurrency
         from django_cfg.apps.payments.services.core.payment_service import PaymentService
         from django_cfg.apps.payments.services.types.requests import PaymentCreateRequest
-        from django_cfg.apps.payments.models import ProviderCurrency
-        
+
         # Extract provider_currency_code and find original currency
         provider_currency_code = validated_data.pop('currency_code')
-        
+
         # Find the ProviderCurrency to get original currency code
         try:
             provider_currency = ProviderCurrency.objects.select_related('currency').get(
@@ -163,7 +164,7 @@ class AdminPaymentCreateSerializer(serializers.Serializer):
             original_currency_code = provider_currency.currency.code
         except ProviderCurrency.DoesNotExist:
             raise serializers.ValidationError(f"Provider currency {provider_currency_code} not found for {validated_data['provider']}")
-        
+
         # Create PaymentCreateRequest for the service
         payment_request = PaymentCreateRequest(
             user_id=validated_data['user'].id,
@@ -175,11 +176,11 @@ class AdminPaymentCreateSerializer(serializers.Serializer):
             cancel_url=validated_data.get('cancel_url', ''),
             metadata={'provider_currency_code': provider_currency_code}  # Store provider code in metadata
         )
-        
+
         # Use PaymentService to create payment with provider integration
         payment_service = PaymentService()
         result = payment_service.create_payment(payment_request)
-        
+
         if result.success:
             # Get the created payment object from database using payment_id
             from django_cfg.apps.payments.models import UniversalPayment
@@ -187,7 +188,7 @@ class AdminPaymentCreateSerializer(serializers.Serializer):
             return payment
         else:
             raise serializers.ValidationError(f"Payment creation failed: {result.message}")
-    
+
     def to_representation(self, instance):
         """Return created payment with ID and currency info."""
         if instance:
@@ -218,14 +219,14 @@ class AdminPaymentUpdateSerializer(serializers.ModelSerializer):
             'status', 'description', 'callback_url', 'cancel_url',
             'provider_data', 'webhook_data'
         ]
-    
+
     def validate_status(self, value):
         """Validate status transitions."""
         if self.instance and self.instance.status == UniversalPayment.PaymentStatus.COMPLETED:
             if value != UniversalPayment.PaymentStatus.COMPLETED:
                 raise serializers.ValidationError("Cannot change status of completed payment")
         return value
-    
+
 
 
 class AdminPaymentStatsSerializer(serializers.Serializer):
@@ -238,30 +239,30 @@ class AdminPaymentStatsSerializer(serializers.Serializer):
     failed_payments = serializers.IntegerField()
     pending_payments = serializers.IntegerField()
     success_rate = serializers.FloatField()
-    
+
     # Provider breakdown
     by_provider = serializers.DictField(
         child=serializers.DictField(),
         help_text="Statistics by provider"
     )
-    
+
     # Currency breakdown
     by_currency = serializers.DictField(
         child=serializers.DictField(),
         help_text="Statistics by currency"
     )
-    
+
     # Time-based stats
     last_24h = serializers.DictField(
         child=serializers.IntegerField(),
         help_text="Payments in last 24 hours"
     )
-    
+
     last_7d = serializers.DictField(
         child=serializers.IntegerField(),
         help_text="Payments in last 7 days"
     )
-    
+
     last_30d = serializers.DictField(
         child=serializers.IntegerField(),
         help_text="Payments in last 30 days"

django_cfg/apps/payments/admin_interface/serializers/webhook_serializers.py

@@ -4,9 +4,8 @@ Webhook Serializers for Admin Interface.
 DRF serializers for webhook management in admin dashboard.
 """
 
+
 from rest_framework import serializers
-from datetime import datetime
-from typing import Dict, Any
 
 
 class WebhookEventSerializer(serializers.Serializer):
@@ -64,19 +63,19 @@ class WebhookStatsSerializer(serializers.Serializer):
     failed = serializers.IntegerField()
     pending = serializers.IntegerField()
     success_rate = serializers.FloatField()
-    
+
     # Provider breakdown
     providers = serializers.DictField(
         child=WebhookProviderStatsSerializer(),
         help_text="Statistics by provider"
     )
-    
+
     # Time-based stats
     last_24h = serializers.DictField(
         child=serializers.IntegerField(),
         help_text="Events in last 24 hours"
     )
-    
+
     # Performance metrics
     avg_response_time = serializers.FloatField()
     max_response_time = serializers.IntegerField()