From: marina <m.zozirova@gmail.com>
Date: Fri, 28 Jun 2024 13:26:55 +0000 (+0300)
Subject: правка пути
X-Git-Tag: 1.3~34^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=855067296ae2f94883ff3d8c0f30402fc79e20e8;p=erp24_rep%2Fyii-erp24%2F.git

правка пути
---

diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php
index 553c9d90..7cb99e96 100644
--- a/erp24/records/TimetableFactModel.php
+++ b/erp24/records/TimetableFactModel.php
@@ -125,7 +125,7 @@ class TimetableFactModel extends ActiveRecord
             $model->status = AdminCheckin::TYPE_START;
             $model->checkin_start_id = $adminCheckin->id;
 
-            $timetable = Timetable::findOne(['plan_id' => $adminCheckin->plan_id]);
+            $timetable = !empty($adminCheckin->plan_id) ? Timetable::findOne(['plan_id' => $adminCheckin->plan_id]) : null;
             if (!empty($timetable)) {
                 $model->tabel = $timetable->id;
                 $model->plan_id = $timetable->plan_id;
@@ -133,6 +133,8 @@ class TimetableFactModel extends ActiveRecord
                 $model->admin_id_add = $timetable->admin_id_add;
                 $model->comment = $timetable->comment;
                 $model->date_add = $timetable->date_add;
+                $model->salary_shift = $timetable->salary_shift ?? null;
+                $model->price_hour = !empty($model->salary_shift) ? round($model->salary_shift / ($model->d_id == AdminGroup::GROUP_ADMINISTRATORS ? 8 : 12), 2) : null;
             } else {
                 $model->tabel = 1;
                 $model->plan_id = null;
@@ -147,8 +149,6 @@ class TimetableFactModel extends ActiveRecord
             $model->d_id = $adminCheckin->d_id;
             $model->store_id = $adminCheckin->store_id;
             $model->date_shift = $adminCheckin->date;
-            $model->salary_shift = !empty($salary = EmployeePayment::findOne(['admin_id' => $adminCheckin->admin_id])) ? $salary->daily_payment : null;
-            $model->price_hour = round($model->salary_shift / ($model->d_id == AdminGroup::GROUP_ADMINISTRATORS ? 8 : 12), 2);
         }
 
         $model->is_opening = $is_start;