VItaliy 04.12.2015

Administrator
1 parent 5824a647
Showing 6 changed files with 94 additions and 27 deletions Show diff stats
console/migrations/m151204_095541_add_field_password_reset_token_accounts.php
frontend/controllers/SiteController.php
frontend/models/PasswordResetRequestForm.php
frontend/views/accounts/cabinet.php
frontend/views/page/view.php
frontend/views/site/requestPasswordResetToken.php
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151204_095541_add_field_password_reset_token_accounts extends Migration
+{
+    public function up()
+    {
+        $view = <<< MySQL
+        ALTER TABLE `italautocomua`.`w_accounts`
+            ADD COLUMN `password_reset_token` VARCHAR(255) NULL AFTER `email`;
+MySQL;
+        $this->execute($view);
+    }
+
+    public function down()
+    {
+        echo "m151204_095541_add_field_password_reset_token_accounts cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
@@ -15,6 +15,7 @@ use frontend\models\ContactForm;
 use yii\base\InvalidParamException;
 use yii\web\BadRequestHttpException;
 use yii\web\Controller;
+
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use common\models\Callback;
@@ -365,14 +366,17 @@ class SiteController extends Controller
      */
     public function actionRequestPasswordReset()
     {
+        $this->layout = '/internal';
+
         $model = new PasswordResetRequestForm();
         if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+
             if ($model->sendEmail()) {
-                Yii::$app->session->setFlash('success', 'Check your email for further instructions.');
+                Yii::$app->session->setFlash('success', 'Для того, чтобы изменить пароль, перейдите по ссылке, которая придет Вам на email');
  
                 return $this->goHome();
             } else {
-                Yii::$app->session->setFlash('error', 'Sorry, we are unable to reset password for email provided.');
+                Yii::$app->session->setFlash('error', 'Пользователя с таким e-mail в базе не существует');
             }
         }
  
 <?php
 namespace frontend\models;
  
-use common\models\User;
+use common\models\Accounts;
 use yii\base\Model;
-
+use common\models\Emails;
 /**
  * Password reset request form
  */
@@ -21,9 +21,8 @@ class PasswordResetRequestForm extends Model
             ['email', 'required'],
             ['email', 'email'],
             ['email', 'exist',
-                'targetClass' => '\common\models\User',
-                'filter' => ['status' => User::STATUS_ACTIVE],
-                'message' => 'There is no user with such email.'
+                'targetClass' => '\common\models\Accounts',
+                'message' => 'Пользователя с таким e-mail в базе не существует.'
             ],
         ];
     }
@@ -35,23 +34,24 @@ class PasswordResetRequestForm extends Model
      */
     public function sendEmail()
     {
-        /* @var $user User */
-        $user = User::findOne([
-            'status' => User::STATUS_ACTIVE,
+
+        /* @var $user Accounts */
+        $user = Accounts::findOne([
             'email' => $this->email,
         ]);
  
         if ($user) {
-            if (!User::isPasswordResetTokenValid($user->password_reset_token)) {
+            if (!Accounts::isPasswordResetTokenValid($user->password_reset_token)) {
                 $user->generatePasswordResetToken();
             }
  
             if ($user->save()) {
-                return \Yii::$app->mailer->compose(['html' => 'passwordResetToken-html', 'text' => 'passwordResetToken-text'], ['user' => $user])
-                    ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name . ' robot'])
-                    ->setTo($this->email)
-                    ->setSubject('Password reset for ' . \Yii::$app->name)
-                    ->send();
+                $form = array();
+                $form ['email'] = $user->email;
+                $form ['name']  = $user->name;
+                $form ['pass']  = $user->pass;
+                return Emails::get('remide',$form,$form ['email']);
+
             }
         }
  
@@ -3,6 +3,7 @@ use \yii\widgets\ActiveForm;
 use \yii\helpers\ArrayHelper;
 use \common\models\DicCities;
 use \common\models\Deliveries;
+use \yii\helpers\Url;
  
 $this->registerCssFile('/css/about_company.css');
 $this->registerCssFile('/css/style/notepad.css');
@@ -17,16 +18,18 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 <div class="vin">
 	<p class="vin_article">Мой профиль</p>
 <div class='side_menu'>
-<ul class="side_menu-list" role="tablist">
-	<li class="active"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Личные данные</a></li>
-	<li><a href="#notepad" aria-controls="notepad" role="tab" data-toggle="tab">Блокнот</a></li>
-	<li><a href="#busket" aria-controls="busket" role="tab" data-toggle="tab">Корзина</a></li>
-	<li><a href="#orders" aria-controls="orders" role="tab" data-toggle="tab">Заказы</a></li>
-	<!-- <li><a href="#finance" aria-controls="finance" role="tab" data-toggle="tab">Финансы</a></li>
-	<li><a href="history" aria-controls="history" role="tab" data-toggle="tab">История запросов</a></li>
-	<li><a href="#avto" aria-controls="avto" role="tab" data-toggle="tab">Ваши авто</a></li>
-	<li><a href="#message" aria-controls="message" role="tab" data-toggle="tab">Оставить сообщение<br>об оплате и возврате</a></li> -->			
-</ul>
+    <?php
+    echo \yii\widgets\Menu::widget([
+        'options' => ['class' => 'side_menu-list'],
+        'items' => [
+            ['label' => 'Личные данные', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Блокнот', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Корзина', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Заказы', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Выйти', 'url' => Url::toRoute(['/site/logout'])],
+        ],
+    ]);
+    ?>
   <div class="tab-content">
     <div role="tabpanel" class="tab-pane active" id="profile">
    	 <p class="tab-content_header">Личные данные</p>
@@ -4,7 +4,6 @@ $this-&gt;registerCssFile(&#39;/css/style/optovikam.css&#39;);
 $this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
 $this->title = $model->title ? $model->title: $model->name;
 $this->params['breadcrumbs'][] = $this->title;
-
 ?>
 <div class="main-vin">
  
+<?php
+use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $form yii\bootstrap\ActiveForm */
+/* @var $model \frontend\models\PasswordResetRequestForm */
+
+$this->title = 'Запрос на востановление пароля';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="main-vin">
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>Введите ваш e-mail</p>
+
+    <div class="row">
+        <div class="col-lg-5">
+            <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
+                <?= $form->field($model, 'email')->label(false) ?>
+                <div class="form-group">
+                    <?= Html::submitButton('Отправить', ['class' => 'btn btn-primary']) ?>
+                </div>
+            <?php ActiveForm::end(); ?>
+        </div>
+    </div>
+</div>