]> gitweb.erp-flowers.ru Git - yii-erp24/.git/commitdiff
fix
authorAlexander Smirnov <fredeom@mail.ru>
Thu, 30 May 2024 14:17:35 +0000 (17:17 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Thu, 30 May 2024 14:17:35 +0000 (17:17 +0300)
erp24/api3/core/services/NotifiableService.php

index fea1ff74c933119998b046c50595a63d081a7e7d..d2457025148907cf97991832f9ca2ba5f1024c8b 100644 (file)
@@ -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');