Commit Graph

808 Commits

Author SHA1 Message Date
Egor
b06da932cd Ensure Pal24 webhook closes DB session 2025-09-24 03:49:01 +03:00
Egor
4f40cb8862 Fix Pal24 webhook DB session handling 2025-09-24 03:31:46 +03:00
Egor
5dcb37032e Fix PayPalych webhook to reuse main event loop 2025-09-24 03:08:33 +03:00
Egor
4225404673 Add PayPalych payment integration 2025-09-24 02:56:51 +03:00
Egor
588e4acbd3 Secure Mulen Pay webhook with signature validation 2025-09-24 01:29:42 +03:00
Egor
eb730ecd6e Add Mulen Pay integration for balance top-ups 2025-09-24 01:14:15 +03:00
Egor
1451bfac12 Fix Telegram Stars payments handler priority 2025-09-23 23:40:17 +03:00
Egor
c445e24ff6 Merge pull request #238 from Fr1ngg/kko1hi-bedolaga/fix-duplicate-imports-in-pricing_utils.py
Fix duplicate imports and avoid cyclic referral code dependency
2025-09-23 23:24:49 +03:00
Egor
bb5af66656 Fix duplicate import and referral code generation 2025-09-23 23:24:24 +03:00
Egor
85e8b7fc24 Merge pull request #237 from Fr1ngg/pe7u0s-bedolaga/fix-notification-status-for-first-deposit
Fix top-up status detection in admin notifications
2025-09-23 23:19:31 +03:00
Egor
c4802fe442 Fix top-up status detection in admin notifications 2025-09-23 23:19:13 +03:00
Egor
19fe40b172 Remove subscription button from post-purchase prompts 2025-09-23 23:16:51 +03:00
Egor
355ac7a0fa Merge pull request #233 from PEDZEO/my-fix
Система модерации и улучшения тикетов
2025-09-23 23:03:15 +03:00
Egor
3105b811d4 Show checkout resume button for expired subscriptions 2025-09-23 22:54:33 +03:00
PEDZEO
b438b6df61 Merge branch 'main' into my-fix 2025-09-23 16:02:16 +03:00
PEDZEO
15bda0560a feat: модерация, обновленное меню тикетов, SLA и управление уведомлениями 2025-09-23 15:39:16 +03:00
Egor
745ebf64ef Revert "Dev5" 2025-09-23 05:53:13 +03:00
Egor
7d5d89302b Ignore topic messages 2025-09-23 05:38:59 +03:00
Egor
44d249ad5b Revert "feat: support auto promo group assignment by spending" 2025-09-23 04:17:17 +03:00
Egor
50c7eaa29a Revert "Add auto-assign controls and prevent repeated promo group reassignment" 2025-09-23 04:16:47 +03:00
Egor
a1d4e9c7b3 Add auto-assign controls and prevent repeated promo group reassignment 2025-09-23 04:14:15 +03:00
Egor
7f62af6955 feat: support auto promo group assignment by spending 2025-09-23 03:53:00 +03:00
Egor
0256203f44 Fix broadcast target parsing for zero-traffic filters 2025-09-23 03:33:16 +03:00
Egor
5a75626625 Merge pull request #210 from Fr1ngg/wy1u0m-bedolaga/add-referral-system-enhancements-and-analytics
Fix campaign stats to include subscription payments
2025-09-23 03:08:51 +03:00
Egor
17e3985671 Fix campaign stats to include subscription payments 2025-09-23 03:08:15 +03:00
Egor
97c8ddf4e1 Add advertising campaign stats to admin user info 2025-09-23 02:54:19 +03:00
Egor
1758eabe0e Fix 14-day period description 2025-09-23 02:25:18 +03:00
Egor
555f76a4ec feat: enhance server status view 2025-09-23 02:09:22 +03:00
Egor
1c3f2c7500 Update texts.py 2025-09-23 01:21:47 +03:00
Egor
a9da2a0e63 Merge branch 'dev5' into vxzeis-bedolaga/fix-user-unblock-errors-in-ticket-system 2025-09-23 01:16:07 +03:00
Egor
aaea98049e Fix FSM context usage in admin ticket handlers 2025-09-23 01:15:26 +03:00
PEDZEO
93668da99f Resolve merge conflicts: integrate server status and ticket system features
- Added server status handler and service
- Integrated server status keyboard functions
- Merged support settings and ticket configurations
- Updated bot.py with new handler registrations
- Resolved conflicts in config.py and inline.py
2025-09-23 01:13:49 +03:00
Egor
86e8ac39c3 Handle admin ticket view after block toggles 2025-09-23 01:08:28 +03:00
Egor
a9a10e3e90 Merge pull request #187 from Fr1ngg/dev5
Полноценная тикет-система by @PEDZEO
2025-09-23 00:39:57 +03:00
Egor
1de81a6aa4 Merge pull request #185 from yazhog/main
Автовыбор количества устройств в заказе, если TRIAL_DEVICE_LIMIT < DEFAULT_DEVICE_LIMIT
2025-09-23 00:38:22 +03:00
PEDZEO
f0ae702933 Fix ticket system: add noop handlers, pagination, validation, and admin back button routing 2025-09-22 21:40:10 +03:00
PEDZEO
19be4348aa Fix ticket system: add noop handlers, pagination, validation, and admin back button routing 2025-09-22 21:20:50 +03:00
Egor
12061f0752 Add server status menu integration 2025-09-22 17:29:20 +03:00
Egor
ac25e1b4c6 Respect base promo period discount flag 2025-09-22 14:53:23 +03:00
Egor
58257a6eac Add return button after creating promo group 2025-09-21 08:01:44 +03:00
Egor
1fcd76db9e Show promo discounts during subscription flow 2025-09-21 07:55:31 +03:00
Egor
b5df729d97 Handle missing traffic package prices 2025-09-21 06:38:34 +03:00
Egor
7330c729e0 Fix subscription extension success message 2025-09-21 06:27:10 +03:00
yazhog
c3f62a4ff6 Merge branch 'Fr1ngg:main' into main 2025-09-20 19:31:51 +03:00
Egor
0aa49a6a94 Fix promo group delete confirmation handler 2025-09-20 10:31:31 +03:00
Egor
4b457240b9 Add configurable base promo group period discounts 2025-09-20 09:12:26 +03:00
Egor
b63c5867d4 Merge pull request #161 from Fr1ngg/feature
Add promo group management to admin user profile
2025-09-20 08:35:23 +03:00
Egor
598dd8b6c1 Add promo group management to admin user profile 2025-09-20 08:35:06 +03:00
Egor
a10b9f0ad7 Expand universal migration to provision promo groups 2025-09-20 08:23:57 +03:00
Egor
177862f178 Add admin promo groups and integrate discounts 2025-09-20 07:48:41 +03:00