отображение ненужных цен за кг

2026-06-05 22:50:13 +03:00
parent 8f9bc92271
commit 4776769782
10 changed files with 969 additions and 89 deletions
@@ -8,6 +8,7 @@ declare(strict_types=1);
 /** @var array<string, mixed> $pagination */

 $heading = $currentCategory['h1'] ?? $currentCategory['name'] ?? 'Каталог продукции';
+$categoryDescription = trim((string) ($currentCategory['description'] ?? ''));
 $pagination = $pagination ?? [
    'base_path' => '/catalog',
    'total' => count($products),
@@ -21,14 +22,28 @@ $pagination = $pagination ?? [
 ?>
 <section class="catalog-layout">
    <aside class="catalog-sidebar">
-        <div class="panel sticky-panel">
-            <h2>Категории</h2>
-            <?php
-            $items = $categories;
-            $depth = 0;
-            $currentSlug = $currentCategory['slug'] ?? '';
-            require base_path('views/partials/category-tree.php');
-            ?>
+        <div class="catalog-side-stack">
+            <div class="panel catalog-menu-panel">
+                <div class="catalog-side-heading">
+                    <span>Каталог</span>
+                    <small><?= e((string) $pagination['total']) ?> позиций</small>
+                </div>
+                <?php
+                $items = $categories;
+                $depth = 0;
+                $currentSlug = $currentCategory['slug'] ?? '';
+                require base_path('views/partials/category-tree.php');
+                ?>
+            </div>
+
+            <div class="panel catalog-mini-cart" data-mini-cart>
+                <div>
+                    <span>Корзина</span>
+                    <strong data-mini-cart-total>0 руб.</strong>
+                </div>
+                <p><span data-mini-cart-count>0</span> позиций</p>
+                <a href="/cart">Перейти</a>
+            </div>
        </div>
    </aside>

@@ -36,13 +51,65 @@ $pagination = $pagination ?? [
        <div class="catalog-heading">
            <p class="eyebrow"><?= $currentCategory === null ? 'Полный каталог' : 'Категория' ?></p>
            <h1><?= e($heading) ?></h1>
-            <?php if (!empty($currentCategory['description'])): ?>
-                <p><?= e($currentCategory['description']) ?></p>
-            <?php else: ?>
-                <p class="muted">Выберите категорию слева или смотрите товары сразу в каталоге.</p>
-            <?php endif; ?>
        </div>

+        <section class="payment-benefit-banner cash-benefit-banner" aria-label="Выгода при оплате наличными">
+            <div class="cash-benefit-copy">
+                <p class="eyebrow">Выгода считается автоматически</p>
+                <h2>Оплачивайте наличными при получении и получайте лучшие условия</h2>
+                <p>Добавляйте товары в корзину, а сайт сам пересчитает итог от суммы заказа. Ничего считать вручную не нужно.</p>
+            </div>
+            <div class="cash-receipt" aria-hidden="true">
+                <div class="cash-receipt-top">
+                    <span>Чек выгоды</span>
+                    <strong>Рыбсток</strong>
+                </div>
+                <dl>
+                    <div>
+                        <dt>от 7 000р.</dt>
+                        <dd>-300р.</dd>
+                    </div>
+                    <div>
+                        <dt>от 20 000р.</dt>
+                        <dd>-5%</dd>
+                    </div>
+                    <div>
+                        <dt>от 50 000р.</dt>
+                        <dd>-7%</dd>
+                    </div>
+                </dl>
+                <small>Пересчет появится в корзине сразу</small>
+            </div>
+        </section>
+
+        <section class="payment-benefit-banner qr-benefit-banner" aria-label="Преимущество оплаты QR-кодом">
+            <div class="cash-benefit-copy">
+                <p class="eyebrow">Удобная оплата при получении</p>
+                <h2>Принимаем оплату QR-кодом без комиссии даже с кредитной карты</h2>
+                <p>После подтверждения заказа менеджер согласует получение, а при передаче товара можно оплатить QR-кодом без лишних комиссий.</p>
+            </div>
+            <div class="payment-benefit-card" aria-hidden="true">
+                <span>QR-оплата</span>
+                <strong>0%</strong>
+                <p>комиссия для покупателя</p>
+                <small>Наличными пользоваться необязательно</small>
+            </div>
+        </section>
+
+        <section class="payment-benefit-banner invoice-benefit-banner" aria-label="Оплата по расчетному счету">
+            <div class="cash-benefit-copy">
+                <p class="eyebrow">Для организаций и крупных заказов</p>
+                <h2>Счет на оплату выставляем день в день</h2>
+                <p>После подтверждения заказа менеджер подготовит счет и согласует документы. Безналичный расчет доступен для заказов от 30 000р.</p>
+            </div>
+            <div class="payment-benefit-card" aria-hidden="true">
+                <span>Расчетный счет</span>
+                <strong>день в день</strong>
+                <p>после подтверждения заказа</p>
+                <small>Документы согласуем с менеджером</small>
+            </div>
+        </section>
+
        <?php if ($products === []): ?>
            <div class="panel">
                <p class="muted">В этой категории товары появятся после переноса каталога со старого сайта.</p>
@@ -74,5 +141,14 @@ $pagination = $pagination ?? [
                </nav>
            <?php endif; ?>
        <?php endif; ?>
+
+        <?php if ($categoryDescription !== ''): ?>
+            <section class="catalog-seo-panel">
+                <h2><?= e($heading) ?></h2>
+                <div class="catalog-seo-content">
+                    <?= (string) $categoryDescription ?>
+                </div>
+            </section>
+        <?php endif; ?>
    </section>
 </section>
@@ -7,6 +7,31 @@ declare(strict_types=1);
 /** @var array<int, array<string, mixed>> $images */

 $mainImage = $product['main_image_path'] ?? '';
+$showUnitPriceForVariant = static function (array $variant) use ($product): bool {
+    if (function_exists('product_should_show_unit_price')) {
+        return product_should_show_unit_price($product, $variant);
+    }
+
+    $unit = (string) ($variant['unit'] ?? $product['base_unit'] ?? '');
+    if (!in_array($unit, ['kg', 'кг'], true)) {
+        return false;
+    }
+
+    if (($variant['price_per_unit'] ?? null) === null || (float) $variant['price_per_unit'] <= 0) {
+        return false;
+    }
+
+    $packageQuantity = (float) ($variant['package_quantity'] ?? 0);
+    if ($packageQuantity < 1) {
+        return false;
+    }
+
+    $lower = static function (string $value): string {
+        return function_exists('mb_strtolower') ? mb_strtolower($value, 'UTF-8') : strtolower($value);
+    };
+
+    return preg_match('/(^|[\s,.;])\d+(?:[.,]\d+)?\s*(мл|шт)\.?($|[\s,.;])/u', $lower((string) ($variant['name'] ?? ''))) !== 1;
+};
 ?>
 <section
    class="product-detail price-aware"
@@ -43,6 +68,7 @@ $mainImage = $product['main_image_path'] ?? '';
            <section class="variant-list" aria-label="Фасовки товара">
                <h2>Фасовки</h2>
                <?php foreach ($variants as $variant): ?>
+                    <?php $showUnitPrice = $showUnitPriceForVariant($variant); ?>
                    <div
                        class="variant-row"
                        data-variant-id="<?= e((string) ($variant['id'] ?? '')) ?>"
@@ -52,11 +78,12 @@ $mainImage = $product['main_image_path'] ?? '';
                    >
                        <strong><?= e((string) $variant['name']) ?></strong>
                        <span>
-                            <?php if ($variant['price_per_unit'] !== null): ?>
+                            <?php if ($showUnitPrice): ?>
                                <span data-dynamic-unit-price data-base-unit-price="<?= e((string) $variant['price_per_unit']) ?>"><?= e(money_label($variant['price_per_unit'])) ?></span> / <?= e(unit_label((string) $variant['unit'])) ?>
                            <?php endif; ?>
                        </span>
                        <b>
+                            <small>За фасовку <?= e((string) $variant['name']) ?></small>
                            <?php if (!empty($variant['old_package_price'])): ?>
                                <span class="old-price"><?= e(money_label($variant['old_package_price'])) ?></span>
                            <?php endif; ?>
@@ -71,15 +71,17 @@ try {

    <?php require base_path('views/partials/mega-category-menu.php'); ?>

-    <section class="price-mode-bar" aria-label="Режим отображения цен">
+    <section class="price-mode-bar" aria-label="Система оплаты при получении">
        <div class="price-mode-inner">
-            <span>Показывать цены:</span>
+            <span>Выберите систему оплаты при получении:</span>
            <div class="price-mode-options" role="group" aria-label="Способ оплаты">
-                <button type="button" class="price-mode-button is-active" data-payment-mode="cash">Наличными</button>
+                <button type="button" class="price-mode-button price-mode-button-cash is-active" data-payment-mode="cash">
+                    <span>Наличными</span>
+                    <b>Выгодно от 7000р.</b>
+                </button>
                <button type="button" class="price-mode-button" data-payment-mode="qr">QR-код</button>
                <button type="button" class="price-mode-button" data-payment-mode="invoice">Расчетный счет</button>
            </div>
-            <small data-price-mode-note>Скидка наличными применится автоматически от суммы корзины.</small>
        </div>
    </section>

@@ -245,22 +247,33 @@ try {
                const total = getCartTotal();

                if (payment === 'invoice') {
-                    return { multiplier: 1.08, label: 'Оплата по расчетному счету: +8%' };
+                    return { multiplier: 1.08, fixedDiscount: 0, label: 'Оплата по расчетному счету: +8%' };
                }

                if (payment === 'qr') {
-                    return { multiplier: 1, label: 'QR-код: базовая цена' };
+                    return { multiplier: 1, fixedDiscount: 0, label: 'QR-код: базовая цена' };
                }

                if (total >= 50000) {
-                    return { multiplier: 0.93, label: 'Наличные: цена от 50 000р.' };
+                    return { multiplier: 0.93, fixedDiscount: 0, label: 'Наличные: цена от 50 000р.' };
                }

                if (total >= 20000) {
-                    return { multiplier: 0.95, label: 'Наличные: цена от 20 000р.' };
+                    return { multiplier: 0.95, fixedDiscount: 0, label: 'Наличные: цена от 20 000р.' };
                }

-                return { multiplier: 1, label: 'Наличные: базовая цена до 20 000р.' };
+                if (total >= 7000) {
+                    return { multiplier: 1, fixedDiscount: 300, label: 'Наличные: -300р. от 7000р.' };
+                }
+
+                return { multiplier: 1, fixedDiscount: 0, label: 'Наличные: базовая цена до 7000р.' };
+            };
+
+            const cartCurrentTotal = (items = getCartItems()) => {
+                const mode = priceMode();
+                const subtotal = Math.floor(cartBaseTotal(items) * mode.multiplier);
+
+                return Math.max(0, subtotal - Number(mode.fixedDiscount || 0));
            };

            const tierValues = (base) => ({
@@ -293,7 +306,9 @@ try {
                if (unitNode || packageNode) {
                    const unitBase = Number(unitNode?.dataset.baseUnitPrice || 0);
                    const packageBase = Number(packageNode?.dataset.basePackagePrice || 0);
-                    const base = unitBase > 0 ? unitBase : packageBase;
+                    const unitPriceRow = card.querySelector('[data-unit-price-row]');
+                    const showUnitPrice = card.dataset.showUnitPrice === '1' && !unitPriceRow?.classList.contains('is-price-placeholder');
+                    const base = showUnitPrice && unitBase > 0 ? unitBase : packageBase;

                    const tiers = tierValues(base);
                    const tierBase = card.querySelector('[data-tier-base]');
@@ -304,7 +319,9 @@ try {
                    if (tierBase) tierBase.textContent = formatRub(tiers.base);
                    if (tierCash20) tierCash20.textContent = formatRub(tiers.cash20);
                    if (tierCash50) tierCash50.textContent = formatRub(tiers.cash50);
-                    if (tierUnitLabel) tierUnitLabel.textContent = card.querySelector('[data-unit-label]')?.textContent || 'шт.';
+                    if (tierUnitLabel) tierUnitLabel.textContent = showUnitPrice
+                        ? (card.querySelector('[data-unit-label]')?.textContent || 'кг')
+                        : 'фасовку';
                }

            };
@@ -318,6 +335,20 @@ try {
                });
            };

+            const updateMiniCart = () => {
+                const items = getCartItems();
+                const count = items.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
+                const total = cartCurrentTotal(items);
+
+                document.querySelectorAll('[data-mini-cart-count]').forEach((node) => {
+                    node.textContent = String(count);
+                });
+
+                document.querySelectorAll('[data-mini-cart-total]').forEach((node) => {
+                    node.textContent = formatRub(total);
+                });
+            };
+
            const itemCurrentPrice = (item) => Math.floor(Number(item.basePackagePrice || 0) * priceMode().multiplier);

            const renderCartPage = () => {
@@ -336,7 +367,7 @@ try {
                const savingNode = cartPage.querySelector('[data-cart-saving-total]');
                const items = getCartItems();
                const baseTotal = cartBaseTotal(items);
-                const currentTotal = Math.floor(baseTotal * priceMode().multiplier);
+                const currentTotal = cartCurrentTotal(items);
                const savingTotal = Math.max(0, baseTotal - currentTotal);

                if (emptyNode) {
@@ -397,20 +428,12 @@ try {
                    button.classList.toggle('is-active', button.dataset.paymentMode === payment);
                });

-                const note = document.querySelector('[data-price-mode-note]');
-                if (note) {
-                    const total = getCartTotal();
-                    const mode = priceMode();
-                    const suffix = payment === 'cash' && total < 50000
-                        ? (total < 20000 ? ' До цены от 20 000р. осталось ' + formatRub(20000 - total) + '.' : ' До цены от 50 000р. осталось ' + formatRub(50000 - total) + '.')
-                        : '';
-                    note.textContent = mode.label + '. Сумма корзины: ' + formatRub(total) + '.' + suffix;
-                }
            };

            const updateAllPrices = () => {
                updateModeButtons();
                updateCartCount();
+                updateMiniCart();
                updateDynamicPrices(document);
                document.querySelectorAll('.product-card.price-aware').forEach(updateCardPrices);
                renderCartPage();
@@ -427,9 +450,46 @@ try {
                },
                currentMode: priceMode,
                cartBaseTotal,
+                cartCurrentTotal,
                update: updateAllPrices
            };

+            const catalogScrollKey = 'rybstock.catalogScrollY';
+            const catalogMenuScrollKey = 'rybstock.catalogMenuScrollY';
+
+            if (window.location.pathname.startsWith('/catalog')) {
+                const savedCatalogScroll = sessionStorage.getItem(catalogScrollKey);
+                const savedCatalogMenuScroll = sessionStorage.getItem(catalogMenuScrollKey);
+                const catalogMenu = document.querySelector('.catalog-menu-panel > .category-list');
+
+                if (savedCatalogScroll !== null) {
+                    sessionStorage.removeItem(catalogScrollKey);
+                    window.requestAnimationFrame(() => {
+                        window.scrollTo({
+                            top: Math.max(0, parseInt(savedCatalogScroll, 10) || 0),
+                            left: 0,
+                            behavior: 'auto'
+                        });
+                    });
+                }
+
+                if (savedCatalogMenuScroll !== null && catalogMenu) {
+                    sessionStorage.removeItem(catalogMenuScrollKey);
+                    catalogMenu.scrollTop = Math.max(0, parseInt(savedCatalogMenuScroll, 10) || 0);
+                }
+            }
+
+            document.addEventListener('click', (event) => {
+                const categoryLink = event.target.closest('.catalog-menu-panel .category-list a[href^="/catalog/"]');
+
+                if (!categoryLink || event.defaultPrevented || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
+                    return;
+                }
+
+                sessionStorage.setItem(catalogScrollKey, String(window.scrollY));
+                sessionStorage.setItem(catalogMenuScrollKey, String(categoryLink.closest('.catalog-menu-panel > .category-list')?.scrollTop || 0));
+            });
+
            document.addEventListener('click', (event) => {
                const modeButton = event.target.closest('[data-payment-mode]');

@@ -594,6 +654,26 @@ try {
                const unitLabelNoteNode = card.querySelector('[data-unit-label-note]');
                const oldPriceNode = card.querySelector('[data-old-package-price-display]');
                const oldUnitPriceNode = card.querySelector('[data-old-unit-price-display]');
+                const unitPriceRow = card.querySelector('[data-unit-price-row]');
+                const packageTierTrigger = card.querySelector('[data-package-tier-trigger]');
+                const packagePriceNote = card.querySelector('[data-package-price-note]');
+                const showUnitPrice = button.dataset.showUnitPrice === '1';
+
+                card.dataset.showUnitPrice = showUnitPrice ? '1' : '0';
+
+                if (unitPriceRow) {
+                    unitPriceRow.classList.toggle('is-price-placeholder', !showUnitPrice);
+                    unitPriceRow.setAttribute('aria-hidden', showUnitPrice ? 'false' : 'true');
+                }
+
+                if (packageTierTrigger) {
+                    packageTierTrigger.hidden = showUnitPrice;
+                }
+
+                if (packagePriceNote) {
+                    packagePriceNote.classList.toggle('is-price-placeholder', !showUnitPrice);
+                    packagePriceNote.setAttribute('aria-hidden', showUnitPrice ? 'false' : 'true');
+                }

                if (unitNode) {
                    unitNode.textContent = button.dataset.unit || 'ед.';
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+if (!function_exists('category_tree_icon')) {
+    function category_tree_icon(string $name): string
+    {
+        $lowerName = mb_strtolower($name);
+
+        return match (true) {
+            str_contains($lowerName, 'рыб') => 'fish',
+            str_contains($lowerName, 'морепроду') => 'shrimp',
+            str_contains($lowerName, 'икра') => 'caviar',
+            str_contains($lowerName, 'мяс') => 'meat',
+            str_contains($lowerName, 'сыр') => 'cheese',
+            str_contains($lowerName, 'полуфаб') => 'box',
+            str_contains($lowerName, 'овощ') || str_contains($lowerName, 'фрукт') || str_contains($lowerName, 'ягод') || str_contains($lowerName, 'гриб') => 'leaf',
+            str_contains($lowerName, 'бакале') => 'jar',
+            str_contains($lowerName, 'молоч') => 'milk',
+            default => 'grid',
+        };
+    }
+}
+
+if (!function_exists('category_tree_icon_svg')) {
+    function category_tree_icon_svg(string $icon): string
+    {
+        return match ($icon) {
+            'fish' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M3 12c3.2-4.2 7.1-6.2 11.6-6 2.3.1 4.2 1.1 5.8 3l1.6-1.5v9L20.4 15c-1.6 1.9-3.6 2.9-5.8 3-4.5.2-8.4-1.8-11.6-6Z"/><path d="M7.5 12h.1"/><path d="M14 7.5c-1.4 1.2-2.1 2.7-2.1 4.5s.7 3.3 2.1 4.5"/></svg>',
+            'shrimp' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M18.5 7.5c-2.8-2.3-7.5-1.6-10.2.9-2.7 2.4-2.8 6-.3 8.1 2.3 2 6 1.9 8.2-.2 1.6-1.5 1.8-3.8.4-5.2-1.2-1.2-3.3-1.3-4.7-.2"/><path d="M19 8l2-2"/><path d="M18.8 8.2l2.4.8"/><path d="M8.8 16.8 7 19"/><path d="M11.4 17.7 10.5 20"/><path d="M14 17.2l.3 2.4"/></svg>',
+            'leaf' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M20 4c-7.8.1-12.8 3-15 8.6C3.7 16 6 20 9.8 20c5.7 0 9.2-5.6 10.2-16Z"/><path d="M5 19c3.2-4.4 7.2-7.5 12-9.2"/></svg>',
+            'caviar' => '<svg viewBox="0 0 24 24" aria-hidden="true"><circle cx="8" cy="8" r="2.4"/><circle cx="15.5" cy="7.5" r="2"/><circle cx="12" cy="14" r="2.5"/><circle cx="6.8" cy="16.2" r="1.8"/><circle cx="17.5" cy="16.5" r="2.1"/></svg>',
+            'jar' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M8 3h8"/><path d="M9 6h6"/><path d="M7 9c0-1.7 1.4-3 3-3h4c1.7 0 3 1.3 3 3v9c0 1.7-1.3 3-3 3h-4c-1.6 0-3-1.3-3-3V9Z"/><path d="M7 13h10"/></svg>',
+            'box' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="m4 8 8-4 8 4-8 4-8-4Z"/><path d="M4 8v8l8 4 8-4V8"/><path d="M12 12v8"/></svg>',
+            'meat' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M5.5 15.5c-2.8-3.9.5-9.1 5.6-9.6 4.1-.4 7.9 1.9 8.7 5.2.8 3.5-2.1 6.8-6.2 7.2-3.4.4-6.3-.7-8.1-2.8Z"/><circle cx="11" cy="12" r="2.4"/></svg>',
+            'cheese' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M4 16 19 7v10H4v-1Z"/><path d="M4 16v3h15v-2"/><circle cx="14.5" cy="13" r="1"/><circle cx="17" cy="10.5" r=".8"/><circle cx="9.5" cy="15" r=".8"/></svg>',
+            'milk' => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M9 3h6v4l2 3v10H7V10l2-3V3Z"/><path d="M9 7h6"/><path d="M7 13h10"/></svg>',
+            default => '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M5 5h6v6H5z"/><path d="M13 5h6v6h-6z"/><path d="M5 13h6v6H5z"/><path d="M13 13h6v6h-6z"/></svg>',
+        };
+    }
+}
@@ -6,6 +6,8 @@ declare(strict_types=1);
 /** @var int $depth */
 /** @var string $currentSlug */

+require_once __DIR__ . '/category-icons.php';
+
 if (!function_exists('category_tree_has_current')) {
    /**
     * @param array<string, mixed> $category
@@ -35,10 +37,14 @@ if (!function_exists('category_tree_has_current')) {
        <?php $isCurrent = ($currentSlug ?? '') === $category['slug']; ?>
        <?php $hasChildren = !empty($category['children']); ?>
        <?php $shouldOpen = category_tree_has_current($category, $currentSlug ?? ''); ?>
-        <li class="<?= $isCurrent ? 'is-current' : '' ?>">
+        <?php $iconName = $depth === 0 ? category_tree_icon((string) $category['name']) : ''; ?>
+        <li class="<?= $isCurrent ? 'is-current' : '' ?><?= $hasChildren ? ' has-children' : '' ?>">
            <?php if ($hasChildren): ?>
                <details class="category-details" <?= $shouldOpen ? 'open' : '' ?>>
                    <summary>
+                        <?php if ($depth === 0): ?>
+                            <span class="category-icon is-<?= e($iconName) ?>" aria-hidden="true"><?= category_tree_icon_svg($iconName) ?></span>
+                        <?php endif; ?>
                        <a class="<?= $isCurrent ? 'is-current-link' : '' ?>" href="/catalog/<?= e($category['slug']) ?>"><?= e($category['name']) ?></a>
                    </summary>
                    <?php
@@ -51,7 +57,12 @@ if (!function_exists('category_tree_has_current')) {
                    ?>
                </details>
            <?php else: ?>
-                <a href="/catalog/<?= e($category['slug']) ?>"><?= e($category['name']) ?></a>
+                <a href="/catalog/<?= e($category['slug']) ?>">
+                    <?php if ($depth === 0): ?>
+                        <span class="category-icon is-<?= e($iconName) ?>" aria-hidden="true"><?= category_tree_icon_svg($iconName) ?></span>
+                    <?php endif; ?>
+                    <span><?= e($category['name']) ?></span>
+                </a>
            <?php endif; ?>
        </li>
    <?php endforeach; ?>
@@ -4,6 +4,8 @@ declare(strict_types=1);

 /** @var array<int, array<string, mixed>> $megaCategories */

+require_once __DIR__ . '/category-icons.php';
+
 if (!function_exists('render_mega_category_children')) {
    /**
     * @param array<int, array<string, mixed>> $children
@@ -30,8 +32,12 @@ if (!function_exists('render_mega_category_children')) {
    <nav class="category-mega-bar" aria-label="Категории товаров">
        <div class="category-mega-inner">
            <?php foreach ($megaCategories as $category): ?>
+                <?php $iconName = category_tree_icon((string) $category['name']); ?>
                <div class="mega-item">
-                    <a class="mega-root" href="/catalog/<?= e((string) $category['slug']) ?>"><?= e((string) $category['name']) ?></a>
+                    <a class="mega-root" href="/catalog/<?= e((string) $category['slug']) ?>">
+                        <span class="mega-category-icon category-icon is-<?= e($iconName) ?>" aria-hidden="true"><?= category_tree_icon_svg($iconName) ?></span>
+                        <span><?= e((string) $category['name']) ?></span>
+                    </a>
                    <?php render_mega_category_children($category['children'] ?? []); ?>
                </div>
            <?php endforeach; ?>
@@ -12,6 +12,31 @@ $activeVariant = $variants[0] ?? [
    'package_quantity' => $product['package_quantity'] ?? 0,
    'old_package_price' => $product['old_package_price'] ?? null,
 ];
+$showUnitPriceForVariant = static function (array $variant) use ($product): bool {
+    if (function_exists('product_should_show_unit_price')) {
+        return product_should_show_unit_price($product, $variant);
+    }
+
+    $unit = (string) ($variant['unit'] ?? $product['base_unit'] ?? '');
+    if (!in_array($unit, ['kg', 'кг'], true)) {
+        return false;
+    }
+
+    if (($variant['price_per_unit'] ?? null) === null || (float) $variant['price_per_unit'] <= 0) {
+        return false;
+    }
+
+    $packageQuantity = (float) ($variant['package_quantity'] ?? 0);
+    if ($packageQuantity < 1) {
+        return false;
+    }
+
+    $lower = static function (string $value): string {
+        return function_exists('mb_strtolower') ? mb_strtolower($value, 'UTF-8') : strtolower($value);
+    };
+
+    return preg_match('/(^|[\s,.;])\d+(?:[.,]\d+)?\s*(мл|шт)\.?($|[\s,.;])/u', $lower((string) ($variant['name'] ?? ''))) !== 1;
+};
 $cardId = 'product-card-' . (int) ($product['id'] ?? 0);
 $activePackagePrice = (float) ($activeVariant['package_price'] ?? 0);
 $activeUnitPrice = $activeVariant['price_per_unit'] === null ? null : (float) $activeVariant['price_per_unit'];
@@ -29,8 +54,9 @@ $activeOldUnitPrice = ($activeOldPackagePrice !== null && $activePackageQuantity
 if ($activeOldUnitPrice !== null && $activeOldUnitPrice <= $activeUnitPrice) {
    $activeOldUnitPrice = null;
 }
-$activeTierBase = $activeUnitPrice ?? $activePackagePrice;
-$activeTierUnit = unit_label((string) ($activeVariant['unit'] ?? '')) ?: 'шт.';
+$activeShowsUnitPrice = $showUnitPriceForVariant($activeVariant);
+$activeTierBase = $activeShowsUnitPrice ? ($activeUnitPrice ?? $activePackagePrice) : $activePackagePrice;
+$activeTierUnit = $activeShowsUnitPrice ? unit_label((string) ($activeVariant['unit'] ?? '')) : 'фасовку';
 $isPublished = (int) ($product['is_published'] ?? 1) === 1;
 $isAvailable = (int) ($product['is_available'] ?? 1) === 1;
 $isPurchasable = $isPublished && $isAvailable && $activePackagePrice > 0;
@@ -42,6 +68,7 @@ $isPurchasable = $isPublished && $isAvailable && $activePackagePrice > 0;
    data-product-name="<?= e((string) ($product['name'] ?? '')) ?>"
    data-product-slug="<?= e((string) ($product['slug'] ?? '')) ?>"
    data-product-image="<?= e((string) ($product['main_image_path'] ?? '')) ?>"
+    data-show-unit-price="<?= $activeShowsUnitPrice ? '1' : '0' ?>"
 >
    <?php if (!$isPurchasable): ?>
        <span class="product-unavailable-badge"><?= !$isPublished ? 'Ожидается поступление' : 'Нет в наличии' ?></span>
@@ -95,6 +122,7 @@ $isPurchasable = $isPublished && $isAvailable && $activePackagePrice > 0;
                    if ($variantOldUnitPrice !== null && $variantOldUnitPrice <= $variantUnitPrice) {
                        $variantOldUnitPrice = null;
                    }
+                    $variantShowsUnitPrice = $showUnitPriceForVariant($variant);
                    ?>
                    <button
                        class="variant-choice-button<?= $index === 0 ? ' is-active' : '' ?>"
@@ -110,6 +138,7 @@ $isPurchasable = $isPublished && $isAvailable && $activePackagePrice > 0;
                        data-variant-unit-price-label="<?= e(money_label($variant['price_per_unit'])) ?>"
                        data-variant-package-price-label="<?= e(money_label($variant['package_price'])) ?>"
                        data-old-price="<?= e($variantOldPackagePrice === null ? '' : money_label($variantOldPackagePrice)) ?>"
+                        data-show-unit-price="<?= $variantShowsUnitPrice ? '1' : '0' ?>"
                    >
                        <?= e((string) $variant['name']) ?>
                    </button>
@@ -118,8 +147,8 @@ $isPurchasable = $isPublished && $isAvailable && $activePackagePrice > 0;
        </div>
    <?php endif; ?>

-    <?php if ($isPurchasable && $activeVariant['price_per_unit'] !== null): ?>
-        <span class="price-line">
+    <?php if ($isPurchasable): ?>
+        <span class="price-line<?= $activeShowsUnitPrice ? '' : ' is-price-placeholder' ?>" data-unit-price-row aria-hidden="<?= $activeShowsUnitPrice ? 'false' : 'true' ?>">
            <span class="price-unit-label">Цена за <span data-unit-label><?= e(unit_label((string) $activeVariant['unit'])) ?></span>:</span>
            <span class="price-unit-values">
                <span class="old-price" data-old-unit-price-display<?= $activeOldUnitPrice === null ? ' hidden' : '' ?>><?= e(money_label($activeOldUnitPrice)) ?></span>
@@ -137,13 +166,11 @@ $isPurchasable = $isPublished && $isAvailable && $activePackagePrice > 0;
            <span class="package-price-values">
                <span class="old-price" data-old-package-price-display<?= $activeOldPackagePrice === null ? ' hidden' : '' ?>><?= e(money_label($activeOldPackagePrice)) ?></span>
                <span data-package-price data-dynamic-package-price data-base-package-price="<?= e((string) $activePackagePrice) ?>"><?= e(money_label($activeVariant['package_price'])) ?></span>
-                <?php if ($activeVariant['price_per_unit'] === null): ?>
-                    <button class="price-tier-trigger" type="button" aria-label="Показать градацию цены">?</button>
-                <?php endif; ?>
+                <button class="price-tier-trigger" data-package-tier-trigger type="button" aria-label="Показать градацию цены"<?= $activeShowsUnitPrice ? ' hidden' : '' ?>>?</button>
            </span>
        </strong>
-        <?php if ($activeVariant['price_per_unit'] !== null): ?>
-            <span class="package-price-note">Цена за <span data-unit-label-note><?= e(unit_label((string) $activeVariant['unit'])) ?></span> × <span data-package-label-note><?= e((string) $activeVariant['name']) ?></span></span>
+        <?php if ($isPurchasable): ?>
+            <span class="package-price-note<?= $activeShowsUnitPrice ? '' : ' is-price-placeholder' ?>" data-package-price-note aria-hidden="<?= $activeShowsUnitPrice ? 'false' : 'true' ?>">Цена за <span data-unit-label-note><?= e(unit_label((string) $activeVariant['unit'])) ?></span> × <span data-package-label-note><?= e((string) $activeVariant['name']) ?></span></span>
        <?php endif; ?>
    <?php elseif (!$isPurchasable): ?>
        <div class="product-card-unavailable-note">Цену уточним после поступления товара.</div>