From 4bf9308692aef95629ded72469a9eb1bee285051 Mon Sep 17 00:00:00 2001 From: marina Date: Thu, 20 Jun 2024 10:22:07 +0300 Subject: [PATCH] =?utf8?q?ERP-57=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?utf8?q?=D1=82=D1=8C=20=D0=BF=D0=BE=D0=B3=D1=80=D0=B5=D1=88=D0=BD=D0=BE?= =?utf8?q?=D1=81=D1=82=D1=8C=20=D0=B2=2010=20=D0=BC=D0=B8=D0=BD=D1=83?= =?utf8?q?=D1=82=20=D0=BF=D1=80=D0=B8=20=D0=BF=D1=80=D0=BE=D1=81=D1=82?= =?utf8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=81=D0=BC=D0=B5?= =?utf8?q?=D0=BD=D1=8B=20=D0=BF=D0=BE=D1=87=D0=B5=D0=BC=D1=83=20=D1=82?= =?utf8?q?=D0=BE=20=D1=81=D0=BB=D0=B5=D1=82=D0=B5=D0=BB=D0=B0=20=D0=BF?= =?utf8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?= =?utf8?q?=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=B2=20=D0=BF=D0=BE=D0=BD=D0=B5?= =?utf8?q?=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/TimetableFactModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php index a5ce0308..4410c12e 100644 --- a/erp24/records/TimetableFactModel.php +++ b/erp24/records/TimetableFactModel.php @@ -113,7 +113,7 @@ class TimetableFactModel extends ActiveRecord $model->time_end = date("H:i:s", strtotime($adminCheckin->time)); $model->is_close = true; $model->is_opening = false; - $model->work_time = min(abs(strtotime($model->time_end) + 600 - strtotime($model->time_start)) / 3600, self::WORK_HOURS_TIME); + $model->work_time = min(abs(strtotime($model->date_end . $model->time_end) + 600 - strtotime($model->date_start . $model->time_start)) / 3600, self::WORK_HOURS_TIME); $model->status = AdminCheckin::TYPE_END; $model->checkin_end_id = $adminCheckin->id; -- 2.39.5