deploy

client/src/pages/me/ui/sections/OrderDetailPage.tsx

@@ -24,9 +24,11 @@ import {
 } from '@/entities/order/api/order-api'
 import { postProductReview, uploadReviewImage } from '@/entities/product/api/reviews-api'
 import { markOrderMessagesRead } from '@/entities/user/api/messages-api'
+import { deliveryCarrierLabelRu } from '@/shared/constants/delivery-carrier'
 import { PAYMENT_TRANSFER_INSTRUCTIONS_PLAIN } from '@/shared/constants/payment-instructions'
 import { PICKUP_ADDRESS_FULL } from '@/shared/constants/pickup-point'
 import { formatPriceRub } from '@/shared/lib/format-price'
+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'
@@ -62,15 +64,6 @@ function reviewSubmitErrorMessage(err: unknown): string {
   return 'Не удалось отправить отзыв'
 }
 
-type AddressSnapshot = {
-  deliveryType?: 'delivery' | 'pickup'
-  label?: string | null
-  recipientName?: string
-  recipientPhone?: string
-  addressLine?: string
-  comment?: string | null
-}
-
 export function OrderDetailPage() {
   const { id } = useParams()
   const qc = useQueryClient()
@@ -180,14 +173,7 @@ export function OrderDetailPage() {
     })()
   }, [id, order, orderQuery.status, qc])
 
-  const address = useMemo((): AddressSnapshot | null => {
-    if (!order?.addressSnapshotJson) return null
-    try {
-      return JSON.parse(order.addressSnapshotJson) as AddressSnapshot
-    } catch {
-      return null
-    }
-  }, [order])
+  const address = useMemo(() => parseOrderAddressSnapshot(order?.addressSnapshotJson), [order?.addressSnapshotJson])
 
   if (!id) return <Alert severity="error">Некорректный заказ.</Alert>
   if (orderQuery.isLoading) return <Typography>Загрузка…</Typography>
@@ -245,6 +231,11 @@ export function OrderDetailPage() {
             Способ: {order.deliveryType === 'pickup' ? 'Самовывоз' : 'Доставка'}
             {order.deliveryType === 'pickup' && <> · оплата: {payOnPickup ? 'при получении' : 'онлайн'}</>}
           </Typography>
+          {order.deliveryType === 'delivery' && deliveryCarrierLabelRu(order.deliveryCarrier) && (
+            <Typography variant="body2" sx={{ mb: 1 }}>
+              Служба: {deliveryCarrierLabelRu(order.deliveryCarrier)}
+            </Typography>
+          )}
           {order.deliveryType === 'delivery' && (
             <>
               {address ? (
@@ -298,6 +289,12 @@ export function OrderDetailPage() {
             </Typography>
           ) : (
             <>
+              {order.status === 'DELIVERY_FEE_ADJUSTMENT' && (
+                <Typography color="text.secondary" variant="body2" sx={{ mb: 1 }}>
+                  Точную стоимость доставки уточняет администратор. Оплата станет доступна после перехода заказа в
+                  статус «{orderStatusLabelRu('PENDING_PAYMENT')}».
+                </Typography>
+              )}
               {order.status === 'PENDING_PAYMENT' && (
                 <>
                   <Typography color="text.secondary" variant="body2" sx={{ mb: 1 }}>
@@ -320,7 +317,7 @@ export function OrderDetailPage() {
                   Оплата отправлена на проверку. Мы проверим поступление и обновим статус.
                 </Typography>
               )}
-              {!['PENDING_PAYMENT', 'PAYMENT_VERIFICATION'].includes(order.status) && (
+              {!['DELIVERY_FEE_ADJUSTMENT', 'PENDING_PAYMENT', 'PAYMENT_VERIFICATION'].includes(order.status) && (
                 <Typography color="text.secondary" variant="body2">
                   На этом этапе действий по оплате в этом блоке не требуется.
                 </Typography>