base commit

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

@@ -30,6 +30,7 @@ import { formatPriceRub } from '@/shared/lib/format-price'
 import { groupOrdersByStatus } from '@/shared/lib/group-orders-by-status'
 import { invalidateQueryKeys } from '@/shared/lib/invalidate-query-keys'
 import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { ChatMessageBubble } from '@/shared/ui/ChatMessageBubble'
 import { RichTextMessageContent } from '@/shared/ui/RichTextMessageContent'
 import { RichTextMessageEditor } from '@/shared/ui/RichTextMessageEditor'
 
@@ -207,6 +208,10 @@ export function AdminOrdersPage() {
                 #{detail.id.slice(-8)} · {detail.user.email} · {orderStatusLabelRu(detail.status)} ·{' '}
                 {formatPriceRub(detail.totalCents)}
               </Typography>
+              <Typography variant="body2" color="text.secondary">
+                Получение: {detail.deliveryType === 'pickup' ? 'самовывоз' : 'доставка'}
+                {(detail.paymentMethod ?? 'online') === 'on_pickup' ? ' · оплата при получении' : ' · онлайн-оплата'}
+              </Typography>
 
               <Stack direction={{ xs: 'column', sm: 'row' }} spacing={2} sx={{ alignItems: { sm: 'center' } }}>
                 <FormControl size="small" sx={{ minWidth: 240 }}>
@@ -240,25 +245,13 @@ export function AdminOrdersPage() {
                 </Typography>
                 <Stack spacing={1} sx={{ mb: 1 }}>
                   {detail.messages.map((m) => (
-                    <Box
-                      key={m.id}
-                      sx={{
-                        p: 1.25,
-                        border: 1,
-                        borderColor: 'divider',
-                        borderRadius: 2,
-                        bgcolor: m.authorType === 'admin' ? 'primary.50' : 'grey.100',
-                        alignSelf: m.authorType === 'admin' ? 'flex-end' : 'flex-start',
-                        width: 'fit-content',
-                        maxWidth: '85%',
-                      }}
-                    >
+                    <ChatMessageBubble key={m.id} authorType={m.authorType === 'admin' ? 'user' : 'admin'}>
                       <Typography variant="caption" color="text.secondary">
                         {m.authorType === 'admin' ? 'Админ (вы)' : 'Пользователь'} ·{' '}
                         {new Date(m.createdAt).toLocaleString()}
                       </Typography>
                       <RichTextMessageContent value={m.text} tone="chat" />
-                    </Box>
+                    </ChatMessageBubble>
                   ))}
                   {detail.messages.length === 0 && <Typography color="text.secondary">Нет сообщений.</Typography>}
                 </Stack>