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

Compare commits

base: Mk:main
Branches Tags
Mk:main
Mk:dev
..
compare: Mk:dev
Branches Tags
Mk:main
Mk:dev

No commits in common. "main" and "dev" have entirely different histories.
main ... dev

11 changed files with 98 additions and 232 deletions
Show Stats Expand all files Collapse all files

2
src/components/driver/DriverDeliveryPlanner.jsx
View File

@ -347,7 +347,7 @@ export const DriverDeliveryPlanner = ({ orderGroups = [], onOpenOrder, currentUs
statusBuckets.get(s).items.push(item);
}
const statusOrder = ["agreed", "driver_assigned", "loaded", "on_route", "delivered", "picked_up", "paid_storage", "problem"];
const statusOrder = ["driver_assigned", "loaded", "on_route", "delivered", "picked_up", "problem"];
const sortedBuckets = Array.from(statusBuckets.entries()).sort(([a], [b]) => {
const ia = statusOrder.indexOf(a);
const ib = statusOrder.indexOf(b);

25
src/components/driver/DriverShipmentPanel.jsx
View File

@ -89,7 +89,7 @@ const parseOrderItems = (order) => {
return [];
};
export const DriverShipmentPanel = ({ order, onShipmentChange, onSaveShipment, isSavingShipment }) => {
export const DriverShipmentPanel = ({ order, onShipmentChange }) => {
const [stopWords, setStopWords] = React.useState([]);
const [scopeActive, setScopeActive] = React.useState(true);
@ -261,29 +261,6 @@ export const DriverShipmentPanel = ({ order, onShipmentChange, onSaveShipment, i
)}
</div>
)}
{onSaveShipment && items.length > 0 && (
<div className="flex items-center gap-3">
<Button
onClick={() => onSaveShipment(items.map((item) => ({
id: item.id,
name: item.name,
quantity: item.quantity,
unit: item.unit,
shipped: shippedItems.has(item.id),
comment: shippedItems.has(item.id) ? "" : (comments[item.id] || ""),
})))}
disabled={isSavingShipment || shippedCount === 0}
>
{isSavingShipment ? "Сохраняем..." : "Сохранить отгрузку"}
</Button>
{shippedCount > 0 && shippedCount < items.length && (
<span className="text-xs text-[var(--color-text-muted)]">
Частичная отгрузка: {shippedCount}/{items.length}
</span>
)}
</div>
)}
</Panel>
);
};

90
src/components/logistics/LogisticsReadinessBoard.jsx
View File

@ -10,7 +10,7 @@ import { Badge } from "../UI/Badge";
import { Panel } from "../UI/Panel";
import { SkeletonPage } from "../UI/Loading";
import { OrderFilters } from "../orders/OrderFilters";
import { formatDate, formatDateTime } from "../../utils/formatters";
import { formatDateTime } from "../../utils/formatters";
export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusOptions = ORDER_GROUP_DISPLAY_STATUS_OPTIONS, isLoading = false }) => {
const [filters, setFilters] = React.useState({ query: "", displayStatus: "all", city: "" });
@ -60,17 +60,17 @@ export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusO
const totalGroups = filteredGroups.length;
const COLS = "grid-cols-[minmax(140px,2fr)_minmax(80px,1fr)_minmax(100px,1.2fr)_minmax(80px,1fr)_minmax(100px,1fr)_minmax(120px,1fr)]";
const TableHeader = () => (
<div className={`grid ${COLS} gap-0 border-b border-[var(--color-border)] bg-[var(--color-surface-strong)] text-xs uppercase tracking-[0.14em] text-[var(--color-text-muted)]`}>
<div className="px-4 py-3 font-medium">Клиент</div>
<div className="px-4 py-3 font-medium">Город</div>
<div className="px-4 py-3 font-medium">Дата доставки</div>
<div className="px-4 py-3 font-medium">Водитель</div>
<div className="px-4 py-3 font-medium">Статус</div>
<div className="px-4 py-3 font-medium">Обновлён</div>
</div>
<thead className="bg-[var(--color-surface-strong)] text-left text-xs uppercase tracking-[0.14em] text-[var(--color-text-muted)]">
<tr>
<th className="px-4 py-3 font-medium">Клиент</th>
<th className="px-4 py-3 font-medium hidden sm:table-cell">Город</th>
<th className="px-4 py-3 font-medium hidden md:table-cell">Дата доставки</th>
<th className="px-4 py-3 font-medium hidden lg:table-cell">Водитель</th>
<th className="px-4 py-3 font-medium">Статус</th>
<th className="px-4 py-3 font-medium hidden md:table-cell">Обновлён</th>
</tr>
</thead>
);
if (isLoading) {
@ -146,38 +146,42 @@ export const LogisticsReadinessBoard = ({ orderGroups = [], onSelectSet, statusO
{!isCollapsed && (
<div className="overflow-x-auto">
<TableHeader />
{groups.map((group) => (
<button
key={group.id}
type="button"
className={`grid ${COLS} gap-0 w-full border-t border-[var(--color-border)] text-left transition hover:bg-[var(--color-accent-soft)]`}
onClick={() => { if (onSelectSet) onSelectSet(group.id); }}
>
<div className="px-4 py-2.5">
<div className="font-medium">{group.displayTitle || group.customerName || group.groupKey}</div>
<div className="text-xs text-[var(--color-text-muted)]">{group.customerPhone || "—"}</div>
</div>
<div className="px-4 py-2.5 text-sm">
{group.city || group.customerAddress || "—"}
</div>
<div className="px-4 py-2.5 text-sm">
{group.deliveryDate
? <span>{formatDate(group.deliveryDate)}{group.deliveryTime ? <span className="text-[var(--color-text-muted)]"> · {group.deliveryTime}</span> : ""}</span>
: <span className="text-[var(--color-text-muted)]">—</span>
}
</div>
<div className="px-4 py-2.5 text-sm">
{group.assignedDriverName || <span className="text-[var(--color-text-muted)]">—</span>}
</div>
<div className="px-4 py-2.5">
<Badge tone={getOrderGroupStatusTone(group)}>{getOrderGroupDisplayStatusLabel(group)}</Badge>
</div>
<div className="px-4 py-2.5 text-sm text-[var(--color-text-muted)]">
{formatDateTime(group.updatedAt)}
</div>
</button>
))}
<table className="min-w-full border-collapse border-t border-[var(--color-border)]">
<TableHeader />
<tbody>
{groups.map((group) => (
<tr
key={group.id}
className="cursor-pointer border-t border-[var(--color-border)] transition hover:bg-[var(--color-accent-soft)]"
onClick={() => { if (onSelectSet) onSelectSet(group.id); }}
>
<td className="px-4 py-2.5">
<div className="font-medium">{group.displayTitle || group.customerName || group.groupKey}</div>
<div className="text-xs text-[var(--color-text-muted)] sm:hidden">{group.customerPhone || "—"}</div>
<div className="text-xs text-[var(--color-text-muted)] md:hidden">{group.deliveryDate || "—"}</div>
</td>
<td className="px-4 py-2.5 text-sm hidden sm:table-cell">
{group.city || group.customerAddress || "—"}
</td>
<td className="px-4 py-2.5 text-sm hidden md:table-cell">
{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-4 py-2.5 text-sm hidden lg:table-cell">
{group.assignedDriverName || <span className="text-[var(--color-text-muted)]">—</span>}
</td>
<td className="px-4 py-2.5">
<Badge tone={getOrderGroupStatusTone(group)}>{getOrderGroupDisplayStatusLabel(group)}</Badge>
</td>
<td className="px-4 py-2.5 text-sm text-[var(--color-text-muted)] hidden md:table-cell">
{formatDateTime(group.updatedAt)}
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
</Panel>

37
src/components/orders/OrderDetailPanel.jsx
View File

@ -544,8 +544,7 @@ export const OrderDetailPanel = ({
drivers = [],
onAssignDriver,
onChangeDeliveryStatus,
onSaveShipmentData,
userRole = "driver",
userRole,
}) => {
const [problemReason, setProblemReason] = React.useState(null);
const [pendingStatus, setPendingStatus] = React.useState(null);
@ -553,7 +552,6 @@ export const OrderDetailPanel = ({
const [deliveryTime, setDeliveryTime] = React.useState(DELIVERY_TIME_OPTIONS[0]);
const [formMessage, setFormMessage] = React.useState("");
const [shipmentState, setShipmentState] = React.useState(null);
const [isSavingShipment, setIsSavingShipment] = React.useState(false);
const [isCalendarOpen, setIsCalendarOpen] = React.useState(false);
const [driverMessage, setDriverMessage] = React.useState("");
const [selectedDriverId, setSelectedDriverId] = React.useState(order?.assignedDriverId || "");
@ -566,26 +564,6 @@ export const OrderDetailPanel = ({
const handleShipmentChange = React.useCallback((state) => {
setShipmentState(state);
}, []);
const handleSaveShipment = React.useCallback(async (shipmentData) => {
if (!onSaveShipmentData) return;
setIsSavingShipment(true);
try {
const result = await onSaveShipmentData({
orderGroupId: order.id,
shipmentData,
});
if (!result.success) {
setFormMessage(result.error || "Не удалось сохранить данные отгрузки");
} else {
setFormMessage("Данные отгрузки сохранены");
}
} catch (err) {
setFormMessage("Не удалось сохранить данные отгрузки");
} finally {
setIsSavingShipment(false);
}
}, [onSaveShipmentData, order?.id]);
const minSelectableDateKey = React.useMemo(() => getNextSelectableDateKey(), []);
const [currentMonth, setCurrentMonth] = React.useState(() => {
const existingDeliveryDate = fromDateKey(order?.deliveryDate);
@ -732,18 +710,17 @@ export const OrderDetailPanel = ({
{(() => {
const isPickup = isPickupOrder;
const effectiveAddress = isPickup
? (order.customerAddress || "")
: (order.deliveryAddress || "");
const requiresAddress = (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") && !effectiveAddress;
const deliveryTypeLabel = isPickup
? "Самовывоз"
: requiresAddress
: (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address")
? "Доставка (требуется адрес)"
: "Доставка";
const dateLabel = isPickup ? "Дата самовывоза" : "Дата доставки";
const timeLabel = isPickup ? "Время самовывоза" : "Время доставки";
const addressLabel = isPickup ? "Адрес клиента" : "Адрес доставки";
const effectiveAddress = isPickup
? (order.customerAddress || "")
: (order.deliveryAddress || "");
return (
<div className="grid gap-3 rounded-[24px] border border-[var(--color-border)] bg-[var(--color-surface-strong)] p-4 md:grid-cols-4">
<div>
@ -763,7 +740,7 @@ export const OrderDetailPanel = ({
Тип
</p>
<p className="mt-1 text-base font-medium !text-[var(--color-text)]">{deliveryTypeLabel}</p>
{requiresAddress && (
{(order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address") && (
<div className="mt-2 flex items-start gap-2 rounded-xl border border-[rgba(239,68,68,0.3)] bg-[rgba(239,68,68,0.08)] p-3">
<span className="text-lg">📍</span>
<div>
@ -1046,7 +1023,7 @@ export const OrderDetailPanel = ({
) : null}
{userRole === "driver" && order ? (
<DriverShipmentPanel order={order} onShipmentChange={handleShipmentChange} onSaveShipment={handleSaveShipment} isSavingShipment={isSavingShipment} />
<DriverShipmentPanel order={order} onShipmentChange={handleShipmentChange} />
) : null}
{userRole === "driver" && order && onChangeDeliveryStatus ? (

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

@ -141,51 +141,57 @@ export const OrdersTable = ({
Группы не найдены. Попробуйте изменить поиск или статус.
</div>
) : (
<div>
<div className="grid grid-cols-[minmax(180px,2.5fr)_minmax(100px,1.2fr)_minmax(100px,1fr)_minmax(80px,1fr)_minmax(120px,1.2fr)_minmax(130px,1.2fr)] gap-0 border-b border-[var(--color-border)] bg-[var(--color-surface-strong)] text-xs uppercase tracking-[0.16em] text-[var(--color-text-muted)]">
<div className="px-5 py-4 font-medium">Группа / Клиент</div>
<div className="px-5 py-4 font-medium">Счёта</div>
<div className="px-5 py-4 font-medium">Статус</div>
<div className="px-5 py-4 font-medium">Водитель</div>
<div className="px-5 py-4 font-medium">Дата доставки</div>
<div className="px-5 py-4 font-medium">Обновлён</div>
</div>
<table className="min-w-full border-collapse">
<thead className="bg-[var(--color-surface-strong)] text-left text-xs uppercase tracking-[0.16em] text-[var(--color-text-muted)]">
<tr>
<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>
</thead>
<tbody>
{orderGroups.map((group) => (
<button
<tr
key={group.id}
type="button"
className={`grid grid-cols-[minmax(180px,2.5fr)_minmax(100px,1.2fr)_minmax(100px,1fr)_minmax(80px,1fr)_minmax(120px,1.2fr)_minmax(130px,1.2fr)] gap-0 w-full border-t border-[var(--color-border)] text-left transition hover:bg-[var(--color-accent-soft)] ${selectedOrderGroupId === group.id ? "bg-[var(--color-accent-soft)]" : ""}`}
className={[
"cursor-pointer border-t border-[var(--color-border)] transition hover:bg-[var(--color-accent-soft)]",
selectedOrderGroupId === group.id ? "bg-[var(--color-accent-soft)]" : "",
].join(" ")}
onClick={() => onOpenOrder(group.id)}
>
<div className="px-5 py-4">
<td className="px-5 py-4">
<div className="font-medium">{group.displayTitle || group.customerName || group.groupKey}</div>
<div className="mt-1 text-sm text-[var(--color-text-muted)]">
{[group.customerName, group.customerPhone].filter(Boolean).join(" · ")}
</div>
<div className="text-xs text-[var(--color-text-muted)]">{group.groupKey}</div>
</div>
<div className="max-w-[260px] px-5 py-4 text-sm text-[var(--color-text-muted)]">
</td>
<td className="max-w-[260px] px-5 py-4 text-sm text-[var(--color-text-muted)]">
{renderOrderNumbers(group)}
</div>
<div className="px-5 py-4">
</td>
<td className="px-5 py-4 text-center">
<Badge tone={getOrderGroupStatusTone(group)}>{getOrderGroupDisplayStatusLabel(group)}</Badge>
</div>
<div className="px-5 py-4 text-sm">
</td>
<td className="px-5 py-4 text-sm">
{group.assignedDriverName || <span className="text-[var(--color-text-muted)]">—</span>}
</div>
<div className="px-5 py-4 text-sm">
</td>
<td className="px-5 py-4 text-sm">
{group.deliveryDate ? (
<span>{fmtDate(group.deliveryDate)}{group.deliveryTime ? <span className="text-[var(--color-text-muted)]"> · {group.deliveryTime}</span> : ""}</span>
) : (
<span className="text-[var(--color-text-muted)]">—</span>
)}
</div>
<div className="px-5 py-4 text-sm text-[var(--color-text-muted)]">
</td>
<td className="px-5 py-4 text-sm text-[var(--color-text-muted)]">
{formatDateTime(group.updatedAt)}
</div>
</button>
</td>
</tr>
))}
</div>
</tbody>
</table>
)}
</div>
</Panel>

28
src/hooks/useOrderGroups.js
View File

@ -1,5 +1,5 @@
import React from "react";
import { assignDriverToOrderGroup, fetchOrderGroups, saveShipmentData, updateDeliveryStatus, updateOrderGroupDeliveryChoice } from "../services/supabase/orderGroupRepository";
import { assignDriverToOrderGroup, fetchOrderGroups, updateDeliveryStatus, updateOrderGroupDeliveryChoice } from "../services/supabase/orderGroupRepository";
import {
buildOrderGroupBuckets,
filterOrderGroups,
@ -171,10 +171,10 @@ export const useOrderGroups = () => {
}
}, []);
const changeDeliveryStatus = React.useCallback(async ({ orderGroupId, status, details, shipmentData }) => {
const changeDeliveryStatus = React.useCallback(async ({ orderGroupId, status, details }) => {
setIsSavingStatusChange(true);
try {
const result = await updateDeliveryStatus({ orderGroupId, status, details, shipmentData });
const result = await updateDeliveryStatus({ orderGroupId, status, details });
if (result.error) {
return {
success: false,
@ -195,27 +195,6 @@ export const useOrderGroups = () => {
}
}, []);
const onSaveShipmentData = React.useCallback(async ({ orderGroupId, shipmentData }) => {
try {
const result = await saveShipmentData({ orderGroupId, shipmentData });
if (result.error) {
return {
success: false,
error: getErrorMessage(result.error, "Не удалось сохранить данные отгрузки"),
};
}
setOrderGroups((currentGroups) =>
currentGroups.map((group) => (group.id === orderGroupId ? result.data : group)),
);
return { success: true, data: result.data };
} catch (error) {
return {
success: false,
error: getErrorMessage(error, "Не удалось сохранить данные отгрузки"),
};
}
}, []);
return {
orderGroups,
allOrderGroups: orderGroups,
@ -232,7 +211,6 @@ export const useOrderGroups = () => {
saveManualDeliveryChoice,
assignDriver,
changeDeliveryStatus,
saveShipmentData: onSaveShipmentData,
isSavingDeliveryChoice,
isSavingDriverAssignment,
isSavingStatusChange,

13
src/pages/DashboardPage.jsx
View File

@ -7,7 +7,6 @@
import React from "react";
import { Navigate, useNavigate, useSearchParams, useLocation } from "react-router-dom";
import { DriverDeliveryPlanner } from "../components/driver/DriverDeliveryPlanner";
import { isOrderGroupVisibleToDriver } from "../services/orderGroupViews";
import { LogisticsReadinessBoard } from "../components/logistics/LogisticsReadinessBoard";
import { OrdersTable } from "../components/orders/OrdersTable";
import { AdminDashboard } from "../components/admin/AdminDashboard";
@ -109,16 +108,6 @@ export const DashboardPage = () => {
return [...set].sort();
}, [allOrderGroups]);
// ── Driver order count (for badge) ────────────────────────────────────────
const driverOrderCount = React.useMemo(() => {
if (userRole !== "driver" || !user) return 0;
return allOrderGroups.filter((g) => {
const isVisible = isOrderGroupVisibleToDriver(g);
const isAssignedToMe = g.assignedDriverId === user.id;
return isVisible && isAssignedToMe;
}).length;
}, [allOrderGroups, user, userRole]);
// ── Navigation Builder ────────────────────────────────────────────────────
const openGroupPage = React.useCallback((groupId) => {
navigate("/dashboard/group/" + groupId);
@ -141,7 +130,7 @@ export const DashboardPage = () => {
{ key: "logistics", label: "Логистика", description: "Группы доставки по готовности к уведомлению.", badge: String(allOrderGroups.length || orderGroups.length || 0) },
]
: [
{ key: section.key, label: section.label, description: section.description, badge: String(userRole === "driver" ? driverOrderCount : (allOrderGroups.length || orderGroups.length || 0)) },
{ key: section.key, label: section.label, description: section.description, badge: String(allOrderGroups.length || orderGroups.length || 0) },
{ key: "suggestions", label: "Предложения", description: "Предложить улучшение.", badge: null },
];

2
src/pages/GroupDetailPage.jsx
View File

@ -35,7 +35,6 @@ export const GroupDetailPage = () => {
isSavingStatusChange,
assignDriver,
changeDeliveryStatus,
saveShipmentData,
isLoading,
} = useOrderGroups();
@ -112,7 +111,6 @@ export const GroupDetailPage = () => {
drivers={drivers}
onAssignDriver={assignDriver}
onChangeDeliveryStatus={changeDeliveryStatus}
onSaveShipmentData={saveShipmentData}
userRole={userRole}
/>
</ErrorBoundary>

2
src/services/orderGroupViews.js
View File

@ -29,14 +29,12 @@ export const NOTIFICATION_STATUS_LABELS = {
};
export const DRIVER_VISIBLE_DELIVERY_STATUSES = [
"agreed",
"driver_assigned",
"loaded",
"on_route",
"problem",
"delivered",
"picked_up",
"paid_storage",
];
export const DRIVER_ACTIVE_DELIVERY_STATUSES = ["driver_assigned", "loaded", "on_route", "problem"];

71
src/services/supabase/orderGroupRepository.js
View File

@ -117,18 +117,11 @@ export const mapOrderGroupRowToDeliveryGroup = (row) => {
// Also treat address equal to "САМОВЫВОЗ" as pickup indicator
const isPickupAddress = deliveryAddress.toUpperCase() === "САМОВЫВОЗ";
// Resolve effective delivery type:
// - If DB explicitly says "pickup" → pickup
// - If status is "pickup" → pickup
// - If DB explicitly says "delivery" (manually confirmed by logistician) → honor it, don't override
// - Otherwise fall back to source/address detection
const effectiveDeliveryType = (row.delivery_type === "pickup" || deliveryStatus === "pickup")
// Resolve effective delivery type: DB field takes precedence, but if it says "delivery"
// while source data clearly indicates pickup, treat as pickup
const effectiveDeliveryType = (row.delivery_type === "pickup" || deliveryStatus === "pickup" || isPickupFromSource || isPickupAddress)
? "pickup"
: row.delivery_type === "delivery"
? "delivery"
: (isPickupFromSource || isPickupAddress)
? "pickup"
: (row.delivery_type || "delivery");
: (row.delivery_type || "delivery");
// Preserve original address for pre-filling delivery form (don't clear for pickup)
const originalDeliveryAddress = deliveryAddress;
@ -221,7 +214,6 @@ export const mapOrderGroupRowToDeliveryGroup = (row) => {
pickupDate: row.pickup_date || null,
pickupTimeSlot: row.pickup_time_slot || null,
driverShipmentData: row.driver_shipment_data || null,
syncedTo1cAt: row.synced_to_1c_at || null,
deliveryHalfDay: getOrderGroupDeliveryHalfDay({
deliveryHalfDay: rawDeliveryHalfDay,
deliveryTime: rawDeliveryTime,
@ -262,7 +254,7 @@ export const mapOrderGroupRowToDeliveryGroup = (row) => {
};
};
const ORDER_GROUP_SELECT_FIELDS = `id, group_key, order_numbers, status, delivery_status, sms_sent_at, created_at, updated_at, created_from_exchange_at, source_key, customer_name, customer_phone, customer_phone_normalized, customer_date, orders_total, orders_ready, orders_not_ready, source_orders, order_list, order_list_structured, delivery_invitation_id, delivery_link, notification_status, sms_attempts, first_sms_sent_at, second_sms_sent_at, last_sms_error, next_notification_check_at, delivery_date, delivery_time, delivery_address, customer_address, delivery_date_source, manual_confirmation_at, paid_storage_at, assigned_driver_id, assigned_driver:users!order_groups_assigned_driver_id_fkey(id, name), driver_shipment_data, delivery_type, pickup_date, pickup_time_slot, synced_to_1c_at`;
const ORDER_GROUP_SELECT_FIELDS = `id, group_key, order_numbers, status, delivery_status, sms_sent_at, created_at, updated_at, created_from_exchange_at, source_key, customer_name, customer_phone, customer_phone_normalized, customer_date, orders_total, orders_ready, orders_not_ready, source_orders, order_list, order_list_structured, delivery_invitation_id, delivery_link, notification_status, sms_attempts, first_sms_sent_at, second_sms_sent_at, last_sms_error, next_notification_check_at, delivery_date, delivery_time, delivery_address, customer_address, delivery_date_source, manual_confirmation_at, paid_storage_at, assigned_driver_id, assigned_driver:users!order_groups_assigned_driver_id_fkey(id, name), driver_shipment_data, delivery_type, pickup_date, pickup_time_slot`;
export const updateOrderGroupDeliveryChoice = async ({
orderGroupId,
@ -288,8 +280,6 @@ export const updateOrderGroupDeliveryChoice = async ({
if (deliveryType === "pickup") {
updatePayload.pickup_date = pickupDate || null;
updatePayload.pickup_time_slot = pickupTimeSlot || null;
// Pickup orders don't need a driver — clear assignment
updatePayload.assigned_driver_id = null;
} else {
updatePayload.pickup_date = null;
updatePayload.pickup_time_slot = null;
@ -388,40 +378,7 @@ export const assignDriverToOrderGroup = async ({
}, "Ошибка назначения водителя");
};
export const saveShipmentData = async ({ orderGroupId, shipmentData }) => {
return safeSupabaseCall(async () => {
const client = requireSupabase();
const { error: updateError } = await client
.from("order_groups")
.update({
driver_shipment_data: shipmentData,
updated_at: new Date().toISOString(),
})
.eq("id", orderGroupId);
if (updateError) throw updateError;
const { data, error } = await client
.from("order_groups")
.select(ORDER_GROUP_SELECT_FIELDS)
.eq("id", orderGroupId)
.single();
if (error) throw error;
await logAction({
orderGroupId,
action: "shipment_data_saved",
newValue: "shipment_data_updated",
details: { itemCount: shipmentData?.length || 0 },
}).catch(() => {});
return mapOrderGroupRowToDeliveryGroup(data);
}, "Ошибка сохранения данных отгрузки");
};
export const updateDeliveryStatus = async ({ orderGroupId, status, details, shipmentData } = {}) => {
export const updateDeliveryStatus = async ({ orderGroupId, status, details } = {}) => {
return safeSupabaseCall(async () => {
const client = requireSupabase();
@ -471,22 +428,6 @@ export const updateDeliveryStatus = async ({ orderGroupId, status, details, ship
if (rpcError) throw rpcError;
}
// Save shipment data if provided (e.g. partial delivery info)
if (shipmentData) {
const { error: shipmentUpdateError } = await client
.from("order_groups")
.update({
driver_shipment_data: shipmentData,
updated_at: new Date().toISOString(),
})
.eq("id", orderGroupId);
if (shipmentUpdateError) {
// Log but don't fail the status update
console.error("[updateDeliveryStatus] Failed to save shipment data:", shipmentUpdateError);
}
}
// Fetch updated group
const { data, error } = await client
.from("order_groups")

2
supabase/schema.sql
View File

@ -241,7 +241,6 @@ alter table public.order_groups add column if not exists last_sms_error text;
alter table public.order_groups add column if not exists next_notification_check_at timestamptz;
alter table public.order_groups add column if not exists delivery_date date;
alter table public.order_groups add column if not exists delivery_time text;
alter table public.order_groups add column if not exists synced_to_1c_at timestamptz;
alter table public.orders add column if not exists source_order_number text;
alter table public.orders add column if not exists source_order_date date;
@ -466,7 +465,6 @@ create index if not exists idx_delivery_invitations_expires_at on public.deliver
create index if not exists idx_order_groups_status on public.order_groups (status);
create index if not exists idx_order_groups_delivery_status on public.order_groups (delivery_status);
create index if not exists idx_order_groups_notification_status on public.order_groups (notification_status, next_notification_check_at);
create index if not exists idx_order_groups_synced_to_1c on public.order_groups (synced_to_1c_at);
create index if not exists idx_integration_events_order_id on public.integration_events (order_id, created_at desc);
create index if not exists idx_integration_events_event_type on public.integration_events (event_type);
create index if not exists idx_rate_limits_scope_key_window on public.rate_limits (scope, rate_key, window_start desc);