From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 13 Dec 2024 09:14:04 +0000 (+0300)
Subject: merge
X-Git-Tag: 1.7~161^2~7
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=bff3996b0f8c4ef09671420be1f3c6bd5a0f40a3;p=erp24_rep%2Fyii-erp24%2F.git

merge
---

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index f27fa83f..0118c611 100644
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -8,6 +8,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use Yii;
 use yii\base\DynamicModel;
 use yii\data\ActiveDataProvider;
+use yii\data\ArrayDataProvider;
 use yii\db\Exception;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
@@ -112,14 +113,14 @@ class UsersMessageManagementController extends Controller
             }
         }
 
-        return $this->render('index', compact('model', 'tab'));
-    }
+
 
         return $this->render('index', [
             'model' => $model,
             'links' => $dates,
             'month' => $month,
             'year' => $year,
+             'tab' => $tab,
 
         ]);
     }
@@ -333,8 +334,9 @@ class UsersMessageManagementController extends Controller
             'date' => $date,
             'type' => $type,
         ]);
-    public function actionLogs() {
-
+    }
+    public function actionLogs()
+    {
         $model = DynamicModel::validateData([
             'date_from' => date('Y-m-d H:i:s', strtotime('-1 week', time())),
             'date_to' => date('Y-m-d 23:59:59'),