Давать редактировать только создателю, отображать только принимателю и создателю

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 8e2bb167f057f3f3c7be8277639d8ce06dea0b47..0b77cc312eb5a4605f0c49e061d582f07461a028 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -44,7 +44,13 @@ class ShiftTransferController extends Controller
         }
         $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();
+        $shiftTransfers = ShiftTransfer::find()->where(['store_guid' => $storeGuids])
+            ->andWhere([
+                'or',
+                ['status_id' => ShiftTransfer::STATUS_ID_READY_TO_ACCEPT],
+                ['end_shift_admin_id' => Yii::$app->user->id],
+            ])
+            ->orderBy(['date' => SORT_DESC])->all();
 
         $storeNameById = TaskService::getEntitiesByAlias('store');
 

diff --git a/erp24/records/ShiftTransfer.php b/erp24/records/ShiftTransfer.php
index a9eade5675adb1e8856abddddd4c1d2d7cf31bc0..db1261e650386497923ffb25419db5c2049c5758 100644 (file)
--- a/erp24/records/ShiftTransfer.php
+++ b/erp24/records/ShiftTransfer.php
@@ -39,7 +39,7 @@ class ShiftTransfer extends \yii\db\ActiveRecord
         return [
             self::STATUS_ID_INPUT_FACT_REMAINS => 'Ввод фактических остатков',
             self::STATUS_ID_TRANSFER_ACTIONS => 'Действия по замене',
-            self::STATUS_ID_READY_TO_ACCEPT => 'Готова к принятию',
+            self::STATUS_ID_READY_TO_ACCEPT => 'Готов к принятию',
             self::STATUS_ID_ACCEPTED => 'Принято',
             self::STATUS_OF_THE_FORMATION_OF_SURPLUSES_AND_SHORTAGES => 'Cтатус формирования излишков и недостачи',
         ];

diff --git a/erp24/views/shift-transfer/index.php b/erp24/views/shift-transfer/index.php
index 112aada290fb47bdbada8401ecdb9aaac6470990..280f0e81040bc1039c6eff21ecb34cf195340bbf 100644 (file)
--- a/erp24/views/shift-transfer/index.php
+++ b/erp24/views/shift-transfer/index.php
@@ -66,10 +66,12 @@ use app\controllers\ShiftTransferController;
                 },
                 'visibleButtons' => [
                     'delete' => function($model){
-                        return in_array($model->status_id,[ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS, ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS]) && ShiftTransferController::isAllowedAdmin();
+                        return in_array($model->status_id,[ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS, ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS])
+                            && ($model->end_shift_admin_id == Yii::$app->user->id);
                     },
                     'update' => function($model){
-                        return in_array($model->status_id,[ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS, ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS]) && ShiftTransferController::isAllowedAdmin();
+                        return in_array($model->status_id,[ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS, ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS])
+                            && ($model->end_shift_admin_id == Yii::$app->user->id);
                     },
                 ],
             ],

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