From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 20 Jan 2025 15:01:59 +0000 (+0300)
Subject: Тестовая рассылка только по номерам
X-Git-Tag: 1.7~64^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a687561eb727f42128f290f2db5207eb89d67f03;p=erp24_rep%2Fyii-erp24%2F.git

Тестовая рассылка только по номерам
---

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index 4bacc121..27ff205c 100755
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -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'