From: marina Date: Tue, 17 Jun 2025 12:47:55 +0000 (+0300) Subject: ERP-360 Сборка страницы автопм X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c098241da90fbcb117c773fa2f0d2bcfce8798fa;p=erp24_rep%2Fyii-erp24%2F.git ERP-360 Сборка страницы автопм --- diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php index 06b7fabd..b5ec64d7 100644 --- a/erp24/controllers/AutoPlannogrammaController.php +++ b/erp24/controllers/AutoPlannogrammaController.php @@ -166,6 +166,7 @@ class AutoPlannogrammaController extends BaseController foreach (['offline', 'marketplace', 'online'] as $channel) { $channelData = $forecast[$storeId][$channel] ?? []; $titleData = []; + $titleData['write_offs'] = Autoplannogramma::findOne(['id' => $productData['id']])->writeoffs_forecast ?? null; if (isset($channelData['share']) && is_numeric($channelData['share'])) { $titleData[0] = round($quantity * $channelData['share'], 2); diff --git a/erp24/web/js/autoplannogramma/autoplannogramma.js b/erp24/web/js/autoplannogramma/autoplannogramma.js index 6f990e8d..7294845e 100644 --- a/erp24/web/js/autoplannogramma/autoplannogramma.js +++ b/erp24/web/js/autoplannogramma/autoplannogramma.js @@ -394,7 +394,8 @@ const generateTitleString = (titleObj) => { const typeTitles = { offline: 'Оффлайн', online: 'Онлайн', - marketplace: 'Маркетплейс' + marketplace: 'Маркетплейс', + write_offs: 'Списания' }; const parts = Object.entries(titleObj)