From e87ebf7a454c5e12150a718f13b8c7caa573be1d Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Thu, 30 May 2024 17:17:35 +0300 Subject: [PATCH] fix --- erp24/api3/core/services/NotifiableService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erp24/api3/core/services/NotifiableService.php b/erp24/api3/core/services/NotifiableService.php index fea1ff74..d2457025 100644 --- a/erp24/api3/core/services/NotifiableService.php +++ b/erp24/api3/core/services/NotifiableService.php @@ -36,7 +36,7 @@ class NotifiableService $userBonuses = UsersBonus::find()->select(['phone', 'sum(CASE WHEN tip=\'plus\' THEN bonus ELSE -bonus END) as sum']) ->where(['in', 'phone', array_keys($buffer)]) ->andWhere(['<', 'date_start', new Expression('NOW()')]) - ->andWhere(['>', 'date_end', new Expression('NOW()')]) + ->andWhere(['or', ['>', 'date_end', new Expression('NOW()')], ['tip' => 'minus']]) ->groupBy(['phone'])->all(); $buffer2 = ArrayHelper::map($userBonuses, 'phone', 'sum'); -- 2.39.5