deploy

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

@@ -22,18 +22,63 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import {
   fetchAdminOrder,
   fetchAdminOrders,
+  patchAdminOrderDeliveryFee,
   postAdminOrderMessage,
   setAdminOrderStatus,
 } from '@/entities/order/api/admin-order-api'
+import { deliveryCarrierLabelRu } from '@/shared/constants/delivery-carrier'
 import { ORDER_STATUSES, getAdminNextOrderStatuses } from '@/shared/constants/order'
 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 { parseOrderAddressSnapshot } from '@/shared/lib/order-address-snapshot'
 import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
 import { ChatMessageBubble } from '@/shared/ui/ChatMessageBubble'
 import { OrderMessageBody } from '@/shared/ui/OrderMessageBody'
 import { RichTextMessageEditor } from '@/shared/ui/RichTextMessageEditor'
 
+function DeliveryFeeAdjustmentForm({ orderId, deliveryFeeCents }: { orderId: string; deliveryFeeCents: number }) {
+  const qc = useQueryClient()
+  const [rub, setRub] = useState(() => String(deliveryFeeCents / 100))
+  const feeMut = useMutation({
+    mutationFn: () => patchAdminOrderDeliveryFee(orderId, Math.round(Number.parseFloat(rub) * 100)),
+    onSuccess: async () => {
+      await invalidateQueryKeys(qc, [
+        ['admin', 'orders'],
+        ['admin', 'orders', 'detail'],
+        ['admin', 'orders', 'summary'],
+      ])
+    },
+  })
+
+  return (
+    <Stack direction={{ xs: 'column', sm: 'row' }} spacing={2} sx={{ alignItems: { sm: 'flex-end' } }}>
+      <TextField
+        size="small"
+        label="Доставка, ₽"
+        type="number"
+        value={rub}
+        onChange={(e) => setRub(e.target.value)}
+        inputProps={{ min: 0, step: 1 }}
+        sx={{ width: { xs: '100%', sm: 200 } }}
+      />
+      <Button
+        variant="contained"
+        disabled={
+          feeMut.isPending ||
+          !rub.trim() ||
+          !Number.isFinite(Number.parseFloat(rub)) ||
+          Number.parseFloat(rub) < 0 ||
+          !Number.isInteger(Number.parseFloat(rub))
+        }
+        onClick={() => feeMut.mutate()}
+      >
+        Утвердить доставку и открыть оплату
+      </Button>
+    </Stack>
+  )
+}
+
 export function AdminOrdersPage() {
   const qc = useQueryClient()
   const [q, setQ] = useState('')
@@ -96,6 +141,11 @@ export function AdminOrdersPage() {
   const detail = orderDetailQuery.data?.item
   const canSendMessage = msg.replace(/<[^>]*>/g, ' ').trim().length > 0
 
+  const deliverySnapshot = useMemo(
+    () => (detail?.deliveryType === 'delivery' ? parseOrderAddressSnapshot(detail.addressSnapshotJson) : null),
+    [detail],
+  )
+
   const nextStatuses = useMemo(() => {
     if (!detail) return []
     return getAdminNextOrderStatuses(detail.status, detail.deliveryType ?? 'delivery')
@@ -211,8 +261,78 @@ export function AdminOrdersPage() {
               <Typography variant="body2" color="text.secondary">
                 Получение: {detail.deliveryType === 'pickup' ? 'самовывоз' : 'доставка'}
                 {(detail.paymentMethod ?? 'online') === 'on_pickup' ? ' · оплата при получении' : ' · онлайн-оплата'}
+                {detail.deliveryType === 'delivery' && deliveryCarrierLabelRu(detail.deliveryCarrier) && (
+                  <> · служба: {deliveryCarrierLabelRu(detail.deliveryCarrier)}</>
+                )}
               </Typography>
 
+              {detail.deliveryType === 'delivery' && (
+                <Box
+                  sx={{
+                    border: 1,
+                    borderColor: 'divider',
+                    borderRadius: 1,
+                    p: 1.5,
+                    bgcolor: 'action.hover',
+                  }}
+                >
+                  <Typography variant="subtitle2" gutterBottom sx={{ fontWeight: 700 }}>
+                    Адрес и получатель (на момент заказа)
+                  </Typography>
+                  {deliverySnapshot ? (
+                    <Stack spacing={0.75}>
+                      {deliverySnapshot.label?.trim() && (
+                        <Typography variant="body2" color="text.secondary">
+                          Метка: {deliverySnapshot.label}
+                        </Typography>
+                      )}
+                      <Typography variant="body2">
+                        <Box component="span" sx={{ color: 'text.secondary' }}>
+                          Адрес:
+                        </Box>{' '}
+                        {deliverySnapshot.addressLine ?? '—'}
+                      </Typography>
+                      <Typography variant="body2">
+                        <Box component="span" sx={{ color: 'text.secondary' }}>
+                          Получатель:
+                        </Box>{' '}
+                        {deliverySnapshot.recipientName ?? '—'}
+                      </Typography>
+                      <Typography variant="body2">
+                        <Box component="span" sx={{ color: 'text.secondary' }}>
+                          Телефон:
+                        </Box>{' '}
+                        {deliverySnapshot.recipientPhone ?? '—'}
+                      </Typography>
+                      {deliverySnapshot.comment?.trim() && (
+                        <Typography variant="body2" color="text.secondary">
+                          Комментарий к адресу: {deliverySnapshot.comment}
+                        </Typography>
+                      )}
+                    </Stack>
+                  ) : (
+                    <Typography color="text.secondary" variant="body2">
+                      Данные адреса в заказе отсутствуют или не распознаны.
+                    </Typography>
+                  )}
+                </Box>
+              )}
+
+              {detail.status === 'DELIVERY_FEE_ADJUSTMENT' && (
+                <Alert severity="info">
+                  Укажите итоговую стоимость доставки (₽). После сохранения заказ получит статус «
+                  {orderStatusLabelRu('PENDING_PAYMENT')}», и клиент сможет оплатить с учётом этой суммы.
+                </Alert>
+              )}
+
+              {detail.status === 'DELIVERY_FEE_ADJUSTMENT' && (
+                <DeliveryFeeAdjustmentForm
+                  key={detail.id}
+                  orderId={detail.id}
+                  deliveryFeeCents={detail.deliveryFeeCents}
+                />
+              )}
+
               <Stack direction={{ xs: 'column', sm: 'row' }} spacing={2} sx={{ alignItems: { sm: 'center' } }}>
                 <FormControl size="small" sx={{ minWidth: 240 }}>
                   <InputLabel id="next-status-label">Сменить статус</InputLabel>