diff --git a/frontend/src/components/delivery/DeliveryCard.tsx b/frontend/src/components/delivery/DeliveryCard.tsx index 7b69141..94522df 100644 --- a/frontend/src/components/delivery/DeliveryCard.tsx +++ b/frontend/src/components/delivery/DeliveryCard.tsx @@ -1,5 +1,5 @@ import { memo } from 'react'; -import { MapPin, Phone, Package, Store, Calendar, MessageSquare, CheckCircle2, Circle, CheckSquare, User, Wrench } from 'lucide-react'; +import { MapPin, Phone, Store, Calendar, MessageSquare, CheckCircle2, Circle, CheckSquare, User, Wrench } from 'lucide-react'; import type { Delivery } from '../../types'; import { pickupLocationLabels } from '../../types'; import { StatusBadge } from './StatusBadge'; @@ -58,24 +58,23 @@ export const DeliveryCard = memo(({ delivery, onStatusChange, onEdit, onDelete } {delivery.date} - {/* Pickup locations */} -
- - - {delivery.pickupLocation2 - ? `${pickupLocationLabels[delivery.pickupLocation]} + ${pickupLocationLabels[delivery.pickupLocation2]}` - : pickupLocationLabels[delivery.pickupLocation]} - -
- {delivery.pickupLocation2 && delivery.productName2 && ( -
- Со 2-й точки: {delivery.productName2} + {/* Pickup locations paired with products */} +
+ +
+
+ {pickupLocationLabels[delivery.pickupLocation]} + + {delivery.productName} +
+ {delivery.pickupLocation2 && ( +
+ {pickupLocationLabels[delivery.pickupLocation2]} + + {delivery.productName2 || '—'} +
+ )}
- )} - -
- - {delivery.productName}