From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 12 Dec 2024 10:26:14 +0000 (+0300)
Subject: Исправил дату и таблицу
X-Git-Tag: 1.7~161^2~15
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=4c8c9e4f8418d676d78fcf64f8e1c0cd3e501bd1;p=erp24_rep%2Fyii-erp24%2F.git

Исправил дату и таблицу
---

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>