From 2349da4989ca4f7eea07ae784624b931da02b6b7 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Mon, 29 Apr 2024 13:33:47 +0300 Subject: [PATCH] =?utf8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?utf8?q?=D0=BE=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D1=83=20=D0=BF?= =?utf8?q?=D0=BB=D0=B0=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/timetable/EditPlanAction.php | 7 +++++-- erp24/api2/controllers/DataController.php | 2 +- erp24/api3/modules/v1/models/timetable/Timetable.php | 4 ++-- erp24/records/Timetable.php | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/erp24/actions/timetable/EditPlanAction.php b/erp24/actions/timetable/EditPlanAction.php index 6865f36..e409492 100755 --- 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 1a970ab..ef70f41 100644 --- 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 14a9436..f069ceb 100644 --- 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 e9c96be..764b119 100755 --- 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() { -- 2.39.5