From 80bf514ede4cd26241eaa1f36bc07f5798543736 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 21 Jan 2025 15:32:11 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?utf8?q?=D1=81=D1=80=D0=BE=D0=BA=20=D0=B4=D0=B5=D0=B9=D1=81=D1=82=D0=B2?=
 =?utf8?q?=D0=B8=D1=8F=20=D0=B1=D0=BE=D0=BD=D1=83=D1=81=D0=BE=D0=B2=20?=
 =?utf8?q?=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/commands/CronController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 151a73c9..da5f04e8 100644
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -301,7 +301,7 @@ class CronController extends Controller
                         $messageData['kogort_date'] = $kogortDate;
                         $messageData['target_date'] = $targetDate;
                         $messageData['type'] = 1;
-                        $messageData['message'] = $messagesSettings->replaceShortcodes($messagesSettings->offer_1);
+                        $messageData['message'] = $messagesSettings->replaceShortcodes($messagesSettings->offer_1, $kogortDate);
 
                         Yii::$app->queue->push(new SendTelegramMessageDBJob([
                             'messageData' =>  $messageData,
@@ -335,7 +335,7 @@ class CronController extends Controller
 
             //Начисляем бонусы
             $tip = "plus";
-            $bonus = 200;
+            $bonus = $messagesSettings ? $messagesSettings->bonus : 0;
             $ip = "tst";
             $tip_sale = "target";
             $name = "Начисление бонусов на дату {$kogortDate}";
@@ -495,7 +495,7 @@ class CronController extends Controller
                                 $messageData['target_date'] = $targetDate;
                                 $messageData['type'] = 2;
                                 $messageData['message'] = $messagesSettings
-                                    ->replaceShortcodes($messagesSettings->offer_2);
+                                    ->replaceShortcodes($messagesSettings->offer_2, $kogortDate);
 
                                 Yii::$app->queue->push(new SendTelegramMessageDBJob([
                                     'messageData' =>  $messageData,
-- 
2.39.5