From 31e6304e967da658e8d24dee21114c46aefccaae Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 3 Dec 2024 17:37:44 +0300 Subject: [PATCH] =?utf8?q?ERP-243=20=D0=94=D0=B5=D0=B9=D1=81=D1=82=D0=B2?= =?utf8?q?=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?utf8?q?=D0=B5=20(II=20=D1=8D=D1=82=D0=B0=D0=BF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/records/ReplacementInvoice.php | 2 +- erp24/views/shift-transfer/_replacement.php | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/erp24/records/ReplacementInvoice.php b/erp24/records/ReplacementInvoice.php index d8d9db66..d3022f5f 100644 --- a/erp24/records/ReplacementInvoice.php +++ b/erp24/records/ReplacementInvoice.php @@ -97,7 +97,7 @@ class ReplacementInvoice extends \yii\db\ActiveRecord if ($model->validate()) { $model->save(); - $model->updateAttributes(['number' => 'ЕРП_ПС_' . date("Y-m-d_H-i") . $model->id]); + $model->updateAttributes(['number' => 'ЕРП_ПС_' . date("Y-m-d_H-i") . '_' .$model->id]); ReplacementInvoiceProducts::setData($model, $shiftTransfer); } else { var_dump($model->getErrors()); diff --git a/erp24/views/shift-transfer/_replacement.php b/erp24/views/shift-transfer/_replacement.php index f1d2e1ac..03a51117 100644 --- a/erp24/views/shift-transfer/_replacement.php +++ b/erp24/views/shift-transfer/_replacement.php @@ -17,12 +17,6 @@ use yii\widgets\ActiveForm; $this->registerJsFile('/js/shift-transfer/replacement.js', ['position' => \yii\web\View::POS_END]); -$usersOnStoreArray = \yii_app\records\Timetable::find() - ->andWhere(['date' => $shiftTransfer->date]) - ->andWhere(['store_id' => array_flip(array_filter(\yii_app\records\CityStore::getAllActiveGuidId(), 'is_string'))[$shiftTransfer->store_guid]]) - ->select(['admin_id']) - ->column(); - $form = \yii\widgets\ActiveForm::begin(); if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIONS, ShiftTransfer::STATUS_ID_INPUT_FACT_REMAINS]) && Yii::$app->user->id === $shiftTransfer->end_shift_admin_id) { @@ -229,7 +223,7 @@ if (in_array($shiftTransfer->status_id, [ShiftTransfer::STATUS_ID_TRANSFER_ACTIO ]); if ( - in_array(Yii::$app->user->id, $usersOnStoreArray) + \yii_app\records\AdminStores::find()->andWhere(['store_guid' => $shiftTransfer->store_guid, 'admin_id' => Yii::$app->user->id])->exists() && $shiftTransfer->status_id == ShiftTransfer::STATUS_ID_READY_TO_ACCEPT && Yii::$app->user->id != $shiftTransfer->end_shift_admin_id ) { -- 2.39.5