From 900be65617dd5bbc6ffdcc82bb5504e1a93ead95 Mon Sep 17 00:00:00 2001 From: Fringg Date: Thu, 5 Mar 2026 11:16:53 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=20=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D0=B8=D1=84=D0=BE=D0=B2=20(1000=20=D0=93=D0=91=20/=202?= =?UTF-8?q?=20=F0=9F=93=B1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/handlers/admin/pricing.py | 2 +- app/handlers/admin/users.py | 2 +- app/handlers/subscription/tariff_purchase.py | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/handlers/admin/pricing.py b/app/handlers/admin/pricing.py index 76efc007..37bfdf57 100644 --- a/app/handlers/admin/pricing.py +++ b/app/handlers/admin/pricing.py @@ -363,7 +363,7 @@ def _format_core_summary(lang_code: str) -> str: else: traffic_mode = '⚙️ selectable' traffic_label = _format_traffic_label(traffic_limit, lang_code, short=True) - return f'{base_price}, {device_limit}📱, {traffic_label}, {traffic_mode}' + return f'{base_price}, {device_limit} 📱, {traffic_label}, {traffic_mode}' def _get_period_items(lang_code: str) -> list[PriceItem]: diff --git a/app/handlers/admin/users.py b/app/handlers/admin/users.py index fd69b4b9..2b790fb4 100644 --- a/app/handlers/admin/users.py +++ b/app/handlers/admin/users.py @@ -4747,7 +4747,7 @@ async def admin_buy_tariff(callback: types.CallbackQuery, db_user: User, db: Asy traffic = '♾️' if tariff.traffic_limit_gb == 0 else f'{tariff.traffic_limit_gb} ГБ' prices = tariff.period_prices or {} min_price = min(prices.values()) if prices else 0 - text += f'{tariff.name} — {traffic}/{tariff.device_limit}📱 от {settings.format_price(min_price)}\n' + text += f'{tariff.name} — {traffic} / {tariff.device_limit} 📱 от {settings.format_price(min_price)}\n' keyboard = [] for tariff in tariffs: diff --git a/app/handlers/subscription/tariff_purchase.py b/app/handlers/subscription/tariff_purchase.py index 35c4f902..37d48bc9 100644 --- a/app/handlers/subscription/tariff_purchase.py +++ b/app/handlers/subscription/tariff_purchase.py @@ -102,7 +102,7 @@ def format_tariffs_list_text( for tariff in tariffs: # Трафик компактно traffic_gb = tariff.traffic_limit_gb - traffic = '∞' if traffic_gb == 0 else f'{traffic_gb}ГБ' + traffic = '∞' if traffic_gb == 0 else f'{traffic_gb} ГБ' # Цена is_daily = getattr(tariff, 'is_daily', False) @@ -127,8 +127,8 @@ def format_tariffs_list_text( discount_icon = '🔥' price_text = f'от {_format_price_kopeks(min_price, compact=True)}{discount_icon}' - # Компактный формат: Название — 250ГБ/10📱 от 179₽🔥 - lines.append(f'{tariff.name} — {traffic}/{tariff.device_limit}📱 {price_text}') + # Компактный формат: Название — 250 ГБ / 10 📱 от 179₽🔥 + lines.append(f'{tariff.name} — {traffic} / {tariff.device_limit} 📱 {price_text}') # Описание тарифа если есть if tariff.description: @@ -1830,7 +1830,7 @@ def format_tariff_switch_list_text( continue traffic_gb = tariff.traffic_limit_gb - traffic = '∞' if traffic_gb == 0 else f'{traffic_gb}ГБ' + traffic = '∞' if traffic_gb == 0 else f'{traffic_gb} ГБ' # Проверяем суточный ли тариф is_daily = getattr(tariff, 'is_daily', False) @@ -1854,7 +1854,7 @@ def format_tariff_switch_list_text( discount_icon = '🔥' price_text = f'от {_format_price_kopeks(min_price, compact=True)}{discount_icon}' - lines.append(f'{tariff.name} — {traffic}/{tariff.device_limit}📱 {price_text}') + lines.append(f'{tariff.name} — {traffic} / {tariff.device_limit} 📱 {price_text}') if tariff.description: lines.append(f'{tariff.description}') @@ -2635,7 +2635,7 @@ def format_instant_switch_list_text( continue traffic_gb = tariff.traffic_limit_gb - traffic = '∞' if traffic_gb == 0 else f'{traffic_gb}ГБ' + traffic = '∞' if traffic_gb == 0 else f'{traffic_gb} ГБ' # Рассчитываем стоимость переключения cost, is_upgrade = _calculate_instant_switch_cost(current_tariff, tariff, remaining_days, db_user) @@ -2645,7 +2645,7 @@ def format_instant_switch_list_text( else: cost_text = '⬇️ Бесплатно' - lines.append(f'{tariff.name} — {traffic}/{tariff.device_limit}📱 {cost_text}') + lines.append(f'{tariff.name} — {traffic} / {tariff.device_limit} 📱 {cost_text}') if tariff.description: lines.append(f'{tariff.description}')