Правки когорт

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index dc20ca7edc00ceffe55e4ed027ccc5f4bec4ef74..91f780e2c8e43cca1fbf216cb9a2e43717023314 100755 (executable)
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -315,6 +315,19 @@ class Users extends \yii\db\ActiveRecord
             ->column();
 
         $usersArray = array_unique(array_merge($salesPhone, $memorableDate));
+        $data = [];
+        if ($type === 'target') {
+            //TODO: Проверка что он уже участвовал в когорте раннее
+
+            foreach ($usersArray as $phone) {
+                $userPhone = $phone;
+                $userData = [
+                    'phone' => $userPhone,
+                ];
+                $data[] = $userData;
+            }
+            return $data;
+        }
 
 
         $query = Users::find()
@@ -325,12 +338,11 @@ class Users extends \yii\db\ActiveRecord
             ->where(['active' => 1])
             ->one();
 
-        if ($type === 'whatsapp') {
-
-
-                $step1 = $messagesSettings ? $messagesSettings->day_before_step1 : 10;
-                $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4;
+        $step1 = $messagesSettings ? $messagesSettings->day_before_step1 : 10;
+        $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4;
+        $step3 = $messagesSettings ? $messagesSettings->day_before_step3 : 2;
 
+        if ($type === 'whatsapp') {
             $excludeSalesPhone = Sales::find()
                 ->where(['>=', 'date', date('Y-m-d', strtotime("$startDate -$step1 days"))])
                 ->andWhere(['<=', 'date', date('Y-m-d', strtotime("$startDate -$step2 days"))])
@@ -340,10 +352,6 @@ class Users extends \yii\db\ActiveRecord
             $query->andWhere(['not in', 'phone', $excludeSalesPhone]);
             $query->andWhere(['telegram_is_subscribed' => 0]);
         } elseif ($type === 'call') {
-
-            $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4;
-            $step3 = $messagesSettings ? $messagesSettings->day_before_step3 : 2;
-
             $excludeSalesPhone = Sales::find()
                 ->where(['>=', 'date', date('Y-m-d', strtotime("$startDate -$step2 days"))])
                 ->andWhere(['<=', 'date', date('Y-m-d', strtotime("$startDate -$step3 days"))])
@@ -356,8 +364,6 @@ class Users extends \yii\db\ActiveRecord
 
         $users = $query->all();
 
-        $data = [];
-
         foreach ($users as $user) {
             $userPhone = $user['phone'];