From 8c247ca3660cc51dc35eebf967eef52526d25b93 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Thu, 4 Jul 2024 16:47:43 +0300
Subject: [PATCH] =?utf8?q?ERP-66=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?utf8?q?=D1=82=D1=8C=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5?=
 =?utf8?q?=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B5=D0=B7=20=D0=BF?=
 =?utf8?q?=D0=BB=D0=B0=D0=BD=D0=B0=20=D0=B2=20=D0=B2=D0=BE=D1=80=D0=BA?=
 =?utf8?q?=D0=B1=D0=BE=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api3/core/services/TimetableService.php     | 6 +++---
 erp24/api3/modules/v1/requests/timetable/Fact.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/erp24/api3/core/services/TimetableService.php b/erp24/api3/core/services/TimetableService.php
index 5cb9ab40..8c364cb7 100644
--- a/erp24/api3/core/services/TimetableService.php
+++ b/erp24/api3/core/services/TimetableService.php
@@ -35,7 +35,7 @@ class TimetableService
 //            throw new InvalidArgumentException("План ссылается на другую дату");
 //        }
         $currentDate = date('Y-m-d H:i:s'); // вынести в хелпер
-        $admin_id = \Yii::$app->user->id;
+        $admin_id = $data->admin_id;
 
         //убрать после согласования оплаты подработчиков
         if (Admin::findOne($admin_id)->group_id === AdminGroup::GROUP_WORKERS && !$data->plan_id) {
@@ -141,7 +141,7 @@ class TimetableService
         }
 
         $currentDate = date('Y-m-d H:i:s');
-        $admin_id = $data->plan_id ? $timetable->admin_id : \Yii::$app->user->id;
+        $admin_id = $data->plan_id ? $timetable->admin_id : $data->admin_id;
 
         //убрать после согласования оплаты подработчиков
         if (Admin::findOne($admin_id)->group_id === AdminGroup::GROUP_WORKERS && !$data->plan_id) {
@@ -185,7 +185,7 @@ class TimetableService
                 ->andWhere(['tabel' => 1])
                 ->orderBy('id desc')
                 ->one();
-            $checkIn->shift_id = $plan->shift_id;
+            $checkIn->shift_id = !empty($plan) ? $plan->shift_id : null;
 
             $checkIn->plan_id = null;
             $checkIn->store_id = $checkInFirst->store_id;
diff --git a/erp24/api3/modules/v1/requests/timetable/Fact.php b/erp24/api3/modules/v1/requests/timetable/Fact.php
index 108cec28..4cc4255f 100644
--- a/erp24/api3/modules/v1/requests/timetable/Fact.php
+++ b/erp24/api3/modules/v1/requests/timetable/Fact.php
@@ -12,6 +12,7 @@ class Fact extends Model
     public $plan_id;
     public $store_id;
     public $shift_id;
+    public $admin_id;
     public $image;
     public $lat;
     public $lon;
@@ -25,7 +26,7 @@ class Fact extends Model
             ['image', 'file', 'extensions' => 'png, jpg', 'maxFiles' => 1, 'maxSize' => 20 * 1024 * 1024],
             ['lat', 'string', 'max' => 18],
             ['lon', 'string', 'max' => 18],
-            [['plan_id', 'store_id', 'shift_id'], 'safe'],
+            [['plan_id', 'store_id', 'shift_id', 'admin_id'], 'safe'],
         ];
     }
 
-- 
2.39.5