From 03fd14584a891899441e61029e13901d1362e5ed Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 31 Jul 2024 06:33:02 +0000 Subject: [PATCH] =?utf8?q?[ERP-125]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?utf8?q?=D0=BB=20=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B=20=D0=B2?= =?utf8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B4=D0=BB=D1=8F=20?= =?utf8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=82=D0=B5=D1=80=D0=BD=D0=BE=D0=B9=20?= =?utf8?q?=D0=BF=D1=80=D0=B8=D0=BD=D0=B0=D0=B4=D0=BB=D0=B5=D0=B6=D0=BD?= =?utf8?q?=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api3/core/services/StoreService.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erp24/api3/core/services/StoreService.php b/erp24/api3/core/services/StoreService.php index af2bfb53..ddc09dc2 100644 --- 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 = []; -- 2.39.5