From: marina Date: Wed, 18 Dec 2024 11:24:34 +0000 (+0300) Subject: ERP-256 Сделать отправку документов Пересортица в 1с X-Git-Tag: 1.7~146^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=81c41fd46f08d550d41f40a28fc8a443cbc1ebdc;p=erp24_rep%2Fyii-erp24%2F.git ERP-256 Сделать отправку документов Пересортица в 1с --- diff --git a/erp24/actions/timetable/StartShiftStepTwoAction.php b/erp24/actions/timetable/StartShiftStepTwoAction.php index 06e35690..c944f35d 100755 --- a/erp24/actions/timetable/StartShiftStepTwoAction.php +++ b/erp24/actions/timetable/StartShiftStepTwoAction.php @@ -1,5 +1,5 @@ getIsPost()) { if (!empty($request->getBodyParam('store_id'))) { - $adminStoreId = (int) $request->getBodyParam('store_id'); + $adminStoreId = (int)$request->getBodyParam('store_id'); $firstRun = true; } } @@ -79,7 +79,7 @@ class StartShiftStepTwoAction extends Action if ($fact) { return AdminCheckin::TYPE_END; } - return AdminCheckin::TYPE_START; + return AdminCheckin::TYPE_START; })(); $model->shift_id = $request->getBodyParam('shift_id'); @@ -140,7 +140,9 @@ class StartShiftStepTwoAction extends Action $model->load($this->controller->request->post()); $model->photo = UploadedFile::getInstance($model, 'photo'); $validate = $model->validate(); - if ($validate) { + $twoMinutes = empty($fact->time_start) || !((strtotime(date('Y/m/d H:i:s')) - strtotime($fact->date_start . $fact->time_start)) < 120); + + if ($validate && $twoMinutes) { $model->save(); $model->checkin_id = $model->checkinModel->id; $model->id = $model->checkinModel->id; @@ -156,7 +158,6 @@ class StartShiftStepTwoAction extends Action ]; } - return $this->controller->render('/timetable/start_shift_step_three.php', [ 'userModel' => $userModel, 'model' => $model,