]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Merge branch 'feature_smirnov_erp-135_hide_visible_0_in_filters' into 'develop'
authorAleksey Filippov <aleksey.filippov@erp-flowers.ru>
Fri, 22 Nov 2024 13:15:38 +0000 (13:15 +0000)
committerAleksey Filippov <aleksey.filippov@erp-flowers.ru>
Fri, 22 Nov 2024 13:15:38 +0000 (13:15 +0000)
[ERP-135] Спрятать магазины с visible=0

See merge request gitlab-instance/yii-erp24!296

1  2 
erp24/actions/motivation/IndexAction.php
erp24/api3/core/services/ReportService.php
erp24/controllers/TimetableFactController.php
erp24/forms/timetable/TabelSearchForm.php
erp24/records/Admin.php
erp24/records/CityStore.php

index 70184d3b425c50d16dfd5a25b29c1ac2c26a4609,944380b2b625504258dba71c42652cbb366da0e5..50a74a653dd701e00f67962314af9e71f8516faf
@@@ -78,10 -78,10 +78,10 @@@ class TimetableFactController extends C
              $timetableFactModelQuery->andWhere(['autoclosed' => '1']);
          }
          if (!$model->sort) {
 -            $timetableFactModelQuery->orderBy(['date_shift' => SORT_DESC]);
 +            $timetableFactModelQuery->orderBy(['date' => SORT_DESC]);
          }
  
-         $storeArr = CityStore::find()->all();
+         $storeArr = CityStore::find()->andWhere(['visible' => '1'])->all();
          $stores = [0 => 'Любой'];
          foreach ($storeArr as $store) {
              $stores[$store->id] = $store->name;
Simple merge
Simple merge