From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 14 Apr 2025 07:53:23 +0000 (+0300)
Subject: Правки
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=5d13a00aea9fdd80584a9864c53cb4383519df35;p=erp24_rep%2Fyii-erp24%2F.git

Правки
---

diff --git a/erp24/services/StorePlanService.php b/erp24/services/StorePlanService.php
index a3f1134c..6fcd365b 100755
--- a/erp24/services/StorePlanService.php
+++ b/erp24/services/StorePlanService.php
@@ -775,14 +775,14 @@ class StorePlanService
 
         if ($matrix_type) {
             $query->leftJoin(
-                'erp24.bouquet_composition_matrix_type_history mth', // Добавили схему
+                'erp24.bouquet_composition_matrix_type_history mth',
                 'mth.bouquet_id = bouquet_composition.id'
             )->andWhere([
                 'mth.matrix_type_id' => $matrix_type,
-                'mth.is_active' => true // Используем true без константы
+                'mth.is_active' => true
             ]);
         }
-        return $query->all();
+        return $query->asArray()->all();
     }