From 25a2fc8e96400b94e0fe60c70cab025d184efda4 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 15 Dec 2025 10:57:42 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?utf8?q?=D0=B5=20=D0=9F=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=B5=D0=B9=20?=
 =?utf8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Admin.php                      | 2 +-
 erp24/views/crud/employee-payment/index.php  | 2 +-
 erp24/views/crud/employee-position/_form.php | 4 ++--
 erp24/views/crud/employee-position/index.php | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/erp24/records/Admin.php b/erp24/records/Admin.php
index 513cf91d..856eca3b 100755
--- a/erp24/records/Admin.php
+++ b/erp24/records/Admin.php
@@ -842,7 +842,7 @@ class Admin extends ActiveRecord implements IdentityInterface
                 // Не бросаем исключение, чтобы не прервать сохранение Admin
             }
         }
-
+        //TODO: разобраться с синхронизацией окладов по должностям
         if ($newPositionId && ($oldPositionId != $newPositionId || $insert) && $this->group_id != AdminGroup::GROUP_FIRED) {
             try {
                 $syncService = new SalarySyncService();
diff --git a/erp24/views/crud/employee-payment/index.php b/erp24/views/crud/employee-payment/index.php
index a619e2cc..9e0e3420 100755
--- a/erp24/views/crud/employee-payment/index.php
+++ b/erp24/views/crud/employee-payment/index.php
@@ -68,7 +68,7 @@ $this->params['breadcrumbs'][] = $this->title;
             ],
             [
                 'attribute' => 'employee_position_id',
-                'label' => 'Должность (из справочника)',
+                'label' => 'Грейд (из справочника)',
                 'value' => function($model) {
                     return $model->employeePosition ? $model->employeePosition->name : null;
                 }
diff --git a/erp24/views/crud/employee-position/_form.php b/erp24/views/crud/employee-position/_form.php
index 84750f3f..eb5a0a90 100755
--- a/erp24/views/crud/employee-position/_form.php
+++ b/erp24/views/crud/employee-position/_form.php
@@ -24,9 +24,9 @@ function printBlock($title, $block) {
     <?php printBlock('Название', $form->field($model, 'name')->textInput(['maxlength' => true])->label(false)) ?>
 
     <?php printBlock('Алиас', $form->field($model, 'alias')->textInput(['maxlength' => true])->label(false)) ?>
-
+    <p class="text-danger font-weight-bold mt-2">ИЗМЕНЯЯ ОКЛАД ВЫ ИЗМЕНИТЕ ОКЛАДЫ ВСЕХ СОТРУДНИКОВ С ЭТИМ ГРЕЙДОМ! <br> С ПЕРВОГО ЧИСЛА СЛЕДУЮЩЕГО МЕСЯЦА</p>
     <?php printBlock('Месячный оклад', $form->field($model, 'monthly_salary')->textInput(['type' => 'number', 'step' => '0.01'])->label(false)) ?>
-
+    <p class="text-danger font-weight-bold mt-2">ИЗМЕНЯЯ ПОДНЕВНУЮ ОПЛАТУ ВЫ ИЗМЕНИТЕ ОПЛАТУ В ДЕНЬ ВСЕХ СОТРУДНИКОВ С ЭТИМ ГРЕЙДОМ! <br> С ПЕРВОГО ЧИСЛА СЛЕДУЮЩЕГО МЕСЯЦА</p>
     <?php printBlock('Подневная оплата', $form->field($model, 'daily_payment')->textInput(['type' => 'number', 'step' => '0.01'])->label(false)) ?>
 
     <?php printBlock('Группа', $form->field($model, 'group_id')->dropDownList(\yii_app\records\AdminGroup::getAllIdName(), ['prompt' => 'Выберите группу'])->label(false)) ?>
diff --git a/erp24/views/crud/employee-position/index.php b/erp24/views/crud/employee-position/index.php
index f36f59c0..b3323592 100755
--- a/erp24/views/crud/employee-position/index.php
+++ b/erp24/views/crud/employee-position/index.php
@@ -10,7 +10,7 @@ use yii\grid\GridView;
 /** @var yii_app\records\EmployeePositionSearch $searchModel */
 /** @var yii\data\ActiveDataProvider $dataProvider */
 
-$this->title = 'Позиции работников';
+$this->title = 'Грейды сотрудников';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="employee-position-index p-4">
@@ -18,7 +18,7 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>
-        <?= Html::a('Создать позицию работника', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Создать грейд', ['create'], ['class' => 'btn btn-success']) ?>
         <?= Html::a('Синхронизировать оклады', ['sync-salaries'], [
             'class' => 'btn btn-primary',
             'data' => [
@@ -38,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
             'id',
             [
-                'label' => 'Название',
+                'label' => 'Название грейда',
                 'format' => 'html',
                 'value' => function ($model) {
                     return Html::a($model->name, ['/crud/employee-position/update', 'id' => $model->id], ['class' => 'btn btn-link']);
@@ -55,7 +55,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 }
             ],
             [
-                'class' => ActionColumn::className(),
+                'class' => ActionColumn::class,
                 'urlCreator' => function ($action, EmployeePosition $model, $key, $index, $column) {
                     return Url::toRoute([$action, 'id' => $model->id]);
                 }
-- 
2.39.5