From dbeb6ae8beb7be61b9f6f7ac4d55519bc9adf7ff Mon Sep 17 00:00:00 2001 From: marina Date: Thu, 13 Jun 2024 14:30:35 +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/actions/timetable/StartShiftStepOneAction.php | 2 +- erp24/records/AdminCheckin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erp24/actions/timetable/StartShiftStepOneAction.php b/erp24/actions/timetable/StartShiftStepOneAction.php index 47c3ac22..116156ea 100755 --- a/erp24/actions/timetable/StartShiftStepOneAction.php +++ b/erp24/actions/timetable/StartShiftStepOneAction.php @@ -54,7 +54,7 @@ class StartShiftStepOneAction extends Action $shiftArray = $lastCheckinFact ? ['id' => $lastCheckinFact->shift_id, 'name' => $lastCheckinFact->shift->name] : []; } else { $adminStores = ArrayHelper::map($userModel->getStores(), 'id', 'name'); - $shiftArray = ArrayHelper::map(Shift::find()->all(), 'id', 'name'); + $shiftArray = ArrayHelper::map(Shift::find()->andWhere(['not in', 'id', [3, 4, 6]])->all(), 'id', 'name'); } diff --git a/erp24/records/AdminCheckin.php b/erp24/records/AdminCheckin.php index 8f11e0fe..1d7b0178 100755 --- a/erp24/records/AdminCheckin.php +++ b/erp24/records/AdminCheckin.php @@ -90,7 +90,7 @@ class AdminCheckin extends ActiveRecord [['lat', 'lon'], 'double'], [['comment', 'photo'], 'string'], [['date'], 'date', 'format' => 'yyyy-M-d'], - [['time'], 'date', 'format' => 'yyyy-M-d HH:mm:ss'], +// [['time'], 'date', 'format' => 'yyyy-M-d HH:mm:ss'], [['admin_id', 'type_id', 'status', 'date', 'time', 'device_id'], 'required'], ]; } -- 2.39.5