Получение букетов из активных матриц

diff --git a/erp24/controllers/BouquetController.php b/erp24/controllers/BouquetController.php
index 86087582031e4629a2321e7c1b0d42ac8b0b8ec3..2d23296cc0f61b419bd4eb7aa84b037a0e5693a0 100644 (file)
--- a/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@ -251,7 +251,16 @@ class BouquetController extends Controller
 
     public function actionMonthGoal()
     {
-        $bouquets = StorePlanService::getBouqetsByDate(5, 2025, 2);
+        $matrixTypesIds = StorePlanService::getActiveMatrixTypes();
+       // var_dump($matrixTypesIds);die();
+        $bouquets = [];
+        if ($matrixTypesIds) {
+            foreach ($matrixTypesIds as $matrixTypeId) {
+                $bouquets[$matrixTypeId] = StorePlanService::getBouqetsByDate(5, 2025, $matrixTypeId);
+            }
+        }
+
+
         var_dump($bouquets);die();
 
     }

diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php
index 25382b77fedd0a623d926507710ef0ecff8f8965..a3f1134c54e0e6cf6ce59f67bb26d8866d3b167b 100755 (executable)
--- a/erp24/services/StorePlanService.php
+++ b/erp24/services/StorePlanService.php
@@ -6,6 +6,7 @@ use DateTime;
 use yii\db\Expression;
 use yii\helpers\ArrayHelper;
 use yii_app\records\BouquetComposition;
+use yii_app\records\BouquetCompositionMatrixTypeHistory;
 use yii_app\records\CityStore;
 use yii_app\records\Motivation;
 use yii_app\records\PricesDynamic;
@@ -750,6 +751,15 @@ class StorePlanService
         ];
     }
 
+    public static function getActiveMatrixTypes()
+    {
+        $matrixTypesIds = BouquetCompositionMatrixTypeHistory::find()
+                ->select(['matrix_type_id'])
+                ->where(['is_active' => 1])
+                ->column();
+        return $matrixTypesIds;
+
+    }
 
     public static function getBouqetsByDate($month, $year, $matrix_type = null) {
         $query = BouquetComposition::find()