From: Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Date: Fri, 22 Nov 2024 13:15:38 +0000 (+0000)
Subject: Merge branch 'feature_smirnov_erp-135_hide_visible_0_in_filters' into 'develop'
X-Git-Tag: 1.7~224
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0ea89e2192e51cae57f0736225825de911c1d5ec;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'feature_smirnov_erp-135_hide_visible_0_in_filters' into 'develop'

[ERP-135] Спрятать магазины с visible=0

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

0ea89e2192e51cae57f0736225825de911c1d5ec
diff --cc erp24/controllers/TimetableFactController.php
index 70184d3b,944380b2..50a74a65
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@@ -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;