Правка при открытии смены в другом магазине

diff --git a/erp24/actions/timetable/StartShiftStepTwoAction.php b/erp24/actions/timetable/StartShiftStepTwoAction.php
index b75180bf3990153d36a3a744864340ba316077f5..9132305ed230389b604c94ecf6a8e9a8aadd98d1 100755 (executable)
--- a/erp24/actions/timetable/StartShiftStepTwoAction.php
+++ b/erp24/actions/timetable/StartShiftStepTwoAction.php
@@ -43,12 +43,12 @@ class StartShiftStepTwoAction extends Action
             ->all();
 
         $plan = Timetable::find()
-            ->andWhere(['admin_id' => $userModel->id])
-            ->andWhere([
-                'OR',
-                ['date' => date('Y-m-d')],
-                ['date' => date('Y-m-d', strtotime('-1 day'))],
+            ->andWhere(['OR',
+                ['BETWEEN', 'datetime_start', date('Y-m-d H:i:s'), date('Y-m-d H:i:s', strtotime('+6 hour'))],
+                ['BETWEEN', 'datetime_end', date('Y-m-d H:i:s', strtotime('-6 hour')), date('Y-m-d H:i:s')],
+                ['AND', ['<', 'datetime_start', date('Y-m-d H:i:s')], ['>', 'datetime_end', date('Y-m-d H:i:s')]]
             ])
+            ->andWhere(['admin_id' => $userModel->id])
             ->andWhere(['tabel' => 0])
             ->orderBy('id desc')
             ->one();