From: marina <m.zozirova@gmail.com>
Date: Tue, 16 Jul 2024 08:53:35 +0000 (+0300)
Subject: ERP-112 Изменения в скрипте объединения фактов смен
X-Git-Tag: 1.4~77^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=cb22775e31be5c6bcc5cb0a4b0a517c11dc91124;p=erp24_rep%2Fyii-erp24%2F.git

ERP-112 Изменения в скрипте объединения фактов смен
---

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index 89f6c0a0..e02bc6db 100644
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -328,6 +328,7 @@ class TimetableFactController extends Controller
                     $start->setAttribute('checkin_end_id', $end->checkin_start_id);
                     $start->setAttribute('work_time', min(abs(strtotime($end->date_start . $end->time_start) + 600 - strtotime($start->date_start . $start->time_start)) / 3600, TimetableFactModel::WORK_HOURS_TIME));
                     $start->setAttribute('autoclosed', 0);
+                    $start->setAttributes('is_close', true);
                     $start->save();
                     $end->delete();
                 }
@@ -360,6 +361,7 @@ class TimetableFactController extends Controller
                     $start->setAttribute('checkin_end_id', $end->checkin_start_id);
                     $start->setAttribute('work_time', min(abs(strtotime($end->date_start . $end->time_start) + 600 - strtotime($start->date_start . $start->time_start)) / 3600, TimetableFactModel::WORK_HOURS_TIME));
                     $start->setAttribute('autoclosed', 0);
+                    $start->setAttributes('is_close', true);
                     $start->save();
                     $end->delete();
                 }