- {(order.deliveryType === "pickup" || order.deliveryStatus === "pickup" || order.delivery_status === "pickup") ? "Карточка группы самовывоза" : "Карточка группы доставки"}
+ {isPickupOrder ? "Карточка группы самовывоза" : "Карточка группы доставки"}
{order.displayTitle || order.customerName || order.groupKey}
@@ -754,7 +733,7 @@ export const OrderDetailPanel = ({
{(() => {
- const isPickup = order.deliveryType === "pickup" || order.deliveryStatus === "pickup" || order.delivery_status === "pickup";
+ const isPickup = isPickupOrder;
const deliveryTypeLabel = isPickup
? "Самовывоз"
: (order.deliveryStatus === "requires_address" || order.delivery_status === "requires_address")
@@ -882,7 +861,7 @@ export const OrderDetailPanel = ({
{formatDateTime(order.updatedAt)}
-
{(order.deliveryType === "pickup" || order.deliveryStatus === "pickup" || order.delivery_status === "pickup") ? "Статус самовывоза" : "Статус доставки"}
+
{isPickupOrder ? "Статус самовывоза" : "Статус доставки"}
{getOrderGroupDeliveryStatusLabel(order.deliveryStatus || order.delivery_status)}
Назначение водителя
diff --git a/src/hooks/useOrderGroups.js b/src/hooks/useOrderGroups.js
index 6d3969b..451523a 100644
--- a/src/hooks/useOrderGroups.js
+++ b/src/hooks/useOrderGroups.js
@@ -7,22 +7,7 @@ import {
ORDER_GROUP_DISPLAY_STATUS_OPTIONS,
getOrderGroupDisplayStatusValue,
} from "../services/orderGroupViews";
-
-const getErrorMessage = (error, fallbackMessage) => {
- if (!error) {
- return fallbackMessage;
- }
-
- if (error instanceof Error) {
- return error.message || fallbackMessage;
- }
-
- if (typeof error === "string") {
- return error || fallbackMessage;
- }
-
- return error?.message || fallbackMessage;
-};
+import { getErrorMessage } from "../utils/deliveryUtils";
export const useOrderGroups = () => {
const [orderGroups, setOrderGroups] = React.useState(() => []);
diff --git a/src/services/orderGroupViews.js b/src/services/orderGroupViews.js
index b24c798..d10ac25 100644
--- a/src/services/orderGroupViews.js
+++ b/src/services/orderGroupViews.js
@@ -5,6 +5,7 @@ const getDeliveryDate = (group) => normalizeDate(group.deliveryDate || group.cus
export const DELIVERY_GROUP_STATUS_LABELS = {
pending_confirmation: "Ожидает согласования",
manual_confirmation_required: "Взят в ручное управление",
+ requires_address: "Требуется адрес",
agreed: "Согласовано",
driver_assigned: "Назначен водитель",
loaded: "Загружено",
diff --git a/src/services/supabase/orderGroupRepository.js b/src/services/supabase/orderGroupRepository.js
index 80f0907..8ad2a0d 100644
--- a/src/services/supabase/orderGroupRepository.js
+++ b/src/services/supabase/orderGroupRepository.js
@@ -8,6 +8,7 @@ import {
getOrderGroupDeliveryStatusLabel,
getOrderGroupStatusLabel,
} from "../orderGroupViews";
+import { normalizeNom } from "../../utils/deliveryUtils";
const requireSupabase = () => {
if (!hasSupabaseConfig || !supabase) {
@@ -68,7 +69,6 @@ export const mapOrderGroupRowToDeliveryGroup = (row) => {
if (!Array.isArray(srcOrders) || !srcOrders.length) return orderNumbers;
const seen = new Set();
const result = [];
- const normalizeNom = (nom) => String(nom || '').replace(/\\\\/g, '\\').trim();
for (const src of srcOrders) {
if (src && Array.isArray(src.orderList)) {
for (const ol of src.orderList) {
diff --git a/src/utils/deliveryUtils.js b/src/utils/deliveryUtils.js
new file mode 100644
index 0000000..d7e49e3
--- /dev/null
+++ b/src/utils/deliveryUtils.js
@@ -0,0 +1,58 @@
+/**
+ * Shared delivery/delivery-group utilities.
+ * Single source of truth for isPickupOrder, getErrorMessage, normalizeNom, and STATUS_LABELS.
+ */
+
+// ── Pickup detection ──────────────────────────────────────────────────────
+
+/**
+ * Returns true if the order group is a pickup (self-pickup) order.
+ * Uses canonical deliveryStatus field (mapper normalizes both delivery_status variants).
+ */
+export const isPickupOrder = (order) =>
+ order?.deliveryType === "pickup" ||
+ order?.deliveryStatus === "pickup" ||
+ order?.delivery_status === "pickup";
+
+// ── Error messages ────────────────────────────────────────────────────────
+
+export const getErrorMessage = (error, fallbackMessage) => {
+ if (!error) {
+ return fallbackMessage;
+ }
+ if (error instanceof Error) {
+ return error.message || fallbackMessage;
+ }
+ if (typeof error === "string") {
+ return error || fallbackMessage;
+ }
+ return error?.message || fallbackMessage;
+};
+
+// ── Nom normalisation ──────────────────────────────────────────────────────
+
+/**
+ * 1C escapes backslashes: "СФ Т\\ЕА-33584" → normalise for comparison.
+ */
+export const normalizeNom = (nom) => {
+ if (!nom) return "";
+ return String(nom).replace(/\\\\/g, "\\").trim();
+};
+
+// ── Status labels ─────────────────────────────────────────────────────────
+
+export const DELIVERY_STATUS_LABELS = {
+ pending_confirmation: "Ожидает подтверждения",
+ requires_address: "Требуется адрес",
+ agreed: "Согласовано",
+ driver_assigned: "Водитель назначен",
+ loaded: "Загружен",
+ on_route: "В пути",
+ delivered: "Доставлено",
+ problem: "Проблема",
+ cancelled: "Отменено",
+ pickup: "Самовывоз",
+};
+
+export const getOrderGroupDeliveryStatusLabel = (status) =>
+ DELIVERY_STATUS_LABELS[status] || status || "Ожидает подтверждения";
\ No newline at end of file