Mk
/
supersam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: delivery date in table+card, driver assign preserves agreed status

This commit is contained in:
root 2026-05-27 12:39:02 +00:00
parent 9ec7d8e8ae
commit 19bed475ee
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/orders/OrdersTable.jsx
View File

@ -10,8 +10,13 @@ import {
const buildGroupSummary = (group) => { const buildGroupSummary = (group) => {
const orderCountLabel = `${group.ordersCount || 0} ${group.ordersCount === 1 ? "заказ" : group.ordersCount < 5 ? "заказа" : "заказов"}`; const orderCountLabel = `${group.ordersCount || 0} ${group.ordersCount === 1 ? "заказ" : group.ordersCount < 5 ? "заказа" : "заказов"}`;
const readyCountLabel = `${group.readyCount || 0} готовы`; 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) => { 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>
<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> </tr>
@ -130,6 +136,13 @@ export const OrdersTable = ({
<td className="px-5 py-4"> <td className="px-5 py-4">
<Badge tone={getOrderGroupStatusTone(group)}>{getOrderGroupDisplayStatusLabel(group)}</Badge> <Badge tone={getOrderGroupStatusTone(group)}>{getOrderGroupDisplayStatusLabel(group)}</Badge>
</td> </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)]"> <td className="px-5 py-4 text-sm text-[var(--color-text-muted)]">
{group.readyCount || 0}/{group.ordersCount || 0} {group.readyCount || 0}/{group.ordersCount || 0}
</td> </td>