Fix script for plan

diff --git a/erp24/controllers/TimetableFactController.php b/erp24/controllers/TimetableFactController.php
index 7ffcce1161246f99e55d6ad7a144821a75ee8927..39a6cb4dcaa5c0cbfd6c6b957f281620924a5bfe 100644 (file)
--- a/erp24/controllers/TimetableFactController.php
+++ b/erp24/controllers/TimetableFactController.php
@@ -249,6 +249,7 @@ class TimetableFactController extends Controller
                     ->andWhere(['date_shift' => $plan->date])
                     ->andWhere(['admin_id' => $plan->admin_id])
                     ->andWhere(['store_id' => $plan->store_id])
+                    ->orderBy('id asc')
                     ->all();
 
                 if (sizeof($facts) > 1) {
@@ -265,6 +266,7 @@ class TimetableFactController extends Controller
                     $start->setAttribute('date_end', $end->date_start);
                     $start->setAttribute('time_end', $end->time_start);
                     $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->save();
                     $end->delete();