Исправлено сообщение

diff --git a/erp24/controllers/AdminPersonBonusesController.php b/erp24/controllers/AdminPersonBonusesController.php
index 78bfa41d4b1c9a089712e7cf5af41089ef5addb3..be94745e98eee00b837c3a7ca3034a86efb01866 100755 (executable)
--- a/erp24/controllers/AdminPersonBonusesController.php
+++ b/erp24/controllers/AdminPersonBonusesController.php
@@ -2,6 +2,7 @@
 
 namespace app\controllers;
 
+use yii\helpers\Url;
 use yii_app\records\AdminPayroll;
 use yii_app\records\AdminPayrollValues;
 use yii_app\records\AdminPayrollValuesDict;
@@ -81,8 +82,11 @@ class AdminPersonBonusesController extends Controller
                 if ($validate) {
                     $oldModel = AdminPersonBonuses::findOne(['admin_id' => $model->admin_id, 'date' => $model->date]);
                     if ($oldModel) {
-                        \Yii::$app->session->setFlash('error', "Данные по сотруднику на данну дату уже заполнены");
-                        return $this->redirect(['/admin-person-bonuses/view', 'id' => $oldModel->id]);
+                        \Yii::$app->session->setFlash('error',
+                            "Данные по сотруднику на выбранный месяц уже внесены.<br>Страница с внесёнными данными находится по адресу: <a class='btn btn-link' href='/admin-person-bonuses/view?id=" . $oldModel->id . "'>" . Url::base(true) . "/admin-person-bonuses/view?id=" . $oldModel->id . "</a>");
+                        return $this->render('/admin_person_bonuses/create', [
+                            'model' => $model,
+                        ]);
                     }
                     $model->save();
                     return $this->redirect(['/admin-person-bonuses/view', 'id' => $model->id]);

diff --git a/erp24/views/admin_person_bonuses/create.php b/erp24/views/admin_person_bonuses/create.php
index 215d20e6f8f211ba1bf061dcceb595ebecbbf810..449d06e307c27fadc908ddb0aaf950e99d60fada 100755 (executable)
--- a/erp24/views/admin_person_bonuses/create.php
+++ b/erp24/views/admin_person_bonuses/create.php
@@ -11,6 +11,12 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="admin-person-bonuses-create m-5">
 
+    <?php if (Yii::$app->session->hasFlash('error')) { ?>
+        <div class="alert alert-danger" role="alert">
+            <?= Yii::$app->session->getFlash('error') ?>
+        </div>
+    <?php } ?>
+
     <h1><?= Html::encode($this->title) ?></h1>
 
     <?= $this->render('_form', [

diff --git a/erp24/views/admin_person_bonuses/view.php b/erp24/views/admin_person_bonuses/view.php
index 787190902791a073ec098675b6f25f49e1431e9d..54f16711519bc7b1f4add5d2befe036f4ad2f81b 100755 (executable)
--- a/erp24/views/admin_person_bonuses/view.php
+++ b/erp24/views/admin_person_bonuses/view.php
@@ -13,12 +13,6 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="admin-person-bonuses-view m-5">
 
-    <?php if (Yii::$app->session->hasFlash('error')) { ?>
-        <div class="alert alert-danger" role="alert">
-            <?= Yii::$app->session->getFlash('error') ?>
-        </div>
-    <?php } ?>
-
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>