django-cfg 1.4.116__py3-none-any.whl → 1.5.14__py3-none-any.whl

django_cfg/apps/{payments → business/payments}/admin/payment_admin.py

@@ -209,93 +209,69 @@ class PaymentAdmin(PydanticAdmin):
         age = timezone.now() - obj.created_at
         age_text = f"{age.days} days, {age.seconds // 3600} hours"
 
-        # Build details list
-        details = []
-
-        # Basic info
-        details.append(self.html.inline([
-            self.html.span("Internal ID:", "font-semibold"),
-            self.html.span(obj.internal_payment_id, "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Age:", "font-semibold"),
-            self.html.span(age_text, "")
-        ], separator=" "))
-
-        # Provider info
-        if obj.provider_payment_id:
-            details.append(self.html.inline([
-                self.html.span("Provider Payment ID:", "font-semibold"),
-                self.html.span(obj.provider_payment_id, "")
-            ], separator=" "))
-
         # Transaction details
+        transaction_value = None
         if obj.transaction_hash:
             explorer_link = obj.get_explorer_link()
             if explorer_link:
-                details.append(self.html.inline([
-                    self.html.span("Transaction:", "font-semibold"),
-                    self.html.span(f'<a href="{explorer_link}" target="_blank">{obj.transaction_hash[:16]}...</a>', "")
-                ], separator=" "))
+                transaction_value = self.html.link(
+                    explorer_link,
+                    f"{obj.transaction_hash[:16]}...",
+                    target="_blank"
+                )
             else:
-                details.append(self.html.inline([
-                    self.html.span("Transaction Hash:", "font-semibold"),
-                    self.html.span(obj.transaction_hash, "")
-                ], separator=" "))
-
-        if obj.confirmations_count > 0:
-            details.append(self.html.inline([
-                self.html.span("Confirmations:", "font-semibold"),
+                transaction_value = self.html.code(obj.transaction_hash)
+
+        return self.html.breakdown(
+            self.html.key_value("Internal ID", obj.internal_payment_id),
+            self.html.key_value("Age", age_text),
+            self.html.key_value(
+                "Provider Payment ID",
+                obj.provider_payment_id
+            ) if obj.provider_payment_id else None,
+            self.html.key_value(
+                "Transaction",
+                transaction_value
+            ) if obj.transaction_hash else None,
+            self.html.key_value(
+                "Confirmations",
                 self.html.badge(str(obj.confirmations_count), variant="info", icon=Icons.CHECK_CIRCLE)
-            ], separator=" "))
-
-        if obj.pay_address:
-            details.append(self.html.inline([
-                self.html.span("Pay Address:", "font-semibold"),
-                self.html.span(f'<code>{obj.pay_address}</code>', "")
-            ], separator=" "))
-
-        if obj.pay_amount:
-            details.append(self.html.inline([
-                self.html.span("Pay Amount:", "font-semibold"),
-                self.html.span(f'{obj.pay_amount:.8f} {obj.currency.token}', "")
-            ], separator=" "))
-
-        if obj.actual_amount:
-            details.append(self.html.inline([
-                self.html.span("Actual Amount:", "font-semibold"),
-                self.html.span(f'{obj.actual_amount:.8f} {obj.currency.token}', "")
-            ], separator=" "))
-
-        # URLs
-        if obj.payment_url:
-            details.append(self.html.inline([
-                self.html.span("Payment URL:", "font-semibold"),
-                self.html.span(f'<a href="{obj.payment_url}" target="_blank">Open</a>', "")
-            ], separator=" "))
-
-        # Expiration
-        if obj.expires_at:
-            if obj.is_expired:
-                details.append(self.html.inline([
-                    self.html.span("Expired:", "font-semibold"),
-                    self.html.badge(f"Yes ({obj.expires_at})", variant="danger", icon=Icons.ERROR)
-                ], separator=" "))
-            else:
-                details.append(self.html.inline([
-                    self.html.span("Expires At:", "font-semibold"),
-                    self.html.span(str(obj.expires_at), "")
-                ], separator=" "))
-
-        # Description
-        if obj.description:
-            details.append(self.html.inline([
-                self.html.span("Description:", "font-semibold"),
-                self.html.span(obj.description, "")
-            ], separator=" "))
-
-        return "<br>".join(details)
+            ) if obj.confirmations_count > 0 else None,
+            self.html.key_value(
+                "Pay Address",
+                self.html.code(obj.pay_address)
+            ) if obj.pay_address else None,
+            self.html.key_value(
+                "Pay Amount",
+                self.html.inline(
+                    self.html.number(obj.pay_amount, precision=8),
+                    obj.currency.token,
+                    separator=" "
+                )
+            ) if obj.pay_amount else None,
+            self.html.key_value(
+                "Actual Amount",
+                self.html.inline(
+                    self.html.number(obj.actual_amount, precision=8),
+                    obj.currency.token,
+                    separator=" "
+                )
+            ) if obj.actual_amount else None,
+            self.html.key_value(
+                "Payment URL",
+                self.html.link(obj.payment_url, "Open", target="_blank")
+            ) if obj.payment_url else None,
+            self.html.key_value(
+                "Expired",
+                self.html.badge(f"Yes ({obj.expires_at})", variant="danger", icon=Icons.ERROR)
+            ) if obj.expires_at and obj.is_expired else (
+                self.html.key_value("Expires At", str(obj.expires_at)) if obj.expires_at else None
+            ),
+            self.html.key_value(
+                "Description",
+                obj.description
+            ) if obj.description else None
+        )
 
     payment_details_display.short_description = "Payment Details"
 
@@ -306,8 +282,12 @@ class PaymentAdmin(PydanticAdmin):
 
         qr_url = obj.get_qr_code_url(size=200)
         if qr_url:
-            return (
-                f'<img src="{qr_url}" alt="QR Code" style="max-width:200px;"><br>'
-                f'<small>Scan to pay: <code>{obj.pay_address}</code></small>'
+            from django.utils.html import format_html
+            img_html = format_html('<img src="{}" alt="QR Code" style="max-width:200px;">', qr_url)
+            caption = self.html.inline(
+                self.html.text("Scan to pay:", size="sm"),
+                self.html.code(obj.pay_address),
+                separator=" "
             )
-        return self.html.span(f"Address: {obj.pay_address}", "text-sm")
+            return self.html.breakdown(img_html, caption)
+        return self.html.text(f"Address: {obj.pay_address}", size="sm")

django_cfg/apps/{payments → business/payments}/admin/withdrawal_admin.py

@@ -251,105 +251,70 @@ class WithdrawalRequestAdmin(PydanticAdmin):
         if not obj.pk:
             return "Save to see details"
 
-        # Build details list
-        details = []
-
-        details.append(self.html.inline([
-            self.html.span("Withdrawal ID:", "font-semibold"),
-            self.html.span(str(obj.id), "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("User:", "font-semibold"),
-            self.html.span(f"{obj.user.username} ({obj.user.email})", "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Amount:", "font-semibold"),
-            self.html.span(f"${obj.amount_usd:.2f} USD", "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Currency:", "font-semibold"),
-            self.html.span(obj.currency.code, "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Wallet Address:", "font-semibold"),
-            self.html.span(f"<code>{obj.wallet_address}</code>", "")
-        ], separator=" "))
-
-        details.append(self.html.inline([
-            self.html.span("Status:", "font-semibold"),
-            self.html.span(obj.get_status_display(), "")
-        ], separator=" "))
-
-        if obj.network_fee_usd:
-            details.append(self.html.inline([
-                self.html.span("Network Fee:", "font-semibold"),
-                self.html.span(f"${obj.network_fee_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.service_fee_usd:
-            details.append(self.html.inline([
-                self.html.span("Service Fee:", "font-semibold"),
-                self.html.span(f"${obj.service_fee_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.total_fee_usd:
-            details.append(self.html.inline([
-                self.html.span("Total Fee:", "font-semibold"),
-                self.html.span(f"${obj.total_fee_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.final_amount_usd:
-            details.append(self.html.inline([
-                self.html.span("Final Amount:", "font-semibold"),
-                self.html.span(f"${obj.final_amount_usd:.2f} USD", "")
-            ], separator=" "))
-
-        if obj.admin_user:
-            details.append(self.html.inline([
-                self.html.span("Approved By:", "font-semibold"),
-                self.html.span(obj.admin_user.username, "")
-            ], separator=" "))
-
-        if obj.admin_notes:
-            details.append(self.html.inline([
-                self.html.span("Admin Notes:", "font-semibold"),
-                self.html.span(obj.admin_notes, "")
-            ], separator=" "))
-
-        if obj.transaction_hash:
-            details.append(self.html.inline([
-                self.html.span("Transaction Hash:", "font-semibold"),
-                self.html.span(f"<code>{obj.transaction_hash}</code>", "")
-            ], separator=" "))
-
-        if obj.crypto_amount:
-            details.append(self.html.inline([
-                self.html.span("Crypto Amount:", "font-semibold"),
-                self.html.span(f"{obj.crypto_amount:.8f} {obj.currency.token}", "")
-            ], separator=" "))
-
-        if obj.approved_at:
-            details.append(self.html.inline([
-                self.html.span("Approved At:", "font-semibold"),
-                self.html.span(str(obj.approved_at), "")
-            ], separator=" "))
-
-        if obj.completed_at:
-            details.append(self.html.inline([
-                self.html.span("Completed At:", "font-semibold"),
-                self.html.span(str(obj.completed_at), "")
-            ], separator=" "))
-
-        if obj.rejected_at:
-            details.append(self.html.inline([
-                self.html.span("Rejected At:", "font-semibold"),
-                self.html.span(str(obj.rejected_at), "")
-            ], separator=" "))
-
-        return "<br>".join(details)
+        return self.html.breakdown(
+            self.html.key_value("Withdrawal ID", str(obj.id)),
+            self.html.key_value(
+                "User",
+                f"{obj.user.username} ({obj.user.email})"
+            ),
+            self.html.key_value(
+                "Amount",
+                self.html.number(obj.amount_usd, precision=2, prefix="$", suffix=" USD")
+            ),
+            self.html.key_value("Currency", obj.currency.code),
+            self.html.key_value(
+                "Wallet Address",
+                self.html.code(obj.wallet_address)
+            ),
+            self.html.key_value("Status", obj.get_status_display()),
+            self.html.key_value(
+                "Network Fee",
+                self.html.number(obj.network_fee_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.network_fee_usd else None,
+            self.html.key_value(
+                "Service Fee",
+                self.html.number(obj.service_fee_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.service_fee_usd else None,
+            self.html.key_value(
+                "Total Fee",
+                self.html.number(obj.total_fee_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.total_fee_usd else None,
+            self.html.key_value(
+                "Final Amount",
+                self.html.number(obj.final_amount_usd, precision=2, prefix="$", suffix=" USD")
+            ) if obj.final_amount_usd else None,
+            self.html.key_value(
+                "Approved By",
+                obj.admin_user.username
+            ) if obj.admin_user else None,
+            self.html.key_value(
+                "Admin Notes",
+                obj.admin_notes
+            ) if obj.admin_notes else None,
+            self.html.key_value(
+                "Transaction Hash",
+                self.html.code(obj.transaction_hash)
+            ) if obj.transaction_hash else None,
+            self.html.key_value(
+                "Crypto Amount",
+                self.html.inline(
+                    self.html.number(obj.crypto_amount, precision=8),
+                    obj.currency.token,
+                    separator=" "
+                )
+            ) if obj.crypto_amount else None,
+            self.html.key_value(
+                "Approved At",
+                str(obj.approved_at)
+            ) if obj.approved_at else None,
+            self.html.key_value(
+                "Completed At",
+                str(obj.completed_at)
+            ) if obj.completed_at else None,
+            self.html.key_value(
+                "Rejected At",
+                str(obj.rejected_at)
+            ) if obj.rejected_at else None
+        )
 
     withdrawal_details_display.short_description = "Withdrawal Details"

django_cfg/apps/{payments → business/payments}/apps.py

@@ -13,7 +13,7 @@ from django.apps import AppConfig
 
 class PaymentsConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'django_cfg.apps.payments'
+    name = 'django_cfg.apps.business.payments'
     verbose_name = 'Payments v2.0'
     label = 'payments'
 

django_cfg/apps/{payments → business/payments}/management/commands/check_payment_status.py

@@ -7,19 +7,21 @@ Uses questionary for interactive selection or accepts payment ID as argument.
 from uuid import UUID
 
 import questionary
-from django.core.management.base import BaseCommand
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 
-from django_cfg.apps.payments.models import Payment
-from django_cfg.apps.payments.services import PaymentService, CheckStatusRequest
-from django_cfg.apps.payments.api.views import get_nowpayments_provider
+from django_cfg.management.utils import InteractiveCommand
+
+from django_cfg.apps.business.payments.models import Payment
+from django_cfg.apps.business.payments.services import PaymentService, CheckStatusRequest
+from django_cfg.apps.business.payments.api.views import get_nowpayments_provider
 
 console = Console()
 
 
-class Command(BaseCommand):
+class Command(InteractiveCommand):
+    command_name = 'check_payment_status'
     help = 'Check payment status interactively or by payment ID'
 
     def add_arguments(self, parser):
@@ -244,7 +246,7 @@ class Command(BaseCommand):
             console.print(f"\n{confirmations_text}\n")
 
         # Show transaction history
-        from django_cfg.apps.payments.models import Transaction
+        from django_cfg.apps.business.payments.models import Transaction
         transactions = Transaction.objects.filter(payment_id=str(payment.id)).order_by('-created_at')
 
         if transactions.exists():

django_cfg/apps/{payments → business/payments}/management/commands/create_payment.py

@@ -8,20 +8,22 @@ from decimal import Decimal, InvalidOperation
 
 import questionary
 from django.contrib.auth import get_user_model
-from django.core.management.base import BaseCommand
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 
-from django_cfg.apps.payments.models import Currency, Payment
-from django_cfg.apps.payments.services import PaymentService, CreatePaymentRequest
-from django_cfg.apps.payments.api.views import get_nowpayments_provider
+from django_cfg.management.utils import InteractiveCommand
+
+from django_cfg.apps.business.payments.models import Currency, Payment
+from django_cfg.apps.business.payments.services import PaymentService, CreatePaymentRequest
+from django_cfg.apps.business.payments.api.views import get_nowpayments_provider
 
 User = get_user_model()
 console = Console()
 
 
-class Command(BaseCommand):
+class Command(InteractiveCommand):
+    command_name = 'create_payment'
     help = 'Create a payment interactively using questionary wizard'
 
     def add_arguments(self, parser):

django_cfg/apps/{payments → business/payments}/management/commands/sync_currencies.py

@@ -5,19 +5,21 @@ Fetches available currencies from NowPayments and updates local database.
 """
 
 import questionary
-from django.core.management.base import BaseCommand
 from rich.console import Console
 from rich.panel import Panel
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.table import Table
 
-from django_cfg.apps.payments.models import Currency
-from django_cfg.apps.payments.api.views import get_nowpayments_provider
+from django_cfg.management.utils import AdminCommand
+
+from django_cfg.apps.business.payments.models import Currency
+from django_cfg.apps.business.payments.api.views import get_nowpayments_provider
 
 console = Console()
 
 
-class Command(BaseCommand):
+class Command(AdminCommand):
+    command_name = 'sync_currencies'
     help = 'Sync currencies from NowPayments provider'
 
     def add_arguments(self, parser):

django_cfg/apps/{payments → business/payments}/urls.py

@@ -10,5 +10,5 @@ app_name = 'django_cfg_payments'
 
 urlpatterns = [
     # API endpoints
-    path('', include('django_cfg.apps.payments.api.urls')),
+    path('', include('django_cfg.apps.business.payments.api.urls')),
 ]

django_cfg/apps/{support → business/support}/apps.py

@@ -3,7 +3,7 @@ from django.apps import AppConfig
 
 class SupportConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'django_cfg.apps.support'
+    name = 'django_cfg.apps.business.support'
     label = 'django_cfg_support'
     verbose_name = 'Django CFG Support'
 

django_cfg/apps/{support → business/support}/managers/message_manager.py

@@ -5,7 +5,7 @@ from django.db import models
 
 if TYPE_CHECKING:
     # Only for type checking
-    from django_cfg.apps.support.models import Message
+    from django_cfg.apps.business.support.models import Message
 
 
 class MessageManager(models.Manager):

django_cfg/apps/{support → business/support}/managers/ticket_manager.py

@@ -16,7 +16,7 @@ class TicketManager(models.Manager):
         1. For each ticket, find the last user message
         2. Check if there's an admin message after the last user message
         """
-        from django_cfg.apps.support.models import Message
+        from django_cfg.apps.business.support.models import Message
 
         unanswered_count = 0
 

django_cfg/apps/{centrifugo → integrations/centrifugo}/__init__.py

@@ -11,7 +11,7 @@ Main Components:
 - DjangoCfgCentrifugoConfig: Pydantic configuration model
 
 Example:
-    >>> from django_cfg.apps.centrifugo import get_centrifugo_client
+    >>> from django_cfg.apps.integrations.centrifugo import get_centrifugo_client
     >>>
     >>> client = get_centrifugo_client()
     >>> result = await client.publish_with_ack(
@@ -35,7 +35,7 @@ from .services.client.exceptions import (
 from .services.logging import CentrifugoLogContext, CentrifugoLogger
 
 # Note: CentrifugoLog model is not imported here to avoid AppRegistryNotReady errors
-# Import it directly from .models when needed: from django_cfg.apps.centrifugo.models import CentrifugoLog
+# Import it directly from .models when needed: from django_cfg.apps.integrations.centrifugo.models import CentrifugoLog
 
 __all__ = [
     # Config