1feature/EK-5822

common/models/ApproachDecOrder.php

@@ -53,9 +53,7 @@ class ApproachDecOrder extends \common\components\ActiveRecord
     {
         return [
             [['TO_USER_ID','REC_USER_ID',/*'CON_USER_ID','DEC_ID', */'TYPE', 'PAID_WALLET', 'PERIOD_NUM', 'P_CALC_MONTH', 'CREATED_AT'], 'required'],
-            [['USER_ID'], 'required', 'when' => function ($model) {
-                return $model->scenario !== 'guestDeclaration';
-            }],
+            [['USER_ID'], 'required'],
             [['IS_ADMIN', 'IS_BATCH', 'PERIOD_NUM', 'CALC_MONTH', 'CREATED_AT', 'IS_DEL', 'DELETED_AT'], 'integer'],
             [['DEC_AMOUNT', 'DEC_PV'], 'number'],
             [['ID', 'DEC_SN', 'ORDER_SN', 'USER_ID', 'TO_USER_ID','REC_USER_ID','CON_USER_ID','DEC_ID', 'TYPE', 'UPDATER', 'UPDATED_AT'], 'string', 'max' => 32],

common/models/forms/ApproachDeclarationForm.php

@@ -836,8 +836,8 @@ class ApproachDeclarationForm extends Model
         $decOrderModel->DEC_SN = 'DS' . $ord;
         $decOrderModel->ORDER_SN = 'OS' . $ord;
         $decOrderModel->TYPE = $this->type;
-        $decOrderModel->scenario = $this->isGuestDeclaration ? 'guestDeclaration' : $decOrderModel->scenario;
-        $decOrderModel->USER_ID = $this->isGuestDeclaration ? null : \Yii::$app->user->id;
+//        $decOrderModel->scenario = $this->isGuestDeclaration ? 'guestDeclaration' : $decOrderModel->scenario;
+        $decOrderModel->USER_ID = $this->isGuestDeclaration ? '' : \Yii::$app->user->id;
         $decOrderModel->TO_USER_ID = $this->_insertUserId;
         $decOrderModel->DEC_AMOUNT = $this->_decAmount;
         $decOrderModel->DEC_PV = $this->_decPv;