ERP-115 Переработать открытие/закрытие смен у администраторов

мелко правки по плану

diff --git a/erp24/actions/timetable/StartShiftStepTwoAction.php b/erp24/actions/timetable/StartShiftStepTwoAction.php
index 0cc6fd4e2cb72b7a3ff1e43ae8ffce49b6961631..afc62b7883950b414f32e2900931598de57e1433 100755 (executable)
--- a/erp24/actions/timetable/StartShiftStepTwoAction.php
+++ b/erp24/actions/timetable/StartShiftStepTwoAction.php
@@ -49,6 +49,8 @@ class StartShiftStepTwoAction extends Action
                 ['date' => date('Y-m-d')],
                 ['date' => date('Y-m-d', strtotime('-1 day'))],
             ])
+            ->andWhere(['tabel' => 0])
+            ->orderBy('id desc')
             ->one();
         $fact = TimetableFactModel::getOpening($userModel->id, date('Y-m-d'));
 
@@ -100,6 +102,7 @@ class StartShiftStepTwoAction extends Action
         if ($plan) {
             $model->shift_id = $plan->shift_id;
             $model->store_id = $plan->store_id;
+            $model->checkinModel->plan_id = $plan->id;
         }
 
         if ($fact) {

diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php
index 8262672f643ef438f16b009ae1528331a63efd2e..a6aa68dff77dcb95bf66a622e558e952cdd61af5 100644 (file)
--- a/erp24/records/TimetableFactModel.php
+++ b/erp24/records/TimetableFactModel.php
@@ -129,10 +129,10 @@ class TimetableFactModel extends ActiveRecord
             $model->status = AdminCheckin::TYPE_START;
             $model->checkin_start_id = $adminCheckin->id;
 
-            $timetable = !empty($adminCheckin->plan_id) ? Timetable::findOne(['plan_id' => $adminCheckin->plan_id]) : null;
+            $timetable = !empty($adminCheckin->plan_id) ? Timetable::findOne(['id' => $adminCheckin->plan_id]) : null;
             if (!empty($timetable)) {
                 $model->tabel = 1;
-                $model->plan_id = $timetable->plan_id;
+                $model->plan_id = $timetable->id;
                 $model->shift_id = $timetable->shift_id;
                 $model->admin_id_add = $timetable->admin_id_add;
                 $model->comment = $timetable->comment;