Добавление фильтрации по активности в фиде

diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php
index d6a15686853bd291f1235246c7dbc6275c0daf16..fb3e5fa742cf649db1f967fc99c501facd8a06ea 100644 (file)
--- a/erp24/controllers/MatrixErpController.php
+++ b/erp24/controllers/MatrixErpController.php
@@ -104,6 +104,7 @@ class MatrixErpController extends Controller
 
         $filterModel = DynamicModel::validateData([
             'activeFilter' => 1,
+            'feedActiveFilter',
             'nameFilter',
             'groupNameFilter',
 
@@ -118,7 +119,8 @@ class MatrixErpController extends Controller
             ],
             [
                 [
-                    'activeFilter'
+                    'activeFilter',
+                    'feedActiveFilter'
                 ],
                 'integer'
             ],
@@ -136,6 +138,7 @@ class MatrixErpController extends Controller
             $nameFilter = $filterModel->nameFilter;
             $groupNameFilter = $filterModel->groupNameFilter;
             $activeFilter = $filterModel->activeFilter;
+            $feedActiveFilter = $filterModel->feedActiveFilter;
 
         } else {
             $query->andWhere(['group_name' => 'marketplace']);
@@ -154,6 +157,12 @@ class MatrixErpController extends Controller
             }
         }
 
+        if (isset($feedActiveFilter) && $feedActiveFilter != "") {
+            if (!empty($feedActiveFilter) || $feedActiveFilter == 0) {
+                $query->andWhere(['is_feed_active' => $feedActiveFilter]);
+            }
+        }
+
         if (isset($nameFilter) && $nameFilter != "") {
             if (!empty($nameFilter)) {
                 $query->andFilterWhere(['like', 'matrix_erp.name', $nameFilter]);;

diff --git a/erp24/records/MatrixErp.php b/erp24/records/MatrixErp.php
index 34727ca43a0b636ea1aec830c2a24d10a8a06d6d..c1592bf336a6762470ec1a011a6dbca83ce6f16a 100644 (file)
--- a/erp24/records/MatrixErp.php
+++ b/erp24/records/MatrixErp.php
@@ -93,7 +93,7 @@ class MatrixErp extends \yii\db\ActiveRecord
             'created_at' => 'Created At',
             'updated_admin_id' => 'Updated Admin ID',
             'updated_at' => 'Updated At',
-            'is_feed_active' => 'Фид Ñ\82оваÑ\80ов',
+            'is_feed_active' => 'Ð\90кÑ\82ивноÑ\81Ñ\82Ñ\8c в Ñ\84иде',
         ];
     }
 

diff --git a/erp24/views/matrix_erp/index.php b/erp24/views/matrix_erp/index.php
index bfd69a8c50e1b237be51c84e2a142bd6b851dd30..ef64a629db15296729460655d5c7054222a552f2 100644 (file)
--- a/erp24/views/matrix_erp/index.php
+++ b/erp24/views/matrix_erp/index.php
@@ -86,7 +86,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([
@@ -106,7 +106,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(
@@ -114,16 +114,22 @@ $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, 'activeFilter')->dropDownList(
                                 ['' => 'Все', 1 => 'Активная', 0 => 'Не активная',],
                                 ['class' => 'form-control', 'onchange' => 'this.form.submit();'])->label('Активность');
                             ?>
                         </div>
-
-
+                        <div class="col-sm-3 col-md-3">
+                            <?php
+                            echo $form->field($filterModel, 'feedActiveFilter')->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']) ?>
@@ -154,7 +160,7 @@ $this->params['breadcrumbs'][] = $this->title;
                                 <th>Дата начала актуальности</th>
                                 <th>Дата окончания актуальности</th>
                                 <th>Активность</th>
-                                <th>Фид Ñ\82оваÑ\80ов</th>
+                                <th>Ð\90кÑ\82ивноÑ\81Ñ\82Ñ\8c в Ñ\84иде</th>
                                 <th></th>
                             </tr>
                             </thead>

diff --git a/erp24/views/matrix_erp/update.php b/erp24/views/matrix_erp/update.php
index 79b219d13230a3e2427427a93008a97ffc1be120..50832f905255aa0913e3b38e73b2ed634cdaedda 100644 (file)
--- a/erp24/views/matrix_erp/update.php
+++ b/erp24/views/matrix_erp/update.php
@@ -36,7 +36,21 @@ $this->params['breadcrumbs'][] = 'Update';
             'guid',
             'date_from',
             'date_to',
-            'active',
+            [
+                    'attribute' => 'active',
+                    'format' => 'raw',
+                    'value' => function ($model) {
+                        return $model->active == 1 ? 'Да' : 'Нет';
+                    }
+            ],
+            [
+                'attribute' => 'is_feed_active',
+                'format' => 'raw',
+                'value' => function ($model) {
+                    return $model->is_feed_active == 1 ? 'Да' : 'Нет';
+                }
+            ],
+
 //            'guid',
 //            'parent_id',
 //            'category_id',