From: marina <m.zozirova@gmail.com>
Date: Tue, 17 Jun 2025 10:11:26 +0000 (+0300)
Subject: ERP-360 Сборка страницы автопм
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=3c17a2eca6b68847b0e214c40aea28d92b7bcb43;p=erp24_rep%2Fyii-erp24%2F.git

ERP-360 Сборка страницы автопм
---

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);