From 3c17a2eca6b68847b0e214c40aea28d92b7bcb43 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 17 Jun 2025 13:11:26 +0300 Subject: [PATCH] =?utf8?q?ERP-360=20=D0=A1=D0=B1=D0=BE=D1=80=D0=BA=D0=B0?= =?utf8?q?=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B=20=D0=B0?= =?utf8?q?=D0=B2=D1=82=D0=BE=D0=BF=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/AutoPlannogrammaController.php | 2 -- erp24/web/js/autoplannogramma/autoplannogramma.js | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php index 51c36b5a..d4e93d80 100644 --- a/erp24/controllers/AutoPlannogrammaController.php +++ b/erp24/controllers/AutoPlannogrammaController.php @@ -220,12 +220,10 @@ class AutoPlannogrammaController extends BaseController $channelData = $forecast[$storeId][$channel] ?? []; $titleData = []; - // Always use share-based value if it exists if (isset($channelData['share']) && is_numeric($channelData['share'])) { $titleData[0] = round($quantity * $channelData['share'], 2); } - // Add product-specific details if available if (isset($productData['product_id']) && isset($forecast[$storeId][$productData['product_id']][$channel])) { $details = $forecast[$storeId][$productData['product_id']][$channel]; $titleData[0] = $titleData[0] ?? round($quantity * array_sum($details), 2); diff --git a/erp24/web/js/autoplannogramma/autoplannogramma.js b/erp24/web/js/autoplannogramma/autoplannogramma.js index 9cfff0f6..ecfc2003 100644 --- a/erp24/web/js/autoplannogramma/autoplannogramma.js +++ b/erp24/web/js/autoplannogramma/autoplannogramma.js @@ -386,16 +386,15 @@ const generateTitleString = (titleObj) => { if (!titleObj || typeof titleObj !== 'object') return ''; const typeTitles = { - offline: '📦 Оффлайн', - online: '🌐 Онлайн', - marketplace: '🛒 Маркетплейс' + offline: 'Оффлайн', + online: 'Онлайн', + marketplace: 'Маркетплейс' }; const parts = Object.entries(titleObj) .map(([typeKey, typeValue]) => { const title = typeTitles[typeKey] || typeKey; - // Handle case where typeValue is an array [numeric_value, {details: {...}}] if (Array.isArray(typeValue) && typeValue.length >= 1) { const numericValue = parseFloat(typeValue[0]); const details = typeValue[1]?.details || {}; @@ -404,12 +403,11 @@ const generateTitleString = (titleObj) => { return `${title}: ${numericValue.toFixed(2)}${lines.length ? '\n' + lines.join('\n') : ''}`; } - // Handle case where typeValue is a number (for share-only, if applicable) if (typeof typeValue === 'number') { return `${title}: ${typeValue.toFixed(2)}`; } - return ''; // Skip invalid or empty values + return ''; }) .filter(Boolean); -- 2.39.5