Commit Graph

3682 Commits

Author SHA1 Message Date
Egor
790ffecade Revert "fix: group WATA payments in the admin menu" 2025-10-15 02:35:37 +03:00
Egor
5c5cc42af7 Merge pull request #1326 from Fr1ngg/ogoewn-bedolaga/update-bot-menu-configuration
fix: group WATA payments in the admin menu
2025-10-15 02:33:46 +03:00
Egor
0784f56f7c fix: organize payment settings and add wata test 2025-10-15 02:33:17 +03:00
Egor
775da62e00 Merge pull request #1325 from Fr1ngg/x280im-bedolaga/verify-wata-payment-method-integration
Add WATA payment support to miniapp API
2025-10-15 01:59:21 +03:00
Egor
436efcdd3e Add WATA payment support to miniapp API and tests 2025-10-15 01:50:34 +03:00
Egor
086660ebef Merge pull request #1324 from Fr1ngg/du2spj-bedolaga/fix-wata-payment-finalization-logic
Handle WATA Paid status during polling
2025-10-15 01:29:49 +03:00
Egor
c546d10d93 Handle WATA Paid status during polling 2025-10-15 01:23:50 +03:00
Egor
169bdae0d1 Merge pull request #1323 from Fr1ngg/q1598f-bedolaga/add-new-balance-topping-method-to-bot
Fix missing logging import in WATA CRUD helpers
2025-10-15 01:21:28 +03:00
Egor
56e0ec4cd2 Fix logging import in WATA CRUD module 2025-10-15 01:14:43 +03:00
Egor
f62e2794b2 Merge pull request #1322 from Fr1ngg/main
w
2025-10-15 00:43:41 +03:00
Egor
f19db8f184 Merge pull request #1320 from Gy9vin/main
Фиксы ошибок запуска
2025-10-15 00:36:24 +03:00
Egor
41d4c9b507 Merge pull request #1321 from Fr1ngg/revert-1319-revert-1318-main
Revert "Revert "да все до кучи""
2025-10-15 00:36:11 +03:00
Egor
73e4abb29f Revert "Revert "да все до кучи"" 2025-10-15 00:35:58 +03:00
gy9vin
f7cd8c9fc3 Фиксы ошибок запуска 2025-10-14 23:03:21 +03:00
Egor
6497f52a11 Merge pull request #1319 from Fr1ngg/revert-1318-main
Revert "да все до кучи"
2025-10-14 21:39:30 +03:00
Egor
a4de6a8330 Revert "да все до кучи" 2025-10-14 21:39:20 +03:00
Egor
d27e625ee6 Merge pull request #1318 from Gy9vin/main
да все до кучи
2025-10-14 21:35:11 +03:00
gy9vin
e7a34152fc удаление бэкапов 2025-10-14 21:30:29 +03:00
Egor
e332fc41fc Delete app/handlers/balance.py.backup 2025-10-14 21:20:29 +03:00
Egor
6bf0ac7fbf Delete app/handlers/balance.py.backup2 2025-10-14 21:19:27 +03:00
Egor
0effaa5240 Merge pull request #1317 from Fr1ngg/revert-1315-revert-1314-revert-1313-nv8l52-bedolaga/add-new-balance-top-up-method-to-bot
Revert "Revert "Revert "Complete Wata Pay integration"""
2025-10-14 21:18:03 +03:00
Egor
89b0544f86 Revert "Revert "Revert "Complete Wata Pay integration""" 2025-10-14 21:17:54 +03:00
Egor
b1626d32cd Merge pull request #1315 from Fr1ngg/revert-1314-revert-1313-nv8l52-bedolaga/add-new-balance-top-up-method-to-bot
Revert "Revert "Complete Wata Pay integration""
2025-10-14 21:00:16 +03:00
gy9vin
8cdb4289c9 Модульность balance 2025-10-14 21:00:08 +03:00
gy9vin
d4e3adddfc pal24 фиксы с кнопками СБП и карта 2025-10-14 20:21:52 +03:00
gy9vin
1baeb50322 кнопка назад при ручной проверки статуса платежа на палыче 2025-10-14 19:55:24 +03:00
Egor
7ed635600e Revert "Revert "Complete Wata Pay integration"" 2025-10-14 19:14:28 +03:00
Egor
cb81fae3d8 Merge pull request #1311 from Fr1ngg/main
w
2025-10-14 19:13:49 +03:00
Egor
93cb99d50c Merge pull request #1314 from Fr1ngg/revert-1313-nv8l52-bedolaga/add-new-balance-top-up-method-to-bot
Revert "Complete Wata Pay integration"
2025-10-14 19:13:23 +03:00
Egor
5a4f59dfb2 Revert "Complete Wata Pay integration" 2025-10-14 19:13:11 +03:00
Egor
59f39e18a0 Merge pull request #1313 from Fr1ngg/nv8l52-bedolaga/add-new-balance-top-up-method-to-bot
Complete Wata Pay integration
2025-10-14 19:12:19 +03:00
Egor
d3dd423042 Complete Wata Pay integration 2025-10-14 16:46:00 +03:00
Egor
b90b270a9e Merge pull request #1306 from Gy9vin/main
Партнерка активация по env + убрано упоминание о vpn в русской локализации
2025-10-14 16:08:41 +03:00
gy9vin
7846b54a6f вернул докер 2025-10-14 11:16:19 +03:00
gy9vin
77083e8349 Фикс 2025-10-14 11:14:55 +03:00
gy9vin
f121a5733b Прячем кнопки пополнения через env. оставляя только введения суммы вручную 2025-10-14 09:45:14 +03:00
Mikhail
ad6bb95df7 Merge branch 'Fr1ngg:main' into main 2025-10-14 09:03:02 +03:00
gy9vin
58588e37d0 Реализация корзины пользователя! запоминает настройки подписки после пополнения баланса. 2025-10-14 09:02:16 +03:00
Egor
9717876fe7 Merge pull request #1307 from Fr1ngg/main
w
2025-10-14 00:55:29 +03:00
gy9vin
badf44a9e7 Выпиливание упоминание про VPN из русской локализации 2025-10-13 23:02:25 +03:00
gy9vin
a320de1cbb Скрытие кнопки партнерки через env 2025-10-13 23:00:06 +03:00
Egor
aebfd8933a Update Dockerfile v2.5.1 2025-10-13 22:11:55 +03:00
Egor
482fb26d48 Update docker-registry.yml 2025-10-13 22:11:47 +03:00
Egor
8542473c6a Update docker-hub.yml 2025-10-13 22:11:33 +03:00
Egor
66e56c68cb Merge pull request #1305 from Fr1ngg/dev4
Рефактор subscription разбите на модули
2025-10-13 21:33:44 +03:00
Egor
135f3ccb92 Merge pull request #1304 from Fr1ngg/pfxfpr-bedolaga/refactor-subscription.py-for-modularity
Refactor subscription handlers into modular package
2025-10-13 21:24:58 +03:00
Egor
d082e8a61c Refactor subscription handlers into modular package 2025-10-13 21:21:26 +03:00
Egor
23ad622fcd Merge pull request #1303 from Fr1ngg/dev4
фиксы + модульность платежек
2025-10-13 21:01:30 +03:00
Egor
9b639c3e1d Merge pull request #1302 from Fr1ngg/bedolaga-koykgg
Preserve advertising payload when subscription check blocks /start
2025-10-13 20:56:10 +03:00
Egor
75e9b8e27d Fix campaign tracking for users subscribing before /start 2025-10-13 20:51:25 +03:00