- FIX

common/modules/users/controllers/UserController.php

@@ -123,54 +123,28 @@ class UserController extends \common\components\BaseController {
             $model->attributes = $_POST['User'];
 
             if ($model->validate()) {
-                $transaction = Yii::$app->db->beginTransaction();
-                try {
-                    $model->password = Yii::$app->getSecurity()->generatePasswordHash($model->password);
-                    $model->activate_code = md5($model->password . 'xdf5sf');
-                    $model->source = User::SOURCE_DEFAULT;
-                    if (!$model->save(false) || !$model->afterRegistration(['email' => $model->email]))
-                        throw new BadRequestHttpException(current(current($model->getErrors())), 500);
-
-                    $assignment = new AuthAssignment();
-                    $assignment->item_name = 'user';
-                    $assignment->user_id = $model->id;
-                    if (!$assignment->save())
-                        throw new BadRequestHttpException(current(current($assignment->getErrors())), 500);
-
-                    $params = [];
-                    $params['link_activate'] = Yii::$app->params['frontUrl'].'/activate/'.$model->activate_code;
-                    $params['link'] = Yii::$app->params['frontUrl'];
-
-                    $transaction->commit();
-                    echo json_encode(array('success'=>true));
-                } catch (Exception $e) {
-                    $transaction->rollBack();
-                    echo json_encode(array('errors'=>$e->getMessage()));
-                }
-//                $model->password = Yii::$app->getSecurity()->generatePasswordHash($model->password);
-//                $model->activate_code = md5($model->password . 'xdf5sf');
-//                $model->source = User::SOURCE_DEFAULT;
-//                $model->save(false);
-//
-//                $assignment = new AuthAssignment();
-//                $assignment->item_name = 'user';
-//                $assignment->user_id = $model->id;
-//                $assignment->save();
-//
-//                /*$linkActivate = Yii::$app->params['frontUrl'].'/activate/'.$model->activate_code;
-//                $subject = 'Регистрация на сайте '.Yii::$app->params['frontUrl'];
-//                Yii::$app->mailer->compose('activate', ['link' => Yii::$app->params['frontUrl'], 'linkActivate' => $linkActivate])
-//                    ->setFrom(Yii::$app->params['adminEmail'])
-//                    ->setTo($model->email)
-//                    ->setSubject($subject)
-//                    ->send(); */
-//                $params = [];
-//                $params['link_activate'] = Yii::$app->params['frontUrl'].'/activate/'.$model->activate_code;
-//                $params['link'] = Yii::$app->params['frontUrl'];
-//                $templateModel = MessageTemplate::findOne(['name' => 'Регистрация на сайте']);
-//                $model->afterRegistration($templateModel->id, $params);
-//
-//                echo json_encode(array('success'=>true));
+                $model->password = Yii::$app->getSecurity()->generatePasswordHash($model->password);
+                $model->activate_code = md5($model->password . 'xdf5sf');
+                $model->source = User::SOURCE_DEFAULT;
+                $model->save(false);
+
+                $assignment = new AuthAssignment();
+                $assignment->item_name = 'user';
+                $assignment->user_id = $model->id;
+                $assignment->save();
+
+                /*$linkActivate = Yii::$app->params['frontUrl'].'/activate/'.$model->activate_code;
+                $subject = 'Регистрация на сайте '.Yii::$app->params['frontUrl'];
+                Yii::$app->mailer->compose('activate', ['link' => Yii::$app->params['frontUrl'], 'linkActivate' => $linkActivate])
+                    ->setFrom(Yii::$app->params['adminEmail'])
+                    ->setTo($model->email)
+                    ->setSubject($subject)
+                    ->send(); */
+                $params = [];
+                $params['link_activate'] = Yii::$app->params['frontUrl'].'/activate/'.$model->activate_code;
+                $params['link'] = Yii::$app->params['frontUrl'];
+
+                echo json_encode(array('success'=>true));
             } else {
                 echo json_encode(array('errors'=>$model->getErrors()));
             }

common/modules/users/models/User.php

@@ -511,6 +511,10 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
             
         }
 
+		if ($this->scenario===self::SCENARIO_REGISTRATION) {
+			return $this->afterRegistration(['email' => $this->email]);
+		}
+
         return parent::beforeSave($insert);
     }