From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 3 Dec 2024 11:48:53 +0000 (+0300)
Subject: [ERP-242] переделки
X-Git-Tag: 1.7~205^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=e5c221ac786ef3a64083dd4a411b47b12f8d6ca6;p=erp24_rep%2Fyii-erp24%2F.git

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

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('
     <?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>