From 1e25813326a71d2111fa99cd66ca5648c3fc7f3c Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 9 Jan 2025 12:43:00 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D1=82=D0=B0=D1=80=D0=B3=D0=B5=D1=82=D0=BD=D0=BE?=
 =?utf8?q?=D0=B9=20=D0=B4=D0=B0=D1=82=D1=8B=20=D0=B2=20=D0=BF=D1=80=D0=B5?=
 =?utf8?q?=D0=B4=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/UsersMessageManagementController.php | 8 ++++++--
 erp24/views/users-message-management/view-kogort.php   | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index d776f717..fda7cf37 100644
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -276,13 +276,16 @@ class UsersMessageManagementController extends Controller
             ->where(['kogort_date' => $date, 'kogort_number' => SentKogort::KOGORT_NUMBERS[$type]])
             ->select(['phone'])
             ->column();
-        //$targetDate
+        $targetDate = SentKogort::find()
+            ->where(['kogort_date' => $date, 'kogort_number' => SentKogort::KOGORT_NUMBERS[$type]])
+            ->select(['target_date'])
+            ->one();
 
         $data = Users::prepareDataForExport($dataKogort, $date, $type);
 
         $messagesSettings = UsersMessageManagement::find()->one();
         $message = '';
-        if($messagesSettings && $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]}) {
+        if ($messagesSettings && $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]}) {
             $message = $messagesSettings->replaceShortcodes(
                 $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]}
             );
@@ -299,6 +302,7 @@ class UsersMessageManagementController extends Controller
         return $this->render('view-kogort', [
             'dataProvider' => $dataProvider,
             'date' => $date,
+            'targetDate' => $targetDate,
             'type' => $type,
             'message' => $message,
         ]);
diff --git a/erp24/views/users-message-management/view-kogort.php b/erp24/views/users-message-management/view-kogort.php
index 55766abb..85dc4582 100644
--- a/erp24/views/users-message-management/view-kogort.php
+++ b/erp24/views/users-message-management/view-kogort.php
@@ -7,6 +7,7 @@ use yii\helpers\Html;
 
 /** @var yii\data\ActiveDataProvider $dataProvider */
 /** @var string $date */
+/** @var string $targetDate */
 /** @var string $type */
 /** @var string $message */
 
@@ -37,7 +38,7 @@ if ($message == '') {
 
 
     <h1><?= Html::encode($this->title) ?>: <?= \yii_app\records\Users::KOGORT_TYPES[$type] ?>
-        на <span style="color:red"><?= date('d-m-Y', strtotime($date)) ?></span></h1>
+        на <span style="color:red"><?= date('d-m-Y', strtotime($date)) ?>  </span> для целевой даты <?= date('d-m-Y', strtotime($targetDate["target_date"])); ?></h1>
 
 <?php if ($type != 'call') { ?>
     <div class="row mb-6">
-- 
2.39.5