From 6a3125146faed9770ab5d1e2af94ba58acc46a90 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 10 Jan 2025 18:31:31 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?utf8?q?=D0=BD=D0=BE=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?=
 =?utf8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/AdminPersonBonusesController.php | 8 ++++++--
 erp24/views/admin_person_bonuses/create.php        | 6 ++++++
 erp24/views/admin_person_bonuses/view.php          | 6 ------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/erp24/controllers/AdminPersonBonusesController.php b/erp24/controllers/AdminPersonBonusesController.php
index 78bfa41d..be94745e 100755
--- 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 215d20e6..449d06e3 100755
--- 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 78719090..54f16711 100755
--- 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>
-- 
2.39.5