[ERP-242] переделки

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 561daf7e41ac2c5079bba09725b1d558164b7195..b10a4034051c9909251cf5f0d4e1beb39fbd56e3 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -34,6 +34,9 @@ class ShiftTransferController extends Controller
     }
 
     public function actionIndex() {
+        if (!self::isAllowedAdmin()) {
+            return 'Нет доступа';
+        }
         $storeGuids = AdminStores::find()->select(['store_guid'])->where(['admin_id' => Yii::$app->user->id])->column();
 
         $shiftTransfers = ShiftTransfer::find()->where(['store_guid' => $storeGuids])->orderBy(['date' => SORT_DESC])->all();

diff --git a/erp24/views/shift-transfer/index.php b/erp24/views/shift-transfer/index.php
index 8e436d0757954768d59b400095933df5a77d34eb..5243b5fcd1bee3ebffbd78b4c782d61fbeb5f172 100644 (file)
--- a/erp24/views/shift-transfer/index.php
+++ b/erp24/views/shift-transfer/index.php
@@ -68,10 +68,10 @@ use app\controllers\ShiftTransferController;
                 },
                 'visibleButtons' => [
                     'delete' => function($model){
-                        return $model->status_id == ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS && ShiftTransferController::isAllowedAdmin();
+                        return in_array($model->status_id,[ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS, ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS]) && ShiftTransferController::isAllowedAdmin();
                     },
                     'update' => function($model){
-                        return $model->status_id == ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS && ShiftTransferController::isAllowedAdmin();
+                        return in_array($model->status_id,[ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS, ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS]) && ShiftTransferController::isAllowedAdmin();
                     },
                 ],
             ],

diff --git a/erp24/views/shift-transfer/view.php b/erp24/views/shift-transfer/view.php
index ef844ca92f41acd51a306879f1dc2036b420f18f..7664153938313af3e5a8e575f70988ba1bcdf26a 100644 (file)
--- a/erp24/views/shift-transfer/view.php
+++ b/erp24/views/shift-transfer/view.php
@@ -29,7 +29,7 @@ $this->registerCss('
     <?php endif; ?>
 
     <?= Html::a('Назад', '/shift-transfer', ['class' => 'btn btn-secondary']) ?>
-    <?= $shiftTransfer->status_id == ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS && ShiftTransferController::isAllowedAdmin() ? Html::a('Редактировать', ['/shift-transfer/update', 'id' => Yii::$app->request->get('id')], ['class' => 'btn btn-primary']) : '' ?>
+    <?= in_array($shiftTransfer->status_id,[ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS, ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS]) && ShiftTransferController::isAllowedAdmin() ? Html::a('Редактировать', ['/shift-transfer/update', 'id' => Yii::$app->request->get('id')], ['class' => 'btn btn-primary']) : '' ?>
 
     <h1>Просмотр передачи смены</h1>