From 175d9188799013d43508d0a184fef46345d884a8 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 14 Mar 2025 11:20:01 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?utf8?q?=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE?=
 =?utf8?q?=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/commands/CronController.php     | 3 +--
 erp24/jobs/SendWhatsappMessageJob.php | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 0c6ecac6..2721cf00 100644
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -773,7 +773,6 @@ class CronController extends Controller
                 if ($index >= $limit) {
                     break;
                 }
-                $isTest = ($test && !in_array($phone, $testPhones));
                 $messageData = [];
                 $messageData['phone'] = $phone;
                 $messageData['kogort_date'] = $kogortDate;
@@ -783,7 +782,7 @@ class CronController extends Controller
 
                 Yii::$app->queue->push(new SendWhatsappMessageJob([
                     'messageData' => $messageData,
-                    'isTest' => $isTest
+                    'isTest' => $test
                 ]));
                 $phonesSentArray[] = $phone;
             }
diff --git a/erp24/jobs/SendWhatsappMessageJob.php b/erp24/jobs/SendWhatsappMessageJob.php
index b51f1f50..39ab5cae 100644
--- a/erp24/jobs/SendWhatsappMessageJob.php
+++ b/erp24/jobs/SendWhatsappMessageJob.php
@@ -56,13 +56,15 @@ class SendWhatsappMessageJob extends BaseObject implements JobInterface
         $requestId = DataHelper::uuid();
         $whatsappService = new WhatsAppService($apiKey, $cascadeId);
         $response = null;
-        $status = 'sent';
+        $status = '';
         try {
             if (!$this->isTest) {
                // $message   = "Здравствуйте\nУзнать подробности вы можете на нашем сайте https://bazacvetov24.ru.";
                 $response = $whatsappService->sendMessage($requestId, $phone, $message, $isTest);
                 if (!$response instanceof WhatsAppMessageResponse) {
                     $status = $response ?? 'error';
+                } else {
+                    $status = 'sent';
                 }
             } else {
                 $status = 'SENT TO DB';
-- 
2.39.5