[ERP-250] users message management ui 2

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index 56af494481444f8633a7350ef6b0bf0bc04431e8..3ace8ac5efcaa4a001754efbe2aea3ac665ef4b4 100644 (file)
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -29,6 +29,10 @@ class UsersMessageManagementController extends Controller
             $model->updated_by = Yii::$app->user->id;
             if ($model->validate()) {
                 $model->save();
+            } else {
+                if (!empty(array_intersect_key($model->getErrors(), ['offer_1' => 1, 'offer_2' => 2, 'offer_whatsapp' => 3, 'offer_text' => 4]))) {
+                    Yii::$app->session->setFlash('error', "Перейдите на табу Сообщения рассылки, чтобы заполнить пустые поля");
+                }
             }
         }
 

diff --git a/erp24/views/users-message-management/index.php b/erp24/views/users-message-management/index.php
index 1d543874865abed999a5152409fa287b765ae93f..3489ffb3010b13506b6b9d60b5d112ea734bb81f 100644 (file)
--- a/erp24/views/users-message-management/index.php
+++ b/erp24/views/users-message-management/index.php
@@ -11,13 +11,29 @@ use yii_app\records\UsersMessageManagement;
 
 $this->registerJsFile('/js/users-message-management/index.js', ['position' => \yii\web\View::POS_END]);
 
+$this->registerCss('
+.nav-link.active {
+    border-bottom: 2px solid purple;
+}
+');
+
 ?>
 
 <div class="usersMessageManagementIndex m-5">
 
+    <?php if (Yii::$app->session->hasFlash('error')): ?>
+        <div class="alert alert-danger alert-dismissable">
+            <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>
+            <h4><i class="icon fa fa-check"></i>Не получилось сохранить настройки!</h4>
+            <?= Yii::$app->session->getFlash('error') ?>
+        </div>
+    <?php endif; ?>
+
     <h1>Настройка управления рассылками клиентам</h1>
 
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'enableClientValidation' => false,
+    ]); ?>
 
     <ul class="nav1 br-7 border">
         <li class="nav-item1">
@@ -27,7 +43,7 @@ $this->registerJsFile('/js/users-message-management/index.js', ['position' => \y
             <a class="nav-link text-primary" id="messageTabAnchor" href="javascript:showTab('messageTab');">Сообщения рассылки</a>
         </li>
         <li class="nav-item1">
-            <a class="nav-link text-primary" id="messageTabAnchor" href="javascript:showTab('unloadingTab');">Выгрузки</a>
+            <a class="nav-link text-primary" id="unloadingTabAnchor" href="javascript:showTab('unloadingTab');">Выгрузки</a>
         </li>
     </ul>
 
@@ -171,9 +187,11 @@ $this->registerJsFile('/js/users-message-management/index.js', ['position' => \y
 
 
 
-
-    <div class="form-group">
-        <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
+    <div class="row">
+        <div class="col-10"></div>
+        <div class="col-2 form-group">
+            <?= Html::submitButton('Сохранить настройки', ['class' => 'btn btn-primary']) ?>
+        </div>
     </div>
 
     <?php ActiveForm::end(); ?>