Добавление таргетной даты в представление

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index d776f7174b5b83e34ef001e4e6138ac39f9bed0c..fda7cf377d3d57596a7cae3411279165fb12c3db 100644 (file)
--- 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 55766abb6958a771fca2c83cae32143434bf6004..85dc45821de53a8080cf6756e9ce728b65bd926f 100644 (file)
--- 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">