From d28e00782bab631da72456a0bdd21bce2a56e659 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Jun 2026 13:29:38 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20never=20show=20raw=20English=20status=20?= =?UTF-8?q?keys=20to=20user=20=E2=80=94=20fall=20back=20to=20'=D0=9D=D0=B5?= =?UTF-8?q?=D0=B8=D0=B7=D0=B2=D0=B5=D1=81=D1=82=D0=BD=D0=BE=20(key)'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/admin/AdminDashboard.jsx | 2 +- src/services/orderGroupViews.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/admin/AdminDashboard.jsx b/src/components/admin/AdminDashboard.jsx index 8fae3ae..ecc21a2 100644 --- a/src/components/admin/AdminDashboard.jsx +++ b/src/components/admin/AdminDashboard.jsx @@ -140,7 +140,7 @@ export const AdminDashboard = () => { const econ = economics || {}; const statusPieData = (statusDist || []).map(s => ({ - name: STATUS_LABELS[s.delivery_status] || s.delivery_status, + name: STATUS_LABELS[s.delivery_status] || (s.delivery_status ? `Неизвестно (${s.delivery_status})` : 'Неизвестно'), value: s.count, status: s.delivery_status, })).filter(d => d.value > 0); diff --git a/src/services/orderGroupViews.js b/src/services/orderGroupViews.js index d831178..3633176 100644 --- a/src/services/orderGroupViews.js +++ b/src/services/orderGroupViews.js @@ -141,7 +141,7 @@ export const isOrderGroupAgreedForDelivery = (group) => { }; export const getOrderGroupDeliveryStatusLabel = (status) => - DELIVERY_GROUP_STATUS_LABELS[status] || status || "Неизвестно"; + DELIVERY_GROUP_STATUS_LABELS[status] || (status ? `Неизвестно (${status})` : "Неизвестно"); export const getOrderGroupDisplayStatusLabel = (group) => { const deliveryStatus = group?.deliveryStatus || group?.delivery_status; @@ -339,7 +339,7 @@ export const ORDER_GROUP_DISPLAY_STATUS_OPTIONS = [ ]; export const getOrderGroupStatusLabel = (status) => - ORDER_GROUP_STATUS_LABELS[status] || status || "Неизвестно"; + ORDER_GROUP_STATUS_LABELS[status] || (status ? `Неизвестно (${status})` : "Неизвестно"); export const getOrderGroupDeliveryStatusTone = (status) => { switch (status) {