ERP-426 Расширение тестовой группы магазинов при редактировании списания

diff --git a/erp24/controllers/WriteOffsErpController.php b/erp24/controllers/WriteOffsErpController.php
index 0ed86110b6b1525c040f417dc43b815cb1938b62..c2d03a2b1d3f5c2fbf9c0fa38a7533be4598e2e1 100644 (file)
--- a/erp24/controllers/WriteOffsErpController.php
+++ b/erp24/controllers/WriteOffsErpController.php
@@ -933,7 +933,7 @@ class WriteOffsErpController extends Controller
                 ->one();
 
 
-            if (in_array($model->store_id, [1, 9, 28, 30, 15, 44, 8]) && !in_array(Yii::$app->user->id, [785, 1463, 225, 1070, 826, 1036])) {
+            if (WriteOffsErp::isManager($model->store_id)) {
                 return 'У вас нет прав для согласования списаний!';
             }
 

diff --git a/erp24/records/WriteOffsErp.php b/erp24/records/WriteOffsErp.php
index c092f5df02b20aec5d3eac4c074bc80ce42b96e1..c6c1eee450e3a55573d14c730ce9fcea3e15dc91 100644 (file)
--- a/erp24/records/WriteOffsErp.php
+++ b/erp24/records/WriteOffsErp.php
@@ -66,6 +66,7 @@ class WriteOffsErp extends \yii\db\ActiveRecord
     {
         return [
             [['guid', 'created_admin_id', 'store_id', 'store_guid', 'number', 'date', 'write_offs_type', 'quantity', 'created_at'], 'required'],
+            [['quantity'], 'required', 'message' => 'Поле Количество обязательно для заполнения'],
             [['status', 'created_admin_id', 'updated_admin_id', 'cause_id', 'confirm_admin_id', 'cause_group_id', 'store_id', 'active', 'deleted_admin_id'], 'integer'],
             [['date', 'created_at', 'send_at', 'updated_at', 'confirm_at', 'deleted_at', 'modelsProducts'], 'safe'],
             [['based_on', 'comment', 'error_text', 'write_offs_type'], 'string'],
@@ -764,4 +765,14 @@ class WriteOffsErp extends \yii\db\ActiveRecord
         }
         return $images;
     }
+
+    public static function isManager(int $storeId) : bool
+    {
+        $adminId = Yii::$app->user->id;
+        $isStoreOnNewSystem = (in_array($storeId, [1, 9, 28, 30, 15, 44, 8]));
+        if (in_array($adminId, [785, 1463, 225, 1070, 826, 1036]) && $isStoreOnNewSystem ) {
+            return true;
+        }
+        return false;
+    }
 }

diff --git a/erp24/views/write_offs_erp/_form.php b/erp24/views/write_offs_erp/_form.php
index 5c22b7d19a71e4c20b2f44e7e15bf1f4122ef85c..e61c80b97c203db6b9617631b6367dc73dd2d0ed 100644 (file)
--- a/erp24/views/write_offs_erp/_form.php
+++ b/erp24/views/write_offs_erp/_form.php
@@ -152,9 +152,8 @@ $this->registerJsFile('/js/heic_to_jpg_replace.js', ['position' => \yii\web\View
                 ],
                 [
                     'name' => 'quantity',
-                    'type' => 'textInput',
+                    'type' => 'numberInput',
                     'title' => 'Количество',
-
                 ],
                 [
                     'name' => 'cause_id',

diff --git a/erp24/views/write_offs_erp/view.php b/erp24/views/write_offs_erp/view.php
index 06507246ab8023075e573469bcc037c1696472dd..fec4a73bc82613822e74635ef7eb826b5f7a0e7e 100644 (file)
--- a/erp24/views/write_offs_erp/view.php
+++ b/erp24/views/write_offs_erp/view.php
@@ -193,7 +193,7 @@ $this->registerCssFile('/css/write-offs-erp.css', ['position' => \yii\web\View::
                 <?php
                 $class = 'btn btn-success btn-lg';
 
-                if (in_array($model->store_id, [1, 9, 28, 30, 15, 44, 8]) && !in_array(Yii::$app->user->id, [785, 1463, 225, 1070, 826, 1036])) {
+                if (WriteOffsErp::isManager($model->store_id)) {
                     $class .= ' disabled';
                 }
                 echo Html::tag('span',