From bb2cbb59731eb16aa01d2401ae90617c78f38308 Mon Sep 17 00:00:00 2001
From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Tue, 14 May 2024 12:38:19 +0300
Subject: [PATCH] =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?=
 =?utf8?q?=D0=BE=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8E?=
 =?utf8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0=20=D0=B7=D0=B0?=
 =?utf8?q?=D1=8F=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api3/core/services/ClaimService.php                   | 6 ++++--
 ...2_create_employee_for_1c_with_admins_with_empty_guid.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/erp24/api3/core/services/ClaimService.php b/erp24/api3/core/services/ClaimService.php
index 4727721..150ada5 100644
--- a/erp24/api3/core/services/ClaimService.php
+++ b/erp24/api3/core/services/ClaimService.php
@@ -100,6 +100,10 @@ class ClaimService extends Model
                 $admin->save(false);
             };
         }
+
+        $model->status = $row->action === 'accept' ? EmployeeOnShift::STATUS_ACCEPT : EmployeeOnShift::STATUS_REJECT;
+        $model->save();
+
         if ($row->action == 'accept') {
             $timetable = new Timetable;
             $timetable->admin_group_id = $admin->group_id;
@@ -126,8 +130,6 @@ class ClaimService extends Model
                 throw new InvalidArgumentException("не получилось создать расписание");
             }
         }
-        $model->status = $row->action === 'accept' ? EmployeeOnShift::STATUS_ACCEPT : EmployeeOnShift::STATUS_REJECT;
-        $model->save();
 
         return true;
     }
diff --git a/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php b/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php
index 1ad061f..ef1f90f 100644
--- a/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php
+++ b/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php
@@ -34,7 +34,7 @@ $result = 0;
 
 $enable = true;
 $start = false;
-$force = false;
+$force = true;
 
 $minuetTimeInTask = date('i', $time);
 $fullTimeInTask = date('Y-m-d H:i:s', $time);
-- 
2.39.5