From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 11 Mar 2025 10:21:41 +0000 (+0300)
Subject: Правки и добавление метода обновления лимита
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a6e53a492e238a316219291dc186fb268835e14b;p=erp24_rep%2Fyii-erp24%2F.git

Правки и добавление метода обновления лимита
---

diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 3570e31a..32380847 100644
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -1237,6 +1237,61 @@ class CronController extends Controller
             "Обновление бонусных уровней завершено.\n",
             BaseConsole::FG_GREEN
         );
+        return ExitCode::OK;
+    }
+
+    public function actionCheckWhatsappLimit()
+    {
+        $messagesSettings = UsersMessageManagement::find()->one();
+        if (!$messagesSettings) {
+            $this->stdout(
+                "Рассылка неактивна (не найдена настройка). Обновление информации о канале прервано.\n",
+                BaseConsole::FG_RED
+            );
+            return ExitCode::UNAVAILABLE;
+        }
+        if (!empty($messagesSettings->channel_limit)) {
+            $this->stdout(
+                "Текущий лимит сообщений {$messagesSettings->channel_limit}.\n",
+                BaseConsole::FG_GREEN
+            );
+        }
+
+        if (!empty($messagesSettings->channel_name)) {
+            $channelData = WhatsappService::getChannelByName($messagesSettings->channel_name);
+            if (!empty($channelData)) {
+                if (isset($channelData['messagingLimit'])) {
+                    Yii::warning("Лимит {$channelData['messagingLimit']}");
+                    $messagesSettings->channel_limit = $channelData['messagingLimit'];
+                }
+            } else {
+                $this->stdout(
+                    "Не удалось получить данные по лимиту.\n",
+                    BaseConsole::FG_RED
+                );
+            }
+        } else {
+            $this->stdout(
+                "Не удалось получить имя канала из настроек.\n",
+                BaseConsole::FG_RED
+            );
+        }
+
+        if ($messagesSettings->save()) {
+            $this->stdout(
+                "Обновленный лимит сообщений {$messagesSettings->channel_limit}.\n",
+                BaseConsole::FG_GREEN
+            );
+        } else {
+            $this->stdout(
+                "Не удалось обновить настройки.\n" . json_encode($messagesSettings->getErrors(), JSON_UNESCAPED_UNICODE),
+                BaseConsole::FG_RED
+            );
+        }
+
+
+
+
         return ExitCode::OK;
     }
 
diff --git a/erp24/views/users-message-management/index.php b/erp24/views/users-message-management/index.php
index 8c53a387..c9785d29 100644
--- a/erp24/views/users-message-management/index.php
+++ b/erp24/views/users-message-management/index.php
@@ -279,14 +279,14 @@ $this->registerCss('
                             </div>
                             <div id="whatsAppSettings" class="collapse">
                                 <div class="card-body">
-                                    <?= $form->field($model, 'channel_name')->textInput()->label('Имя канала') ?>
+                                    <?= $form->field($model, 'channel_name')->textInput(['required' => true])->label('Имя канала <span class="text-danger">*</span>') ?>
                                     <?= $form->field($model, 'channel_id')->textInput()->label('Идентификатор канала - подпись') ?>
-                                    <?= $form->field($model, 'channel_limit')->textInput(['type' => 'number'])->label('Суточный лимит сообщений') ?>
-                                    <?= $form->field($model, 'cascade_name')->textInput()->label('Имя каскада') ?>
-                                    <?= $form->field($model, 'cascade_id')->textInput(['type' => 'number'])->label('ID каскада') ?>
-                                    <?= $form->field($model, 'subject_id')->textInput(['type' => 'number'])->label('Идентификатор подписи') ?>
-                                    <?= $form->field($model, 'template_name')->textInput()->label('Имя шаблона') ?>
-                                    <?= $form->field($model, 'template_id')->textInput(['type' => 'number'])->label('Идентификатор шаблона') ?>
+                                    <?= $form->field($model, 'channel_limit')->textInput(['type' => 'number', 'readonly' => true])->label('Суточный лимит сообщений') ?>
+                                    <?= $form->field($model, 'cascade_name')->textInput(['required' => true])->label('Имя каскада <span class="text-danger">*</span>') ?>
+                                    <?= $form->field($model, 'cascade_id')->textInput(['type' => 'number', 'readonly' => true])->label('ID каскада') ?>
+                                    <?= $form->field($model, 'subject_id')->textInput(['type' => 'number', 'readonly' => true])->label('Идентификатор подписи') ?>
+                                    <?= $form->field($model, 'template_name')->textInput(['required' => true])->label('Имя шаблона <span class="text-danger">*</span>') ?>
+                                    <?= $form->field($model, 'template_id')->textInput(['type' => 'number', 'readonly' => true])->label('Идентификатор шаблона') ?>
                                     <?= $form->field($model, 'callback_status_url')->textInput()->label('URL приема колбеков статусов сообщений') ?>
                                 </div>
                             </div>
diff --git a/erp24/views/users-message-management/logs.php b/erp24/views/users-message-management/logs.php
index 4a365f3a..950d9186 100644
--- a/erp24/views/users-message-management/logs.php
+++ b/erp24/views/users-message-management/logs.php
@@ -77,6 +77,11 @@ use dosamigos\datetimepicker\DateTimePicker;
 
     <?php ActiveForm::end() ?>
 
+    <p>
+        <?= Html::a('Сообщения Telegram', ['/users-telegram-message/index'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Сообщения Whatsapp', ['/users-whatsapp-message/index'], ['class' => 'btn btn-success']) ?>
+    </p>
+
     <div class="row">
         <div class="col-12">
             <?= GridView::widget([
diff --git a/erp24/views/users-whatsapp-message/index.php b/erp24/views/users-whatsapp-message/index.php
index 16559c1c..67eafd11 100644
--- a/erp24/views/users-whatsapp-message/index.php
+++ b/erp24/views/users-whatsapp-message/index.php
@@ -38,7 +38,8 @@ $this->params['breadcrumbs'][] = $this->title;
             'status',
             'created_at',
             [
-                'class' => ActionColumn::className(),
+                'class' => ActionColumn::class,
+                'template' => '{view}',
                 'urlCreator' => function ($action, UsersWhatsappMessage $model, $key, $index, $column) {
                     return Url::toRoute([$action, 'id' => $model->id]);
                  }
diff --git a/erp24/views/users-whatsapp-message/view.php b/erp24/views/users-whatsapp-message/view.php
index 485b42b4..a98152d9 100644
--- a/erp24/views/users-whatsapp-message/view.php
+++ b/erp24/views/users-whatsapp-message/view.php
@@ -11,21 +11,10 @@ $this->params['breadcrumbs'][] = ['label' => 'Users Whatsapp Messages', 'url' =>
 $this->params['breadcrumbs'][] = $this->title;
 \yii\web\YiiAsset::register($this);
 ?>
-<div class="users-whatsapp-message-view">
-
+<div class="users-whatsapp-message-view p-4">
+    <?= Html::a('Назад', ['index'], ['class' => 'btn btn-primary m-5']) ?>
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a('Update', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a('Delete', ['delete', 'id' => $model->id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => 'Are you sure you want to delete this item?',
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
-
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [