Merge pull request #65 from Vladless/subscriptions-feature

добавление freekassa

bot.py

@@ -10,8 +10,8 @@ router = Router()
 
 from handlers.admin import admin, admin_panel, user_editor
 from handlers.keys import key_management, keys
-from handlers import (notifications, pay,
-                      profile, start, commands)
+from handlers.payment import pay, freekassa
+from handlers import (notifications, profile, start, commands)
 
 dp.include_router(admin.router)
 dp.include_router(admin_panel.router)
@@ -22,4 +22,5 @@ dp.include_router(profile.router)
 dp.include_router(keys.router)
 dp.include_router(key_management.router)
 dp.include_router(pay.router)
+dp.include_router(freekassa.router)
 dp.include_router(notifications.router)

handlers/commands.py

@@ -6,7 +6,7 @@ import asyncpg
 
 from bot import bot
 from config import ADMIN_ID, DATABASE_URL
-from handlers.pay import ReplenishBalanceState, process_custom_amount_input
+from handlers.payment.pay import ReplenishBalanceState, process_custom_amount_input
 from handlers.profile import process_callback_view_profile
 from handlers.start import start_command
 from handlers.texts import TRIAL

handlers/payment/freekassa.py

@@ -0,0 +1,159 @@
+import uuid
+import hashlib
+import requests
+import logging
+import time
+
+from aiogram import Router, types
+from aiogram.fsm.context import FSMContext
+from aiogram.fsm.state import State, StatesGroup
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
+from aiohttp import web
+from bot import bot
+from config import FREEKASSA_API_KEY, FREEKASSA_SHOP_ID
+from database import update_balance
+
+router = Router()
+logging.basicConfig(level=logging.DEBUG)
+
+class ReplenishBalanceState(StatesGroup):
+    choosing_amount = State()
+    waiting_for_payment_confirmation = State()
+    entering_custom_amount = State()
+
+def generate_signature(params, api_key):
+    sign_string = ":".join([str(params[k]) for k in sorted(params)]) + api_key
+    return hashlib.md5(sign_string.encode()).hexdigest()
+
+async def create_payment(user_id, amount, email, ip):
+    payment_id = str(uuid.uuid4())
+    nonce = int(time.time() * 1000)
+    params = {
+        "shopId": FREEKASSA_SHOP_ID,
+        "amount": amount,
+        "currency": "RUB",
+        "paymentId": payment_id,
+        "email": email,
+        "ip": ip,
+        "i": 6, 
+        "nonce": nonce
+    }
+    params["signature"] = generate_signature(params, FREEKASSA_API_KEY)
+
+    try:
+        response = requests.post("https://api.freekassa.com/v1/orders/create", json=params)
+        response_data = response.json()
+        
+        logging.debug(f"Ответ от FreeKassa при создании платежа: {response_data}")
+
+        if response_data.get("type") == "success":
+            return response_data["location"] 
+        else:
+            logging.error(f"Ошибка создания платежа: {response_data}")
+            return None
+
+    except Exception as e:
+        logging.error(f"Ошибка запроса к FreeKassa: {e}")
+        return None
+
+async def send_payment_success_notification(user_id, amount):
+    try:
+        await bot.send_message(
+            chat_id=user_id,
+            text=f"Ваш баланс успешно пополнен на {amount} рублей. Спасибо за оплату!"
+        )
+    except Exception as e:
+        logging.error(f"Ошибка при отправке уведомления пользователю {user_id}: {e}")
+
+async def freekassa_webhook(request):
+    data = await request.json()
+    logging.debug(f"Получен вебхук от FreeKassa: {data}")
+
+    logging.debug(f"Данные вебхука от FreeKassa: {data}")
+
+    if data["status"] == "completed":
+        user_id = data["metadata"]["user_id"]
+        amount = float(data["amount"])
+
+        await update_balance(user_id, amount)
+        await send_payment_success_notification(user_id, amount)
+
+    return web.Response(status=200)
+
+@router.callback_query(lambda c: c.data == 'pay_freekassa')
+async def process_callback_pay_freekassa(callback_query: types.CallbackQuery, state: FSMContext):
+    tg_id = callback_query.from_user.id
+    
+    amount_keyboard = InlineKeyboardMarkup(inline_keyboard=[
+        [
+            InlineKeyboardButton(text="100 рублей", callback_data="amount|100"),
+            InlineKeyboardButton(text="500 рублей", callback_data="amount|500")
+        ],
+        [
+            InlineKeyboardButton(text="1000 рублей", callback_data="amount|1000"),
+            InlineKeyboardButton(text="5000 рублей", callback_data="amount|5000")
+        ],
+        [
+            InlineKeyboardButton(text="Введите другую сумму", callback_data="enter_custom_amount")
+        ]
+    ])
+    
+    await bot.delete_message(chat_id=tg_id, message_id=callback_query.message.message_id)
+
+    await bot.send_message(
+        chat_id=tg_id,
+        text="Выберите сумму пополнения через FreeKassa:",
+        reply_markup=amount_keyboard
+    )
+    
+    await state.set_state(ReplenishBalanceState.choosing_amount)
+    await callback_query.answer()
+
+@router.callback_query(lambda c: c.data.startswith('amount|'))
+async def process_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
+    data = callback_query.data.split('|', 1)
+    amount_str = data[1]
+    try:
+        amount = int(amount_str)
+    except ValueError:
+        await bot.send_message(callback_query.from_user.id, "Некорректная сумма.")
+        return
+
+    user_email = f"{callback_query.from_user.id}@solo.net" 
+    user_ip = callback_query.message.chat.id 
+    payment_url = await create_payment(callback_query.from_user.id, amount, user_email, user_ip)
+
+    if payment_url:
+        await bot.send_message(callback_query.from_user.id, f"Перейдите по ссылке для оплаты: {payment_url}")
+    else:
+        await bot.send_message(callback_query.from_user.id, "Ошибка при создании платежа. Попробуйте позже.")
+
+    await callback_query.answer()
+
+@router.callback_query(lambda c: c.data == 'enter_custom_amount')
+async def process_enter_custom_amount(callback_query: types.CallbackQuery, state: FSMContext):
+    await callback_query.message.edit_text(
+        text="Введите сумму пополнения:"
+    )
+    await state.set_state(ReplenishBalanceState.entering_custom_amount)
+    await callback_query.answer()
+
+@router.message(ReplenishBalanceState.entering_custom_amount)
+async def process_custom_amount_input(message: types.Message, state: FSMContext):
+    if message.text.isdigit():
+        amount = int(message.text)
+        if amount <= 0:
+            await message.answer("Сумма должна быть больше нуля. Пожалуйста, введите сумму еще раз:")
+            return
+        
+        user_email = f"{message.from_user.id}@solo.net"
+        user_ip = message.chat.id
+        payment_url = await create_payment(message.from_user.id, amount, user_email, user_ip)
+
+        if payment_url:
+            await bot.send_message(message.from_user.id, f"Перейдите по ссылке для оплаты: {payment_url}")
+        else:
+            await message.answer("Ошибка при создании платежа. Попробуйте позже.")
+
+    else:
+        await message.answer("Пожалуйста, введите корректную сумму.")

handlers/payment/pay.py

@@ -73,7 +73,7 @@ async def process_callback_replenish_balance(callback_query: types.CallbackQuery
         ],
         [
             InlineKeyboardButton(text=PAYMENT_OPTIONS[5]['text'], callback_data=PAYMENT_OPTIONS[5]['callback_data'])
-        ]
+        ],
     ])
     
     await bot.delete_message(chat_id=tg_id, message_id=callback_query.message.message_id)

handlers/profile.py

@@ -8,6 +8,7 @@ from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup, BufferedIn
 from bot import bot
 from database import get_balance, get_key_count, get_referral_stats
 from handlers.texts import profile_message_send, invite_message_send, CHANNEL_LINK, get_referral_link
+from config import PAYMENT_METHOD
 
 
 class ReplenishBalanceState(StatesGroup):
@@ -44,7 +45,7 @@ async def process_callback_view_profile(callback_query: types.CallbackQuery, sta
         
         inline_keyboard = InlineKeyboardMarkup(inline_keyboard=[
             [InlineKeyboardButton(text='➕ Устройство', callback_data='create_key'), InlineKeyboardButton(text='📱 Мои устр-ва', callback_data='view_keys')],
-            [InlineKeyboardButton(text='💳 Пополнить баланс', callback_data='replenish_balance')],
+            [InlineKeyboardButton(text='💳 Пополнить баланс', callback_data='pay_freekassa' if PAYMENT_METHOD == 'freekassa' else 'replenish_balance')],
             [InlineKeyboardButton(text='👥 Пригласить', callback_data='invite'), InlineKeyboardButton(text='📘 Инструкции', callback_data='instructions')],
             [InlineKeyboardButton(text='⬅️ Назад', callback_data='back_to_menu')]
         ])

main.py

@@ -11,7 +11,8 @@ from bot import bot, dp, router
 from config import WEBAPP_HOST, WEBAPP_PORT, WEBHOOK_PATH, WEBHOOK_URL
 from database import init_db
 from handlers.notifications import notify_expiring_keys
-from handlers.pay import payment_webhook
+from handlers.payment.pay import payment_webhook
+from handlers.payment.freekassa import freekassa_webhook
 
 logging.basicConfig(level=logging.DEBUG)
 
@@ -52,6 +53,7 @@ async def main():
     app.on_startup.append(on_startup)
     app.on_shutdown.append(on_shutdown)
     app.router.add_post('/yookassa/webhook', payment_webhook)
+    app.router.add_post('/freekassa/webhook', freekassa_webhook)
 
     SimpleRequestHandler(dispatcher=dp, bot=bot).register(app, path=WEBHOOK_PATH)
     setup_application(app, dp, bot=bot)