added gb packets selling

2025-12-11 12:47:32 +03:00
parent 061fdeb72b
commit 22171eb66f
24 changed files with 798 additions and 246 deletions
@@ -63,6 +63,7 @@ class CryptoPayService:
        months: int,
        amount: float,
        description: str,
+        sale_mode: str = "subscription",
    ) -> Optional[str]:
        if not self.configured or not self.client:
            logging.error("CryptoPayService not configured")
@@ -78,7 +79,7 @@ class CryptoPayService:
                    "currency": self.settings.CRYPTOPAY_ASSET,
                    "status": "pending_cryptopay",
                    "description": description,
-                    "subscription_duration_months": months,
+                    "subscription_duration_months": int(months),
                    "provider": "cryptopay",
                },
            )
@@ -94,6 +95,8 @@ class CryptoPayService:
            "user_id": str(user_id),
            "subscription_months": str(months),
            "payment_db_id": str(payment_record.payment_id),
+            "sale_mode": sale_mode,
+            "traffic_gb": str(months) if sale_mode == "traffic" else None,
        })
        try:
            invoice = await self.client.create_invoice(
@@ -132,8 +135,10 @@ class CryptoPayService:
        try:
            meta = json.loads(invoice.payload)
            user_id = int(meta["user_id"])
-            months = int(meta["subscription_months"])
+            months = float(meta.get("subscription_months") or 0)
            payment_db_id = int(meta["payment_db_id"])
+            sale_mode = meta.get("sale_mode") or ("traffic" if self.settings.traffic_sale_mode else "subscription")
+            traffic_gb = float(meta.get("traffic_gb")) if meta.get("traffic_gb") else months
        except Exception as e:
            logging.error(f"Failed to parse CryptoPay payload: {e}")
            return
@@ -156,18 +161,22 @@ class CryptoPayService:
                activation = await subscription_service.activate_subscription(
                    session,
                    user_id,
-                    months,
+                    int(months) if sale_mode != "traffic" else 0,
                    float(invoice.amount),
                    payment_db_id,
                    provider="cryptopay",
+                    sale_mode=sale_mode,
+                    traffic_gb=traffic_gb if sale_mode == "traffic" else None,
                )
-                referral_bonus = await referral_service.apply_referral_bonuses_for_payment(
-                    session,
-                    user_id,
-                    months,
-                    current_payment_db_id=payment_db_id,
-                    skip_if_active_before_payment=False,
-                )
+                referral_bonus = None
+                if sale_mode != "traffic":
+                    referral_bonus = await referral_service.apply_referral_bonuses_for_payment(
+                        session,
+                        user_id,
+                        int(months) or 1,
+                        current_payment_db_id=payment_db_id,
+                        skip_if_active_before_payment=False,
+                    )
                await session.commit()
            except Exception as e:
                await session.rollback()
@@ -186,7 +195,12 @@ class CryptoPayService:
                final_end = referral_bonus["referee_new_end_date"]
                applied_days = referral_bonus.get("referee_bonus_applied_days", 0)

-            if applied_days:
+            if sale_mode == "traffic":
+                text = _("payment_successful_traffic_full",
+                         traffic_gb=str(int(traffic_gb)) if float(traffic_gb).is_integer() else f"{traffic_gb:g}",
+                         end_date=final_end.strftime('%Y-%m-%d') if final_end else "—",
+                         config_link=config_link)
+            elif applied_days:
                inviter_name_display = _("friend_placeholder")
                if db_user and db_user.referred_by_id:
                    inviter = await user_dal.get_user_by_id(session, db_user.referred_by_id)
@@ -197,7 +211,7 @@ class CryptoPayService:
                        elif inviter.username:
                            inviter_name_display = username_for_display(inviter.username, with_at=False)
                text = _("payment_successful_with_referral_bonus_full",
-                         months=months,
+                         months=int(months),
                         base_end_date=activation["end_date"].strftime('%Y-%m-%d'),
                         bonus_days=applied_days,
                         final_end_date=final_end.strftime('%Y-%m-%d'),
@@ -205,8 +219,8 @@ class CryptoPayService:
                         config_link=config_link)
            else:
                text = _("payment_successful_full",
-                         months=months,
-                         end_date=final_end.strftime('%Y-%m-%d'),
+                         months=int(months),
+                         end_date=final_end.strftime('%Y-%m-%d') if final_end else "—",
                         config_link=config_link)

            markup = get_connect_and_main_keyboard(
@@ -231,7 +245,8 @@ class CryptoPayService:
                    user_id=user_id,
                    amount=float(invoice.amount),
                    currency=invoice.asset or settings.DEFAULT_CURRENCY_SYMBOL,
-                    months=months,
+                    months=int(months) if sale_mode != "traffic" else 0,
+                    traffic_gb=traffic_gb if sale_mode == "traffic" else None,
                    payment_provider="crypto_pay",
                    username=user.username if user else None
                )
@@ -284,23 +284,28 @@ class FreeKassaService:
                )

                months = payment.subscription_duration_months or 1
+                sale_mode = "traffic" if self.settings.traffic_sale_mode else "subscription"

                activation = await self.subscription_service.activate_subscription(
                    session,
                    payment.user_id,
-                    months,
+                    int(months) if sale_mode != "traffic" else 0,
                    float(payment.amount),
                    payment.payment_id,
                    provider="freekassa",
+                    sale_mode=sale_mode,
+                    traffic_gb=months if sale_mode == "traffic" else None,
                )

-                referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
-                    session,
-                    payment.user_id,
-                    months,
-                    current_payment_db_id=payment.payment_id,
-                    skip_if_active_before_payment=False,
-                )
+                referral_bonus = None
+                if sale_mode != "traffic":
+                    referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
+                        session,
+                        payment.user_id,
+                        int(months),
+                        current_payment_db_id=payment.payment_id,
+                        skip_if_active_before_payment=False,
+                    )

                await session.commit()
            except Exception as e:
@@ -315,6 +320,7 @@ class FreeKassaService:
            config_link = None
            final_end = None
            months = payment.subscription_duration_months or 1
+            sale_mode = "traffic" if self.settings.traffic_sale_mode else "subscription"
            if activation:
                config_link = activation.get("subscription_url")
                final_end = activation.get("end_date")
@@ -334,7 +340,14 @@ class FreeKassaService:
            else:
                end_date_str = _("config_link_not_available")

-            if applied_days:
+            traffic_label = str(int(months)) if float(months).is_integer() else f"{months:g}"
+
+            if sale_mode == "traffic":
+                text = _("payment_successful_traffic_full",
+                         traffic_gb=traffic_label,
+                         end_date=end_date_str if final_end else "",
+                         config_link=config_link)
+            elif applied_days:
                inviter_name_display = _("friend_placeholder")
                if db_user and db_user.referred_by_id:
                    inviter = await user_dal.get_user_by_id(session, db_user.referred_by_id)
@@ -392,7 +405,8 @@ class FreeKassaService:
                    user_id=payment.user_id,
                    amount=float(payment.amount),
                    currency=self.default_currency,
-                    months=months,
+                    months=int(months) if sale_mode != "traffic" else 0,
+                    traffic_gb=months if sale_mode == "traffic" else None,
                    payment_provider="freekassa",
                    username=db_user.username if db_user else None,
                )
@@ -222,7 +222,8 @@ class NotificationService:
    
    async def notify_payment_received(self, user_id: int, amount: float, currency: str,
                                    months: int, payment_provider: str, 
-                                    username: Optional[str] = None):
+                                    username: Optional[str] = None,
+                                    traffic_gb: Optional[float] = None):
        """Send notification about successful payment"""
        if not self.settings.LOG_PAYMENTS:
            return
@@ -243,23 +244,42 @@ class NotificationService:
            "platega": "💳",
            "severpay": "💳",
        }.get(payment_provider.lower(), "💰")
-        
-        message = _(
-            "log_payment_received",
-            default="{provider_emoji} <b>Получен платеж</b>\n\n"
-                   "👤 Пользователь: {user_display}\n"
-                   "💰 Сумма: <b>{amount} {currency}</b>\n"
-                   "📅 Период: <b>{months} мес.</b>\n"
-                   "🏦 Провайдер: {payment_provider}\n"
-                   "🕐 Время: {timestamp}",
-            provider_emoji=provider_emoji,
-            user_display=user_display,
-            amount=amount,
-            currency=currency,
-            months=months,
-            payment_provider=payment_provider,
-            timestamp=datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        )
+
+        if traffic_gb is not None:
+            traffic_label = str(int(traffic_gb)) if float(traffic_gb).is_integer() else f"{traffic_gb:g}"
+            message = _(
+                "log_payment_received_traffic",
+                default="{provider_emoji} <b>Получен платеж</b>\n\n"
+                        "👤 Пользователь: {user_display}\n"
+                        "💰 Сумма: <b>{amount} {currency}</b>\n"
+                        "🗂 Трафик: <b>{traffic_gb} GB</b>\n"
+                        "🏦 Провайдер: {payment_provider}\n"
+                        "🕐 Время: {timestamp}",
+                provider_emoji=provider_emoji,
+                user_display=user_display,
+                amount=amount,
+                currency=currency,
+                traffic_gb=traffic_label,
+                payment_provider=payment_provider,
+                timestamp=datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            )
+        else:
+            message = _(
+                "log_payment_received",
+                default="{provider_emoji} <b>Получен платеж</b>\n\n"
+                       "👤 Пользователь: {user_display}\n"
+                       "💰 Сумма: <b>{amount} {currency}</b>\n"
+                       "📅 Период: <b>{months} мес.</b>\n"
+                       "🏦 Провайдер: {payment_provider}\n"
+                       "🕐 Время: {timestamp}",
+                provider_emoji=provider_emoji,
+                user_display=user_display,
+                amount=amount,
+                currency=currency,
+                months=months,
+                payment_provider=payment_provider,
+                timestamp=datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            )
        
        # Send to log channel
        profile_keyboard = self._build_profile_keyboard(_, user_id)
@@ -157,6 +157,7 @@ class PlategaService:
                return web.Response(text="ok")

            payment_months = payment.subscription_duration_months or 1
+            sale_mode = "traffic" if self.settings.traffic_sale_mode else "subscription"

            if status == "CONFIRMED":
                if amount_raw is not None:
@@ -184,19 +185,23 @@ class PlategaService:
                    activation = await self.subscription_service.activate_subscription(
                        session,
                        payment.user_id,
-                        payment_months,
+                        int(payment_months) if sale_mode != "traffic" else 0,
                        float(payment.amount),
                        payment.payment_id,
                        provider="platega",
+                        sale_mode=sale_mode,
+                        traffic_gb=payment_months if sale_mode == "traffic" else None,
                    )

-                    referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
-                        session,
-                        payment.user_id,
-                        payment_months,
-                        current_payment_db_id=payment.payment_id,
-                        skip_if_active_before_payment=False,
-                    )
+                    referral_bonus = None
+                    if sale_mode != "traffic":
+                        referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
+                            session,
+                            payment.user_id,
+                            int(payment_months),
+                            current_payment_db_id=payment.payment_id,
+                            skip_if_active_before_payment=False,
+                        )

                    await session.commit()
                except Exception as exc:
@@ -221,7 +226,16 @@ class PlategaService:
                    final_end = referral_bonus["referee_new_end_date"]
                    applied_days = referral_bonus.get("referee_bonus_applied_days", 0)

-                if applied_days:
+                traffic_label = str(int(payment_months)) if float(payment_months).is_integer() else f"{payment_months:g}"
+
+                if sale_mode == "traffic":
+                    text = _(
+                        "payment_successful_traffic_full",
+                        traffic_gb=traffic_label,
+                        end_date=final_end.strftime("%Y-%m-%d") if final_end else "",
+                        config_link=config_link,
+                    )
+                elif applied_days:
                    inviter_name_display = _("friend_placeholder")
                    if db_user and db_user.referred_by_id:
                        inviter = await user_dal.get_user_by_id(session, db_user.referred_by_id)
@@ -281,7 +295,8 @@ class PlategaService:
                        user_id=payment.user_id,
                        amount=float(payment.amount),
                        currency=currency,
-                        months=payment_months,
+                        months=int(payment_months) if sale_mode != "traffic" else 0,
+                        traffic_gb=payment_months if sale_mode == "traffic" else None,
                        payment_provider="platega",
                        username=db_user.username if db_user else None,
                    )
@@ -190,6 +190,7 @@ class SeverPayService:
                return web.json_response({"status": False, "msg": "payment_not_found"}, status=404)

            payment_months = payment.subscription_duration_months or 1
+            sale_mode = "traffic" if self.settings.traffic_sale_mode else "subscription"
            if status == "success":
                try:
                    await payment_dal.update_provider_payment_and_status(
@@ -202,19 +203,23 @@ class SeverPayService:
                    activation = await self.subscription_service.activate_subscription(
                        session,
                        payment.user_id,
-                        payment_months,
+                        int(payment_months) if sale_mode != "traffic" else 0,
                        float(payment.amount),
                        payment.payment_id,
                        provider="severpay",
+                        sale_mode=sale_mode,
+                        traffic_gb=payment_months if sale_mode == "traffic" else None,
                    )

-                    referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
-                        session,
-                        payment.user_id,
-                        payment_months,
-                        current_payment_db_id=payment.payment_id,
-                        skip_if_active_before_payment=False,
-                    )
+                    referral_bonus = None
+                    if sale_mode != "traffic":
+                        referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
+                            session,
+                            payment.user_id,
+                            int(payment_months),
+                            current_payment_db_id=payment.payment_id,
+                            skip_if_active_before_payment=False,
+                        )

                    await session.commit()
                except Exception as exc:
@@ -239,7 +244,16 @@ class SeverPayService:
                    final_end = referral_bonus["referee_new_end_date"]
                    applied_days = referral_bonus.get("referee_bonus_applied_days", 0)

-                if applied_days:
+                traffic_label = str(int(payment_months)) if float(payment_months).is_integer() else f"{payment_months:g}"
+
+                if sale_mode == "traffic":
+                    text = _(
+                        "payment_successful_traffic_full",
+                        traffic_gb=traffic_label,
+                        end_date=final_end.strftime("%Y-%m-%d") if final_end else "",
+                        config_link=config_link,
+                    )
+                elif applied_days:
                    inviter_name_display = _("friend_placeholder")
                    if db_user and db_user.referred_by_id:
                        inviter = await user_dal.get_user_by_id(session, db_user.referred_by_id)
@@ -299,7 +313,8 @@ class SeverPayService:
                        user_id=payment.user_id,
                        amount=float(payment.amount),
                        currency=payment.currency,
-                        months=payment_months,
+                        months=int(payment_months) if sale_mode != "traffic" else 0,
+                        traffic_gb=payment_months if sale_mode == "traffic" else None,
                        payment_provider="severpay",
                        username=db_user.username if db_user else None,
                    )
@@ -26,14 +26,14 @@ class StarsService:
        self.referral_service = referral_service

    async def create_invoice(self, session: AsyncSession, user_id: int, months: int,
-                             stars_price: int, description: str) -> Optional[int]:
+                             stars_price: int, description: str, sale_mode: str = "subscription") -> Optional[int]:
        payment_record_data = {
            "user_id": user_id,
            "amount": float(stars_price),
            "currency": "XTR",
            "status": "pending_stars",
            "description": description,
-            "subscription_duration_months": months,
+            "subscription_duration_months": int(months),
            "provider": "telegram_stars",
        }
        try:
@@ -46,7 +46,7 @@ class StarsService:
                          exc_info=True)
            return None

-        payload = f"{db_payment_record.payment_id}:{months}"
+        payload = f"{db_payment_record.payment_id}:{months}:{sale_mode}"
        prices = [LabeledPrice(label=description, amount=stars_price)]
        try:
            await self.bot.send_invoice(
@@ -69,7 +69,8 @@ class StarsService:
                                         payment_db_id: int,
                                         months: int,
                                         stars_amount: int,
-                                         i18n_data: dict) -> None:
+                                         i18n_data: dict,
+                                         sale_mode: str = "subscription") -> None:
        try:
            await payment_dal.update_provider_payment_and_status(
                session, payment_db_id,
@@ -86,23 +87,27 @@ class StarsService:
        activation_details = await self.subscription_service.activate_subscription(
            session,
            message.from_user.id,
-            months,
+            int(months) if sale_mode != "traffic" else 0,
            float(stars_amount),
            payment_db_id,
            provider="telegram_stars",
+            sale_mode=sale_mode,
+            traffic_gb=months if sale_mode == "traffic" else None,
        )
        if not activation_details or not activation_details.get("end_date"):
            logging.error(
                f"Failed to activate subscription after stars payment for user {message.from_user.id}")
            return

-        referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
-            session,
-            message.from_user.id,
-            months,
-            current_payment_db_id=payment_db_id,
-            skip_if_active_before_payment=False,
-        )
+        referral_bonus = None
+        if sale_mode != "traffic":
+            referral_bonus = await self.referral_service.apply_referral_bonuses_for_payment(
+                session,
+                message.from_user.id,
+                int(months) or 1,
+                current_payment_db_id=payment_db_id,
+                skip_if_active_before_payment=False,
+            )
        await session.commit()

        applied_days = referral_bonus.get("referee_bonus_applied_days") if referral_bonus else None
@@ -120,7 +125,14 @@ class StarsService:
            "config_link_not_available"
        )

-        if applied_days:
+        if sale_mode == "traffic":
+            success_msg = _(
+                "payment_successful_traffic_full",
+                traffic_gb=str(int(months)) if float(months).is_integer() else f"{months:g}",
+                end_date=final_end.strftime('%Y-%m-%d'),
+                config_link=config_link,
+            )
+        elif applied_days:
            inviter_name_display = _("friend_placeholder")
            db_user = await user_dal.get_user_by_id(session, message.from_user.id)
            if db_user and db_user.referred_by_id:
@@ -170,9 +182,10 @@ class StarsService:
                user_id=message.from_user.id,
                amount=float(stars_amount),
                currency="XTR",
-                months=months,
+                months=int(months) if sale_mode != "traffic" else 0,
                payment_provider="stars",
-                username=user.username if user else None
+                username=user.username if user else None,
+                traffic_gb=months if sale_mode == "traffic" else None,
            )
        except Exception as e:
            logging.error(f"Failed to send stars payment notification: {e}")
@@ -419,6 +419,119 @@ class SubscriptionService:
            "subscription_url": final_subscription_url,
        }

+    async def _activate_traffic_package(
+        self,
+        session: AsyncSession,
+        user_id: int,
+        traffic_gb: float,
+        payment_amount: float,
+        payment_db_id: int,
+        provider: str = "yookassa",
+    ) -> Optional[Dict[str, Any]]:
+        """Activate or extend a traffic-based package instead of a time-based subscription."""
+        db_user = await user_dal.get_user_by_id(session, user_id)
+        if not db_user:
+            logging.error("User %s not found for traffic package activation", user_id)
+            return None
+
+        panel_user_uuid, panel_sub_link_id, panel_short_uuid, _ = (
+            await self._get_or_create_panel_user_link_details(session, user_id, db_user)
+        )
+
+        if not panel_user_uuid or not panel_sub_link_id:
+            logging.error("Failed to ensure panel linkage for user %s during traffic activation", user_id)
+            return None
+
+        panel_user_data = await self.panel_service.get_user_by_uuid(panel_user_uuid) or {}
+        traffic_info = panel_user_data.get("userTraffic") or {}
+        current_limit = panel_user_data.get("trafficLimitBytes")
+        current_used = traffic_info.get("usedTrafficBytes")
+
+        active_sub = await subscription_dal.get_active_subscription_by_user_id(
+            session, user_id, panel_user_uuid
+        )
+        if current_limit is None and active_sub:
+            current_limit = active_sub.traffic_limit_bytes
+        if current_used is None and active_sub:
+            current_used = active_sub.traffic_used_bytes
+
+        purchase_bytes = int(float(traffic_gb) * (1024**3))
+        new_limit = (current_limit or 0) + purchase_bytes
+
+        start_date = datetime.now(timezone.utc)
+        # Set a far-future expiry to satisfy panel requirements; keep the latest known expiry if it's further.
+        far_future = datetime(2099, 1, 1, tzinfo=timezone.utc)
+        final_end_date = far_future
+        if active_sub and active_sub.end_date and active_sub.end_date > final_end_date:
+            final_end_date = active_sub.end_date
+
+        await subscription_dal.deactivate_other_active_subscriptions(
+            session, panel_user_uuid, panel_sub_link_id
+        )
+
+        sub_payload = {
+            "user_id": user_id,
+            "panel_user_uuid": panel_user_uuid,
+            "panel_subscription_uuid": panel_sub_link_id,
+            "start_date": start_date,
+            "end_date": final_end_date,
+            "duration_months": 0,
+            "is_active": True,
+            "status_from_panel": "ACTIVE",
+            "traffic_limit_bytes": new_limit,
+            "traffic_used_bytes": current_used,
+            "provider": provider,
+            "skip_notifications": True,
+            "auto_renew_enabled": False,
+        }
+
+        try:
+            new_or_updated_sub = await subscription_dal.upsert_subscription(session, sub_payload)
+        except Exception as exc:
+            logging.error("Failed to upsert traffic subscription for user %s: %s", user_id, exc, exc_info=True)
+            return None
+
+        panel_update_payload = self._build_panel_update_payload(
+            panel_user_uuid=panel_user_uuid,
+            expire_at=final_end_date,
+            status="ACTIVE",
+            traffic_limit_bytes=new_limit,
+            traffic_limit_strategy="NO_RESET",
+        )
+
+        panel_update_payload["description"] = "\n".join(
+            [
+                (db_user.username or "") if db_user else "",
+                (db_user.first_name or "") if db_user else "",
+                (db_user.last_name or "") if db_user else "",
+            ]
+        )
+
+        updated_panel_user = await self.panel_service.update_user_details_on_panel(
+            panel_user_uuid, panel_update_payload
+        )
+        if not updated_panel_user or updated_panel_user.get("error"):
+            logging.warning(
+                "Panel user details update FAILED for traffic package user %s. Response: %s",
+                panel_user_uuid,
+                updated_panel_user,
+            )
+            return None
+
+        final_subscription_url = updated_panel_user.get("subscriptionUrl")
+        final_panel_short_uuid = updated_panel_user.get("shortUuid", panel_short_uuid)
+
+        return {
+            "subscription_id": new_or_updated_sub.subscription_id,
+            "end_date": final_end_date,
+            "is_active": True,
+            "panel_user_uuid": panel_user_uuid,
+            "panel_short_uuid": final_panel_short_uuid,
+            "subscription_url": final_subscription_url,
+            "applied_promo_bonus_days": 0,
+            "traffic_limit_bytes": new_limit,
+        }
+
    async def activate_subscription(
        self,
        session: AsyncSession,
@@ -428,8 +541,21 @@ class SubscriptionService:
        payment_db_id: int,
        promo_code_id_from_payment: Optional[int] = None,
        provider: str = "yookassa",
+        sale_mode: str = "subscription",
+        traffic_gb: Optional[float] = None,
    ) -> Optional[Dict[str, Any]]:

+        if sale_mode == "traffic" or getattr(self.settings, "traffic_sale_mode", False):
+            target_gb = traffic_gb if traffic_gb is not None else float(months)
+            return await self._activate_traffic_package(
+                session=session,
+                user_id=user_id,
+                traffic_gb=target_gb,
+                payment_amount=payment_amount,
+                payment_db_id=payment_db_id,
+                provider=provider,
+            )
+
        db_user = await user_dal.get_user_by_id(session, user_id)
        if not db_user:
            logging.error(
@@ -447,6 +573,11 @@ class SubscriptionService:
            )
            return None

+        try:
+            months_int = int(months)
+        except Exception:
+            months_int = 1
+
        current_active_sub = await subscription_dal.get_active_subscription_by_user_id(
            session, user_id, panel_user_uuid
        )
@@ -459,7 +590,7 @@ class SubscriptionService:
            start_date = current_active_sub.end_date

        # base duration by months
-        end_after_months = add_months(start_date, months)
+        end_after_months = add_months(start_date, months_int)
        duration_days_total = (end_after_months - start_date).days
        applied_promo_bonus_days = 0

@@ -512,7 +643,7 @@ class SubscriptionService:
            "panel_subscription_uuid": panel_sub_link_id,
            "start_date": start_date,
            "end_date": final_end_date,
-            "duration_months": months,
+            "duration_months": months_int,
            "is_active": True,
            "status_from_panel": "ACTIVE",
            "traffic_limit_bytes": self.settings.user_traffic_limit_bytes,
@@ -823,6 +954,9 @@ class SubscriptionService:
        sub: Subscription,
    ) -> bool:
        """Attempt to charge user using saved payment method. Return True on initiated/handled, False on failure."""
+        if getattr(self.settings, "traffic_sale_mode", False):
+            logging.info("Auto-renew skipped: traffic sale mode enabled")
+            return True
        if not sub.auto_renew_enabled:
            return True
        # If autopayments are disabled globally, skip charging attempts
@@ -902,6 +1036,7 @@ class SubscriptionService:
        status: Optional[str] = None,
        traffic_limit_bytes: Optional[int] = None,
        include_uuid: bool = True,
+        traffic_limit_strategy: Optional[str] = None,
    ) -> Dict[str, Any]:
        payload: Dict[str, Any] = {}
        if include_uuid and panel_user_uuid:
@@ -912,7 +1047,7 @@ class SubscriptionService:
            payload["status"] = status
        if traffic_limit_bytes is not None:
            payload["trafficLimitBytes"] = traffic_limit_bytes
-            payload["trafficLimitStrategy"] = self.settings.USER_TRAFFIC_STRATEGY
+            payload["trafficLimitStrategy"] = traffic_limit_strategy or self.settings.USER_TRAFFIC_STRATEGY
        if self.settings.parsed_user_squad_uuids:
            payload["activeInternalSquads"] = self.settings.parsed_user_squad_uuids
        if self.settings.parsed_user_external_squad_uuid: