Изменения тестового режима

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 0c6ecac6d15d7707b0ad45dbc8dab4ccb40279f1..2721cf009ac75cefe94de5a3a21c89b7b53df0d9 100644 (file)
--- 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 b51f1f5011da53c62abc4a49f34647b786bc92b4..39ab5cae13911ef42d776444853b68746ad56703 100644 (file)
--- 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';