From 4a68347ae8aec6296187da084031c02474fb97a1 Mon Sep 17 00:00:00 2001 From: Fringg Date: Fri, 27 Feb 2026 09:50:13 +0300 Subject: [PATCH] revert: remove user-facing reset traffic toggle Reset traffic on tariff switch is an admin-only setting. Backend handles it via admin settings system (data-driven, no frontend code needed). Reverted all user-facing toggle UI, API params, types, and translations. --- src/api/subscription.ts | 9 +----- src/locales/en.json | 4 +-- src/locales/fa.json | 4 +-- src/locales/ru.json | 4 +-- src/locales/zh.json | 4 +-- src/pages/SubscriptionPurchase.tsx | 45 +++--------------------------- src/types/index.ts | 3 -- 7 files changed, 9 insertions(+), 64 deletions(-) diff --git a/src/api/subscription.ts b/src/api/subscription.ts index 857d86f..99fe63d 100644 --- a/src/api/subscription.ts +++ b/src/api/subscription.ts @@ -345,7 +345,6 @@ export const subscriptionApi = { // Preview tariff switch cost previewTariffSwitch: async ( tariffId: number, - resetTraffic?: boolean, ): Promise<{ can_switch: boolean; current_tariff_id: number | null; @@ -365,14 +364,10 @@ export const subscriptionApi = { base_upgrade_cost_kopeks?: number; discount_percent?: number; discount_kopeks?: number; - // Traffic reset on switch - reset_traffic_available?: boolean; - reset_traffic_default?: boolean; }> => { const response = await apiClient.post('/cabinet/subscription/tariff/switch/preview', { tariff_id: tariffId, - period_days: 30, - ...(resetTraffic !== undefined && { reset_traffic: resetTraffic }), + period_days: 30, // Default period for switch }); return response.data; }, @@ -380,7 +375,6 @@ export const subscriptionApi = { // Switch to a different tariff switchTariff: async ( tariffId: number, - resetTraffic?: boolean, ): Promise<{ success: boolean; message: string; @@ -395,7 +389,6 @@ export const subscriptionApi = { const response = await apiClient.post('/cabinet/subscription/tariff/switch', { tariff_id: tariffId, period_days: 30, - ...(resetTraffic !== undefined && { reset_traffic: resetTraffic }), }); return response.data; }, diff --git a/src/locales/en.json b/src/locales/en.json index 1c614a2..e7d818b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -483,9 +483,7 @@ "switched": "Tariff switched", "notEnoughBalance": "Insufficient balance", "dailyPayment": "Daily payment", - "dailyChargeDescription": "Charged daily from your balance", - "resetTraffic": "Reset traffic", - "resetTrafficHint": "Reset used traffic when switching tariff" + "dailyChargeDescription": "Charged daily from your balance" }, "switchTraffic": { "title": "Change Traffic", diff --git a/src/locales/fa.json b/src/locales/fa.json index 933a10b..08b1833 100644 --- a/src/locales/fa.json +++ b/src/locales/fa.json @@ -378,9 +378,7 @@ "remainingDays": "روزهای باقی‌مانده", "switch": "تغییر", "title": "تغییر تعرفه", - "upgradeCost": "هزینه ارتقا", - "resetTraffic": "بازنشانی ترافیک", - "resetTrafficHint": "بازنشانی ترافیک مصرفی هنگام تغییر تعرفه" + "upgradeCost": "هزینه ارتقا" }, "promoGroup": { "yourGroup": "گروه شما: {{name}}", diff --git a/src/locales/ru.json b/src/locales/ru.json index 6631864..b4cae25 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -506,9 +506,7 @@ "switched": "Тариф изменён", "notEnoughBalance": "Недостаточно средств", "dailyPayment": "Оплата за день", - "dailyChargeDescription": "Списывается ежедневно с баланса", - "resetTraffic": "Сбросить трафик", - "resetTrafficHint": "Обнулить использованный трафик при смене тарифа" + "dailyChargeDescription": "Списывается ежедневно с баланса" }, "switchTraffic": { "title": "Изменить трафик", diff --git a/src/locales/zh.json b/src/locales/zh.json index 0faad4f..122b6ae 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -378,9 +378,7 @@ "remainingDays": "剩余天数", "switch": "切换", "title": "切换套餐", - "upgradeCost": "升级费用", - "resetTraffic": "重置流量", - "resetTrafficHint": "切换套餐时重置已使用流量" + "upgradeCost": "升级费用" }, "promoGroup": { "yourGroup": "您的组：{{name}}", diff --git a/src/pages/SubscriptionPurchase.tsx b/src/pages/SubscriptionPurchase.tsx index 991c501..9e91891 100644 --- a/src/pages/SubscriptionPurchase.tsx +++ b/src/pages/SubscriptionPurchase.tsx @@ -128,14 +128,13 @@ export default function SubscriptionPurchase() { // Tariff switch const [switchTariffId, setSwitchTariffId] = useState(null); - const [resetTrafficOnSwitch, setResetTrafficOnSwitch] = useState(false); // Auto-close all modals on success notification const handleCloseAllModals = () => { setShowPurchaseForm(false); setShowTariffPurchase(false); setSwitchTariffId(null); - setResetTrafficOnSwitch(false); + setSelectedTariff(null); setSelectedTariffPeriod(null); }; @@ -232,21 +231,14 @@ export default function SubscriptionPurchase() { enabled: !!switchTariffId, }); - // Initialize reset traffic toggle from server default - useEffect(() => { - if (switchPreview?.reset_traffic_default !== undefined) { - setResetTrafficOnSwitch(switchPreview.reset_traffic_default); - } - }, [switchPreview?.reset_traffic_default]); - // Tariff switch mutation const switchTariffMutation = useMutation({ - mutationFn: (tariffId: number) => subscriptionApi.switchTariff(tariffId, resetTrafficOnSwitch), + mutationFn: (tariffId: number) => subscriptionApi.switchTariff(tariffId), onSuccess: () => { queryClient.invalidateQueries({ queryKey: ['subscription'] }); queryClient.invalidateQueries({ queryKey: ['purchase-options'] }); setSwitchTariffId(null); - setResetTrafficOnSwitch(false); + navigate('/subscription', { replace: true }); }, onError: (error: unknown) => { @@ -260,7 +252,7 @@ export default function SubscriptionPurchase() { const targetTariff = tariffs.find((tariff) => tariff.id === switchTariffId); if (targetTariff) { setSwitchTariffId(null); - setResetTrafficOnSwitch(false); + setSelectedTariff(targetTariff); setSelectedTariffPeriod(targetTariff.periods[0] || null); setShowTariffPurchase(true); @@ -609,35 +601,6 @@ export default function SubscriptionPurchase() { - {/* Reset traffic toggle */} - {switchPreview.reset_traffic_available && ( - - )} - {!switchPreview.has_enough_balance && switchPreview.upgrade_cost_kopeks > 0 && (