[ERP-125] Добавил границы времени для кластерной принадлежности

diff --git a/erp24/api3/core/services/StoreService.php b/erp24/api3/core/services/StoreService.php
index af2bfb53b8313f59bb9a267fae3e44aaf1d9a83a..ddc09dc216fddfee40fa0bb1477d0d5aadc15cf6 100644 (file)
--- a/erp24/api3/core/services/StoreService.php
+++ b/erp24/api3/core/services/StoreService.php
@@ -4,6 +4,7 @@ namespace yii_app\api3\core\services;
 
 use yii\db\Exception;
 use yii\base\InvalidArgumentException;
+use yii\db\Expression;
 use yii_app\helpers\ClientHelper;
 use yii_app\helpers\SalaryHelper;
 use yii_app\records\Assemblies;
@@ -299,6 +300,8 @@ class StoreService
     public function getClusters() {
         $storeDynamic = StoreDynamic::find()->alias('s')->select(['s.store_id as id', 's.value_int as cluster', 'c.name'])
             ->innerJoin("city_store c", "c.id = s.store_id")
+            ->where(['<=', 'date_from', new Expression('NOW()::text')])
+            ->andWhere(['>=', 'date_to', new Expression('NOW()::text')])
             ->asArray()->all();
 
         $storesPerCluster = [];