From 9a7cc34a3a15c933b60648e697bfb45b4cd50a47 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Thu, 11 Jul 2024 10:32:13 +0300
Subject: [PATCH] =?utf8?q?ERP-66=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?utf8?q?=D1=82=D1=8C=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5?=
 =?utf8?q?=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B5=D0=B7=20=D0=BF?=
 =?utf8?q?=D0=BB=D0=B0=D0=BD=D0=B0=20=D0=B2=20=D0=B2=D0=BE=D1=80=D0=BA?=
 =?utf8?q?=D0=B1=D0=BE=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api3/modules/v1/models/Admin.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/erp24/api3/modules/v1/models/Admin.php b/erp24/api3/modules/v1/models/Admin.php
index 8ad4d069..9260af70 100644
--- a/erp24/api3/modules/v1/models/Admin.php
+++ b/erp24/api3/modules/v1/models/Admin.php
@@ -6,6 +6,7 @@ use yii_app\api3\modules\v1\models\timetable\Timetable;
 use yii_app\records\AdminStores;
 use yii_app\records\CityStore;
 use yii_app\records\EmployeePayment;
+use yii_app\records\TimetableFactModel;
 use yii_app\records\TimetableV3;
 
 class Admin extends \yii_app\records\Admin
@@ -93,16 +94,36 @@ class Admin extends \yii_app\records\Admin
         return $this->hasOne(EmployeePayment::class, ['admin_id' => 'id'])->orderBy(['date' => SORT_DESC]);
     }
 
+
     // Получить текущую актуальную сменю
-    public function getCurrentTimetablePlan() {
-        return $this->hasOne(Timetable::class, ['admin_id' => 'id'])
+    public function getCurrentTimetablePlan()
+    {
+        $plan = $this->hasOne(Timetable::class, ['admin_id' => 'id'])
             ->andWhere(['>=', 'date', date('Y-m-d 00:00:00')])
             ->andWhere(['<=', 'date', date('Y-m-d 23:59:59')])
             ->andWhere(['tabel' => 0]);
+
+        $fact = $this->getFact();
+
+        return $plan ?? $fact;
     }
 
     // Достать магазин из плана
     public function getStoreFromPlan() {
         return $this->hasOne(CityStore::class, ['id' => 'store_id'])->via('currentTimetablePlan');
     }
+
+    public function getFact() {
+        return $this->hasOne(TimetableFactModel::class, ['admin_id' => 'id'])
+            ->andWhere(['>=', 'date', date('Y-m-d 00:00:00', strtotime("-1 day"))])
+            ->andWhere(['<=', 'date', date('Y-m-d 23:59:59')])
+            ->andWhere(['is_opening' => true])
+            ->addSelect([
+                'id as id',
+                'date_shift as date',
+                'date_start as start',
+                'date_end as end',
+            ])
+            ->orderBy('id desc');
+    }
 }
\ No newline at end of file
-- 
2.39.5