ERP-66 Добавить открытие смены без плана в воркботе

diff --git a/erp24/api3/core/services/TimetableService.php b/erp24/api3/core/services/TimetableService.php
index 5cb9ab40e5ca708acbb16fbec723031c87e15e39..8c364cb75ac37bbcfd774ccae78a4ef08563e5d9 100644 (file)
--- 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 108cec2839de491a841638ae13800201b45902c5..4cc4255f8124be619d4c0cab54dd9804eb998d1f 100644 (file)
--- 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'],
         ];
     }