Merge branch 'dev' into feature/new-tariffs

# Conflicts: # .gitignore # bot/app/web/subscription_webapp.py # tests/test_settings.py
2026-04-30 10:52:20 +03:00
parent 4958e1fdfd 4d0241a0ea
commit ce610b4804
39 changed files with 6813 additions and 8192 deletions
@@ -99,7 +99,7 @@ def _layout(
        logo_block = (
            f'<img src="{html.escape(logo_url, quote=True)}" width="64" height="64" '
            f'alt="" style="display:block;border:0;outline:none;text-decoration:none;'
-            f'border-radius:16px;background:{_CARD_BG};">'
+            f'border-radius:16px;">'
        )

    return f"""<!DOCTYPE html>
@@ -495,6 +495,7 @@ class SubscriptionService:
            "is_active": True,
            "status_from_panel": "TRIAL",
            "traffic_limit_bytes": self.settings.trial_traffic_limit_bytes,
+            "traffic_limit_strategy": self.settings.TRIAL_TRAFFIC_STRATEGY,
            "auto_renew_enabled": False,
        }
        try:
@@ -516,6 +517,7 @@ class SubscriptionService:
            expire_at=end_date,
            status="ACTIVE",
            traffic_limit_bytes=self.settings.trial_traffic_limit_bytes,
+            traffic_limit_strategy=self.settings.TRIAL_TRAFFIC_STRATEGY,
        )

        panel_update_payload.update(self._panel_identity_payload_for_user(db_user))