Merge remote-tracking branch 'origin/dev' into pr-539

src/api/adminUsers.ts

@@ -456,7 +456,8 @@ export const adminUsersApi = {
         | 'traffic'
         | 'last_activity'
         | 'total_spent'
-        | 'purchase_count';
+        | 'purchase_count'
+        | 'subscription_end_date';
     } = {},
   ): Promise<UsersListResponse> => {
     const response = await apiClient.get('/cabinet/admin/users', { params });

src/locales/en.json

@@ -3459,7 +3459,8 @@
         "byDate": "By date",
         "byBalance": "By balance",
         "byActivity": "By activity",
-        "bySpent": "By spending"
+        "bySpent": "By spending",
+        "byExpiry": "By expiry"
       },
       "pagination": {
         "showing": "Showing {{from}}-{{to}} of {{total}}"

src/locales/fa.json

@@ -2963,7 +2963,8 @@
         "byDate": "بر اساس تاریخ",
         "byBalance": "بر اساس موجودی",
         "byActivity": "بر اساس فعالیت",
-        "bySpent": "بر اساس هزینه"
+        "bySpent": "بر اساس هزینه",
+        "byExpiry": "بر اساس انقضا"
       },
       "pagination": {
         "showing": "نمایش {{from}}-{{to}} از {{total}}"

src/locales/ru.json

@@ -3856,7 +3856,8 @@
         "byDate": "По дате",
         "byBalance": "По балансу",
         "byActivity": "По активности",
-        "bySpent": "По расходам"
+        "bySpent": "По расходам",
+        "byExpiry": "По истечению подписки"
       },
       "pagination": {
         "showing": "Показано {{from}}-{{to}} из {{total}}"

src/locales/zh.json

@@ -2962,7 +2962,8 @@
         "byDate": "按日期",
         "byBalance": "按余额",
         "byActivity": "按活跃度",
-        "bySpent": "按消费"
+        "bySpent": "按消费",
+        "byExpiry": "按到期时间"
       },
       "pagination": {
         "showing": "显示 {{from}}-{{to}}，共 {{total}}"

src/pages/AdminUsers.tsx

@@ -288,6 +288,7 @@ export default function AdminUsers() {
             <option value="balance">{t('admin.users.filters.byBalance')}</option>
             <option value="last_activity">{t('admin.users.filters.byActivity')}</option>
             <option value="total_spent">{t('admin.users.filters.bySpent')}</option>
+            <option value="subscription_end_date">{t('admin.users.filters.byExpiry')}</option>
           </select>
         </div>
       </div>