From: marina Date: Tue, 16 Jul 2024 08:54:32 +0000 (+0300) Subject: ERP-112 Изменения в скрипте объединения фактов смен X-Git-Tag: 1.4~77^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=7c6e08efec29c0ecd40c899f338d3984f7f1d204;p=erp24_rep%2Fyii-erp24%2F.git ERP-112 Изменения в скрипте объединения фактов смен --- diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php index e02bc6db..a2341a93 100644 --- a/erp24/controllers/TimetableFactController.php +++ b/erp24/controllers/TimetableFactController.php @@ -328,7 +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->setAttribute('is_close', true); $start->save(); $end->delete(); } @@ -361,7 +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->setAttribute('is_close', true); $start->save(); $end->delete(); }