[ERP-135] Добавлены фильтры на visible = 1 и view = 1

diff --git a/erp24/actions/teambonus/SettingsAction.php b/erp24/actions/teambonus/SettingsAction.php
index 0ad6bce9cb63ba7b09399032b1a7f16f5f6631b1..84ae01851fdeda7ef265774ed93fd3be2cc512c2 100644 (file)
--- a/erp24/actions/teambonus/SettingsAction.php
+++ b/erp24/actions/teambonus/SettingsAction.php
@@ -62,7 +62,7 @@ class SettingsAction extends Action {
             $months [$i] = ['Январь','Февраль','Март','Апрель','Май','Июнь', 'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'][$i-1];
         }
 
-        $stores = ArrayHelper::map(CityStore::find()->all(), 'id', 'name');
+        $stores = ArrayHelper::map(CityStore::find()->andWhere(['visible' => '1'])->all(), 'id', 'name');
 
         $tbSettings = [];
         $teambonusSettings = TeambonusSettings::find()->where(['year' => $filterModel->year, 'month' => $filterModel->month])

diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php
index 273d47118cb7670797786a47899a12d00c09a394..741637c90c4fce1b3de9e59ec0dc43fd86439696 100644 (file)
--- a/erp24/api3/core/services/ReportService.php
+++ b/erp24/api3/core/services/ReportService.php
@@ -420,7 +420,7 @@ class ReportService
 
         $reports = [];
 
-        $cityStoreNames = ArrayHelper::map(CityStore::find()->all(), 'id', 'name');
+        $cityStoreNames = ArrayHelper::map(CityStore::find()->where(['visible' => '1'])->all(), 'id', 'name');
 
         $eitStores = ExportImportTable::find()->where(['export_val' => $data->stores])
             ->select(['entity_id', 'export_val'])

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index a2341a93c808f36ec280100707407bbb347c628a..944380b2b625504258dba71c42652cbb366da0e5 100644 (file)
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -81,7 +81,7 @@ class TimetableFactController extends Controller
             $timetableFactModelQuery->orderBy(['date_shift' => SORT_DESC]);
         }
 
-        $storeArr = CityStore::find()->all();
+        $storeArr = CityStore::find()->andWhere(['visible' => '1'])->all();
         $stores = [0 => 'Любой'];
         foreach ($storeArr as $store) {
             $stores[$store->id] = $store->name;

diff --git a/erp24/forms/timetable/TabelSearchForm.php b/erp24/forms/timetable/TabelSearchForm.php
index 53147b2ff0c2206e75fd87c17d34bad13363f1b2..197a7566059b91cc941ffb33e217d5d07918cfc3 100755 (executable)
--- a/erp24/forms/timetable/TabelSearchForm.php
+++ b/erp24/forms/timetable/TabelSearchForm.php
@@ -52,6 +52,7 @@ class TabelSearchForm extends Model
         $stores = CityStore::find()
             ->select(['name', 'id'])
             ->andWhere(['id' => $_SESSION["store_arr_dostup"]])
+            ->andWhere(['visible' => '1'])
             ->indexBy('id')
             ->cache(3600)
             ->column();

diff --git a/erp24/forms/timetable/TabelSearchFormFact.php b/erp24/forms/timetable/TabelSearchFormFact.php
index 40be10f70bb7c69fa554bb0f8fc8b5693699a39a..4d3073ca19e95951b15c0a98e024594c8884e408 100755 (executable)
--- a/erp24/forms/timetable/TabelSearchFormFact.php
+++ b/erp24/forms/timetable/TabelSearchFormFact.php
@@ -52,6 +52,7 @@ class TabelSearchFormFact extends Model
         return CityStore::find()
             ->select(['name', 'id'])
             ->andWhere(['id' => $_SESSION["store_arr_dostup"]])
+            ->andWhere(['visible' => '1'])
             ->indexBy('id')
             ->cache(3600)
             ->column();

diff --git a/erp24/records/Admin.php b/erp24/records/Admin.php
index 9c04ccf95f53cd64e3426bc5de058c7da2ae6c89..b4fdb19f01550f409338d3afa175ef6385642aa9 100755 (executable)
--- a/erp24/records/Admin.php
+++ b/erp24/records/Admin.php
@@ -361,7 +361,7 @@ class Admin extends ActiveRecord implements IdentityInterface
 
     public function getStore(): ActiveQueryInterface
     {
-        return $this->hasOne(CityStore::class, ['id' => 'store_id']);
+        return $this->hasOne(CityStore::class, ['id' => 'store_id'])->andWhere(['visible' => '1']);
     }
 
     /**

diff --git a/erp24/records/CityStore.php b/erp24/records/CityStore.php
index 8bfbc4ebaf3b45f53c32d691832e1710a7411b20..e8b9dc77a246c182e7bf756d66403b9452d232f2 100755 (executable)
--- a/erp24/records/CityStore.php
+++ b/erp24/records/CityStore.php
@@ -231,6 +231,7 @@ class CityStore extends ActiveRecord
 
         $values = self::find()
             ->andWhere(['id' => DashboardSales::getActiveCityStore()])
+            ->andWhere(['visible' => '1'])
             ->orderBy([self::tableName() . '.name' => SORT_ASC])
             ->all();
 
@@ -295,7 +296,7 @@ class CityStore extends ActiveRecord
 
     public static function getNames(array $storeIds = []): array
     {
-        $query = self::find()->select(['name', 'id']);
+        $query = self::find()->select(['name', 'id'])->andWhere(['visible' => '1']);
 
         if (!empty($storeIds)) {
             $query->andWhere(['id' => $storeIds]);

diff --git a/erp24/records/Products1c.php b/erp24/records/Products1c.php
index f356eae027d446b8f7f306bce9d5900cfa5b11e3..11b180eee921340ac6870d4edd4aae69bdc651dd 100644 (file)
--- a/erp24/records/Products1c.php
+++ b/erp24/records/Products1c.php
@@ -70,6 +70,7 @@ class Products1c extends \yii\db\ActiveRecord
             ->select(['name', 'id'])
             ->indexBy('id')
             ->andWhere('tip=:tip', [':tip' => $tip])
+            ->andWhere(['view' => 1])
             ->column();
     }
 

diff --git a/erp24/records/WriteOffsErpSearch.php b/erp24/records/WriteOffsErpSearch.php
index 25514153700ece7b048c062ebbd78ac0687deddd..3bab7a10d0e301492466902aa30491d4b5e0eefe 100644 (file)
--- a/erp24/records/WriteOffsErpSearch.php
+++ b/erp24/records/WriteOffsErpSearch.php
@@ -79,6 +79,7 @@ class WriteOffsErpSearch extends WriteOffsErp
         $query->joinWith(['cityStore']);
 
         // add conditions that should always apply here
+        $query->andWhere(['city_store.visible' => '1']);
 
         $dataProvider = new ActiveDataProvider([
             'query' => $query,