ERP-102 Приёмник для эксель файла (корректировка)

diff --git a/erp24/actions/motivation/IndexAction.php b/erp24/actions/motivation/IndexAction.php
index 9ad3fe81ab26f0232266643af7913bbc69acb4a4..c103b8e782eb1f64867f2df4096ab76785439254 100644 (file)
--- a/erp24/actions/motivation/IndexAction.php
+++ b/erp24/actions/motivation/IndexAction.php
@@ -32,7 +32,7 @@ class IndexAction extends Action
             if ($file) {
                 $adjustment = Yii::$app->request->post('adjustment');
 
-                if ($adjustment && array_key_exists(Admin::findOne(Yii::$app->user->id)->group_id, Motivation::getAdjustmentEditors())) {
+                if ($adjustment && in_array(Admin::findOne(Yii::$app->user->id)->group_id, Motivation::getAdjustmentEditors())) {
                 return implode('<br>', ['Вы не можете вносить корректировки']);
                 }
 

diff --git a/erp24/records/AdminGroup.php b/erp24/records/AdminGroup.php
index 77e37fe4a2e313dd77ddec7fbd2b4713aea10606..2c59269fd65d35cee4560fafac75917021b96eae 100755 (executable)
--- a/erp24/records/AdminGroup.php
+++ b/erp24/records/AdminGroup.php
@@ -19,6 +19,7 @@ class AdminGroup extends ActiveRecord
     const GROUP_FIRED = -1;
     const NOT_INITIALIZED_GROUP = 1000;
 
+    const DIRECTOR = 1;
     const GROUP_HR = 20;
     const GROUP_LOGIST_TRANSPORT = 15;
     const GROUP_FLORIST_DAY = 30;

diff --git a/erp24/records/Motivation.php b/erp24/records/Motivation.php
index 6002e5fb4ed9de970f1cfcc2d6aa7005758a74fc..abf1c23c750b4c5647a9d0ebeb1de9f3ceb10d4e 100644 (file)
--- a/erp24/records/Motivation.php
+++ b/erp24/records/Motivation.php
@@ -68,7 +68,8 @@ class Motivation extends \yii\db\ActiveRecord
     public static function getAdjustmentEditors() {
         return array(
             AdminGroup::GROUP_IT,
-            AdminGroup::GROUP_OPERATIONAL_DIRECTOR
+            AdminGroup::GROUP_OPERATIONAL_DIRECTOR,
+            AdminGroup::DIRECTOR
         );
     }
 }

diff --git a/erp24/views/motivation/index.php b/erp24/views/motivation/index.php
index a42c6013c5cbd252b2aa78c92eaf01f2da480e06..126b342b360f52bb735d8424710c73bff0ac0748 100644 (file)
--- a/erp24/views/motivation/index.php
+++ b/erp24/views/motivation/index.php
@@ -77,7 +77,7 @@ $this->registerJsFile('/js/motivation/index.js', ['position' => \yii\web\View::P
             </div>
             <div class="d-flex justify-content-around align-items-center gap-2">
                 <div class="mb-3"><?php
-                    if (array_key_exists(Admin::findOne(Yii::$app->user->id)->group_id, Motivation::getAdjustmentEditors())) {
+                    if (in_array(Admin::findOne(Yii::$app->user->id)->group_id, Motivation::getAdjustmentEditors())) {
                         echo Html::button('Внесение корректировок', ['class' => 'btn btn-warning btn-sm btn-adjustment',
                             'onclick' => 'openUploadDictionary("btn-adjustment");']);
                     } ?>