diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index 06ebd817..ecc4234e 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -36,15 +36,15 @@ jobs: TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🏷️ Собираем релизную версию: $VERSION" elif [[ $GITHUB_REF == refs/heads/main ]]; then - VERSION="v2.9.5-$(git rev-parse --short HEAD)" + VERSION="v2.9.6-$(git rev-parse --short HEAD)" TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🚀 Собираем версию из main: $VERSION" elif [[ $GITHUB_REF == refs/heads/dev ]]; then - VERSION="v2.9.5-dev-$(git rev-parse --short HEAD)" + VERSION="v2.9.6-dev-$(git rev-parse --short HEAD)" TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:dev,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}" echo "🧪 Собираем dev версию: $VERSION" else - VERSION="v2.9.5-pr-$(git rev-parse --short HEAD)" + VERSION="v2.9.6-pr-$(git rev-parse --short HEAD)" TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:pr-$(git rev-parse --short HEAD)" echo "🔀 Собираем PR версию: $VERSION" fi diff --git a/.github/workflows/docker-registry.yml b/.github/workflows/docker-registry.yml index d23c7a8c..87ea6baa 100644 --- a/.github/workflows/docker-registry.yml +++ b/.github/workflows/docker-registry.yml @@ -49,13 +49,13 @@ jobs: VERSION=${GITHUB_REF#refs/tags/} echo "🏷️ Building release version: $VERSION" elif [[ $GITHUB_REF == refs/heads/main ]]; then - VERSION="v2.9.5-$(git rev-parse --short HEAD)" + VERSION="v2.9.6-$(git rev-parse --short HEAD)" echo "🚀 Building main version: $VERSION" elif [[ $GITHUB_REF == refs/heads/dev ]]; then - VERSION="v2.9.5-dev-$(git rev-parse --short HEAD)" + VERSION="v2.9.6-dev-$(git rev-parse --short HEAD)" echo "🧪 Building dev version: $VERSION" else - VERSION="v2.9.5-pr-$(git rev-parse --short HEAD)" + VERSION="v2.9.6-pr-$(git rev-parse --short HEAD)" echo "🔀 Building PR version: $VERSION" fi echo "version=$VERSION" >> $GITHUB_OUTPUT diff --git a/Dockerfile b/Dockerfile index b11675f7..4f7bbed1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN pip install --no-cache-dir --upgrade pip && \ FROM python:3.13-slim -ARG VERSION="v2.9.5" +ARG VERSION="v2.9.6" ARG BUILD_DATE ARG VCS_REF diff --git a/miniapp/index.html b/miniapp/index.html index 51ffe9f8..75dc2297 100644 --- a/miniapp/index.html +++ b/miniapp/index.html @@ -8916,8 +8916,8 @@ trafficTopupBtn.classList.remove('hidden'); // Сохраняем данные для модального окна window._trafficTopupPackages = trafficTopupPackages; - window._subscriptionId = userData?.subscription_id; - window._userBalance = userData?.balance_kopeks || 0; + window._subscriptionId = userData?.subscription_id ?? userData?.subscriptionId; + window._userBalance = userData?.balance_kopeks || userData?.balanceKopeks || 0; } else { trafficTopupBtn.classList.add('hidden'); } @@ -12251,14 +12251,19 @@ clearTrafficTopupError(); try { + const initData = tg.initData || ''; + const requestBody = { + initData: initData, + gb: gb + }; + if (window._subscriptionId) { + requestBody.subscriptionId = window._subscriptionId; + } + const response = await fetch('/miniapp/subscription/traffic-topup', { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - initData: window._initData, - subscriptionId: window._subscriptionId, - gb: gb - }) + body: JSON.stringify(requestBody) }); const data = await response.json();