Merge pull request #150 from Fr1ngg/dev3

Фиксы покупки подписки в апдейте с локалью

app/handlers/subscription.py

@@ -4152,6 +4152,21 @@ def register_handlers(dp: Dispatcher):
         F.data == "subscription_confirm",
         SubscriptionStates.confirming_purchase
     )
+
+    dp.callback_query.register(
+        resume_subscription_checkout,
+        F.data == "subscription_resume_checkout",
+    )
+
+    dp.callback_query.register(
+        return_to_saved_cart,
+        F.data == "return_to_saved_cart",
+    )
+
+    dp.callback_query.register(
+        clear_saved_cart,
+        F.data == "clear_saved_cart",
+    )
     
     dp.callback_query.register(
         handle_autopay_menu,

app/keyboards/inline.py

@@ -1015,14 +1015,16 @@ def get_reset_traffic_confirm_keyboard(price_kopeks: int, language: str = DEFAUL
     ])
 
 def get_manage_countries_keyboard(
-    countries: List[dict], 
-    selected: List[str], 
+    countries: List[dict],
+    selected: List[str],
     current_subscription_countries: List[str],
     language: str = DEFAULT_LANGUAGE,
     subscription_end_date: datetime = None
 ) -> InlineKeyboardMarkup:
     from app.utils.pricing_utils import get_remaining_months
-    
+
+    texts = get_texts(language)
+
     months_multiplier = 1
     if subscription_end_date:
         months_multiplier = get_remaining_months(subscription_end_date)

app/localization/locales/en.json

@@ -35,6 +35,7 @@
   "ERROR_TRY_AGAIN": "❌ An error occurred. Please try again.",
   "ERROR_RULES_RETRY": "An error occurred. Please try accepting the rules again:",
   "GO_TO_BALANCE_TOP_UP": "💳 Go to balance top up",
+  "RETURN_TO_SUBSCRIPTION_CHECKOUT": "⬅️ Return to subscription checkout",
   "INSUFFICIENT_BALANCE": "❌ Insufficient balance.\n\nTop up {amount} and try again.",
   "LANGUAGE_SELECTED": "🌐 Interface language set: <b>English</b>",
   "LOADING": "⏳ Loading...",

app/localization/locales/ru.json

@@ -71,6 +71,7 @@
   "ERROR_TRY_AGAIN": "❌ Произошла ошибка. Попробуйте еще раз.",
   "ERROR_RULES_RETRY": "Произошла ошибка. Попробуйте принять правила еще раз:",
   "GO_TO_BALANCE_TOP_UP": "💳 Перейти к пополнению баланса",
+  "RETURN_TO_SUBSCRIPTION_CHECKOUT": "⬅️ Вернуться к оформлению подписки",
   "INSUFFICIENT_BALANCE": "❌ Недостаточно средств на балансе.  \n    \n    <b>Пополните баланс на {amount} и попробуйте снова.</b>\n    ",
   "INVALID_AMOUNT": "❌ Неверная сумма",
   "LANGUAGE_SELECTED": "🌐 Язык интерфейса установлен: <b>Русский</b>",