Commit Graph

5844 Commits

Author SHA1 Message Date
Egor 1de81a6aa4 Merge pull request #185 from yazhog/main
Автовыбор количества устройств в заказе, если TRIAL_DEVICE_LIMIT < DEFAULT_DEVICE_LIMIT
2025-09-23 00:38:22 +03:00
Egor 540a0e35a1 Merge pull request #184 from PEDZEO/dev3
Fix ticket system: add noop handlers, pagination, validation, and adm…
2025-09-23 00:30:09 +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 84ed1fc5ca Merge pull request #182 from Fr1ngg/dev3
Мониторинг серверов
2025-09-22 17:51:11 +03:00
Egor de38f8219c Merge pull request #181 from Fr1ngg/h47qjb-bedolaga/add-server-status-button-with-modes
Add server status menu integration
2025-09-22 17:29:52 +03:00
Egor 12061f0752 Add server status menu integration 2025-09-22 17:29:20 +03:00
Egor a5174f10d5 Merge pull request #180 from Fr1ngg/dev3
Фикс отключения скидки на дл. периоды для базовых юзеров
2025-09-22 14:54:40 +03:00
Egor 69eeaf6c46 Merge pull request #179 from Fr1ngg/v2tigz-bedolaga/fix-discount-settings-in-env
Respect base promo period discount flag
2025-09-22 14:53:43 +03:00
Egor ac25e1b4c6 Respect base promo period discount flag 2025-09-22 14:53:23 +03:00
Legacyyy777 51ba5b980c Merge branch 'Fr1ngg:main' into DEV 2025-09-21 10:57:47 +05:00
Egor 26e0800d70 Update Dockerfile v2.3.7 2025-09-21 08:19:43 +03:00
Egor d0197aacd7 Update docker-registry.yml 2025-09-21 08:19:16 +03:00
Egor b097c5db44 Update docker-hub.yml 2025-09-21 08:19:06 +03:00
Egor 302f64ad5c Merge pull request #178 from Fr1ngg/dev3
Вывод скидок за длительный период, за промогруппу при покупке/продлении подписки
2025-09-21 08:09:02 +03:00
Egor 23cd2097da Merge pull request #177 from Fr1ngg/embv4q-bedolaga/add-navigation-to-promo-groups-after-creation
Add return button after creating promo group
2025-09-21 08:05:56 +03:00
Egor 58257a6eac Add return button after creating promo group 2025-09-21 08:01:44 +03:00
Egor ea7b982b7b Merge pull request #176 from Fr1ngg/0h9kvj-bedolaga/display-promo-group-discounts-on-subscription-page
Show promo group discounts during subscription flow
2025-09-21 07:56:00 +03:00
Egor 1fcd76db9e Show promo discounts during subscription flow 2025-09-21 07:55:31 +03:00
Egor 66d92cfa51 Merge pull request #175 from Fr1ngg/dev3
Фикс покупки/продления подпсики для режима FIXED трафика
2025-09-21 06:43:43 +03:00
Egor 9dc5ee22ee Merge pull request #174 from Fr1ngg/p3trbh-bedolaga/fix-pricing-calculation-error-in-fixed-mode
Handle missing traffic package prices
2025-09-21 06:38:57 +03:00
Egor b5df729d97 Handle missing traffic package prices 2025-09-21 06:38:34 +03:00
Egor 56e3541b80 Merge pull request #173 from Fr1ngg/dev3
Фикс продления подписки
2025-09-21 06:31:24 +03:00
Egor 9681bce540 Merge pull request #172 from Fr1ngg/2osn6z-bedolaga/fix-subscription-renewal-error
Fix subscription extension success message
2025-09-21 06:27:40 +03:00
Egor 7330c729e0 Fix subscription extension success message 2025-09-21 06:27:10 +03:00
Egor 977a19a4c9 Merge pull request #171 from Fr1ngg/revert-170-a3l29i-bedolaga/fix-subscription-renewal-error
Revert "Fix edit_text patch signature"
2025-09-21 06:25:49 +03:00
Egor d226fedf75 Revert "Fix edit_text patch signature" 2025-09-21 06:24:59 +03:00
Egor c9ee1da728 Merge pull request #170 from Fr1ngg/a3l29i-bedolaga/fix-subscription-renewal-error
Fix edit_text patch signature
2025-09-21 06:14:37 +03:00
Egor d6753501e7 Fix edit_text patch signature 2025-09-21 06:13:59 +03:00
yazhog c3f62a4ff6 Merge branch 'Fr1ngg:main' into main 2025-09-20 19:31:51 +03:00
Legacyyy777 9fb6d7ecf6 Merge branch 'Fr1ngg:main' into DEV 2025-09-20 18:13:25 +05:00
Egor 48101eee39 Merge pull request #168 from Fr1ngg/dev3
Фикс удаления промогрупп
2025-09-20 10:38:01 +03:00
Egor 16e771f1c3 Merge pull request #167 from Fr1ngg/dbzwiq-bedolaga/fix-promo-group-deletion-not-working
Fix promo group deletion confirm handling
2025-09-20 10:31:45 +03:00
Egor 0aa49a6a94 Fix promo group delete confirmation handler 2025-09-20 10:31:31 +03:00
Egor c810619a13 Merge pull request #166 from Fr1ngg/revert-165-pa311q-bedolaga/fix-promo-group-deletion-not-working
Revert "Handle promo group deletion when default group is missing"
2025-09-20 10:30:58 +03:00
Egor 817d277091 Revert "Handle promo group deletion when default group is missing" 2025-09-20 10:30:35 +03:00
Egor d3a822e8b3 Merge pull request #165 from Fr1ngg/pa311q-bedolaga/fix-promo-group-deletion-not-working
Handle promo group deletion when default group is missing
2025-09-20 10:28:31 +03:00
Egor ec8c37744a Handle missing default promo group on deletion 2025-09-20 10:27:54 +03:00
Egor 732c36630c Merge pull request #163 from Fr1ngg/dev3
Промогруппы + Скидка базовым юзерам на доп услуги за продолжительный период подписки
2025-09-20 09:46:59 +03:00
Egor 498d2f04b6 Update .env.example 2025-09-20 09:42:14 +03:00
Egor d167147725 Update README.md 2025-09-20 09:41:45 +03:00
Egor 19800971d6 Merge pull request #162 from Fr1ngg/bedolaga
Add configurable base promo group period discounts
2025-09-20 09:12:58 +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 6cd399cea7 Merge pull request #160 from Fr1ngg/codex/fix-bot-start-error-due-to-missing-column-anc9e0
Expand universal migration to provision promo groups
2025-09-20 08:25:39 +03:00
Egor 466033d04c Delete migrations/alembic/versions/cbd1be472f3d_add_cascade_to_sent_notifications.py 2025-09-20 08:25:29 +03:00
Egor 99bca0220b Delete migrations/alembic/versions/3d9b35c6bd8f_add_paid_price_to_subscription.py 2025-09-20 08:25:14 +03:00
Egor a10b9f0ad7 Expand universal migration to provision promo groups 2025-09-20 08:23:57 +03:00
Egor 825d549822 Delete migrations/alembic/versions/3d9b35c6bd8f_add_paid_price_to_subscription.py 2025-09-20 08:15:21 +03:00