From 604b54b03baeea1b47fa6df9faad969ddecba4c6 Mon Sep 17 00:00:00 2001 From: marina Date: Fri, 5 Jul 2024 08:00:46 +0300 Subject: [PATCH] =?utf8?q?ERP-65=20=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?= =?utf8?q?=D1=81=D1=82=D0=B8=20=D0=B2=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20?= =?utf8?q?=D1=84=D0=B0=D0=BA=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8?= =?utf8?q?=D0=B9=20=D1=82=D0=B0=D0=B1=D0=B5=D0=BB=D1=8C=20=D0=B2=D1=81?= =?utf8?q?=D0=B5=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D1=81=D0=BE=D1=82?= =?utf8?q?=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2,=20=D0=BA=D0=BE?= =?utf8?q?=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=B1=D1=8B=D0=BB=D0=B8=20?= =?utf8?q?=D0=B4=D0=BE=2013.06?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api3/core/services/TimetableService.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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; -- 2.39.5