From e5c221ac786ef3a64083dd4a411b47b12f8d6ca6 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 3 Dec 2024 14:48:53 +0300 Subject: [PATCH] =?utf8?q?[ERP-242]=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?= =?utf8?q?=D0=BB=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/ShiftTransferController.php | 3 +++ erp24/views/shift-transfer/index.php | 4 ++-- erp24/views/shift-transfer/view.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php index 561daf7e..b10a4034 100644 --- 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 8e436d07..5243b5fc 100644 --- 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 ef844ca9..76641539 100644 --- a/erp24/views/shift-transfer/view.php +++ b/erp24/views/shift-transfer/view.php @@ -29,7 +29,7 @@ $this->registerCss(' 'btn btn-secondary']) ?> - 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']) : '' ?> + 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']) : '' ?>

Просмотр передачи смены

-- 2.39.5