From: marina <m.zozirova@gmail.com>
Date: Tue, 10 Jun 2025 06:44:26 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c8735024e6c9cf7da6240647c64aa223a3542747;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build

# Conflicts:
#	erp24/controllers/AutoPlannogrammaController.php
---

c8735024e6c9cf7da6240647c64aa223a3542747
diff --cc erp24/controllers/AutoPlannogrammaController.php
index aa6acaaf,5f672918..ad2fa16d
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@@ -7,7 -8,7 +8,8 @@@ use yii\data\ArrayDataProvider
  use yii\db\Expression;
  use yii\db\Query;
  use yii\helpers\ArrayHelper;
 +use yii_app\records\Autoplannogramma;
+ use yii\web\Response;
  use yii_app\records\CityStore;
  use yii_app\records\MatrixBouquetForecast;
  use yii_app\records\PricesDynamic;
@@@ -1393,13 -1371,9 +1384,13 @@@ class AutoPlannogrammaController extend
                  return true;
              });
  
 +
 +            echo '<pre>';
 +            var_dump($flatData);
 +            echo '</pre>';die();
              $dataProvider = new ArrayDataProvider([
                  'allModels' => $flatData,
-                 'pagination' => ['pageSize' => 100],
+                 'pagination' => ['pageSize' => 1000],
              ]);
          }
          return $this->render('week-sales-products_forecast', [