From ab43968fd7d5d5457b3fc8c7468043189d74a3ee Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Thu, 30 May 2024 19:04:43 +0300 Subject: [PATCH] fix for nullable date_start --- erp24/api3/core/services/NotifiableService.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erp24/api3/core/services/NotifiableService.php b/erp24/api3/core/services/NotifiableService.php index d2457025..a2ae6e36 100644 --- a/erp24/api3/core/services/NotifiableService.php +++ b/erp24/api3/core/services/NotifiableService.php @@ -35,8 +35,11 @@ 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(['or', ['>', 'date_end', new Expression('NOW()')], ['tip' => 'minus']]) + ->andWhere([ + 'or', + ['<', 'date_start', new Expression('NOW()')], + ['date_start' => null] + ]) ->groupBy(['phone'])->all(); $buffer2 = ArrayHelper::map($userBonuses, 'phone', 'sum'); -- 2.39.5