From 19bed475ee1741208537e52afdab15f8fa03c93c Mon Sep 17 00:00:00 2001
From: root <root@cgvcpusuzr.local>
Date: Wed, 27 May 2026 12:39:02 +0000
Subject: [PATCH] feat: delivery date in table+card, driver assign preserves
 agreed status

---
 src/components/orders/OrdersTable.jsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/orders/OrdersTable.jsx b/src/components/orders/OrdersTable.jsx
index 532c7df..454d9e7 100644
--- a/src/components/orders/OrdersTable.jsx
+++ b/src/components/orders/OrdersTable.jsx
@@ -10,8 +10,13 @@ import {
 const buildGroupSummary = (group) => {
   const orderCountLabel = `${group.ordersCount || 0} ${group.ordersCount === 1 ? "заказ" : group.ordersCount < 5 ? "заказа" : "заказов"}`;
   const readyCountLabel = `${group.readyCount || 0} готовы`;
+  const parts = [orderCountLabel, readyCountLabel];
+  if (group.deliveryDate) {
+    const datePart = group.deliveryTime ? `${group.deliveryDate} · ${group.deliveryTime}` : group.deliveryDate;
+    parts.push(datePart);
+  }
 
-  return `${orderCountLabel} · ${readyCountLabel}`;
+  return parts.join(" · ");
 };
 
 const renderOrderNumbers = (group) => {
@@ -100,6 +105,7 @@ export const OrdersTable = ({
               <th className="px-5 py-4 font-medium">Клиент</th>
               <th className="px-5 py-4 font-medium">Номера</th>
               <th className="px-5 py-4 font-medium">Статус</th>
+              <th className="px-5 py-4 font-medium">Дата доставки</th>
               <th className="px-5 py-4 font-medium">Готовность</th>
               <th className="px-5 py-4 font-medium">Обновлён</th>
             </tr>
@@ -130,6 +136,13 @@ export const OrdersTable = ({
                 <td className="px-5 py-4">
                   <Badge tone={getOrderGroupStatusTone(group)}>{getOrderGroupDisplayStatusLabel(group)}</Badge>
                 </td>
+                <td className="px-5 py-4 text-sm">
+                  {group.deliveryDate ? (
+                    <span>{group.deliveryDate}{group.deliveryTime ? <span className="text-[var(--color-text-muted)]"> · {group.deliveryTime}</span> : ""}</span>
+                  ) : (
+                    <span className="text-[var(--color-text-muted)]">—</span>
+                  )}
+                </td>
                 <td className="px-5 py-4 text-sm text-[var(--color-text-muted)]">
                   {group.readyCount || 0}/{group.ordersCount || 0}
                 </td>