From d80d5f8d3b9eae0e853b65fc042fb4517016996a Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 10 Jun 2024 16:36:05 +0300 Subject: [PATCH] =?utf8?q?ERP-5=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=B0=D1=82=D1=8C=20=D1=84=D0=B0=D0=BA=D1=82=D0=B8=D1=87?= =?utf8?q?=D0=B5=D1=81=D0=BA=D0=B8=D0=B9=20=D0=BF=D0=BB=D0=B0=D0=BD=20?= =?utf8?q?=D0=BF=D0=BE=20=D1=81=D0=BE=D1=82=D1=80=D1=83=D0=B4=D0=BD=D0=B8?= =?utf8?q?=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/TimetableFactModel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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()) { -- 2.39.5