Расчет цели букета выбор магазина

diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php
index e14f6bd2014fb0cceebda42eb1974b32db05e299..a5664825b88f774d18e2187395efa27dcff41a97 100755 (executable)
--- a/erp24/services/StorePlanService.php
+++ b/erp24/services/StorePlanService.php
@@ -928,17 +928,13 @@ class StorePlanService
             );
         }
        // var_dump($stores); die();
-        $storesParams = ArrayHelper::map(
-            CityStoreParams::find()
-                ->select(['store_id', 'address_region'])
+        $storesParams = CityStoreParams::find()
+                ->select(['store_id', 'address_region', 'store_type'])
                 ->where(['store_id' => $stores])
                 ->andWhere(['not', ['address_region' => '']])
                 ->asArray()
                 ->indexBy('store_id')
-                ->all(),
-            'store_id',
-            'address_region'
-        );
+                ->all();
 
         $forecasts = MatrixBouquetForecast::find()
             ->where(['year' => $year, 'month' => $month])
@@ -981,13 +977,23 @@ class StorePlanService
                 'internet' => 'online'
             ];
 
+            $storeSizeTypes = [
+                 1 => 's_store',
+                2 => 'm_store',
+                3 => 'l_store',
+                4 => 'xl_store',
+
+            ];
+
             foreach ($types as $field => $typeSales) {
+                
                 $typeSalesValue = (int)$forecast[$field];
                 if ($typeSalesValue <= 0) {
                     continue;
                 }
 
-                foreach ($storesParams as $storeId => $regionId) {
+                foreach ($storesParams as $storeId => $params) {
+                    $regionId = $params['region_id'];
                     if (!$regionId) {
                         if (CityStore::find()->where(['id' => $storeId])->one()->city_id == 1342) {
                             $regionId = 52;