From d68d7aee8e5bf31d82212669d6c1c4f7f09fc6e0 Mon Sep 17 00:00:00 2001
From: marina <m.zozirova@gmail.com>
Date: Fri, 28 Jun 2024 15:31:06 +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/core/services/ClientService.php | 10 +++++++---
 erp24/api3/modules/v1/models/Admin.php     | 11 ++++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/erp24/api3/core/services/ClientService.php b/erp24/api3/core/services/ClientService.php
index 61135a75..ddc39142 100644
--- a/erp24/api3/core/services/ClientService.php
+++ b/erp24/api3/core/services/ClientService.php
@@ -402,7 +402,6 @@ class ClientService
      */
     public function getInfo($data) {
         $phone = $data->phone;
-        $admin_id = !empty(Admin::findOne(['mobile' => $phone])) ? Admin::findOne(['mobile' => $phone])->id : null;
 
         $ref_code = !empty($data->ref_code) ? $data->ref_code : '';
         $cond = !empty($phone) ? ['phone' => $phone] : ['ref_code' => $ref_code];
@@ -468,7 +467,6 @@ class ClientService
         $mess['total_price_rejected'] = (int)$sales_rejected_sum ?? 0; // Выручка отмененных заявок
         $mess["referral_count_get_bonus_already"] = (int)$referral_count_get_bonus_already;
         $mess["referral_count_all"] = (int)$referral_count_all;
-        $mess["plan_id"] = !empty($timetable = Timetable::findOne(['admin_id' => $admin_id, 'date' => date('Y-m-d'), 'tabel' => 0])) ? $timetable->id : 0;
 
         $mess["events"] = $this->listEvents($phone);
 
@@ -490,7 +488,13 @@ class ClientService
 
     public function getShifts() {
         $shifts = Shift::find()->where(['not in', 'id',  [3, 4, 6, 7]])->all();
-        return ArrayHelper::map($shifts, 'id', 'name');
+        $result = [];
+        foreach ($shifts as $shift) {
+            if (!empty($shift->name ?? null)) {
+                $result [] = ['id' => $shift->id, 'name' => $shift->name];
+            }
+        }
+        return $result;
     }
 
     /**
diff --git a/erp24/api3/modules/v1/models/Admin.php b/erp24/api3/modules/v1/models/Admin.php
index 3e1e97c2..ccffcaa7 100644
--- a/erp24/api3/modules/v1/models/Admin.php
+++ b/erp24/api3/modules/v1/models/Admin.php
@@ -28,7 +28,8 @@ class Admin extends \yii_app\records\Admin
             'phone' => 'mobile',
             'group' => 'adminGroup',
             'export' => 'exportImportTable',
-            'parent_admin_id'
+            'parent_admin_id',
+            'plan_id'
         ];
 
         /*if($this->parent_admin_id) {
@@ -79,6 +80,14 @@ class Admin extends \yii_app\records\Admin
         return $this->hasOne(self::class, ['id' => 'parent_admin_id']);
     }
 
+    public function getPlanId()
+    {
+        return $this->hasOne( Timetable::class, ['admin_id' => 'id'])
+            ->andWhere(['date' => date('Y-m-d')])
+            ->andWhere(['tabel' => 0]);
+    }
+
+
     // Получить последнюю в списке запись о з.п.
     public function getSalary() {
         return $this->hasOne(EmployeePayment::class, ['admin_id' => 'id'])->orderBy(['date' => SORT_DESC]);
-- 
2.39.5