[ERP-454] Добавил фильтр по умолчанию

diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php
index 2226b4ee6de492dde48d342ea318e73d94e50731..5cdec005dec921f2a8018a964da9b37ccf02f133 100644 (file)
--- 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 f65c99c98be57d7dfd9cf78a633ca835624ba195..5235e3f8d8a6e29b6540d0ba71a7ffb727195430 100644 (file)
--- 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 a03672b757cd86cc15657929bb9d9e939a0aa7fc..79b219d13230a3e2427427a93008a97ffc1be120 100644 (file)
--- 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">