Merge branch 'master' of gitlab.artweb.com.ua:root/test_1

Mihail
2 parents 62dba7d8 47ef95dc
Showing 17 changed files with 422 additions and 188 deletions Show diff stats
backend/views/user/_form.php
backend/web/.gitignore
common/models/Accounts.php
composer.json
frontend/.gitignore
frontend/controllers/AccountsController.php
frontend/controllers/SiteController.php
frontend/models/AccountsForm.php
frontend/models/ChangePasswordForm.php
frontend/models/PasswordResetRequestForm.php
frontend/views/accounts/cabinet.php
frontend/views/accounts/change-password.php
frontend/views/layouts/main.php
frontend/web/.gitignore
frontend/web/css/main.css
frontend/web/js/main.js
frontend/web/js/script.js
@@ -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
@@ -51,6 +51,9 @@ use yii\db\ActiveRecord;
 class Accounts extends ActiveRecord implements IdentityInterface
 {
  
+    /**
+     * @var
+     */
     public $re_pass;
     public $surname;
     public $country_region;
@@ -69,6 +72,9 @@ class Accounts extends ActiveRecord implements IdentityInterface
     }
  
  
+    /**
+     * @return bool
+     */
     public function beforeSave()
     {
         $this->dt = time();
@@ -84,7 +90,7 @@ class Accounts extends ActiveRecord implements IdentityInterface
     {
         return [
             [['if_manager', 'margin_id', 'country', 'city', 'rating',  'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'],
-            [['company','email', 'pass', 'name','surname', 'phones',], 'required'],
+            [['company','email', 'pass', 'name', 'phones',], 'required'],
             [['comment'], 'string'],
             [['balance'], 'number'],
             [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150],
@@ -95,9 +101,6 @@ class Accounts extends ActiveRecord implements IdentityInterface
             [['snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'company'], 'string', 'max' => 255],
             [['email'], 'unique'],
             [['email'], 'email'],
-            ['re_pass', 'compare', 'compareAttribute' => 'pass'],
-            ['verifyCode', 'captcha'],
-            ['dt', 'date', 'format' => 'Y.m.d'],
             [['rating','if_manager','set_manager_id','balance'], 'default', 'value' => '0'],
             [['is_active','margin_id','office_id','is_scribe'], 'default', 'value' => '1'],
             [['comment'], 'default', 'value' => 'Новый пользователь'],
@@ -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
+            ]);
+
+        }
+    }
+
  
  
  
@@ -2,6 +2,7 @@
 namespace frontend\controllers;
  
 use common\models\Accounts;
+use frontend\models\AccountsForm;
 use common\models\News;
 use common\models\Slider;
 use common\models\Team;
@@ -338,15 +339,21 @@ class SiteController extends Controller
  
         $this->layout = '/internal';
  
-        $model = new Accounts();
+        $model = new AccountsForm();
  
-        if ($model->load(Yii::$app->request->post()) ) {
+        if ($model->load(Yii::$app->request->post()) && $model->validate() ) {
  
-            $model->generateAuthKey();
  
-            $model->save();
  
-            if (Yii::$app->getUser()->login($model)) {
+            $accounts = new Accounts();
+
+            $accounts->load(Yii::$app->request->post());
+
+            $accounts->generateAuthKey();
+
+            $accounts->save();
+
+            if (Yii::$app->getUser()->login($accounts)) {
  
                 return $this->goHome();
  
@@ -369,13 +376,16 @@ class SiteController extends Controller
         $this->layout = '/internal';
  
         $model = new PasswordResetRequestForm();
+
         if ($model->load(Yii::$app->request->post()) && $model->validate()) {
  
             if ($model->sendEmail()) {
+
                 Yii::$app->session->setFlash('success', 'Для того, чтобы изменить пароль, перейдите по ссылке, которая придет Вам на email');
  
                 return $this->goHome();
             } else {
+                die('here2');
                 Yii::$app->session->setFlash('error', 'Пользователя с таким e-mail в базе не существует');
             }
         }
+<?php
+
+namespace frontend\models;
+
+use common\models\Accounts;
+use yii\base\Model;
+use Yii;
+/**
+ * This is the model class for table "w_accounts".
+ *
+ *
+ * @property integer $id
+ * @property integer $if_manager
+ * @property string $email
+ * @property string $auth_key
+ * @property string $pass
+ * @property integer $margin_id
+ * @property string $name
+ * @property string $phones
+ * @property integer $country
+ * @property integer $city
+ * @property string $address
+ * @property string $comment
+ * @property integer $rating
+ * @property string $dt
+ * @property integer $is_active
+ * @property integer $is_firm
+ * @property string $last_loginin
+ * @property string $firm_inn
+ * @property string $firm_bank
+ * @property double $balance
+ * @property integer $office_id
+ * @property integer $is_scribe
+ * @property integer $set_manager_id
+ * @property string $phones2
+ * @property string $phones3
+ * @property integer $car
+ * @property integer $mod
+ * @property string $snumb
+ * @property integer $deliveries
+ * @property integer $scode
+ * @property string $firm_ur_adr
+ * @property string $firm_fiz_adr
+ * @property string $firm_code_eg
+ * @property string $firm_rs
+ * @property string $firm_mfo
+ * @property string $firm_site
+ * @property string $company
+ */
+class AccountsForm extends Accounts
+{
+
+
+    public $re_pass;
+    public $surname;
+    public $country_region;
+    public $verifyCode;
+    public $auth_key;
+    public $password_hash;
+    public $password_reset_token;
+
+
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['if_manager', 'margin_id', 'country', 'city', 'rating',  'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'],
+            [['company','email', 'pass', 'name','surname', 'phones'], 'required'],
+            [['comment'], 'string'],
+            [['balance'], 'number'],
+            [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150],
+            [['pass','re_pass'], 'string', 'max' => 30],
+            [['phones', 'phones2', 'phones3'], 'string', 'max' => 50],
+            [['address', 'firm_inn', 'firm_bank'], 'string', 'max' => 254],
+            [['last_loginin'], 'string', 'max' => 15],
+            [['snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'company'], 'string', 'max' => 255],
+            [['email'], 'unique'],
+            [['email'], 'email'],
+            ['re_pass', 'compare', 'compareAttribute' => 'pass'],
+            ['verifyCode', 'captcha'],
+            ['dt', 'date', 'format' => 'Y.m.d'],
+            [['rating','if_manager','set_manager_id','balance'], 'default', 'value' => '0'],
+            [['is_active','margin_id','office_id','is_scribe'], 'default', 'value' => '1'],
+            [['comment'], 'default', 'value' => 'Новый пользователь'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'if_manager' => 'Статус менеджера',
+            'email' => 'E-mail (Логин)',
+            'pass' => 'Пароль',
+            're_pass' => 'Повторите пароль',
+            'margin_id' => 'Тип цены',
+            'name' => 'Имя',
+            'phones' => 'Телефоны',
+            'country' => Yii::t('app', 'Country'),
+            'city' =>'Город',
+            'address' => 'Адрес',
+            'comment' => 'Комментарий',
+            'rating' => Yii::t('app', 'Rating'),
+            'dt' =>'Дата регистрации',
+            'is_active' => 'Активный',
+            'is_firm' => 'Юридическое лицо',
+            'last_loginin' => Yii::t('app', 'Last Loginin'),
+            'firm_inn' => 'ИНН',
+            'firm_bank' => 'Банк',
+            'balance' => Yii::t('app', 'Balance'),
+            'office_id' => Yii::t('app', 'Office ID'),
+            'is_scribe' => 'Подписка',
+            'set_manager_id' => 'Персональный менеджер',
+            'phones2' => 'Телефоны 2',
+            'phones3' => 'Телефоны 3',
+            'car' => Yii::t('app', 'Car'),
+            'mod' => Yii::t('app', 'Mod'),
+            'snumb' => 'snumb',
+            'deliveries' => Yii::t('app', 'Deliveries'),
+            'scode' => 'Код в 1С',
+            'firm_ur_adr' => 'Юридический адрес',
+            'firm_fiz_adr' => 'Физический адрес',
+            'firm_code_eg' => 'Код ЭГ',
+            'firm_rs' => 'Расчётный счёт',
+            'firm_mfo' => 'МФО',
+            'firm_site' => 'Сайт',
+            'company' => 'Название фирмы',
+            'country_region' => 'Регион'
+        ];
+    }
+
+
+
+
+
+
+
+}
+<?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' => 'Повторите пароль',
+        ];
+    }
+
+
+
+
+
+
+
+}
@@ -45,11 +45,15 @@ class PasswordResetRequestForm extends Model
                 $user->generatePasswordResetToken();
             }
  
+
+
             if ($user->save()) {
+
                 $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\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>
@@ -8,7 +8,7 @@ use yii\widgets\ActiveForm;
 use \yii\widgets\Menu;
 use \yii\helpers\Url;
 use common\models\Callback;
-use \common\models\Accounts;
+use \frontend\models\AccountsForm;
 use \yii\helpers\ArrayHelper;
 use \common\models\DicCities;
 use \common\models\Deliveries;
@@ -410,41 +410,41 @@ use \common\models\UserLoginForm;
                                 <div class="registration_for_person">
                                     <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => '/site/signup']); ?>
  
-                                    <?= $form->field(new Accounts(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+                                    <?= $form->field(new AccountsForm(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
                                         ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'),
                                         ['prompt' => 'Выберите область']
                                     )->label(false);
                                     ?>
  
-                                    <?= $form->field(new Accounts(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+                                    <?= $form->field(new AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
                                         [],
                                         ['prompt' => 'Выберите город']
                                     )->label(false);
                                     ?>
  
-                                    <?= $form->field(new Accounts(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+                                    <?= $form->field(new AccountsForm(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
                                         ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'),
                                         ['prompt' => 'Выберите тип перевозки']
                                     )->label(false);
                                     ?>
  
-                                    <?= $form->field(new Accounts(), 'verifyCode')->widget(Captcha::className(), [
+                                    <?= $form->field(new AccountsForm(), 'verifyCode')->widget(Captcha::className(), [
                                         'options'=>['placeholder'=>'Введите код' ],
                                         'template' => '<div>{input}</div><div class="row"><div class="col-lg-3">{image}</div></div>',
                                     ])->label(false); ?>
@@ -457,142 +457,6 @@ use \common\models\UserLoginForm;
                     </div>
  
  
-
-
-
-
-<!---->
-<!---->
-<!--                    <form action="" method="post" id="registration_form">-->
-<!--                        <h3>Заявка на регистрацию</h3>-->
-<!--                        <div class="purple_registration active_button" style=" border-radius:12px 0 0 0 " id="person"><p>Частное лицо</p></div><div id="company" class="purple_registration"><p>Оптовик</p></div>-->
-<!--                        <div class="registration_holder">-->
-<!---->
-<!--                            <div class="registration_for_person">-->
-<!---->
-<!---->
-<!--                                <input type="text" name="familyname" id="family_name" placeholder="Фамилия-->
-<!--                                " minlength="2" required=""><span class='star'>*</span>-->
-<!---->
-<!--                                <input name="name" id="name" placeholder="Имя" minlength="2" type="text" required=""><span class='star1'>*</span>-->
-<!--                                <input type="email" name="email" id="email_registration" placeholder="email" minlength="10" required=""><span class='star2'>*</span>-->
-<!---->
-<!--                                <input type="phone" name="telephone" id="telephone_registration" placeholder="Телефон" minlength="7" required=""><span class='star3'>*</span>-->
-<!--                                <input type="telephone" name="telephone" id="telephone_registration_add" placeholder="Телефон"><span class='star4'>*</span>-->
-<!--                                <p class="add_telephone" style="font-size: 14px;-->
-<!--    margin-right: 12px;-->
-<!--    margin-top: 10px;">добавить еще 1 телефон</p>-->
-<!--                                <p>Фактический адрес</p>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="area">-->
-<!--                                        <option value="" disabled="" selected="">Выберите область</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="city">-->
-<!--                                        <option value="" disabled="" selected="">Выберите город</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="steel1">-->
-<!--                                        <option value="" disabled="" selected="">Перевозчик</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!---->
-<!--                                <input type="text" placeholder="Введите код" id="code_input" required="4"><span class='star5'>*</span>-->
-<!--                                <div class="code_generate">-->
-<!--                                    <img src="/images/code_generator.png">-->
-<!--                                </div>-->
-<!--                                <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>-->
-<!---->
-<!---->
-<!--                            </div>-->
-<!--                            <div class="registration_for_company">-->
-<!---->
-<!--                                <input type="text" name="fullname" id="company_name" placeholder="Компания-->
-<!--                                " minlength="2" required="">-->
-<!--                                <input type="text" name="fullname" id="family_name" placeholder="Фамилия-->
-<!--                                " minlength="2" required=""><span class='star'>*</span>-->
-<!---->
-<!--                                <input type="" name="name" id="name" placeholder="Имя" minlength="2" required=""><span class='star1'>*</span>-->
-<!--                                <input type="email" name="email" id="email_registration" placeholder="email" minlength="10" required=""><span class='star3'>*</span>-->
-<!---->
-<!--                                <input type="telephone" name="telephone" id="telephone_registration" placeholder="Телефон" minlength="7" required=""><span class='star4'>*</span><span class='star6'>*</span>-->
-<!--                                <input type="telephone" name="telephone" id="telephone_registration_add1" placeholder="Телефон" style="display:none">-->
-<!--                                <p class="add_telephone1" style="font-size: 14px;-->
-<!--    margin-right: 12px;-->
-<!--    margin-top: 10px;">добавить еще 1 телефон</p>-->
-<!--                                <p>Фактический адрес</p>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="area">-->
-<!--                                        <option value="" disabled="" selected="">Выберите область</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="city">-->
-<!--                                        <option value="" disabled="" selected="">Выберите город</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="steel1">-->
-<!--                                        <option value="" disabled="" selected="">Перевозчик</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!---->
-<!--                                <input type="text" placeholder="Введите код" id="code_input" required='4'>-->
-<!--                                <div class="code_generate">-->
-<!--                                    <img src="/images/code_generator.png">-->
-<!--                                </div><span class='star5'>*</span>-->
-<!--                                <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>-->
-<!---->
-<!---->
-<!--                            </div>-->
-<!--                        </div></form>-->
-
-
-
                 </div>
             </div>
  
+/assets
 /index.php
 /index-test.php
@@ -395,11 +395,16 @@ div.required:after {    content: &quot; *&quot;;
     width: 434px!important;
 }
  
+.field-accountsform-company{
+    display: none;
+}
+
 .field-accounts-company{
     display: none;
 }
  
  
+
 #form_login{
     margin: 0 auto;
     width: 561px;
@@ -464,4 +469,48 @@ div.required:after {    content: &quot; *&quot;;
  
 .my_profile .selectize_item2 label{
     left: -65px;
+}
+
+.myprofile .purple_white {
+    margin-top: 28px;
+    margin-left: 174px;
+    font-family: Arial;
+    font-size: 11px;
+    font-weight: 600;
+    color: #6b84b5;
+    height: 43px;
+    width: 130px;
+    border-radius: 8px;
+    border: 1px solid #6b84b5;
+    background-color: #ffffff;
+    cursor: pointer;
+    outline: none;
+    text-transform: uppercase;
+    display: inline-block;
+    text-align: center;
+    box-sizing: border-box;
+    padding-top: 14px;
+    position: relative;
+    top: 1px;
+}
+
+.myprofile input{
+    margin-left: 135px;
+}
+
+.myprofile div.required:after{
+    left: 121px;
+}
+.myprofile a.top{
+    padding-top: 13px;
+    text-align: center;
+}
+
+.field-passwordresetrequestform-email:after{
+    top: -34px!important;
+    left: 388px!important;
+}
+
+.myprofile .field-changepasswordform-old_pass label, .myprofile .field-changepasswordform-pass label, .myprofile .field-changepasswordform-re_pass label{
+    left: 0px!important;
 }
 \ No newline at end of file
@@ -2,7 +2,7 @@
  * Created by vitaliy on 23.11.15.
  */
 $(document).ready(function(){
-    $('#accounts-country').change(function(){
+    $('#accountsform-country').change(function(){
         var region_id = $(this).val();
         if(region_id){
             $.get( "/ajax/get-city", {region_id:region_id}, function( data ) {
@@ -18,9 +18,9 @@ $(document).ready(function(){
         $(this).addClass('active_button');
         $('#person').removeClass('active_button');
  
-        $('#accounts-company').attr('type', 'text').attr('placeholder', 'Компания').val('');
-        $('.field-accounts-company').css('display','block');
-        $('#accounts-is_firm').val('1');
+        $('#accountsform-company').attr('type', 'text').attr('placeholder', 'Компания').val('');
+        $('.field-accountsform-company').css('display','block');
+        $('#accountsform-is_firm').val('1');
  
     });
  
@@ -28,11 +28,11 @@ $(document).ready(function(){
         $('#company').removeClass('active_button');
         $(this).addClass('active_button');
  
-        $('.field-accounts-company').css('display','none');
-        $('#accounts-company').attr('type', 'hidden').val('Частное лицо');
-        $('#accounts-is_firm').val('0');
+        $('.field-accountsform-company').css('display','none');
+        $('#accountsform-company').attr('type', 'hidden').val('Частное лицо');
+        $('#accountsform-is_firm').val('0');
  
  
     });
  
-});
 \ No newline at end of file
+});
@@ -469,6 +469,7 @@ $(&#39;.phone_control, .phone_placeholder&#39;).click(
 	function(){
 		$('.menu_block_center').css({display:'none'});
 		$('.menu_block_center1').css({display:'block'});
+        $('.menus_search_down').css({display: 'block'});
 		$('.menu_search_down .input_search').find('input').focus();
  
 	});
@@ -539,7 +540,9 @@ $(&#39;.active_menu&#39;).hover(function(){
 	$('#auto_staff').css({'background-color':'#6b84b5'});
 	$('#auto_staff').find('a').css({'color':'#fff'});	
 });
-
+    $('.menu_block_center2 #main_seacrh').click(function(){
+       $('.menu_block_center2 .menu_search_down').css({display: 'block'});
+    });
 $('.menu_block_center2 .by_articul .menu_search_down').hover(function(){
 	$(this).find('a:first-child').css({'color':'#333'});