diff --git a/common/models/UserLoginForm.php b/common/models/UserLoginForm.php index fad1bd4..df85bc7 100755 --- a/common/models/UserLoginForm.php +++ b/common/models/UserLoginForm.php @@ -3,7 +3,7 @@ namespace common\models; use Yii; use yii\base\Model; - +use yii\web\IdentityInterface; /** * Login form */ @@ -26,6 +26,8 @@ class UserLoginForm extends Model [['email', 'pass'], 'required'], // rememberMe must be a boolean value ['rememberMe', 'boolean'], + // password is validated by validatePassword() + ['pass', 'validatePassword'], ]; } @@ -40,8 +42,8 @@ class UserLoginForm extends Model { if (!$this->hasErrors()) { $user = $this->getUser(); - if (!$user || !$user->validatePassword($this->password)) { - $this->addError($attribute, 'Incorrect email or password.'); + if (!$user || $user->pass != $this->pass) { + $this->addError($attribute, 'Неправильный логин или пароль'); } } } @@ -59,6 +61,7 @@ class UserLoginForm extends Model } else { return false; } + } /** diff --git a/frontend/views/accounts/cabinet.php b/frontend/views/accounts/cabinet.php index a118780..d883661 100755 --- a/frontend/views/accounts/cabinet.php +++ b/frontend/views/accounts/cabinet.php @@ -35,7 +35,7 @@ $this->params['breadcrumbs'][] = $this->title; ['enctype'=> 'multipart/form-data','class'=>'my_profile'], 'method'=>'post','action' => '/site/signup',]); ?> - = $form->field($model, 'is_firm')->hiddenInput(['value'=>'0']) ?> + = $form->field($model, 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?> = $form->field($model, 'company')->hiddenInput(['value'=>'Частное лицо']) ?> @@ -51,19 +51,19 @@ $this->params['breadcrumbs'][] = $this->title; = $form->field($model, 're_pass',['options'=>['class'=>'input2']])->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration']) ?> - = $form->field($model, 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + = $form->field($model, 'country',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList( ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'), ['prompt' => 'Выберите область'] ); ?> - = $form->field($model, 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + = $form->field($model, 'city',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList( [], ['prompt' => 'Выберите город'] ); ?> - = $form->field($model, 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + = $form->field($model, 'deliveries',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList( ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'), ['prompt' => 'Выберите тип перевозки'] ); @@ -79,7 +79,7 @@ $this->params['breadcrumbs'][] = $this->title; - +
Блокнот
@@ -249,85 +249,6 @@ $this->params['breadcrumbs'][] = $this->title;