From: marina <m.zozirova@gmail.com>
Date: Fri, 5 Jul 2024 05:00:46 +0000 (+0300)
Subject: ERP-65
X-Git-Tag: 1.3~14^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=604b54b03baeea1b47fa6df9faad969ddecba4c6;p=erp24_rep%2Fyii-erp24%2F.git

ERP-65
Перенести в новый фактический табель все смены сотрудников, которые были до 13.06
---

diff --git a/erp24/api3/core/services/TimetableService.php b/erp24/api3/core/services/TimetableService.php
index 8c364cb7..59e859f3 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 = $data->admin_id;
+        $admin_id = !empty($data->plan_id) ? Timetable::findOne($data->plan_id)->admin_id : $data->admin_id;
 
         //убрать после согласования оплаты подработчиков
         if (Admin::findOne($admin_id)->group_id === AdminGroup::GROUP_WORKERS && !$data->plan_id) {
@@ -46,8 +46,6 @@ class TimetableService
         try {
             if ($data->plan_id) {
                 $timetable = Timetable::findOne($data->plan_id);
-
-                $admin_id = $timetable->admin_id;
                 $fact = new Timetable($timetable);
                 unset($fact['id']);
                 $fact->isNewRecord = true;