django-cfg 1.3.7__py3-none-any.whl → 1.3.9__py3-none-any.whl

django_cfg/apps/payments/admin/tariffs_admin.py

@@ -0,0 +1,248 @@
+"""
+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,
+    DisplayMixin,
+    MoneyDisplayConfig,
+    DateTimeDisplayConfig,
+    StatusBadgeConfig,
+    Icons,
+    ActionVariant,
+    display,
+    action
+)
+from django_cfg.modules.django_admin.utils.badges import StatusBadge
+
+from ..models.tariffs import Tariff, TariffEndpointGroup
+
+
+@admin.register(Tariff)
+class TariffAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
+    """
+    Admin interface for Tariff model.
+    
+    Features:
+    - Clean pricing display
+    - Rate limits visualization
+    - Feature flags display
+    - Automatic query optimization
+    - Type-safe configuration
+    """
+    
+    # Performance optimization
+    select_related_fields = []
+    annotations = {}
+    
+    # List configuration
+    list_display = [
+        'name_display',
+        'code_display',
+        'pricing_display',
+        'rate_limits_display',
+        'features_display',
+        'status_display',
+        'created_at_display'
+    ]
+    
+    list_filter = [
+        'is_active',
+        'is_public',
+        'supports_webhooks',
+        '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, 
+            'monthly_price_usd',
+            MoneyDisplayConfig(currency="USD", show_sign=False)
+        )
+        
+        if obj.yearly_price_usd:
+            yearly = self.display_money_amount(
+                obj,
+                '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", 
+        "Inactive": "danger"
+    })
+    def status_display(self, obj):
+        """Status display using Unfold label feature."""
+        if obj.is_active and obj.is_public:
+            return "Active"
+        elif obj.is_active:
+            return "Private"
+        else:
+            return "Inactive"
+    
+    @display(description="Created")
+    def created_at_display(self, obj):
+        """Created at display."""
+        config = DateTimeDisplayConfig(
+            show_relative=True,
+            show_seconds=False
+        )
+        return self.display_datetime_relative(obj, 'created_at', config)
+
+
+@admin.register(TariffEndpointGroup)
+class TariffEndpointGroupAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin):
+    """
+    Admin interface for TariffEndpointGroup model.
+    
+    Features:
+    - Tariff and endpoint group relationships
+    - Custom rate limit display
+    - Clean utilities integration
+    """
+    
+    # Performance optimization
+    select_related_fields = ['tariff', 'endpoint_group']
+    annotations = {}
+    
+    # List configuration
+    list_display = [
+        'tariff_display',
+        'endpoint_group_display',
+        'rate_limit_display',
+        '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):
+        """Tariff display."""
+        config = StatusBadgeConfig(show_icons=True, icon=Icons.PRICE_CHANGE)
+        return StatusBadge.create(
+            text=obj.tariff.name,
+            variant="primary",
+            config=config
+        )
+    
+    @display(description="Endpoint Group")
+    def endpoint_group_display(self, obj):
+        """Endpoint group display."""
+        config = StatusBadgeConfig(show_icons=True, icon=Icons.GROUP)
+        return StatusBadge.create(
+            text=obj.endpoint_group.name,
+            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."""
+        if obj.is_enabled:
+            status = "Enabled"
+            variant = "success"
+            icon = Icons.CHECK_CIRCLE
+        else:
+            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."""
+        config = DateTimeDisplayConfig(
+            show_relative=True,
+            show_seconds=False
+        )
+        return self.display_datetime_relative(obj, 'created_at', config)

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

@@ -21,65 +21,118 @@ class AdminUserSerializer(serializers.ModelSerializer):
         read_only_fields = fields
 
 
-class AdminPaymentListSerializer(serializers.ModelSerializer):
+class AdminPaymentListSerializer(serializers.Serializer):
     """
     Serializer for payment list in admin interface.
+    Uses UniversalPayment only for data extraction.
     """
+    id = serializers.UUIDField(read_only=True)
     user = AdminUserSerializer(read_only=True)
-    status_display = serializers.CharField(source='get_status_display', read_only=True)
-    provider_display = serializers.CharField(source='get_provider_display', read_only=True)
+    amount_usd = serializers.FloatField(read_only=True)
+    currency_code = serializers.SerializerMethodField()
+    currency_name = serializers.SerializerMethodField()
+    provider = serializers.CharField(read_only=True)
+    provider_display = serializers.SerializerMethodField()
+    status = serializers.CharField(read_only=True)
+    status_display = serializers.SerializerMethodField()
+    pay_amount = serializers.DecimalField(max_digits=20, decimal_places=8, read_only=True)
+    pay_address = serializers.CharField(read_only=True)
+    transaction_hash = serializers.CharField(read_only=True)
+    created_at = serializers.DateTimeField(read_only=True)
+    updated_at = serializers.DateTimeField(read_only=True)
+    description = serializers.CharField(read_only=True)
     age = serializers.SerializerMethodField()
     
-    class Meta:
-        model = UniversalPayment
-        fields = [
-            'id', 'user', 'amount_usd', 'currency_code', 'provider', 'provider_display',
-            'status', 'status_display', 'pay_amount', 'pay_address', 'transaction_hash',
-            'created_at', 'updated_at', 'age', 'description'
-        ]
-        read_only_fields = fields
+    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 obj.age_display
+        from django.contrib.humanize.templatetags.humanize import naturaltime
+        return naturaltime(obj.created_at)
 
 
-class AdminPaymentDetailSerializer(serializers.ModelSerializer):
+class AdminPaymentDetailSerializer(serializers.Serializer):
     """
     Detailed serializer for individual payment in admin interface.
+    Uses UniversalPayment only for data extraction.
     """
+    id = serializers.UUIDField(read_only=True)
     user = AdminUserSerializer(read_only=True)
-    status_display = serializers.CharField(source='get_status_display', read_only=True)
-    provider_display = serializers.CharField(source='get_provider_display', read_only=True)
+    internal_payment_id = serializers.CharField(read_only=True)
+    amount_usd = serializers.FloatField(read_only=True)
+    actual_amount_usd = serializers.FloatField(read_only=True)
+    fee_amount_usd = serializers.FloatField(read_only=True)
+    currency_code = serializers.SerializerMethodField()
+    currency_name = serializers.SerializerMethodField()
+    provider = serializers.CharField(read_only=True)
+    provider_display = serializers.SerializerMethodField()
+    status = serializers.CharField(read_only=True)
+    status_display = serializers.SerializerMethodField()
+    pay_amount = serializers.DecimalField(max_digits=20, decimal_places=8, read_only=True)
+    pay_address = serializers.CharField(read_only=True)
+    payment_url = serializers.URLField(read_only=True)
+    transaction_hash = serializers.CharField(read_only=True)
+    confirmations_count = serializers.IntegerField(read_only=True)
+    security_nonce = serializers.CharField(read_only=True)
+    expires_at = serializers.DateTimeField(read_only=True)
+    completed_at = serializers.DateTimeField(read_only=True)
+    description = serializers.CharField(read_only=True)
+    callback_url = serializers.URLField(read_only=True)
+    cancel_url = serializers.URLField(read_only=True)
+    provider_data = serializers.JSONField(read_only=True)
+    webhook_data = serializers.JSONField(read_only=True)
+    created_at = serializers.DateTimeField(read_only=True)
+    updated_at = serializers.DateTimeField(read_only=True)
     age = serializers.SerializerMethodField()
     
-    class Meta:
-        model = UniversalPayment
-        fields = [
-            'id', 'user', 'internal_payment_id', 'amount_usd', 'actual_amount_usd',
-            'fee_amount_usd', 'currency_code', 'provider', 'provider_display',
-            'status', 'status_display', 'pay_amount', 'pay_address', 'payment_url',
-            'transaction_hash', 'confirmations_count', 'security_nonce',
-            'expires_at', 'completed_at', 'description', 'callback_url', 'cancel_url',
-            'provider_data', 'webhook_data', 'created_at', 'updated_at', 'age'
-        ]
-        read_only_fields = fields
+    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 obj.age_display
+        from django.contrib.humanize.templatetags.humanize import naturaltime
+        return naturaltime(obj.created_at)
 
 
-class AdminPaymentCreateSerializer(serializers.ModelSerializer):
+class AdminPaymentCreateSerializer(serializers.Serializer):
     """
     Serializer for creating payments in admin interface.
+    Uses UniversalPayment only for data creation.
     """
-    class Meta:
-        model = UniversalPayment
-        fields = [
-            'user', 'amount_usd', 'currency_code', 'provider',
-            'description', 'callback_url', 'cancel_url'
-        ]
+    user = serializers.PrimaryKeyRelatedField(queryset=User.objects.all())
+    amount_usd = serializers.FloatField(min_value=1.0, max_value=100000.0)
+    currency_code = serializers.CharField(max_length=10, help_text="Currency code (e.g., BTC, ETH)")
+    provider = serializers.CharField(max_length=50)
+    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."""
@@ -88,6 +141,24 @@ class AdminPaymentCreateSerializer(serializers.ModelSerializer):
         if value > 100000:  # Max $100k per payment
             raise serializers.ValidationError("Amount exceeds maximum limit")
         return value
+    
+    def create(self, validated_data):
+        """Create payment with currency lookup."""
+        from django_cfg.apps.payments.models.currencies import Currency
+        import uuid
+        
+        # Extract currency_code and find Currency object
+        currency_code = validated_data.pop('currency_code')
+        try:
+            currency = Currency.objects.get(code=currency_code)
+        except Currency.DoesNotExist:
+            raise serializers.ValidationError(f"Currency {currency_code} not found")
+        
+        # Generate internal payment ID and create payment
+        validated_data['currency'] = currency
+        validated_data['internal_payment_id'] = f"PAY-{uuid.uuid4().hex[:12].upper()}"
+        
+        return UniversalPayment.objects.create(**validated_data)
 
 
 class AdminPaymentUpdateSerializer(serializers.ModelSerializer):

django_cfg/apps/payments/admin_interface/templates/payments/payment_form.html

@@ -96,12 +96,8 @@
                             class="block w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:text-white disabled:opacity-50"
                             required>
                         <option value="">Select currency...</option>
-                        <template x-for="currency in currencies" :key="currency.code">
-                            <option :value="currency.code">
-                                <span x-text="currency.code"></span> - 
-                                <span x-text="currency.name"></span>
-                                <span x-show="currency.type === 'crypto'" class="text-blue-600"> (Crypto)</span>
-                                <span x-show="currency.network_name" class="text-gray-500" x-text="`[${currency.network_name}]`"></span>
+                        <template x-for="currency in currencies" :key="`${currency.code}-${currency.provider_code || currency.network || Math.random()}`">
+                            <option :value="currency.code" x-text="`${currency.code} - ${currency.name}${currency.type === 'crypto' ? ' (Crypto)' : ''}${currency.network_name ? ' [' + currency.network_name + ']' : ''}`">
                             </option>
                         </template>
                     </select>
@@ -122,22 +118,22 @@
                                 <span class="text-gray-500">Network:</span> 
                                 <span x-text="getCurrencyInfo(form.currency_code)?.network_name"></span>
                             </div>
-                            <div x-show="getCurrencyInfo(form.currency_code)?.min_amount || getCurrencyInfo(form.currency_code)?.max_amount" class="mt-1">
+                            <div x-show="getCurrencyInfo(form.currency_code)?.provider_min_amount_usd || getCurrencyInfo(form.currency_code)?.provider_max_amount_usd" class="mt-1">
                                 <span class="text-gray-500">Limits:</span>
-                                <span x-show="getCurrencyInfo(form.currency_code)?.min_amount">
-                                    Min: $<span x-text="getCurrencyInfo(form.currency_code)?.min_amount"></span>
+                                <span x-show="getCurrencyInfo(form.currency_code)?.provider_min_amount_usd">
+                                    Min: $<span x-text="getCurrencyInfo(form.currency_code)?.provider_min_amount_usd"></span>
                                 </span>
-                                <span x-show="getCurrencyInfo(form.currency_code)?.max_amount">
-                                    Max: $<span x-text="getCurrencyInfo(form.currency_code)?.max_amount"></span>
+                                <span x-show="getCurrencyInfo(form.currency_code)?.provider_max_amount_usd">
+                                    Max: $<span x-text="getCurrencyInfo(form.currency_code)?.provider_max_amount_usd"></span>
                                 </span>
                             </div>
-                            <div x-show="getCurrencyInfo(form.currency_code)?.fee_percentage > 0 || getCurrencyInfo(form.currency_code)?.fixed_fee > 0" class="mt-1">
+                            <div x-show="getCurrencyInfo(form.currency_code)?.provider_fee_percentage > 0 || getCurrencyInfo(form.currency_code)?.provider_fixed_fee_usd > 0" class="mt-1">
                                 <span class="text-gray-500">Fees:</span>
-                                <span x-show="getCurrencyInfo(form.currency_code)?.fee_percentage > 0">
-                                    <span x-text="(getCurrencyInfo(form.currency_code)?.fee_percentage * 100).toFixed(2)"></span>%
+                                <span x-show="getCurrencyInfo(form.currency_code)?.provider_fee_percentage > 0">
+                                    <span x-text="(getCurrencyInfo(form.currency_code)?.provider_fee_percentage * 100).toFixed(2)"></span>%
                                 </span>
-                                <span x-show="getCurrencyInfo(form.currency_code)?.fixed_fee > 0">
-                                    + $<span x-text="getCurrencyInfo(form.currency_code)?.fixed_fee"></span>
+                                <span x-show="getCurrencyInfo(form.currency_code)?.provider_fixed_fee_usd > 0">
+                                    + $<span x-text="getCurrencyInfo(form.currency_code)?.provider_fixed_fee_usd"></span>
                                 </span>
                             </div>
                         </div>

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

@@ -13,6 +13,7 @@ from .api import (
     AdminPaymentViewSet,
     AdminWebhookViewSet,
     AdminWebhookEventViewSet,
+    WebhookTestViewSet,
     AdminStatsViewSet,
     AdminUserViewSet,
 )
@@ -29,6 +30,7 @@ __all__ = [
     'AdminPaymentViewSet',
     'AdminWebhookViewSet',
     'AdminWebhookEventViewSet',
+    'WebhookTestViewSet',
     'AdminStatsViewSet',
     'AdminUserViewSet',
 ]

django_cfg/apps/payments/admin_interface/views/api/webhook_admin.py

@@ -79,39 +79,34 @@ class AdminWebhookViewSet(AdminReadOnlyViewSet):
         
         # Mock webhook stats based on real payment data
         stats_data = {
-            'total_events': total_payments * 2,  # Assume 2 events per payment on average
-            'successful_events': int(total_payments * 1.8),  # 90% success rate
-            'failed_events': int(total_payments * 0.2),  # 10% failure rate
+            'total': total_payments * 2,  # Assume 2 events per payment on average
+            'successful': int(total_payments * 1.8),  # 90% success rate
+            'failed': int(total_payments * 0.2),  # 10% failure rate
+            'pending': 0,  # No pending events for now
             'success_rate': 90.0,
-            'recent_events': recent_payments * 2,
             'providers': {
                 'nowpayments': {
                     'total': int(total_payments * 0.7),
                     'successful': int(total_payments * 0.65),
                     'failed': int(total_payments * 0.05),
+                    'pending': 0,
                     'success_rate': 92.8
                 },
                 'stripe': {
                     'total': int(total_payments * 0.3),
                     'successful': int(total_payments * 0.28),
                     'failed': int(total_payments * 0.02),
+                    'pending': 0,
                     'success_rate': 93.3
                 }
             },
-            'events_by_type': {
-                'payment.created': int(total_payments * 1.0),
-                'payment.completed': int(total_payments * 0.8),
-                'payment.failed': int(total_payments * 0.2),
+            'last_24h': {
+                'total': recent_payments * 2,
+                'successful': int(recent_payments * 1.8),
+                'failed': int(recent_payments * 0.2),
             },
-            'recent_activity': [
-                {
-                    'timestamp': timezone.now() - timedelta(minutes=i*5),
-                    'event_type': 'payment.created' if i % 3 == 0 else 'payment.completed',
-                    'provider': 'nowpayments' if i % 2 == 0 else 'stripe',
-                    'status': 'success' if i % 4 != 0 else 'failed'
-                }
-                for i in range(10)
-            ]
+            'avg_response_time': 150.5,  # milliseconds
+            'max_response_time': 2500,  # milliseconds
         }
         
         serializer = self.get_serializer(stats_data)
@@ -140,7 +135,7 @@ class AdminWebhookEventViewSet(AdminReadOnlyViewSet):
         # In real implementation, this would return WebhookEvent.objects.all()
         return UniversalPayment.objects.none()
     
-    def list(self, request):
+    def list(self, request, webhook_pk=None):
         """List webhook events with filtering and pagination."""
         # Get filter parameters
         event_type = request.query_params.get('event_type')