Исправления значения по умолчанию salary_shift при создании employee_on_shift

diff --git a/erp24/records/Timetable.php b/erp24/records/Timetable.php
index e3ba83c8939da55696e0aa71f7e24784eebcd971..1b81660f784f25427717259d9682098bb7c78cff 100755 (executable)
--- a/erp24/records/Timetable.php
+++ b/erp24/records/Timetable.php
@@ -73,6 +73,11 @@ class Timetable extends ActiveRecord
         return [1700, 2000, 2500];
     }
 
+    public static function getFirstValueSalariesDay() {
+        $salaryShiftArray = self::getSalariesDay();
+        return $salaryShiftArray[array_key_first($salaryShiftArray)];
+    }
+
     public function getSalaryShift($timetableId) : array
     {
 //TODO ERROR $adminGuid

diff --git a/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php b/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php
index c3ed56ef6936e86e1c421ae542cb20d97f82027b..2bc3e4c2ffa822ae3620cb69cc01eefa0a602931 100644 (file)
--- a/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php
+++ b/erp24/scripts/tasks/task_22_create_employee_for_1c_with_admins_with_empty_guid.php
@@ -11,6 +11,7 @@ use yii_app\records\AdminGroup;
 use yii_app\records\EmployeeOnShift;
 use yii_app\records\ExportImportTable;
 use yii_app\records\SchedulerTaskLog;
+use yii_app\records\Timetable;
 use yii_app\services\ExportImportService;
 
 
@@ -97,6 +98,8 @@ try {
                 }
             }
 
+            $salaryShift = Timetable::getFirstValueSalariesDay();
+
             $model = new EmployeeOnShift([
                 'first_name' => $admin->name, 'last_name' => '', 'phone' => $admin->phone,
                 'shift_date' => date('Y-m-d H:i:s'), 'shift_type' => 1,
@@ -105,7 +108,7 @@ try {
                 'created_by' => 1,
                 'store_id' => $storeGuid,
                 'price' => 0,
-                'salary_shift' => 1500,
+                'salary_shift' => $salaryShift,
             ]);
             $model->guid = DataHelper::createGuidMy("06");
             $model->created_at = date("Y-m-d H:i:s");