VItaliy 04.12.2015

Administrator
1 parent ea47d08d
Showing 10 changed files with 179 additions and 21 deletions Show diff stats
backend/views/user/_form.php
backend/web/.gitignore
composer.json
frontend/.gitignore
frontend/controllers/AccountsController.php
frontend/models/AccountsForm.php
frontend/models/ChangePasswordForm.php
frontend/views/accounts/cabinet.php
frontend/views/accounts/change-password.php
frontend/web/.gitignore
@@ -34,7 +34,6 @@ use yii\helpers\ArrayHelper;
     <?= \backend\components\ImageUploader::widget([
-        'form'=>$form,
         'model'=> $model,
         'field'=>'photo',
         'width'=>200,
 /index.php
 /index-test.php
-uploads/
+/assets
@@ -27,7 +27,8 @@
         "mihaildev/yii2-ckeditor": "^1.0",
         "kartik-v/yii2-widget-fileinput": "@dev",
         "phpmailer/phpmailer": "^5.2",
-        "mihaildev/yii2-elfinder": "*"
+        "mihaildev/yii2-elfinder": "*",
+        "yiisoft/yii2-apidoc": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
-/temp
+/tmp
+/runtime/temp
 <?php
 namespace frontend\controllers;
-
-use common\models\Accounts;
 use Yii;
+use common\models\Accounts;
+use frontend\models\ChangePasswordForm;
 use common\models\News;
 use yii\data\ActiveDataProvider;
 use yii\filters\AccessControl;
@@ -16,6 +16,7 @@ use yii\web\NotFoundHttpException;
  */
 class AccountsController extends Controller
 {
+
     public $layout = '/internal';
@@ -26,7 +27,7 @@ class AccountsController extends Controller
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['cabinet',],
+                        'actions' => ['cabinet','change-password'],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
@@ -39,9 +40,22 @@ class AccountsController extends Controller
     public function actionCabinet()
     {
-        return $this->render('cabinet',[
-            'model' => $this->findModel(Yii::$app->user->identity->id)
+
+        $model =  $this->findModel(Yii::$app->user->identity->id);
+
+
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+
+            $model->save();
+
+        }
+
+        return $this->render('cabinet', [
+            'model' => $model
         ]);
+
+
+
     }
     public function actionIndex()
@@ -83,6 +97,31 @@ class AccountsController extends Controller
     }
+    public function actionChangePassword(){
+
+
+        $form = new ChangePasswordForm();
+
+
+        if ($form->load(Yii::$app->request->post()) && $form->validate()) {
+
+            $model = Accounts::findOne(Yii::$app->user->identity->id);
+
+            $model->load(Yii::$app->request->post(), 'ChangePasswordForm');
+
+            $model->save();
+
+            return $this->redirect(['cabinet']);
+
+        } else {
+
+            return $this->render('change-password', [
+                'model' => $form
+            ]);
+
+        }
+    }
+
@@ -98,6 +98,7 @@ class AccountsForm extends Accounts
             'if_manager' => 'Статус менеджера',
             'email' => 'E-mail (Логин)',
             'pass' => 'Пароль',
+            're_pass' => 'Повторите пароль',
             'margin_id' => 'Тип цены',
             'name' => 'Имя',
             'phones' => 'Телефоны',
+<?php
+
+namespace frontend\models;
+
+use common\models\Accounts;
+use yii\base\Model;
+use Yii;
+/**
+ * @property string $old_pass
+ * @property string $new_pass
+ * @property string $re_pass
+ */
+class ChangePasswordForm extends Accounts
+{
+
+
+    public $re_pass;
+    public $old_pass;
+
+
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['old_pass','pass', 're_pass'], 'required'],
+            [['old_pass','pass', 're_pass'], 'string', 'max' => 30],
+            ['re_pass', 'compare', 'compareAttribute' => 'pass'],
+            ['old_pass', 'validatePassword'],
+        ];
+    }
+
+    public function validatePassword($attribute, $params)
+    {
+        if (!$this->hasErrors()) {
+            $user = Accounts::findOne(Yii::$app->user->identity->id);
+            if (!$user || $user->pass != $this->old_pass) {
+                $this->addError($attribute, 'Неправильный логин или пароль');
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'old_pass' => 'Старый пароль',
+            'pass' => 'Новый пароль',
+            're_pass' => 'Повторите пароль',
+        ];
+    }
+
+
+
+
+
+
+
+}
@@ -3,6 +3,7 @@ use \yii\widgets\ActiveForm;
 use \yii\helpers\ArrayHelper;
 use \common\models\DicCities;
 use \common\models\Deliveries;
+use \yii\helpers\Html;
 use \yii\helpers\Url;
 $this->registerCssFile('/css/about_company.css');
@@ -35,9 +36,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <div role="tabpanel" class="tab-pane active" id="profile">
    	 <p class="tab-content_header">Личные данные</p>
     	<div class="myprofile">
-			<button class="purple top">Изменить пароль</button>
-            <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data','class'=>'my_profile'], 'method'=>'post','action' => '/site/signup',]); ?>
+            <?= Html::a( 'Изменить пароль', Url::toRoute('accounts/change-password'),['class'=>'purple top'])?>
+
+            <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data','class'=>'my_profile'], 'method'=>'post',]); ?>
             <?= $form->field($model, 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
@@ -45,16 +47,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             <?= $form->field($model, 'name',['options'=>['class'=>'input2']])->textInput(['maxlength' => 45,'placeholder'=>'Имя']) ?>
-            <?= $form->field($model, 'surname',['options'=>['class'=>'input2']])->textInput(['maxlength' => 45,'placeholder'=>'Фамилия']) ?>
-
             <?= $form->field($model, 'phones',['options'=>['class'=>'input2']])->textInput(['maxlength' => 45,'placeholder'=>'Телефон']) ?>
             <?= $form->field($model, 'email',['options'=>['class'=>'input2']])->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration']) ?>
-            <?= $form->field($model, 'pass',['options'=>['class'=>'input2']])->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration']) ?>
-
-            <?= $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 input2' ]])->dropDownList(
                 ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'),
                 ['prompt' => 'Выберите область']
@@ -72,10 +68,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 ['prompt' => 'Выберите тип перевозки']
             );
             ?>
-
-
-            <button class="purple_white">Отмена</button>
-            <button class="purple">Изменить</button>
+            <?= Html::a( 'Отмена', Url::toRoute('/'),['class'=>'purple_white'])?>
+            <button type="submit" class="purple">Изменить</button>
             <?php ActiveForm::end(); ?>
+<?php
+use \yii\widgets\ActiveForm;
+use \yii\helpers\Url;
+use \yii\helpers\Html;
+
+$this->registerCssFile('/css/about_company.css');
+$this->registerCssFile('/css/style/my_profile.css');
+
+$this->title = 'Смена пароля';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<div class="vin">
+    <p class="vin_article">Мой профиль</p>
+    <div class='side_menu'>
+        <?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>
+                <div class="myprofile">
+                    <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data','class'=>'my_profile'], 'method'=>'post',]); ?>
+
+                    <?= $form->field($model, 'old_pass',['options'=>['class'=>'input2']])->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration']) ?>
+
+                    <?= $form->field($model, 'pass',['options'=>['class'=>'input2']])->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration']) ?>
+
+                    <?= $form->field($model, 're_pass',['options'=>['class'=>'input2']])->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration']) ?>
+
+
+                    <?= Html::a( 'Отмена', Url::toRoute('/'),['class'=>'purple_white'])?>
+                    <button type="submit" class="purple">Изменить</button>
+                    <?php ActiveForm::end(); ?>
+
+
+
+                </div>
+
+
+
+            </div>
+
+
+
+        </div>
+    </div>
+    <img src="/images/lonh_line.png" class='long_line'>
+</div>
+/assets
 /index.php
 /index-test.php