]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
ERP-112 Изменения в скрипте объединения фактов смен
authormarina <m.zozirova@gmail.com>
Tue, 16 Jul 2024 08:53:35 +0000 (11:53 +0300)
committermarina <m.zozirova@gmail.com>
Tue, 16 Jul 2024 08:53:35 +0000 (11:53 +0300)
erp24/controllers/TimetableFactController.php

index 89f6c0a0f6fc282ff413ba744bab28ae4573cf2d..e02bc6db83996604ec39e4e47a4a8aec0322e019 100644 (file)
@@ -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();
                 }