Фильтр по артикулу и сортировка по имени

diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php
index b22bd971bcbac9e14a153bf002051664c7d93eef..00785677a1a994825e9cfd76b15c271933a68652 100644 (file)
--- a/erp24/controllers/MatrixErpController.php
+++ b/erp24/controllers/MatrixErpController.php
@@ -106,12 +106,14 @@ class MatrixErpController extends Controller
             'activeFilter' => 1,
             'nameFilter',
             'groupNameFilter',
+            'articuleFilter',
 
         ], [
             [
                 [
                     'groupNameFilter',
                     'nameFilter',
+                    'articuleFilter',
                 ],
                 'safe',
 
@@ -136,6 +138,7 @@ class MatrixErpController extends Controller
             $nameFilter = $filterModel->nameFilter;
             $groupNameFilter = $filterModel->groupNameFilter;
             $activeFilter = $filterModel->activeFilter;
+            $articuleFilter = $filterModel->articuleFilter;
 
         } else {
             $query->andWhere(['group_name' => 'marketplace']);
@@ -159,11 +162,17 @@ class MatrixErpController extends Controller
                 $query->andFilterWhere(['like', 'matrix_erp.name', $nameFilter]);;
             }
         }
+
+        if (isset($articuleFilter) && $articuleFilter != "") {
+            if (!empty($articuleFilter)) {
+                $query->andFilterWhere(['like', 'matrix_erp.articule', $articuleFilter]);
+            }
+        }
         $test = 1;
 
 //        $action = $query->createCommand()->getRawSql();
 
-        $model = $query->all();
+        $model = $query->orderBy(['name' => SORT_ASC])->all();
         if (!empty($model)) {
             foreach ($model as $item) {
                 $item->setComponentsArray();

diff --git a/erp24/views/matrix_erp/index.php b/erp24/views/matrix_erp/index.php
index 5235e3f8d8a6e29b6540d0ba71a7ffb727195430..14493c17665e3cc2673c219483f0775ae69e3fde 100644 (file)
--- a/erp24/views/matrix_erp/index.php
+++ b/erp24/views/matrix_erp/index.php
@@ -85,7 +85,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 <div class="card-body">
                     <?php $form = ActiveForm::begin(['id' => 'filter-form']); ?>
                     <div class="row">
-                        <div class="col-sm-4 col-md-4">
+                        <div class="col-sm-3 col-md-3">
                             <?php
 
                             echo $form->field($filterModel, 'groupNameFilter')->dropDownList(array_merge([
@@ -105,7 +105,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
                             ?>
                         </div>
-                        <div class="col-sm-4 col-md-4">
+                        <div class="col-sm-3 col-md-3">
                             <?php
 
                             echo $form->field($filterModel, 'nameFilter')->textInput(
@@ -113,19 +113,23 @@ $this->params['breadcrumbs'][] = $this->title;
 
                             ?>
                         </div>
-                        <div class="col-sm-4 col-md-4">
+                        <div class="col-sm-3 col-md-3">
+                            <?php
+                            echo $form->field($filterModel, 'articuleFilter')->textInput(
+                                ['class' => 'form-control'])->label('Артикул');
+                            ?>
+                        </div>
+                        <div class="col-sm-3 col-md-3">
                             <?php
                             echo $form->field($filterModel, 'activeFilter')->dropDownList(
                                 ['' => 'Все', 1 => 'Активная', 0 => 'Не активная',],
                                 ['class' => 'form-control', 'onchange' => 'this.form.submit();'])->label('Активность');
                             ?>
                         </div>
-
-
                     </div>
                     <div class="row">
-                        <div class="col-sm-4 col-md-4">
-                            <?= Html::submitButton('Фильтр', ['class' => 'btn btn-primary  mt-4 mb-0']) ?>
+                        <div class="col-sm-12 col-md-12">
+                            <?= Html::submitButton('Фильтр', ['class' => 'btn btn-primary mt-4 mb-0']) ?>
                         </div>
                     </div>
                     <?php ActiveForm::end() ?>