From 35d76484c1240c2b7784d5f30425a9f4f8f244ab Mon Sep 17 00:00:00 2001 From: marina Date: Wed, 5 Jun 2024 08:15:55 +0300 Subject: [PATCH] =?utf8?q?ERP-5=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=B0=D1=82=D1=8C=20=D1=84=D0=B0=D0=BA=D1=82=D0=B8=D1=87?= =?utf8?q?=D0=B5=D1=81=D0=BA=D0=B8=D0=B9=20=D0=BF=D0=BB=D0=B0=D0=BD=20?= =?utf8?q?=D0=BF=D0=BE=20=D1=81=D0=BE=D1=82=D1=80=D1=83=D0=B4=D0=BD=D0=B8?= =?utf8?q?=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/TimetableFactModel.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php index f58a603d..4b14bdd0 100644 --- a/erp24/records/TimetableFactModel.php +++ b/erp24/records/TimetableFactModel.php @@ -49,6 +49,7 @@ class TimetableFactModel extends ActiveRecord return [ [[]], [['is_opening, is_close'], 'boolean'], + [['is_opening, is_close'], 'default', 'value' => null], [['d_id', 'admin_group_id'], 'exist', 'targetClass' => AdminGroup::class, 'targetAttribute' => 'id', 'skipOnEmpty' => true], [['admin_id', 'admin_id_add'], 'exist', 'targetClass' => Admin::class, 'targetAttribute' => 'id', 'skipOnEmpty' => true], [['store_id'], 'exist', 'targetClass' => CityStore::class, 'targetAttribute' => 'id', 'skipOnEmpty' => true], @@ -67,7 +68,7 @@ class TimetableFactModel extends ActiveRecord ]; } - public function setValues($adminCheckin, $timetable) + public function setValues($adminCheckin, $timetable, $lastCheckin) { $this->admin_id = $adminCheckin->admin_id; $this->admin_group_id = $adminCheckin->admin->shift; @@ -85,6 +86,11 @@ class TimetableFactModel extends ActiveRecord $this->time_start = $timetable->time_start; $this->time_end = $timetable->time_end; $this->date_end = $timetable->datetime_end; + if (empty($lastCheckin)) { + $is_active = true; + } else { + $is_close = true; + } $this->save(); } -- 2.39.5