From 41139e0435aaba8e2e6a62441678039f83e316cb Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 28 Jan 2025 11:02:10 +0300 Subject: [PATCH] =?utf8?q?ERP-282=20=D0=9D=D1=83=D0=B6=D0=BD=D0=BE=20?= =?utf8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=B8=D0=BD=D1=82?= =?utf8?q?=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=20=D0=BD=D0=B0=D1=81=D1=82?= =?utf8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BC=D0=B0=D0=B3=D0=B0=D0=B7?= =?utf8?q?=D0=B8=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../controllers/CityStoreParamsController.php | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/erp24/controllers/CityStoreParamsController.php b/erp24/controllers/CityStoreParamsController.php index c9b1b571..76691b91 100644 --- a/erp24/controllers/CityStoreParamsController.php +++ b/erp24/controllers/CityStoreParamsController.php @@ -118,22 +118,24 @@ class CityStoreParamsController extends Controller $territorialManager = $data['territorial_manager'] ?? ''; $bushChefFlorist = $data['bush_chef_florist'] ?? ''; - $territorialManagerQuery = StoreDynamic::find()->andFilterWhere(['category' => 1, 'active' => 1]); - $bushChefFloristQuery = StoreDynamic::find()->andFilterWhere(['category' => 2, 'active' => 1]); + $query = StoreDynamic::find()->andFilterWhere(['active' => 1]); if ($territorialManager) { - $territorialManagerQuery->andFilterWhere(['value_int' => ClusterAdmin::find() - ->andFilterWhere(['admin_id' => $territorialManager, 'active' => 1]) - ->select('cluster_id') - ->column()]); + $query->andFilterWhere([ + 'category' => 3, + 'value_int' => ClusterAdmin::find() + ->andFilterWhere(['admin_id' => $territorialManager, 'active' => 1]) + ->select('cluster_id') + ->column() + ]); } if ($bushChefFlorist) { - $bushChefFloristQuery->andWhere(['value_int' => $bushChefFlorist]); + $query->andWhere(['category' => 2, 'value_int' => $bushChefFlorist]); } - $territorialManagerStoreIds = $territorialManagerQuery->select('store_id')->column(); - $bushChefFloristStoreIds = $bushChefFloristQuery->select('store_id')->column(); + $territorialManagerStoreIds = $query->select('store_id')->column(); + $bushChefFloristStoreIds = $query->select('store_id')->column(); $stores = CityStore::find() ->andFilterWhere([ -- 2.39.5