[ERP-261] cause -> comment

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index b31c256173dfb3da3a4803ffc19c660fb3269c9c..2daf354e278d4908f02b6ce6112b58c8f6e3801b 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -499,14 +499,15 @@ class DataController extends BaseController {
                 }
 
                 foreach ($waybillIncoming as $row) {
+                    $cause = 'Документ ревизии при передаче смены в ERP ' . $row['number'];
                     $waybillIncomingResult[] = [
                         'id' => $row['guid'],
                         'store_id' => $row['store_guid'],
                         'type' => 'ревизия при передаче смены',
-                        'cause' => 'Документ ревизии при передаче смены в ERP ' . $row['number'],
+                        'cause' => $cause,
                         'items' => $row['items'],
                         'summ' => $row['summ_self_cost'],
-                        'comment' => $row['comment'],
+                        'comment' => $cause . ' ' . $row['comment'],
                     ];
                 }
             }

diff --git a/erp24/controllers/ShiftTransferController.php b/erp24/controllers/ShiftTransferController.php
index 5b8119acce0d15da0475767ee6e5cda8a20df50b..d64892937d5a3e5d9b99c118449efe22a2379e76 100644 (file)
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@ -48,13 +48,16 @@ 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])
-            ->andWhere([
+        $admin = Admin::findOne(Yii::$app->user->id);
+        $shiftTransfersQuery = ShiftTransfer::find()->where(['store_guid' => $storeGuids]);
+        if ($admin->group_id != AdminGroup::GROUP_IT) {
+            $shiftTransfersQuery->andWhere([
                 'or',
                 ['status_id' => ShiftTransfer::STATUS_ID_READY_TO_ACCEPT],
                 ['end_shift_admin_id' => Yii::$app->user->id],
-            ])
-            ->orderBy(['date' => SORT_DESC])->all();
+            ]);
+        }
+        $shiftTransfers = $shiftTransfersQuery->orderBy(['date' => SORT_DESC])->all();
 
         $storeNameById = TaskService::getEntitiesByAlias('store');