Убираем salary_shift из заявки для 1с и изменяем Employee_on_shift rules

diff --git a/erp24/records/EmployeeOnShift.php b/erp24/records/EmployeeOnShift.php
index 0be1477785c33102d8ae48024c5fb94d208bb8f5..1155474d27f20a9acc561a8f17c3128403d12938 100644 (file)
--- a/erp24/records/EmployeeOnShift.php
+++ b/erp24/records/EmployeeOnShift.php
@@ -53,9 +53,9 @@ class EmployeeOnShift extends \yii\db\ActiveRecord
         // Сделать проверку этой таблички телефона
         return [
             [['guid', 'phone', 'created_at', 'shift_date', 'shift_type', 'datetime_start', 'datetime_end', 'created_by', 'store_id', 'price'], 'required'],
-            [['created_at', 'shift_date', 'datetime_start', 'datetime_end'], 'safe'],
+            [['created_at', 'shift_date', 'datetime_start', 'datetime_end', 'salary_shift'], 'safe'],
             [['shift_type', 'created_by', 'price', 'status', 'status_source', 'active'], 'integer'],
-            [['salary_shift'], 'in', 'range' => Timetable::getSalariesDay(), 'skipOnEmpty' => false],
+            [['salary_shift'], 'in', 'range' => Timetable::getSalariesDay(), 'skipOnEmpty' => true],
             [['guid', 'store_id'], 'string', 'max' => 36],
             [['phone'], 'string', 'max' => 16],
             [['first_name', 'last_name'], 'string', 'max' => 40],

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 2bc3e4c2ffa822ae3620cb69cc01eefa0a602931..2b125e515ea3003552f48cf4bcea9d5c1b60ae04 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
@@ -98,7 +98,7 @@ try {
                 }
             }
 
-            $salaryShift = Timetable::getFirstValueSalariesDay();
+//            $salaryShift = Timetable::getFirstValueSalariesDay();
 
             $model = new EmployeeOnShift([
                 'first_name' => $admin->name, 'last_name' => '', 'phone' => $admin->phone,
@@ -108,7 +108,7 @@ try {
                 'created_by' => 1,
                 'store_id' => $storeGuid,
                 'price' => 0,
-                'salary_shift' => $salaryShift,
+//                'salary_shift' => $salaryShift,
             ]);
             $model->guid = DataHelper::createGuidMy("06");
             $model->created_at = date("Y-m-d H:i:s");
@@ -118,6 +118,7 @@ try {
             $model->save();
             if ($model->getErrors()) {
                 $error .= json_encode($model->getErrors(), JSON_UNESCAPED_UNICODE);
+                continue;
             }
 
             $admin->guid = $model->guid;