From 19e631359b1652a22e3834f0c8a3d68cb6d950c9 Mon Sep 17 00:00:00 2001
From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Wed, 3 Apr 2024 10:36:19 +0300
Subject: [PATCH] =?utf8?q?=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/MatrixErpController.php         | 6 +++---
 erp24/controllers/MatrixErpPropertyController.php | 4 ++++
 erp24/views/matrix_erp/index.php                  | 4 ++--
 erp24/views/write_offs_erp/_form.php              | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php
index d8e86c7..d0ddafb 100644
--- a/erp24/controllers/MatrixErpController.php
+++ b/erp24/controllers/MatrixErpController.php
@@ -100,7 +100,7 @@ class MatrixErpController extends Controller
 
         if (isset($nameFilter) && $nameFilter != "") {
             if (!empty($nameFilter)) {
-                $query->andFilterWhere(['like', '`matrix_erp`.`name`',  $nameFilter]);;
+                $query->andFilterWhere(['like', 'matrix_erp.name',  $nameFilter]);;
             }
         }
         $test = 1;
@@ -196,8 +196,8 @@ class MatrixErpController extends Controller
             $isSetModelsMatrixErpMedia = true;
         }
 
-        if ($this->request->isPost && $modelMatrixErp->load($this->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
+        if ($this->request->isPost && $modelMatrixErp->load($this->request->post()) && $modelMatrixErp->save()) {
+            return $this->redirect(['view', 'id' => $modelMatrixErp->id]);
         }
 
         $filterModel = DynamicModel::validateData([
diff --git a/erp24/controllers/MatrixErpPropertyController.php b/erp24/controllers/MatrixErpPropertyController.php
index 7773550..3e37dbf 100644
--- a/erp24/controllers/MatrixErpPropertyController.php
+++ b/erp24/controllers/MatrixErpPropertyController.php
@@ -175,7 +175,10 @@ class MatrixErpPropertyController extends Controller
 
                             $loadMediaIds = ArrayHelper::getColumn($modelsMatrixErpMedia, 'id');
 
+                            if (!empty(array_filter($loadMediaIds))) {
                                 $MatrixErpMediaOld = MatrixErpMedia::find()->andWhere(['guid' => $modelEdit->guid])->andWhere(['NOT IN','id', $loadMediaIds])->all();
+                            }
+                            if (!empty($MatrixErpMediaOld)) {
                                 foreach ($MatrixErpMediaOld as $item) {
                                     /** @var MatrixErpMedia $item */
                                     if (!empty($item->file_id)) {
@@ -188,6 +191,7 @@ class MatrixErpPropertyController extends Controller
                                     }
                                     $item->delete();
                                 }
+                            }
 
 
 
diff --git a/erp24/views/matrix_erp/index.php b/erp24/views/matrix_erp/index.php
index 514e0f5..f0e0bf9 100644
--- a/erp24/views/matrix_erp/index.php
+++ b/erp24/views/matrix_erp/index.php
@@ -75,7 +75,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
                             echo $form->field($filterModel, 'groupNameFilter')->dropDownList(array_merge(['' => 'Все'], ArrayHelper::map(
                                 \yii_app\records\MatrixErp::find()
-                                    ->select(['group_name' => new \yii\db\Expression("DISTINCT(`group_name`)")])
+                                    ->select(['group_name' => new \yii\db\Expression("DISTINCT(group_name)")])
                                     ->orderBy(['group_name' => SORT_ASC])
                                     ->asArray()
                                     ->all(),
@@ -147,7 +147,7 @@ $this->params['breadcrumbs'][] = $this->title;
                                     }
                                     if (!empty($item->matrixProperty)) {
                                         $matrixPropertyRow = $item->matrixProperty;
-                                        $imageIdRow = $matrixPropertyRow->image_id ?? '-';
+                                        $imageIdRow = $matrixPropertyRow->image_id;
                                     }
                                     $matrixMediaRow = null;
                                     if (!empty($item->matrixMedia)) {
diff --git a/erp24/views/write_offs_erp/_form.php b/erp24/views/write_offs_erp/_form.php
index cd992ac..9209d2f 100644
--- a/erp24/views/write_offs_erp/_form.php
+++ b/erp24/views/write_offs_erp/_form.php
@@ -145,7 +145,7 @@ $this->registerJsFile('/js/heic_to_jpg_replace.js', ['position' => \yii\web\View
                 'type'  => BaseColumn::TYPE_STATIC,
                 'value' => function($data) {
 //                    $images = WriteOffsErp::getImagesList($product->imagesWriteOffsErp);
-                    if (!empty($data)) {
+                    if (!empty($data['id'])) {
                         $query = WriteOffsProductsErp::find()
                             ->andWhere([
                                 'write_offs_products_erp.id' => $data['id'],
-- 
2.39.5