]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Тестовая рассылка только по номерам
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 20 Jan 2025 15:01:59 +0000 (18:01 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 20 Jan 2025 15:01:59 +0000 (18:01 +0300)
erp24/records/Users.php

index 4bacc1215b055c810bd5fb6598af9e6ca78916a1..27ff205cb517824dde3eb3ba75b5fbaa889e2677 100755 (executable)
@@ -487,16 +487,24 @@ class Users extends \yii\db\ActiveRecord
         $filteredUsers = array_diff($usersArray, $phonesSent);
         $kogortData = array_values($filteredUsers);
 
-        if (isset($messagesSettings->test_phones_active) &&
-            $messagesSettings->test_phones_active == 0 &&
-            !empty($messagesSettings->test_phones_list))
-        {
-            $testPhones = array_map('trim', explode(',', $messagesSettings->test_phones_list));
-            $kogortData = array_merge($kogortData, $testPhones);
+        $targetKogortData = $kogortData;
+
+        if (!empty($messagesSettings->test_phones_list)) {
+            if (
+                isset($messagesSettings->test_phones_active)
+                &&
+                $messagesSettings->test_phones_active == 0
+            ) {
+                $testPhones = array_map('trim', explode(',', $messagesSettings->test_phones_list));
+                $targetKogortData = array_merge($targetKogortData, $testPhones);
+            } else {
+                $testPhones = array_map('trim', explode(',', $messagesSettings->test_phones_list));
+                $targetKogortData = $testPhones;
+            }
         }
 
         if ($type === 'target') {
-            return $kogortData;
+            return $targetKogortData;
         }
 
         return $type === 'whatsapp'