From 043a95d51c6daa11503e7a680b327e38074161ca Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Wed, 19 Feb 2025 15:00:25 +0300
Subject: [PATCH] =?utf8?q?ERP-302=20=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?=
 =?utf8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B1=D1=83?=
 =?utf8?q?=D0=BA=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/BouquetComposition.php           |  2 +-
 .../BouquetCompositionMatrixTypeHistory.php    |  1 -
 erp24/views/bouquet/_form.php                  | 18 +++++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index d153b405..f25682e0 100644
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -87,7 +87,7 @@ class BouquetComposition extends ActiveRecord
 
     public function getMatrixType()
     {
-        return $this->hasMany(BouquetCompositionMatrixTypeHistory::class, ['bouquet_id' => 'id'])
+        return $this->hasOne(BouquetCompositionMatrixTypeHistory::class, ['bouquet_id' => 'id'])
             ->andWhere(['is_active' => BouquetCompositionMatrixTypeHistory::IS_ACTIVE]);
     }
 
diff --git a/erp24/records/BouquetCompositionMatrixTypeHistory.php b/erp24/records/BouquetCompositionMatrixTypeHistory.php
index 58a2bbb7..cfab41e8 100644
--- a/erp24/records/BouquetCompositionMatrixTypeHistory.php
+++ b/erp24/records/BouquetCompositionMatrixTypeHistory.php
@@ -84,7 +84,6 @@ class BouquetCompositionMatrixTypeHistory extends ActiveRecord
 
     public static function setData($value, $bouquetId) {
         if (self::findOne(['bouquet_id' => $bouquetId])) {
-            var_dump(1);die();
             BouquetCompositionMatrixTypeHistory::updateAll(['date_to' => date('Y-m-d H:i:s'), 'bouquet_id' => $bouquetId, 'date_from' => null, 'is_active' => self::IS_ACTIVE]);
         }
 
diff --git a/erp24/views/bouquet/_form.php b/erp24/views/bouquet/_form.php
index 41b21a8d..ecc8feca 100644
--- a/erp24/views/bouquet/_form.php
+++ b/erp24/views/bouquet/_form.php
@@ -1,6 +1,7 @@
 <?php
 
 use kartik\file\FileInput;
+use kartik\select2\Select2;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\helpers\Url;
@@ -55,11 +56,18 @@ $form = ActiveForm::begin([
                     <?= Html::label('Тип матрицы', null, ['class' => 'h5 mt-2 mb-0']) ?>
                 </div>
                 <div class="col-md-7">
-                    <?= Html::dropDownList('matrix_type_id',
-                        $model && $model->matrixType ? $model->matrixType->matrix_type_id : null,
-                        ArrayHelper::map(MatrixType::find()->all(), 'id', 'name'),
-                        ['class' => 'form-control', 'prompt' => 'Тип матрицы'])
-                    ?>
+                    <?= Select2::widget([
+                        'name' => 'matrix_type_id',
+                        'value' => isset($model->matrixType) ? $model->matrixType->matrix_type_id : null,
+                        'data' => ArrayHelper::map(MatrixType::find()->all(), 'id', 'name'),
+                        'options' => [
+                            'placeholder' => 'Тип матрицы',
+                        ],
+                        'pluginOptions' => [
+                            'allowClear' => true,
+                        ],
+                    ]) ?>
+
                 </div>
             </div>
 
-- 
2.39.5