правки по графику план

diff --git a/erp24/actions/timetable/EditPlanAction.php b/erp24/actions/timetable/EditPlanAction.php
index 6865f36f889d84e7f96f6ca535132d34388594f9..e4094929f39510c23bee0b287b6edf32baf06d43 100755 (executable)
--- a/erp24/actions/timetable/EditPlanAction.php
+++ b/erp24/actions/timetable/EditPlanAction.php
@@ -27,7 +27,8 @@ class EditPlanAction extends Action
                 if (!empty($fact) && $this->controller->request->get('force') !== null) {
                     $fact->delete();
                 }
-                $slot->validate() && $slot->delete();
+//                $slot->validate() && $slot->delete();
+                $slot->delete();
             }
             return $this->controller->redirect($this->controller->request->getReferrer() ?: ['timetable/plan']);
         }
@@ -76,7 +77,9 @@ class EditPlanAction extends Action
             $slot->addError('tabel', 'Переданы неправильные параметры');
             return $this->makeResponse($slot);
         }
-        $slot->refresh();
+        if(!empty($slot->id)) {
+            $slot->refresh();
+        }
         $slot->load($this->controller->request->post());
 
         if (preg_match('/^\d{1,2}:\d{1,2}$/', $slot->time_start)) {

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 1a970ab0ac646c0fd7a1d1b0b25c4ec8b4ad4b42..ef70f41af1f50ffd8433ecb14e1d7be9e0f580e6 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -780,7 +780,7 @@ class DataController extends BaseController {
                 $matrixProductsIds = SalaryHelper::getMatrixProductsIds();
             }
 
-            if (!empty($result['checks']) && count($result['checks']) < 1000) {
+            if (!empty($result['checks']) && count($result['checks']) > 1) {
                 foreach ($result["checks"] as $arr) {
                     $check_id = $arr["id"];
                     if ($arr["seller_id"] == '00000000-0000-0000-0000-000000000000') {

diff --git a/erp24/api3/modules/v1/models/timetable/Timetable.php b/erp24/api3/modules/v1/models/timetable/Timetable.php
index 14a94362597a8af7cc986898ab0933aa0c8e40d5..f069ceb4f4e836786005fd96b35f784806589864 100644 (file)
--- a/erp24/api3/modules/v1/models/timetable/Timetable.php
+++ b/erp24/api3/modules/v1/models/timetable/Timetable.php
@@ -20,7 +20,7 @@ class Timetable extends \yii_app\records\TimetableV3
         return [
             [['store_id'], 'required'],
             [['tabel'], 'integer', 'skipOnEmpty' => false],
-            [['id', 'shift_id', 'store_id'], 'integer'],
+            [['shift_id', 'store_id'], 'integer'],
             [['date'], 'date', 'format' => 'yyyy-M-d'],
             [['salary_shift'], 'in', 'range' => \yii_app\records\Timetable::getSalariesDay(), 'skipOnEmpty' => true],
             [['shift_id'], 'in', 'range' => array_keys(Shift::all()), 'skipOnEmpty' => false],
@@ -31,7 +31,7 @@ class Timetable extends \yii_app\records\TimetableV3
             [['work_time'], 'number', 'min' => 0, 'max' => 24],
             [['comment'], 'string'],  // ???
             [['comment'], 'default', 'value' => ''], // ???
-            [['datetime_start', 'datetime_end'], 'datetime', 'format' => 'yyyy-M-d HH:mm:ss'],
+//            [['datetime_start', 'datetime_end'], 'datetime', 'format' => 'yyyy-M-d HH:mm:ss'],
 //            [['date_add', 'datetime_start', 'datetime_end'], 'datetime', 'format' => 'yyyy-M-d HH:mm:ss'],
             ['slot_type_id', 'in', 'range' => array_keys(self::slotTypeName())],
             [['datetime_start', 'datetime_end'], 'required'],

diff --git a/erp24/records/Timetable.php b/erp24/records/Timetable.php
index e9c96beeec4d574fcaaee793e8ce59258e1963c2..764b119576c7584d480dfb9418fec6f8ecadc13b 100755 (executable)
--- a/erp24/records/Timetable.php
+++ b/erp24/records/Timetable.php
@@ -74,7 +74,7 @@ class Timetable extends ActiveRecord
 
     public function getSalaryShift($timetableId) : array
     {
-
+//TODO ERROR $adminGuid
         $salesByAdminPrepared = $this->salesService->getSalesByAdmin($adminGuid, $dateFrom, $dateTo, $isAdministrator);
 
         $timeTable = [];
@@ -241,13 +241,14 @@ class Timetable extends ActiveRecord
     public function rules()
     {
         return [
+            [['store_id'], 'required'],
             [['tabel'], 'integer', 'skipOnEmpty' => false],
-            [['id', 'shift_id', 'store_id'], 'integer'],
+            [['shift_id', 'store_id'], 'integer'],
 //            [['price_hour'], 'number', 'safe'],
             [['salary_shift'], 'in', 'range' => self::getSalariesDay(), 'skipOnEmpty' => true],
             [['date'], 'date', 'format' => 'php:Y-m-d'],
             [['shift_id'], 'in', 'range' => array_keys(Shift::all()), 'skipOnEmpty' => false],
-            [['store_id'], 'exist', 'targetClass' => CityStore::class, 'targetAttribute' => 'id', 'skipOnEmpty' => false],
+            [['store_id'], 'exist', 'targetClass' => CityStore::class, 'targetAttribute' => 'id', 'skipOnEmpty' => true],
             [['admin_id', 'admin_id_add'], 'exist', 'targetClass' => Admin::class, 'targetAttribute' => 'id'],
             [['d_id', 'admin_group_id'], 'exist', 'targetClass' => AdminGroup::class, 'targetAttribute' => 'id', 'skipOnEmpty' => false],
             [['time_start', 'time_end'], 'date', 'format' => 'php:H:i:s'],
@@ -256,7 +257,7 @@ class Timetable extends ActiveRecord
             [['comment'], 'string'],
             [['comment'], 'default', 'value' => ''],
             [['status'], 'in', 'range' => array_keys(self::statuses())],
-            [['datetime_start', 'datetime_end'], 'date', 'format' => 'php:Y-m-d H:i:s'],
+//            [['datetime_start', 'datetime_end'], 'date', 'format' => 'php:Y-m-d H:i:s'],
 //            [['date_add', 'datetime_start', 'datetime_end'], 'date', 'format' => 'php:Y-m-d H:i:s'],
             [['datetime_start', 'datetime_end'], 'required'],
             [['admin_id', 'store_id'], function() {