From a687561eb727f42128f290f2db5207eb89d67f03 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 20 Jan 2025 18:01:59 +0300
Subject: [PATCH] =?utf8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?=
 =?utf8?q?=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20=D1=82?=
 =?utf8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BF=D0=BE=20=D0=BD=D0=BE?=
 =?utf8?q?=D0=BC=D0=B5=D1=80=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Users.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

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'
-- 
2.39.5