Commit Graph

3130 Commits

Author SHA1 Message Date
Egor 7628b9aaa7 Implement percent-based promo discounts 2025-10-04 11:31:55 +03:00
Egor 9ab8f1dee9 Merge pull request #748 from Fr1ngg/revert-747-bedolaga/update-promo-offers-to-apply-percentage-discount
Revert "Implement stackable percent-based promo offers"
2025-10-04 11:31:05 +03:00
Egor 092ea034ec Revert "Implement stackable percent-based promo offers" 2025-10-04 11:30:57 +03:00
Egor c4e5261b31 Merge pull request #747 from Fr1ngg/bedolaga/update-promo-offers-to-apply-percentage-discount
Implement stackable percent-based promo offers
2025-10-04 11:29:04 +03:00
Egor 2baf2b9abb Adjust promo offer templates for percent discounts 2025-10-04 11:28:47 +03:00
Egor 87a6b05e54 Merge pull request #746 from Fr1ngg/revert-745-bedolaga/update-promo-offers-for-discounts-rwpidj
Revert "Implement percent-based promo offers"
2025-10-04 11:05:56 +03:00
Egor 0925dfdf80 Revert "Implement percent-based promo offers" 2025-10-04 11:05:47 +03:00
Egor cf294fae0a Merge pull request #745 from Fr1ngg/bedolaga/update-promo-offers-for-discounts-rwpidj
Implement percent-based promo offers
2025-10-04 10:58:35 +03:00
Egor 12e77cd6bf Implement percent-based promo offers 2025-10-04 10:57:00 +03:00
Egor 867ae1b807 Merge pull request #744 from Fr1ngg/revert-743-bedolaga/update-promo-offers-for-discounts-9jz4ar
Revert "Clear expired promo discounts when preparing checkout summaries"
2025-10-04 10:55:45 +03:00
Egor db9f91b336 Revert "Clear expired promo discounts when preparing checkout summaries" 2025-10-04 10:55:32 +03:00
Egor df0792d4dd Merge pull request #743 from Fr1ngg/bedolaga/update-promo-offers-for-discounts-9jz4ar
Clear expired promo discounts when preparing checkout summaries
2025-10-04 10:54:35 +03:00
Egor 0e0569fe23 Clear expired promo discounts before checkout 2025-10-04 10:53:09 +03:00
Egor daa37370e3 Merge pull request #741 from Fr1ngg/bedolaga/fix-invalid-values-error-for-active-subscriptions
Fix parsing of promo offer send callbacks
2025-10-04 10:19:36 +03:00
Egor b35c731ba5 Fix promo offer segment parsing 2025-10-04 10:19:05 +03:00
Egor 06879089a1 Merge pull request #740 from Fr1ngg/bedolaga/fix-missing-join-in-promo-segment-query
Fix promo segment join for no subscription users
2025-10-04 10:14:01 +03:00
Egor b96d530808 Fix promo segment no subscription join 2025-10-04 10:13:45 +03:00
Egor 8f3c8f37c1 Merge pull request #739 from Fr1ngg/bedolaga/add-promotional-offers-feature-to-bot-mgwac3
Add admin promo offer management and targeted promotions
2025-10-04 10:05:54 +03:00
Egor e4c7a9cf15 Add admin promo offers and targeted discount workflows 2025-10-04 10:05:31 +03:00
Egor 935e2356db Merge pull request #738 from Fr1ngg/revert-737-bedolaga/add-promotional-offers-feature-to-bot
Revert "Implement targeted promotional offer campaigns"
2025-10-04 10:04:59 +03:00
Egor 3b392a671d Revert "Implement targeted promotional offer campaigns" 2025-10-04 10:04:49 +03:00
Egor 4ceb09d609 Merge pull request #737 from Fr1ngg/bedolaga/add-promotional-offers-feature-to-bot
Implement targeted promotional offer campaigns
2025-10-04 09:59:41 +03:00
Egor 3f8ea7f8fd Add promotional offer broadcasting support 2025-10-04 09:59:17 +03:00
Egor 95525f2132 Update README.md 2025-10-04 08:03:44 +03:00
Egor d15b46dede Merge pull request #736 from Legacyyy777/DEV
Мулен 3
2025-10-04 07:44:54 +03:00
Egor f2fc7581a3 Update Dockerfile v2.4.3 2025-10-04 07:37:47 +03:00
Egor e96010d24d Update docker-registry.yml 2025-10-04 07:37:32 +03:00
Egor 35fc39b9f2 Update docker-hub.yml 2025-10-04 07:37:13 +03:00
Legacyyy777 7129625ab5 Merge branch 'Fr1ngg:main' into DEV 2025-10-04 09:23:31 +05:00
Legacyyy777 e480356447 Оптимизирована обработка подключения к БД в WebhookServer. Удален цикл async for, добавлена обработка исключений при получении соединения с БД. 2025-10-04 09:21:49 +05:00
Egor 46ea2de300 Merge pull request #735 from Fr1ngg/dev2
Перенос настроек цен и управления серверов + рефактор запуска бота
2025-10-04 06:58:37 +03:00
Egor 2152ded3c4 Merge pull request #734 from Fr1ngg/bedolaga/improve-bot-startup-log-format-ih803q
feat: add structured startup timeline logging
2025-10-04 06:51:36 +03:00
Egor da0e8a2e3e feat: add structured startup timeline logging 2025-10-04 06:51:19 +03:00
Egor da540e8680 Merge pull request #733 from Fr1ngg/revert-732-bedolaga/improve-bot-startup-log-format
Revert "Enhance startup log presentation"
2025-10-04 06:51:07 +03:00
Egor a12ad52c7e Revert "Enhance startup log presentation" 2025-10-04 06:50:59 +03:00
Egor 38b5fa297b Merge pull request #732 from Fr1ngg/bedolaga/improve-bot-startup-log-format
Enhance startup log presentation
2025-10-04 06:49:05 +03:00
Egor d50475974c Improve startup logging aesthetics 2025-10-04 06:48:49 +03:00
Egor ada891f2d9 Merge pull request #731 from Fr1ngg/bedolaga/resolve-missing-localization-keys
Add missing admin pricing locale strings
2025-10-04 06:40:13 +03:00
Egor e7467e5434 Add missing admin pricing translations 2025-10-04 06:38:45 +03:00
Egor fa4a692574 Merge pull request #730 from Fr1ngg/bedolaga/fix-subscription-price-update-in-admin-panel-y4nuoo
Mutate period price cache in place
2025-10-04 06:31:18 +03:00
Egor 9c60ef2c33 Mutate period price cache in place 2025-10-04 06:30:50 +03:00
Egor 634633d12e Merge pull request #729 from Fr1ngg/revert-728-bedolaga/fix-subscription-price-update-in-admin-panel-ivhvb7
Revert "Fix subscription period price cache update"
2025-10-04 06:30:25 +03:00
Egor b3fd0c50ca Revert "Fix subscription period price cache update" 2025-10-04 06:30:17 +03:00
Egor acb267668e Merge pull request #728 from Fr1ngg/bedolaga/fix-subscription-price-update-in-admin-panel-ivhvb7
Fix subscription period price cache update
2025-10-04 06:24:55 +03:00
Egor 344cffef60 Fix period price cache refresh 2025-10-04 06:24:38 +03:00
Egor ef652d4518 Merge pull request #727 from Fr1ngg/revert-726-bedolaga/fix-subscription-price-update-in-admin-panel-8wrvf1
Revert "Fix subscription period price updates in admin panel"
2025-10-04 06:23:25 +03:00
Egor a66f9bbf28 Revert "Fix subscription period price updates in admin panel" 2025-10-04 06:23:17 +03:00
Egor 3e5fbcf2bd Merge pull request #726 from Fr1ngg/bedolaga/fix-subscription-price-update-in-admin-panel-8wrvf1
Fix subscription period price updates in admin panel
2025-10-04 06:20:12 +03:00
Egor ba2de9e150 Fix period price updates in admin 2025-10-04 06:19:52 +03:00
Egor b638e04629 Merge pull request #725 from Fr1ngg/revert-724-bedolaga/fix-subscription-price-update-in-admin-panel
Revert "Fix subscription price refresh in admin panel"
2025-10-04 06:19:32 +03:00