From 161fde430160a145cbc2c79a616676905d0242ad Mon Sep 17 00:00:00 2001 From: Fringg Date: Fri, 24 Apr 2026 05:28:08 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20bulk=20actions=20=E2=80=94=20add=20tarif?= =?UTF-8?q?f=20info=20to=20user=20list,=20fix=20tariff=20column=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update UserListItem type to include tariff_id, tariff_name, traffic_used_gb, traffic_limit_gb, device_limit, days_remaining from the backend (now returned in user list API) - Fix tariff column: was showing subscription_status, now shows actual tariff_name from the API response --- src/api/adminUsers.ts | 6 ++++++ src/pages/AdminBulkActions.tsx | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/api/adminUsers.ts b/src/api/adminUsers.ts index 3a0a23a..5e33075 100644 --- a/src/api/adminUsers.ts +++ b/src/api/adminUsers.ts @@ -49,6 +49,12 @@ export interface UserListItem { subscription_status: string | null; subscription_is_trial: boolean; subscription_end_date: string | null; + tariff_id: number | null; + tariff_name: string | null; + traffic_used_gb: number; + traffic_limit_gb: number; + device_limit: number; + days_remaining: number; promo_group_id: number | null; promo_group_name: string | null; total_spent_kopeks: number; diff --git a/src/pages/AdminBulkActions.tsx b/src/pages/AdminBulkActions.tsx index 5cdc93a..d3ed81d 100644 --- a/src/pages/AdminBulkActions.tsx +++ b/src/pages/AdminBulkActions.tsx @@ -1245,22 +1245,15 @@ export default function AdminBulkActions() { }, { id: 'tariff', - accessorFn: (row) => row.promo_group_name, + accessorFn: (row) => row.tariff_name, header: t('admin.bulkActions.columns.tariff'), size: 120, cell: ({ row }) => { - // UserListItem doesn't have tariff_name directly; we'll show subscription info const user = row.original; - if (!user.has_subscription) { - return -; + if (!user.tariff_name) { + return ; } - return ( - - {user.subscription_status === 'trial' - ? t('admin.bulkActions.statuses.trial') - : user.subscription_status || '-'} - - ); + return {user.tariff_name}; }, }, {