Add toggle to disable device selection

2026-02-25 13:51:50 +00:00 · 2025-10-31 12:13:11 +03:00
parent 0d7a235715
commit 348e4dd4dc
11 changed files with 254 additions and 64 deletions
--- a/app/config.py
+++ b/app/config.py
@@ -83,6 +83,7 @@ class Settings(BaseSettings):
    TRIAL_ADD_REMAINING_DAYS_TO_PAID: bool = False
    DEFAULT_TRAFFIC_LIMIT_GB: int = 100
    DEFAULT_DEVICE_LIMIT: int = 1
+    DEVICES_SELECTION_ENABLED: bool = True
    TRIAL_SQUAD_UUID: Optional[str] = None
    DEFAULT_TRAFFIC_RESET_STRATEGY: str = "MONTH"
    RESET_TRAFFIC_ON_PAYMENT: bool = False
@@ -797,9 +798,12 @@ class Settings(BaseSettings):
    
    def is_traffic_fixed(self) -> bool:
        return self.TRAFFIC_SELECTION_MODE.lower() == "fixed"
-    
+
    def get_fixed_traffic_limit(self) -> int:
        return self.FIXED_TRAFFIC_LIMIT_GB
+
+    def is_devices_selection_enabled(self) -> bool:
+        return bool(self.DEVICES_SELECTION_ENABLED)
    
    def is_yookassa_enabled(self) -> bool:
        return (self.YOOKASSA_ENABLED and 
--- a/app/handlers/subscription/autopay.py
+++ b/app/handlers/subscription/autopay.py
@@ -208,6 +208,33 @@ async def handle_subscription_config_back(
            await state.set_state(SubscriptionStates.selecting_period)

    elif current_state == SubscriptionStates.selecting_devices.state:
+        if not settings.is_devices_selection_enabled():
+            if await _should_show_countries_management(db_user):
+                countries = await _get_available_countries(db_user.promo_group_id)
+                data = await state.get_data()
+                selected_countries = data.get('countries', [])
+
+                await callback.message.edit_text(
+                    texts.SELECT_COUNTRIES,
+                    reply_markup=get_countries_keyboard(countries, selected_countries, db_user.language)
+                )
+                await state.set_state(SubscriptionStates.selecting_countries)
+            elif settings.is_traffic_selectable():
+                await callback.message.edit_text(
+                    texts.SELECT_TRAFFIC,
+                    reply_markup=get_traffic_packages_keyboard(db_user.language)
+                )
+                await state.set_state(SubscriptionStates.selecting_traffic)
+            else:
+                await callback.message.edit_text(
+                    await _build_subscription_period_prompt(db_user, texts, db),
+                    reply_markup=get_subscription_period_keyboard(db_user.language),
+                    parse_mode="HTML",
+                )
+                await state.set_state(SubscriptionStates.selecting_period)
+            await callback.answer()
+            return
+
        if await _should_show_countries_management(db_user):
            countries = await _get_available_countries(db_user.promo_group_id)
            data = await state.get_data()
@@ -234,13 +261,36 @@ async def handle_subscription_config_back(

    elif current_state == SubscriptionStates.confirming_purchase.state:
        data = await state.get_data()
-        selected_devices = data.get('devices', settings.DEFAULT_DEVICE_LIMIT)
+        if settings.is_devices_selection_enabled():
+            selected_devices = data.get('devices', settings.DEFAULT_DEVICE_LIMIT)

-        await callback.message.edit_text(
-            texts.SELECT_DEVICES,
-            reply_markup=get_devices_keyboard(selected_devices, db_user.language)
-        )
-        await state.set_state(SubscriptionStates.selecting_devices)
+            await callback.message.edit_text(
+                texts.SELECT_DEVICES,
+                reply_markup=get_devices_keyboard(selected_devices, db_user.language)
+            )
+            await state.set_state(SubscriptionStates.selecting_devices)
+        elif await _should_show_countries_management(db_user):
+            countries = await _get_available_countries(db_user.promo_group_id)
+            selected_countries = data.get('countries', [])
+
+            await callback.message.edit_text(
+                texts.SELECT_COUNTRIES,
+                reply_markup=get_countries_keyboard(countries, selected_countries, db_user.language)
+            )
+            await state.set_state(SubscriptionStates.selecting_countries)
+        elif settings.is_traffic_selectable():
+            await callback.message.edit_text(
+                texts.SELECT_TRAFFIC,
+                reply_markup=get_traffic_packages_keyboard(db_user.language)
+            )
+            await state.set_state(SubscriptionStates.selecting_traffic)
+        else:
+            await callback.message.edit_text(
+                await _build_subscription_period_prompt(db_user, texts, db),
+                reply_markup=get_subscription_period_keyboard(db_user.language),
+                parse_mode="HTML",
+            )
+            await state.set_state(SubscriptionStates.selecting_period)

    else:
        from app.handlers.menu import show_main_menu
--- a/app/handlers/subscription/countries.py
+++ b/app/handlers/subscription/countries.py
@@ -79,6 +79,7 @@ from app.utils.promo_offer import (
 )

 from .common import _get_addon_discount_percent_for_user, _get_period_hint_from_subscription, logger
+from .workflow import present_subscription_summary

 async def handle_add_countries(
        callback: types.CallbackQuery,
@@ -588,15 +589,21 @@ async def countries_continue(
        await callback.answer("⚠️ Выберите хотя бы одну страну!", show_alert=True)
        return

-    selected_devices = data.get('devices', settings.DEFAULT_DEVICE_LIMIT)
+    if settings.is_devices_selection_enabled():
+        selected_devices = data.get('devices', settings.DEFAULT_DEVICE_LIMIT)

-    await callback.message.edit_text(
-        texts.SELECT_DEVICES,
-        reply_markup=get_devices_keyboard(selected_devices, db_user.language)
-    )
+        await callback.message.edit_text(
+            texts.SELECT_DEVICES,
+            reply_markup=get_devices_keyboard(selected_devices, db_user.language)
+        )

-    await state.set_state(SubscriptionStates.selecting_devices)
-    await callback.answer()
+        await state.set_state(SubscriptionStates.selecting_devices)
+        await callback.answer()
+        return
+
+    success = await present_subscription_summary(callback, state, db_user, texts)
+    if success:
+        await callback.answer()

 async def _get_available_countries(promo_group_id: Optional[int] = None):
    from app.utils.cache import cache, cache_key
--- a/app/handlers/subscription/devices.py
+++ b/app/handlers/subscription/devices.py
@@ -183,6 +183,16 @@ async def handle_change_devices(
    texts = get_texts(db_user.language)
    subscription = db_user.subscription

+    if not settings.is_devices_selection_enabled():
+        await callback.answer(
+            texts.t(
+                "DEVICES_SELECTION_DISABLED",
+                "⚠️ Изменение количества устройств недоступно",
+            ),
+            show_alert=True,
+        )
+        return
+
    if not subscription or subscription.is_trial:
        await callback.answer(
            texts.t("PAID_FEATURE_ONLY", "⚠️ Эта функция доступна только для платных подписок"),
@@ -233,6 +243,16 @@ async def confirm_change_devices(
    texts = get_texts(db_user.language)
    subscription = db_user.subscription

+    if not settings.is_devices_selection_enabled():
+        await callback.answer(
+            texts.t(
+                "DEVICES_SELECTION_DISABLED",
+                "⚠️ Изменение количества устройств недоступно",
+            ),
+            show_alert=True,
+        )
+        return
+
    current_devices = subscription.device_limit

    if new_devices_count == current_devices:
@@ -379,6 +399,16 @@ async def execute_change_devices(
    subscription = db_user.subscription
    current_devices = subscription.device_limit

+    if not settings.is_devices_selection_enabled():
+        await callback.answer(
+            texts.t(
+                "DEVICES_SELECTION_DISABLED",
+                "⚠️ Изменение количества устройств недоступно",
+            ),
+            show_alert=True,
+        )
+        return
+
    try:
        if price > 0:
            success = await subtract_user_balance(
@@ -863,6 +893,16 @@ async def confirm_add_devices(
    texts = get_texts(db_user.language)
    subscription = db_user.subscription

+    if not settings.is_devices_selection_enabled():
+        await callback.answer(
+            texts.t(
+                "DEVICES_SELECTION_DISABLED",
+                "⚠️ Изменение количества устройств недоступно",
+            ),
+            show_alert=True,
+        )
+        return
+
    resume_callback = None

    new_total_devices = subscription.device_limit + devices_count
--- a/app/handlers/subscription/purchase.py
+++ b/app/handlers/subscription/purchase.py
@@ -140,6 +140,7 @@ from .traffic import (
    handle_switch_traffic,
    select_traffic,
 )
+from .workflow import present_subscription_summary

 async def show_subscription_info(
        callback: types.CallbackQuery,
@@ -1256,12 +1257,15 @@ async def select_period(
                reply_markup=get_countries_keyboard(countries, [], db_user.language)
            )
            await state.set_state(SubscriptionStates.selecting_countries)
-        else:
-            countries = await _get_available_countries(db_user.promo_group_id)
-            available_countries = [c for c in countries if c.get('is_available', True)]
-            data['countries'] = [available_countries[0]['uuid']] if available_countries else []
-            await state.set_data(data)
+            await callback.answer()
+            return

+        countries = await _get_available_countries(db_user.promo_group_id)
+        available_countries = [c for c in countries if c.get('is_available', True)]
+        data['countries'] = [available_countries[0]['uuid']] if available_countries else []
+        await state.set_data(data)
+
+        if settings.is_devices_selection_enabled():
            selected_devices = data.get('devices', settings.DEFAULT_DEVICE_LIMIT)

            await callback.message.edit_text(
@@ -1269,6 +1273,13 @@ async def select_period(
                reply_markup=get_devices_keyboard(selected_devices, db_user.language)
            )
            await state.set_state(SubscriptionStates.selecting_devices)
+            await callback.answer()
+            return
+
+        success = await present_subscription_summary(callback, state, db_user, texts)
+        if success:
+            await callback.answer()
+        return

    await callback.answer()

@@ -1281,6 +1292,17 @@ async def select_devices(
        await callback.answer("❌ Некорректный запрос", show_alert=True)
        return

+    if not settings.is_devices_selection_enabled():
+        texts = get_texts(db_user.language)
+        await callback.answer(
+            texts.t(
+                "DEVICES_SELECTION_DISABLED",
+                "⚠️ Изменение количества устройств недоступно",
+            ),
+            show_alert=True,
+        )
+        return
+
    try:
        devices = int(callback.data.split('_')[1])
    except (ValueError, IndexError):
@@ -1324,24 +1346,9 @@ async def devices_continue(
    data = await state.get_data()
    texts = get_texts(db_user.language)

-    try:
-        summary_text, prepared_data = await _prepare_subscription_summary(db_user, data, texts)
-    except ValueError:
-        logger.error(f"Ошибка в расчете цены подписки для пользователя {db_user.telegram_id}")
-        await callback.answer("Ошибка расчета цены. Обратитесь в поддержку.", show_alert=True)
-        return
-
-    await state.set_data(prepared_data)
-    await save_subscription_checkout_draft(db_user.id, prepared_data)
-
-    await callback.message.edit_text(
-        summary_text,
-        reply_markup=get_subscription_confirm_keyboard(db_user.language),
-        parse_mode="HTML",
-    )
-
-    await state.set_state(SubscriptionStates.confirming_purchase)
-    await callback.answer()
+    success = await present_subscription_summary(callback, state, db_user, texts)
+    if success:
+        await callback.answer()

 async def confirm_purchase(
        callback: types.CallbackQuery,
--- a/app/handlers/subscription/traffic.py
+++ b/app/handlers/subscription/traffic.py
@@ -80,6 +80,7 @@ from app.utils.promo_offer import (

 from .common import _apply_addon_discount, _get_addon_discount_percent_for_user, _get_period_hint_from_subscription, get_confirm_switch_traffic_keyboard, get_traffic_switch_keyboard, logger
 from .countries import _get_available_countries, _should_show_countries_management
+from .workflow import present_subscription_summary

 async def handle_add_traffic(
        callback: types.CallbackQuery,
@@ -352,19 +353,29 @@ async def select_traffic(
            reply_markup=get_countries_keyboard(countries, [], db_user.language)
        )
        await state.set_state(SubscriptionStates.selecting_countries)
+        await callback.answer()
+        return
    else:
        countries = await _get_available_countries(db_user.promo_group_id)
        available_countries = [c for c in countries if c.get('is_available', True)]
        data['countries'] = [available_countries[0]['uuid']] if available_countries else []
        await state.set_data(data)

-        selected_devices = data.get('devices', settings.DEFAULT_DEVICE_LIMIT)
+        if settings.is_devices_selection_enabled():
+            selected_devices = data.get('devices', settings.DEFAULT_DEVICE_LIMIT)

-        await callback.message.edit_text(
-            texts.SELECT_DEVICES,
-            reply_markup=get_devices_keyboard(selected_devices, db_user.language)
-        )
-        await state.set_state(SubscriptionStates.selecting_devices)
+            await callback.message.edit_text(
+                texts.SELECT_DEVICES,
+                reply_markup=get_devices_keyboard(selected_devices, db_user.language)
+            )
+            await state.set_state(SubscriptionStates.selecting_devices)
+            await callback.answer()
+            return
+
+        success = await present_subscription_summary(callback, state, db_user, texts)
+        if success:
+            await callback.answer()
+        return

    await callback.answer()

--- a/app/handlers/subscription/workflow.py
+++ b/app/handlers/subscription/workflow.py
@@ -0,0 +1,49 @@
+import logging
+from typing import Any
+
+from aiogram import types
+from aiogram.fsm.context import FSMContext
+
+from app.database.models import User
+from app.keyboards.inline import get_subscription_confirm_keyboard
+from app.services.subscription_checkout_service import save_subscription_checkout_draft
+from app.states import SubscriptionStates
+
+from .pricing import _prepare_subscription_summary
+
+
+logger = logging.getLogger(__name__)
+
+
+async def present_subscription_summary(
+    callback: types.CallbackQuery,
+    state: FSMContext,
+    db_user: User,
+    texts: Any,
+) -> bool:
+    data = await state.get_data()
+
+    try:
+        summary_text, prepared_data = await _prepare_subscription_summary(db_user, data, texts)
+    except ValueError:
+        logger.error(
+            "Ошибка в расчете цены подписки для пользователя %s",
+            db_user.telegram_id,
+        )
+        await callback.answer(
+            "Ошибка расчета цены. Обратитесь в поддержку.",
+            show_alert=True,
+        )
+        return False
+
+    await state.set_data(prepared_data)
+    await save_subscription_checkout_draft(db_user.id, prepared_data)
+
+    await callback.message.edit_text(
+        summary_text,
+        reply_markup=get_subscription_confirm_keyboard(db_user.language),
+        parse_mode="HTML",
+    )
+    await state.set_state(SubscriptionStates.confirming_purchase)
+
+    return True
--- a/app/keyboards/inline.py
+++ b/app/keyboards/inline.py
@@ -2091,15 +2091,25 @@ def get_updated_subscription_settings_keyboard(language: str = DEFAULT_LANGUAGE,
            InlineKeyboardButton(text=texts.t("ADD_COUNTRIES_BUTTON", "🌐 Добавить страны"), callback_data="subscription_add_countries")
        ])

-    keyboard.extend([
-        [
-            InlineKeyboardButton(text=texts.t("CHANGE_DEVICES_BUTTON", "📱 Изменить устройства"), callback_data="subscription_change_devices") 
-        ],
-        [
-            InlineKeyboardButton(text=texts.t("MANAGE_DEVICES_BUTTON", "🔧 Управление устройствами"), callback_data="subscription_manage_devices")
-        ]
+    settings_buttons = []
+
+    if settings.is_devices_selection_enabled():
+        settings_buttons.append([
+            InlineKeyboardButton(
+                text=texts.t("CHANGE_DEVICES_BUTTON", "📱 Изменить устройства"),
+                callback_data="subscription_change_devices",
+            )
+        ])
+
+    settings_buttons.append([
+        InlineKeyboardButton(
+            text=texts.t("MANAGE_DEVICES_BUTTON", "🔧 Управление устройствами"),
+            callback_data="subscription_manage_devices",
+        )
    ])

+    keyboard.extend(settings_buttons)
+
    if settings.is_traffic_selectable():
        keyboard.insert(-2, [
            InlineKeyboardButton(text=texts.t("SWITCH_TRAFFIC_BUTTON", "🔄 Переключить трафик"), callback_data="subscription_switch_traffic")
--- a/app/localization/locales/en.json
+++ b/app/localization/locales/en.json
@@ -796,6 +796,7 @@
  "CANCEL_REPLY": "❌ Cancel reply",
  "CANCEL_TICKET_CREATION": "❌ Cancel ticket creation",
  "CHANGE_DEVICES_BUTTON": "📱 Change devices",
+  "DEVICES_SELECTION_DISABLED": "⚠️ Changing the number of devices is disabled",
  "CHANGE_DEVICES_CONFIRM": "\n📱 <b>Confirm change</b>\n\nCurrent amount: {current_devices} devices\nNew amount: {new_devices} devices\n\nAction: {action}\n💰 {cost}\n\nApply this change?\n",
  "CHANGE_DEVICES_INFO": "\n📱 <b>Adjust device limit</b>\n\nCurrent limit: {current_devices} devices\n\nChoose the new number of devices:\n\n💡 <b>Important:</b>\n• Increasing — extra charge proportional to the remaining time\n• Decreasing — funds are not refunded\n",
  "CHANGE_DEVICES_PROMPT": "📱 <b>Adjust device limit</b>\n\nCurrent limit: {current_devices} devices\nChoose the new number of devices:\n\n💡 <b>Important:</b>\n• Increasing — extra cost prorated by remaining time\n• Decreasing — payments are not refunded",
--- a/app/localization/locales/ru.json
+++ b/app/localization/locales/ru.json
@@ -796,6 +796,7 @@
  "CANCEL_REPLY": "❌ Отменить ответ",
  "CANCEL_TICKET_CREATION": "❌ Отменить создание тикета",
  "CHANGE_DEVICES_BUTTON": "📱 Изменить устройства",
+  "DEVICES_SELECTION_DISABLED": "⚠️ Изменение количества устройств недоступно",
  "CHANGE_DEVICES_CONFIRM": "\n    📱 <b>Подтверждение изменения</b>\n\n    Текущее количество: {current_devices} устройств\n    Новое количество: {new_devices} устройств\n\n    Действие: {action}\n    💰 {cost}\n\n    Подтвердить изменение?\n    ",
  "CHANGE_DEVICES_INFO": "\n    📱 <b>Изменение количества устройств</b>\n\n    Текущий лимит: {current_devices} устройств\n\n    Выберите новое количество устройств:\n\n    💡 <b>Важно:</b>\n    • При увеличении - доплата пропорционально оставшемуся времени\n    • При уменьшении - возврат средств не производится\n    ",
  "CHANGE_DEVICES_PROMPT": "📱 <b>Изменение количества устройств</b>\n\nТекущий лимит: {current_devices} устройств\nВыберите новое количество устройств:\n\n💡 <b>Важно:</b>\n• При увеличении - доплата пропорционально оставшемуся времени\n• При уменьшении - возврат средств не производится",
--- a/app/webapi/routes/miniapp.py
+++ b/app/webapi/routes/miniapp.py
@@ -4133,20 +4133,21 @@ async def _build_subscription_settings(
    )

    devices_options: List[MiniAppSubscriptionDeviceOption] = []
-    for value in range(1, max_devices + 1):
-        chargeable = max(0, value - default_device_limit)
-        discounted_per_month, _ = apply_percentage_discount(
-            chargeable * settings.PRICE_PER_DEVICE,
-            devices_discount,
-        )
-        devices_options.append(
-            MiniAppSubscriptionDeviceOption(
-                value=value,
-                label=None,
-                price_kopeks=discounted_per_month,
-                price_label=None,
+    if settings.is_devices_selection_enabled():
+        for value in range(1, max_devices + 1):
+            chargeable = max(0, value - default_device_limit)
+            discounted_per_month, _ = apply_percentage_discount(
+                chargeable * settings.PRICE_PER_DEVICE,
+                devices_discount,
+            )
+            devices_options.append(
+                MiniAppSubscriptionDeviceOption(
+                    value=value,
+                    label=None,
+                    price_kopeks=discounted_per_month,
+                    price_label=None,
+                )
            )
-        )

    settings_payload = MiniAppSubscriptionSettings(
        subscription_id=subscription.id,
@@ -4171,7 +4172,7 @@ async def _build_subscription_settings(
        ),
        devices=MiniAppSubscriptionDevicesSettings(
            options=devices_options,
-            can_update=True,
+            can_update=settings.is_devices_selection_enabled(),
            min=1,
            max=max_devices_setting or 0,
            step=1,
@@ -5011,6 +5012,15 @@ async def update_subscription_devices_endpoint(
    subscription = _ensure_paid_subscription(user)
    _validate_subscription_id(payload.subscription_id, subscription)

+    if not settings.is_devices_selection_enabled():
+        raise HTTPException(
+            status.HTTP_403_FORBIDDEN,
+            detail={
+                "code": "devices_selection_disabled",
+                "message": "Изменение количества устройств отключено",
+            },
+        )
+
    raw_value = payload.devices if payload.devices is not None else payload.device_limit
    if raw_value is None:
        raise HTTPException(