From bd1a777b412157ef7e5b63e4aa60e2638c78bccb Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Tue, 23 Jul 2024 12:15:12 +0300
Subject: [PATCH] =?utf8?q?ERP-122=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?utf8?q?=D0=B8=D1=82=D1=8C=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8?=
 =?utf8?q?=D0=B5/=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5=20=D1=81?=
 =?utf8?q?=D0=BC=D0=B5=D0=BD=20=D0=BD=D0=B0=20=D0=AE=D0=B6=D0=BD=D0=BE?=
 =?utf8?q?=D0=BC=20=D0=B1=D1=83=D0=BB=D1=8C=D0=B2=D0=B0=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../timetable/StartShiftStepTwoAction.php     | 26 +++++++++----------
 .../controllers/timetable/FactController.php  |  2 --
 erp24/forms/timetable/StartForm.php           |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/erp24/actions/timetable/StartShiftStepTwoAction.php b/erp24/actions/timetable/StartShiftStepTwoAction.php
index 7d998e84..b75180bf 100755
--- a/erp24/actions/timetable/StartShiftStepTwoAction.php
+++ b/erp24/actions/timetable/StartShiftStepTwoAction.php
@@ -82,20 +82,6 @@ class StartShiftStepTwoAction extends Action
              return AdminCheckin::TYPE_START;
         })();
 
-        /** @var TimetablePlan[] $planSlots */
-        $planSlots = TimetablePlan::find()
-            ->andWhere(
-                ($device->isFixedStore() && !$userModel->adminGroup->isRoaming()) ?
-                    ['store_id' => $model->store_id] :
-                    ['admin_id' => $model->admin_id]
-            )
-            ->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')]]
-            ])
-            ->all();
-
         $model->shift_id = $request->getBodyParam('shift_id');
         $model->store_id = $request->getBodyParam('store_id');
 
@@ -110,6 +96,18 @@ class StartShiftStepTwoAction extends Action
             $model->store_id = $fact->store_id;
         }
 
+        /** @var TimetablePlan[] $planSlots */
+        $planSlots = TimetablePlan::find()
+            ->andWhere(['store_id' => $model->store_id])
+            ->andWhere(['admin_id' => $model->admin_id])
+            ->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')]]
+            ])
+            ->all();
+
+
         if ($fact) {
             $model->plan_id = $fact->plan_id;
             $model->replaced_admin_id = $fact->admin_id_add;
diff --git a/erp24/api3/modules/v1/controllers/timetable/FactController.php b/erp24/api3/modules/v1/controllers/timetable/FactController.php
index bdbf881e..6585682a 100644
--- a/erp24/api3/modules/v1/controllers/timetable/FactController.php
+++ b/erp24/api3/modules/v1/controllers/timetable/FactController.php
@@ -8,8 +8,6 @@ use yii_app\api3\core\services\TimetableService;
 use yii_app\api3\core\traits\ServiceTrait;
 use yii_app\api3\modules\v1\requests\timetable\Fact;
 
-///test
-/// test
 /**
  * @property TimetableService $timetableService
  */
diff --git a/erp24/forms/timetable/StartForm.php b/erp24/forms/timetable/StartForm.php
index 501aac7e..fb9be7a2 100755
--- a/erp24/forms/timetable/StartForm.php
+++ b/erp24/forms/timetable/StartForm.php
@@ -173,7 +173,7 @@ class StartForm extends Model
                 if ($this->date != $plan->date) {
                     $this->addError('date', 'Дата открытия не совпадает с планом');
                 }
-                $targetAdminId = $this->replaced_admin_id ?: $this->admin_id;
+                $targetAdminId = $this->admin_id ?: $this->replaced_admin_id;
                 if ($targetAdminId != $plan->admin_id) {
                     $this->addError($this->replaced_admin_id ? 'replaced_admin_id' : 'admin_id', 'Выбран неправильный пользователь в плане');
                 }
-- 
2.39.5