ERP-243 Действия по замене (II этап)

diff --git a/erp24/records/ReplacementInvoice.php b/erp24/records/ReplacementInvoice.php
index d8d9db66f4476323c5a66403b16692ad36c99ac8..d3022f5f6f3efcc1a8177768a1cee9665ec73995 100644 (file)
--- 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 f1d2e1accc5f8909914d64f1a6c8755b12b320c5..03a5111710c83915ea4f466b08b2aa39c725c2ed 100644 (file)
--- 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
     ) {