From 4c8c9e4f8418d676d78fcf64f8e1c0cd3e501bd1 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 12 Dec 2024 13:26:14 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?utf8?q?=20=D0=B4=D0=B0=D1=82=D1=83=20=D0=B8=20=D1=82=D0=B0=D0=B1=D0=BB?=
 =?utf8?q?=D0=B8=D1=86=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Users.php                       | 12 ++---
 .../users-message-management/view-kogort.php  | 45 +++++++++++++++++++
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index d8572a7c..d1eaf6eb 100755
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -294,18 +294,18 @@ class Users extends \yii\db\ActiveRecord
     {
 
         $startDate = $startDate ?? date('Y-m-d');
-        $endDate = $endDate ?? date('Y-m-d', strtotime($startDate . ' +7 days'));
-
+       // $endDate = $endDate ?? date('Y-m-d', strtotime($startDate . ' +7 days'));
+        $dateThreeYearsAgo = date('Y-m-d', strtotime("$startDate -3 years"));
         $salesPhone = Sales::find()
-            ->where(['>=', 'date', "$startDate 00:00:00"])
-            ->andWhere(['<=', 'date', "$endDate 23:59:59"])
+            ->where(['>=', 'date', "$dateThreeYearsAgo 00:00:00"])
+            ->andWhere(['<=', 'date', "$dateThreeYearsAgo 23:59:59"])
             ->distinct('phone')
             ->select('phone')
             ->column();
 
         $memorableDate = UsersEvents::find()
-            ->where(['>=', 'date', "$startDate 00:00:00"])
-            ->andWhere(['<=', 'date', "$endDate 23:59:59"])
+            ->where(['>=', 'date', "$dateThreeYearsAgo 00:00:00"])
+            ->andWhere(['<=', 'date', "$dateThreeYearsAgo 23:59:59"])
             ->distinct('phone')
             ->select('phone')
             ->column();
diff --git a/erp24/views/users-message-management/view-kogort.php b/erp24/views/users-message-management/view-kogort.php
index e07d333f..dc1586f5 100644
--- a/erp24/views/users-message-management/view-kogort.php
+++ b/erp24/views/users-message-management/view-kogort.php
@@ -20,6 +20,51 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            [
+                'attribute' => 'id',
+                'label' => 'ID',
+            ],
+            [
+                'attribute' => 'phone',
+                'label' => 'Телефон',
+            ],
+            [
+                'attribute' => 'phone',
+                'label' => 'Телефон',
+            ],
+            [
+                'attribute' => 'name',
+                'label' => 'ФИО',
+            ],
+            [
+                'attribute' => 'date',
+                'label' => 'Дата',
+            ],
+            [
+                'attribute' => 'name_name',
+                'label' => 'Имя',
+            ],
+            [
+                'attribute' => 'name_last',
+                'label' => 'Отчество',
+            ],
+            [
+                'attribute' => 'name_family',
+                'label' => 'Фамилия',
+            ],
+            [
+                'attribute' => 'pol',
+                'label' => 'Пол',
+                'value' => function ($model) {
+                    return $model->pol === 'male' ? "Муж" : "Жен";
+                },
+            ],
+
+
+            ],
     ]); ?>
 
 </div>
-- 
2.39.5