From db86d7549d35745a02cde7d8bc52f1fe6ccac2c5 Mon Sep 17 00:00:00 2001
From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Tue, 19 Aug 2025 19:23:53 +0300
Subject: [PATCH] =?utf8?q?[ERP-454]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?utf8?q?=D0=BB=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D0=BF=D0=BE=20?=
 =?utf8?q?=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/MatrixErpController.php | 19 +++++++++----------
 erp24/views/matrix_erp/index.php          |  6 +++++-
 erp24/views/matrix_erp/update.php         |  3 ++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php
index 2226b4ee..5cdec005 100644
--- a/erp24/controllers/MatrixErpController.php
+++ b/erp24/controllers/MatrixErpController.php
@@ -106,16 +106,6 @@ class MatrixErpController extends Controller
             ],
         ]);
 
-        if(Yii::$app->request->isPost && $filterModel->load(Yii::$app->request->post())){
-            $nameFilter = $filterModel->nameFilter;
-            $groupNameFilter = $filterModel->groupNameFilter;
-            $activeFilter = $filterModel->activeFilter;
-
-        }
-
-
-
-
         $searchModel = new MatrixErpSearch();
         $dataProvider = $searchModel->search($this->request->queryParams);
 
@@ -126,6 +116,15 @@ class MatrixErpController extends Controller
 
         ;
 
+        if(Yii::$app->request->isPost && $filterModel->load(Yii::$app->request->post())){
+            $nameFilter = $filterModel->nameFilter;
+            $groupNameFilter = $filterModel->groupNameFilter;
+            $activeFilter = $filterModel->activeFilter;
+
+        } else {
+            $query->andWhere(['group_name' => 'marketplace']);
+        }
+
         if (isset($groupNameFilter) && $groupNameFilter != "") {
             if (!empty($groupNameFilter)) {
                 $query->andWhere(['group_name' => $groupNameFilter]);
diff --git a/erp24/views/matrix_erp/index.php b/erp24/views/matrix_erp/index.php
index f65c99c9..5235e3f8 100644
--- a/erp24/views/matrix_erp/index.php
+++ b/erp24/views/matrix_erp/index.php
@@ -88,9 +88,13 @@ $this->params['breadcrumbs'][] = $this->title;
                         <div class="col-sm-4 col-md-4">
                             <?php
 
-                            echo $form->field($filterModel, 'groupNameFilter')->dropDownList(array_merge(['' => 'Все'], ArrayHelper::map(
+                            echo $form->field($filterModel, 'groupNameFilter')->dropDownList(array_merge([
+                                    'marketplace' => 'marketplace',
+                                    '' => 'Все',
+                            ], ArrayHelper::map(
                                 \yii_app\records\MatrixErp::find()
                                     ->select(['group_name' => new \yii\db\Expression("DISTINCT(group_name)")])
+                                    ->where(['!=','group_name' , 'marketplace'])
                                     ->orderBy(['group_name' => SORT_ASC])
                                     ->asArray()
                                     ->all(),
diff --git a/erp24/views/matrix_erp/update.php b/erp24/views/matrix_erp/update.php
index a03672b7..79b219d1 100644
--- a/erp24/views/matrix_erp/update.php
+++ b/erp24/views/matrix_erp/update.php
@@ -29,6 +29,7 @@ $this->params['breadcrumbs'][] = 'Update';
         'attributes' => [
 //            'id',
             'name',
+            'articule',
             'price.price',
             'group_name',
             'code',
@@ -44,7 +45,7 @@ $this->params['breadcrumbs'][] = 'Update';
 //            'updated_admin_id',
 //            'created_at',
 //            'created_admin_id',
-//            'articule',
+
         ],
     ]) ?>
     <span style="display: none">
-- 
2.39.5