base commit

client/src/pages/admin-orders/ui/AdminOrdersPage.tsx

@@ -26,9 +26,10 @@ import {
   postAdminOrderMessage,
   setAdminOrderStatus,
 } from '@/entities/order/api/admin-order-api'
-import { ORDER_STATUS_TRANSITIONS, type OrderStatus } from '@/shared/constants/order'
+import { ORDER_STATUSES, getAdminNextOrderStatuses } from '@/shared/constants/order'
 import { clearAdminToken, getAdminToken, setAdminToken } from '@/shared/lib/admin-token'
 import { formatPriceRub } from '@/shared/lib/format-price'
+import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
 
 type TokenFormState = { token: string }
 
@@ -37,6 +38,7 @@ export function AdminOrdersPage() {
   const [token, setTokenState] = useState<string | null>(() => getAdminToken())
   const [q, setQ] = useState('')
   const [status, setStatus] = useState('')
+  const [deliveryType, setDeliveryType] = useState<'delivery' | 'pickup' | ''>('')
   const [dialogOpen, setDialogOpen] = useState(false)
   const [selectedId, setSelectedId] = useState<string | null>(null)
   const [msg, setMsg] = useState('')
@@ -59,8 +61,13 @@ export function AdminOrdersPage() {
   }
 
   const ordersQuery = useQuery({
-    queryKey: ['admin', 'orders', token, { q, status }],
-    queryFn: () => fetchAdminOrders(token!, { q: q.trim() || undefined, status: status || undefined }),
+    queryKey: ['admin', 'orders', token, { q, status, deliveryType }],
+    queryFn: () =>
+      fetchAdminOrders(token!, {
+        q: q.trim() || undefined,
+        status: status || undefined,
+        deliveryType: deliveryType || undefined,
+      }),
     enabled: Boolean(token),
   })
 
@@ -75,6 +82,7 @@ export function AdminOrdersPage() {
     onSuccess: async () => {
       await qc.invalidateQueries({ queryKey: ['admin', 'orders'] })
       await qc.invalidateQueries({ queryKey: ['admin', 'orders', 'detail'] })
+      await qc.invalidateQueries({ queryKey: ['admin', 'orders', 'summary'] })
     },
   })
 
@@ -96,10 +104,9 @@ export function AdminOrdersPage() {
   const detail = orderDetailQuery.data?.item
 
   const nextStatuses = useMemo(() => {
-    const s = detail?.status
-    if (!s) return []
-    return ORDER_STATUS_TRANSITIONS[s as OrderStatus] ?? []
-  }, [detail?.status])
+    if (!detail) return []
+    return getAdminNextOrderStatuses(detail.status, detail.deliveryType ?? 'delivery')
+  }, [detail])
 
   return (
     <Box>
@@ -153,13 +160,31 @@ export function AdminOrdersPage() {
                 <MenuItem value="">
                   <em>Все</em>
                 </MenuItem>
-                {Object.keys(ORDER_STATUS_TRANSITIONS).map((s) => (
+                {ORDER_STATUSES.map((s) => (
                   <MenuItem key={s} value={s}>
-                    {s}
+                    {orderStatusLabelRu(s)}
                   </MenuItem>
                 ))}
               </Select>
             </FormControl>
+            <FormControl size="small" sx={{ minWidth: 220 }}>
+              <InputLabel id="delivery-type-label">Способ получения</InputLabel>
+              <Select
+                labelId="delivery-type-label"
+                label="Способ получения"
+                value={deliveryType}
+                onChange={(e) => {
+                  const v = String(e.target.value)
+                  if (v === '' || v === 'delivery' || v === 'pickup') setDeliveryType(v)
+                }}
+              >
+                <MenuItem value="">
+                  <em>Все</em>
+                </MenuItem>
+                <MenuItem value="delivery">Доставка</MenuItem>
+                <MenuItem value="pickup">Самовывоз</MenuItem>
+              </Select>
+            </FormControl>
           </Stack>
 
           {ordersQuery.isError && <Alert severity="error">Не удалось загрузить заказы.</Alert>}
@@ -180,7 +205,7 @@ export function AdminOrdersPage() {
                 <TableRow key={o.id} hover>
                   <TableCell>{o.id.slice(-8)}</TableCell>
                   <TableCell>{o.user.email}</TableCell>
-                  <TableCell>{o.status}</TableCell>
+                  <TableCell>{orderStatusLabelRu(o.status)}</TableCell>
                   <TableCell>{formatPriceRub(o.totalCents)}</TableCell>
                   <TableCell>{o.itemsCount}</TableCell>
                   <TableCell align="right">
@@ -210,7 +235,8 @@ export function AdminOrdersPage() {
           {detail && (
             <Stack spacing={2} sx={{ mt: 1 }}>
               <Typography sx={{ fontWeight: 700 }}>
-                #{detail.id.slice(-8)} · {detail.user.email} · {detail.status} · {formatPriceRub(detail.totalCents)}
+                #{detail.id.slice(-8)} · {detail.user.email} · {orderStatusLabelRu(detail.status)} ·{' '}
+                {formatPriceRub(detail.totalCents)}
               </Typography>
 
               <Stack direction={{ xs: 'column', sm: 'row' }} spacing={2} sx={{ alignItems: { sm: 'center' } }}>
@@ -232,7 +258,7 @@ export function AdminOrdersPage() {
                     </MenuItem>
                     {nextStatuses.map((s) => (
                       <MenuItem key={s} value={s}>
-                        {s}
+                        {orderStatusLabelRu(s)}
                       </MenuItem>
                     ))}
                   </Select>