Правки по формированию и сообщениям

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index d08be7ecbe041590cc830b0daec2688cb127a5f7..e1355a586aaa4cbf92ef87f4a9b0ced192d92f24 100644 (file)
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -284,9 +284,12 @@ class UsersMessageManagementController extends Controller
         $messagesSettings = UsersMessageManagement::find()
             ->where(['active' => 1])
             ->one();
-        $message = $messagesSettings->replaceShortcodes(
-            $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]} ?? ''
-        );
+        if($messagesSettings && $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]}) {
+            $message = $messagesSettings->replaceShortcodes(
+                $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]}
+            );
+        }
+
 
         $dataProvider = new ArrayDataProvider([
             'allModels' => $data,
@@ -299,7 +302,7 @@ class UsersMessageManagementController extends Controller
             'dataProvider' => $dataProvider,
             'date' => $date,
             'type' => $type,
-            'message' => $message,
+            'message' => $message ?? '',
         ]);
     }
 

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index 0f33263cf40dc7ab4777d8644698852bdddeb526..9f7ccc8140833b106148fb0e2839faf288c1770c 100755 (executable)
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -433,34 +433,21 @@ class Users extends \yii\db\ActiveRecord
     public static function formKogortByDateAndType($startDate = null, $type = 'target'): array
     {
         $startDate = $startDate ?? date('Y-m-d');
+        $existingTargetKogort = SentKogort::find()
+            ->select('phone')
+            ->where([
+                'kogort_date' => $startDate,
+                'kogort_number' => SentKogort::KOGORT_NUMBERS['target']
+            ])
+            ->column();
 
 
-        if ($type === 'whatsapp') {
-            $existingTargetKogort = SentKogort::find()
-                ->select('phone')
-                ->where([
-                    'kogort_date' => $startDate,
-                    'kogort_number' => SentKogort::KOGORT_NUMBERS['target']
-                ])
-                ->column();
-
-            if (!empty($existingTargetKogort)) {
+        if ($type === 'whatsapp' && !empty($existingTargetKogort)) {
                 return self::processWhatsappKogort($existingTargetKogort, $startDate);
-            }
         }
 
-        if ($type === 'call') {
-            $existingWhatsappKogort = SentKogort::find()
-                ->select('phone')
-                ->where([
-                    'kogort_date' => $startDate,
-                    'kogort_number' => SentKogort::KOGORT_NUMBERS['whatsapp']
-                ])
-                ->column();
-
-            if (!empty($existingWhatsappKogort)) {
-                return self::processCallKogort($existingWhatsappKogort, $startDate);
-            }
+        if ($type === 'call' && !empty($existingTargetKogort)) {
+                return self::processCallKogort($existingTargetKogort, $startDate);
         }
 
         $monthDay = date('m-d', strtotime($startDate));
@@ -506,7 +493,7 @@ class Users extends \yii\db\ActiveRecord
 
         return $type === 'whatsapp'
             ? self::processWhatsappKogort($kogortData, $startDate)
-            : self::processCallKogort(self::processWhatsappKogort($kogortData, $startDate), $startDate);
+            : self::processCallKogort($kogortData, $startDate);
     }
 
     /**