From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 21 Jan 2025 12:32:11 +0000 (+0300)
Subject: Добавил срок действия бонусов и исправления
X-Git-Tag: 1.7~55^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=80bf514ede4cd26241eaa1f36bc07f5798543736;p=erp24_rep%2Fyii-erp24%2F.git

Добавил срок действия бонусов и исправления
---

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,