Правки по датам

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 493aadf518973bc0a9950462ef35f4855e5ffd12..86b392c14014a2c59e0690ca13961d0b2184568e 100644 (file)
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -397,7 +397,7 @@ class CronController extends Controller
                         $messageData['type'] = 1;
                         $messageData['message'] = $messagesSettings->replaceShortcodes(
                             $messagesSettings->offer_1,
-                            $kogortDate
+                            $targetDate
                         );
 
                         Yii::$app->queue->push(new SendTelegramMessageDBJob([
@@ -607,7 +607,7 @@ class CronController extends Controller
         $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4;
         $currentDate = date('Y-m-d');
         $targetDate = date('Y-m-d', strtotime("+$step2 days", strtotime($currentDate)));
-        $kogortDate = date('Y-m-d', strtotime("-$step1 days", strtotime($currentDate)));
+        $kogortDate = date('Y-m-d', strtotime("-$step1 days", strtotime($targetDate)));
 
         $kogortPhones = SentKogort::find()
             ->select('phone')
@@ -653,7 +653,7 @@ class CronController extends Controller
                         $messageData['target_date'] = $targetDate;
                         $messageData['type'] = 2;
                         $messageData['message'] = $messagesSettings
-                            ->replaceShortcodes($messagesSettings->offer_2, $kogortDate);
+                            ->replaceShortcodes($messagesSettings->offer_2, $targetDate);
 
                         Yii::$app->queue->push(new SendTelegramMessageDBJob([
                             'messageData' => $messageData,

diff --git a/erp24/records/UsersMessageManagement.php b/erp24/records/UsersMessageManagement.php
index 16968530f99dd8d19ac70820893f645130de646c..d17f782b0354235887be409f983c7a61df6ea83c 100644 (file)
--- a/erp24/records/UsersMessageManagement.php
+++ b/erp24/records/UsersMessageManagement.php
@@ -41,7 +41,7 @@ class UsersMessageManagement extends \yii\db\ActiveRecord
     const TYPE_CALL = 'call';
 
     const TYPE_MESSAGE = [
-        'target' => 'offer_text',
+        'target' => 'offer_1',
         'whatsapp' => 'offer_whatsapp',
         'call' => 'offer_text',
         ];
@@ -122,10 +122,12 @@ class UsersMessageManagement extends \yii\db\ActiveRecord
         return $this->test_phones_list ?? '';
     }
 
-    public function replaceShortcodes($message, $kogortDate)
+    public function replaceShortcodes($message, $targetDate)
     {
         $bonusActivity = $this->getBonusAction();
-        $validDate = date('d.m.Y', strtotime("+$bonusActivity days", strtotime($kogortDate)));
+        $step1 = $this->day_before_step1;
+        $startDate = date('d.m.Y', strtotime("-$step1 days", strtotime($targetDate)));
+        $validDate = date('d.m.Y', strtotime("+$bonusActivity days", strtotime($startDate)));
         $message = str_replace('[NumberOfBonuses]', $this->bonus, $message);
         return str_replace('[ValidityOfBonuses]', $validDate, $message);
     }