From 4cc91b6dc885c4d12e0ebae71f620b6ab3fb4afb Mon Sep 17 00:00:00 2001 From: Hermes Date: Wed, 30 Sep 2026 19:04:46 +0200 Subject: [PATCH] =?UTF-8?q?style(client):=20=D0=BF=D0=BE=D0=B4=20=D1=88?= =?UTF-8?q?=D1=82=D1=80=D0=B8=D1=85-=D0=BA=D0=BE=D0=B4=D0=BE=D0=BC=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B8?= =?UTF-8?q?=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D1=86=D0=B8=D1=84?= =?UTF-8?q?=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Код выдачи и так написан крупно над полосами, дублировать 13-значное значение под ними не нужно (просьба владельца). Заодно убрал значение из aria-label — читалке экрана оно ничего не добавляет. - PickupCodeCard передаёт showText={false}; возможность печатать подпись у компонента осталась (нужна, если печать понадобится другой); - SW-кэш static-v131. --- public/service-worker.js | 2 +- src/components/client/PickupCodeBarcode.jsx | 2 +- src/components/client/PickupCodeCard.jsx | 2 +- src/components/client/PickupCodeCard.test.jsx | 31 +++++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 src/components/client/PickupCodeCard.test.jsx diff --git a/public/service-worker.js b/public/service-worker.js index a9223de..38b9354 100644 --- a/public/service-worker.js +++ b/public/service-worker.js @@ -1,7 +1,7 @@ const isLocalhost = self.location.hostname === "localhost" || self.location.hostname === "127.0.0.1"; if (!isLocalhost) { - const STATIC_CACHE = "construction-delivery-static-v130"; + const STATIC_CACHE = "construction-delivery-static-v131"; const RUNTIME_CACHE = "construction-delivery-runtime-v119"; const APP_SHELL_URLS = ["/", "/client", "/index.html", "/manifest.webmanifest", "/icons/icon-192.png", "/icons/icon-512.png"]; diff --git a/src/components/client/PickupCodeBarcode.jsx b/src/components/client/PickupCodeBarcode.jsx index 2fe43a2..cd7c962 100644 --- a/src/components/client/PickupCodeBarcode.jsx +++ b/src/components/client/PickupCodeBarcode.jsx @@ -59,7 +59,7 @@ export const PickupCodeBarcode = ({ value, format = "ean13", showText = true, cl role="img" aria-label={ useEan13 - ? `Штрих-код EAN-13 кода выдачи ${code} (значение ${caption})` + ? `Штрих-код EAN-13 кода выдачи ${code}` : `Штрих-код кода выдачи ${code}` } viewBox={`0 0 ${width} ${height}`} diff --git a/src/components/client/PickupCodeCard.jsx b/src/components/client/PickupCodeCard.jsx index 1d69e0f..842e6e6 100644 --- a/src/components/client/PickupCodeCard.jsx +++ b/src/components/client/PickupCodeCard.jsx @@ -26,7 +26,7 @@ export const PickupCodeCard = ({ invitation, deliveryNumberDigits, className = " ) : null}

Ваш код выдачи

{code}

- +

Покажите код при получении заказа или дайте отсканировать штрих-код

diff --git a/src/components/client/PickupCodeCard.test.jsx b/src/components/client/PickupCodeCard.test.jsx new file mode 100644 index 0000000..63e0069 --- /dev/null +++ b/src/components/client/PickupCodeCard.test.jsx @@ -0,0 +1,31 @@ +/** + * @file PickupCodeCard.test.jsx + * @description Блок «Ваш код выдачи»: крупный код, под ним штрих-код без цифр + * (владелец попросил убрать дублирующую подпись под полосами). + */ +import React from "react"; +import { describe, expect, it } from "vitest"; +import { renderToStaticMarkup } from "react-dom/server"; + +import { PickupCodeCard } from "./PickupCodeCard"; + +describe("PickupCodeCard", () => { + it("показывает код и штрих-код, но без цифр под полосами", () => { + const html = renderToStaticMarkup( + React.createElement(PickupCodeCard, { + invitation: { pickupCode: "7470", deliveryType: "pickup" }, + deliveryNumberDigits: "010769", + }), + ); + expect(html).toContain("Ваш код выдачи"); + expect(html).toContain("7470"); + expect(html).toContain("Ваш номер доставки 010769"); + expect(html).toContain(" { + expect(renderToStaticMarkup(React.createElement(PickupCodeCard, { invitation: {} }))).toBe(""); + }); +});