Переименование переменных

diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php
index 261650202186337a55829a051cff959e357af878..4b651d33addf19cb1ebb5cd97ff21d729cb5121c 100755 (executable)
--- a/erp24/services/StorePlanService.php
+++ b/erp24/services/StorePlanService.php
@@ -859,7 +859,7 @@ class StorePlanService
         }
 
         $resultData = [];
-        $debugData = [];
+        $detailData = [];
         //var_dump($storesParams);die();
         foreach ($storesForecasts as $storeForecast) {
             $products = ArrayHelper::toArray(BouquetCompositionProducts::getCompositionProducts($storeForecast['bouquet_id']));
@@ -887,7 +887,7 @@ class StorePlanService
                 }
                 $resultData[$storeForecast["type_sales_id"]][$species][$storeForecast["type_sales"]] += $productCost;
 
-                $debugData[$storeForecast["type_sales_id"]][$species][$storeForecast["type_sales"]][] = [
+                $detailData[$storeForecast["type_sales_id"]][$species][$storeForecast["type_sales"]][] = [
                     'product_guid' => $product['product_guid'],
                     'price'        => $basePrice,
                     'count'        => $product['count'],
@@ -906,7 +906,7 @@ class StorePlanService
             }
         }
 
-        return ['detail' => $resultData, 'final' => $finalResult, 'debug' => $debugData];
+        return ['detail' => $resultData, 'final' => $finalResult, 'fullDetail' => $detailData];
     }
 
 
@@ -948,7 +948,7 @@ class StorePlanService
         );
 
         $resultData = [];
-        $debugData = [];
+        $detailData = [];
         $priceCache = [];
         $speciesCache = [];
 
@@ -1032,7 +1032,7 @@ class StorePlanService
                             $cost = round($raw * BouquetCompositionPrice::SURCHARGE_ASSEMBLY, 2);
 
                             $resultData[$sid][$species][$typeSales] = ($resultData[$sid][$species][$typeSales] ?? 0) + $cost;
-                            $debugData[$sid][$species][$typeSales][] = [
+                            $detailData[$sid][$species][$typeSales][] = [
                                 'product_guid' => $guid,
                                 'price' => $price,
                                 'count' => $product['count'],
@@ -1056,7 +1056,7 @@ class StorePlanService
         return [
             'detail' => $resultData,
             'final' => $finalResult,
-            'debug' => $debugData
+            'fullDetail' => $detailData
         ];
     }
 

diff --git a/erp24/views/bouquet/month-goal-forecast.php b/erp24/views/bouquet/month-goal-forecast.php
index 727e0199608edc1af654131ce488ab43b5724fa5..6b329a848831ccbbc47549f405ebe64acdd15656 100644 (file)
--- a/erp24/views/bouquet/month-goal-forecast.php
+++ b/erp24/views/bouquet/month-goal-forecast.php
@@ -8,7 +8,7 @@ use yii\widgets\ActiveForm;
 use yii\data\ArrayDataProvider;
 
 /* @var $model yii\base\DynamicModel */
-/* @var $result array ['final', 'detail', 'debug'] */
+/* @var $result array ['final', 'detail', 'fullDetail'] */
 /* @var $storesMap array */
 /* @var $month int */
 /* @var $year int */
@@ -113,8 +113,8 @@ $saleTypesLabels = [
     <hr>
 
     <h2>Детальный разбор по магазинам</h2>
-<?php if (!empty($result['debug'])): ?>
-    <?php foreach ($result['debug'] as $storeId => $speciesData): ?>
+<?php if (!empty($result['fullDetail'])): ?>
+    <?php foreach ($result['fullDetail'] as $storeId => $speciesData): ?>
         <h3>Магазин: <?= Html::encode($storesMap[$storeId] ?? $storeId) ?></h3>
         <?php foreach ($speciesData as $species => $saleTypes): ?>
             <h4>Вид продукции: <?= Html::encode($species) ?></h4>
@@ -156,9 +156,9 @@ $saleTypesLabels = [
     <h2>Детальный разбор по всем магазинам</h2>
     <?php
 
-    $flattenedDebug = [];
-    if (!empty($result['debug'])) {
-        foreach ($result['debug'] as $storeId => $speciesData) {
+    $flattenedFullDetail = [];
+    if (!empty($result['fullDetail'])) {
+        foreach ($result['fullDetail'] as $storeId => $speciesData) {
             foreach ($speciesData as $species => $saleTypes) {
                 foreach ($saleTypes as $saleType => $entries) {
                     foreach ($entries as $entry) {
@@ -169,17 +169,17 @@ $saleTypesLabels = [
                         $entry['species']        = $species;
                         $entry['sale_type']      = $saleType;
                         $entry['sale_type_label']= isset($saleTypesLabels[$saleType]) ? $saleTypesLabels[$saleType] : $saleType;
-                        $flattenedDebug[] = $entry;
+                        $flattenedFullDetail[] = $entry;
                     }
                 }
             }
         }
     }
-    $debugProvider = new ArrayDataProvider([
-        'allModels'  => $flattenedDebug,
+    $fullDetailProvider = new ArrayDataProvider([
+        'allModels'  => $flattenedFullDetail,
         'pagination' => false,
     ]);
-    $fullDataProvider = clone $debugProvider;
+    $fullDataProvider = clone $fullDetailProvider;
     $fullDataProvider->pagination = false;
     $gridColumns = [
         ['attribute' => 'month',           'label' => 'Месяц'],
@@ -233,7 +233,7 @@ $saleTypesLabels = [
     ]);
     echo $exportMenu;
     echo GridView::widget([
-        'dataProvider' => $debugProvider,
+        'dataProvider' => $fullDetailProvider,
         'columns' =>  $gridColumns,
     ]);
 

diff --git a/erp24/views/bouquet/month-goal.php b/erp24/views/bouquet/month-goal.php
index 3ea81784e5e4caed6bdd95d13c99c762a5d2024d..74b9ebe59ce8f65ee27a57efd7d66044246df5e5 100644 (file)
--- a/erp24/views/bouquet/month-goal.php
+++ b/erp24/views/bouquet/month-goal.php
@@ -100,8 +100,8 @@ $saleTypesLabels = [
     <hr>
 
     <h2>Детальный разбор по магазинам</h2>
-<?php if (!empty($result['debug'])): ?>
-    <?php foreach ($result['debug'] as $storeId => $speciesData): ?>
+<?php if (!empty($result['fullDetail'])): ?>
+    <?php foreach ($result['fullDetail'] as $storeId => $speciesData): ?>
         <h3>Магазин: <?= Html::encode($storesMap[$storeId] ?? $storeId) ?></h3>
         <?php foreach ($speciesData as $species => $saleTypes): ?>
             <h4>Вид продукции: <?= Html::encode($species) ?></h4>
@@ -175,9 +175,9 @@ $saleTypesLabels = [
     <h2>Детальный разбор по всем магазинам</h2>
     <?php
 
-    $flattenedDebug = [];
-    if (!empty($result['debug'])) {
-        foreach ($result['debug'] as $storeId => $speciesData) {
+    $flattenedFullDetail = [];
+    if (!empty($result['fullDetail'])) {
+        foreach ($result['fullDetail'] as $storeId => $speciesData) {
             foreach ($speciesData as $species => $saleTypes) {
                 foreach ($saleTypes as $saleType => $entries) {
                     foreach ($entries as $entry) {
@@ -188,14 +188,14 @@ $saleTypesLabels = [
                         $entry['species']        = $species;
                         $entry['sale_type']      = $saleType;
                         $entry['sale_type_label']= isset($saleTypesLabels[$saleType]) ? $saleTypesLabels[$saleType] : $saleType;
-                        $flattenedDebug[] = $entry;
+                        $flattenedFullDetail[] = $entry;
                     }
                 }
             }
         }
     }
-    $debugProvider = new ArrayDataProvider([
-        'allModels'  => $flattenedDebug,
+    $fullDetailProvider = new ArrayDataProvider([
+        'allModels'  => $flattenedFullDetail,
         'pagination' => false,
     ]);
     $gridColumns = [
@@ -227,7 +227,7 @@ $saleTypesLabels = [
             ['attribute' => 'rounded',         'label' => 'С наценкой за сборку'],
         ];
     $exportMenu = ExportMenu::widget([
-        'dataProvider' => $debugProvider,
+        'dataProvider' => $fullDetailProvider,
         'columns' => $gridColumns,
         'exportConfig' => [
             ExportMenu::FORMAT_EXCEL => [
@@ -250,7 +250,7 @@ $saleTypesLabels = [
     ]);
     echo $exportMenu;
     echo GridView::widget([
-        'dataProvider' => $debugProvider,
+        'dataProvider' => $fullDetailProvider,
         'columns' =>  $gridColumns,
 //        'exportConfig' => [
 //            GridView::CSV => [