From: marina <m.zozirova@gmail.com>
Date: Mon, 10 Jun 2024 13:36:05 +0000 (+0300)
Subject: ERP-5 Доработать фактический план по сотрудникам
X-Git-Tag: 1.2^2~4^2~10
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d80d5f8d3b9eae0e853b65fc042fb4517016996a;p=erp24_rep%2Fyii-erp24%2F.git

ERP-5 Доработать фактический план по сотрудникам
---

diff --git a/erp24/records/TimetableFactModel.php b/erp24/records/TimetableFactModel.php
index 7b6a070c..7d9b44fe 100644
--- a/erp24/records/TimetableFactModel.php
+++ b/erp24/records/TimetableFactModel.php
@@ -61,11 +61,11 @@ class TimetableFactModel extends ActiveRecord
             [['work_time'], 'number', 'min' => 0, 'max' => 24],
             [['comment'], 'string'],
             [['comment'], 'default', 'value' => null],
-            [['slot_type_id', 'shift_id', 'date_add', 'time_end', 'salary_shift'], 'safe'],
+            [['slot_type_id', 'shift_id', 'date_add', 'time_end', 'salary_shift', 'price_hour'], 'safe'],
             [['date_shift'], 'date', 'format' => 'yyyy-M-d'],
 //            [['salary_shift'], 'in', 'range' => \yii_app\records\Timetable::getSalariesDay(), 'skipOnEmpty' => true],
             [['time_start'], 'required'],
-            [['price_hour'], 'number', 'numberPattern' => '/^\d+(\.\d{1,2})?$/'],
+//            [['price_hour'], 'number', 'numberPattern' => '/^\d+(\.\d{1,2})?$/'],
 //            [['date_add'], 'datetime', 'format' => "yyyy-MM-dd H:m:s"],
         ];
     }
@@ -113,7 +113,7 @@ class TimetableFactModel extends ActiveRecord
                 $model->date_shift = $adminCheckin->date;
                 $model->shift_id = $shift_id;
                 $model->salary_shift = !empty($salary = EmployeePayment::findOne(['admin_id' => $adminCheckin->admin_id])) ? $salary->daily_payment : null;
-                $model->price_hour = $model->salary_shift / $model->d_id == AdminGroup::GROUP_ADMINISTRATORS ? 8 : 12;
+                $model->price_hour = $model->salary_shift / ($model->d_id == AdminGroup::GROUP_ADMINISTRATORS ? 8 : 12);
             }
 
             if ($model->validate()) {