VItaliy 25.11.2015

Administrator
1 parent 07a132f4
Showing 71 changed files with 973 additions and 889 deletions Show diff stats
.htaccess
backend/assets/MyAsset.php
backend/components/ImgResizer.php → backend/components/ImageResizer.php
backend/components/ImageSizer.php → backend/components/ImageUploader.php
backend/components/base/BaseController.php
backend/components/views/image_sizer.php
backend/controllers/AccountsController.php
backend/controllers/NewsController.php
backend/models/Accounts.php
backend/views/accounts/_form.php
backend/views/accounts/index.php
backend/views/layouts/main.php
backend/views/news/_form.php
backend/views/news/index.php
backend/views/team/_form.php
backend/views/team/index.php
backend/views/user/_form.php
backend/web/css/AdminLTE.css
backend/web/css/site.css
backend/web/js/script.js
 <IfModule mod_rewrite.c>
-
+AddDefaultCharset UTF-8
     Options +FollowSymlinks
     RewriteEngine On
@@ -38,8 +38,6 @@ class MyAsset extends AssetBundle
         'js/app.min.js',
         'js/pages/dashboard.js',
         'js/main.js',
-        'js/angular.js',
-        'js/angular_js.js',
         'js/script.js',
     ];
@@ -9,7 +9,7 @@ use yii\imagine\Image;
 use Yii;
 use Imagine\Gd\Imagine;
-class ImgResizer extends Widget
+class ImageResizer extends Widget
 {
     public $height;
@@ -36,6 +36,10 @@ class ImgResizer extends Widget
             $model->file = UploadedFile::getInstance($model, 'file');
+            if(!$model->file){
+                return json_encode(["error"=>"Не указан файл"]);
+            }
+
             $md5_file = md5_file($model->file->tempName);
             $imgDir = Yii::getAlias('@storage/'.$md5_file.'/');
@@ -10,7 +10,7 @@ namespace backend\components;
 use yii\base\Widget;
-class ImageSizer extends Widget
+class ImageUploader extends Widget
 {
     public $height = 0;
     public $width = 0;
@@ -17,7 +17,15 @@ use yii\imagine\Image;
 class BaseController extends Controller {
-
+    public function isBigger($width,$height,$w,$h)
+    {
+        if($width>$w){
+            return true;
+        }else if($height >$h) {
+            return true;
+        }
+        return false;
+    }
     private function resizeImg($w, $h, $imageAlias,$imageAliasSave){
         $img = Image::getImagine()->open(Yii::getAlias($imageAlias));
@@ -27,17 +35,38 @@ class BaseController extends Controller {
         $width = $size->getWidth();
         $height = $size->getHeight();
-        if($width > $height) {
-            $y = 0;
-            $x = ($width - $height) / 2;
-            $smallestSide = $height;
+        $e_width = $w/$h;
+        $e_height = $h/$w;
+
+        $e1_width = $width/$height;
+        $e1_height = $height/$width;
+
+
+        if($this->isBigger($width,$height,$w,$h)){
+            if($e_width<$e1_width){
+
+                $new_width = $width*($e_width/$e1_width);
+
+                $y = 0;
+                $x = $width/ 2-($new_width/2);
+                $width = $new_width;
+
+            }else {
+
+                $new_height = $height*($e_height/$e1_height);
+                $x = 0;
+                $y = $height/2-($new_height/2);
+                $height = $new_height;
+            }
+
+
         } else {
-            $x = 0;
-            $y = ($height - $width) / 2;
-            $smallestSide = $width;
+            $img->save($imageAliasSave, array('flatten' => false));
+            return true;
         }
-        Image::crop($imageAlias, $smallestSide, $smallestSide,[$x,$y])
+
+        Image::crop($imageAlias, $width, $height,[$x,$y])
             ->save(Yii::getAlias($imageAliasSave), ['quality' =>
                 100]);
@@ -49,8 +78,6 @@ class BaseController extends Controller {
-
-
     }
     private function deleteImages($old_img){
@@ -75,11 +102,22 @@ class BaseController extends Controller {
     }
     public function actionDeleteImage(){
-        $old_img = Yii::$app->request->post('old_img');
-        if ($old_img) {
-            $this->deleteImages($old_img);
+        $request = Yii::$app->request->post();
+
+        if($request){
+            if ($request['old_img']) {
+                $this->deleteImages($request['old_img']);
+            }
+            if(isset($request['action']) && $request['action']=='save'){
+                $object = str_replace('-', '\\',$request['model']);
+                $model = new $object;
+                $model = $model->findOne($request['id']);
+                $model->$request['field'] = $request['new_url'];
+                $model->save();
+            }
         }
+
     }
@@ -88,9 +126,8 @@ class BaseController extends Controller {
         $model = new ImageSizerForm();
-        if ($model->load(Yii::$app->request->post())) {
-
-            $this->deleteImages($model->old_img);
+        $request = Yii::$app->request->post();
+        if ($request) {
             $model->file = UploadedFile::getInstance($model, 'file');
@@ -106,13 +143,13 @@ class BaseController extends Controller {
             $model->file->saveAs($imageOrigAlias);
-            if($model->width && $model->height){
+            if($request['width'] && $request['height']){
-                $imageAlias = Yii::getAlias($imgDir.$model->width.'x'.$model->height.'.'.$model->file->extension);
+                $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension);
-                $imageLink = '/storage/'.$md5_file.'/'.$model->width.'x'.$model->height.'.'.$model->file->extension;
+                $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension;
-                $this->resizeImg($model->width, $model->height, $imageOrigAlias,$imageAlias);
+                $this->resizeImg($request['width'], $request['height'], $imageOrigAlias,$imageAlias);
             } else {
@@ -11,39 +11,14 @@ $this-&gt;registerJsFile(&#39;@web/js/vendor/bower/jquery-file-upload/js/jquery.iframe-
 $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupload.js');
 ?>
-<style>
-    .gallery_image{
-
-        position: relative;
-        margin-left: 20px;
-        margin-top: 20px;
-        display: inline-block;
-    }
-    .delete-gallery-item{
-        background-color: #fff;
-        opacity: 0.5;
-        font-size: 20px;
-        position: absolute;
-        top: 5px;
-        right: 5px;
-        cursor: pointer;
-    }
-
-    .delete-field-item{
-        position: absolute;
-        top: 33%;
-        right: -35px;
-        font-size: 15px;
-        cursor: pointer;
-    }
-</style>
+
 <?php if(!$multi):?>
 <?= $form->field( new \backend\models\ImageSizerForm(), 'file')->fileInput(['id'=>$field, 'data-url'=>"/admin/site/download-photo" ]); ?>
 <?= $form->field($model,$field)->hiddenInput(['id' => "{$field}_picture_link"]) ?>
-    <input type="hidden" name="ImageSizerForm[width]" value="<?=$width?>"/>
-    <input type="hidden" name="ImageSizerForm[height]" value="<?=$height?>"/>
-    <input type="hidden" name="ImageSizerForm[old_img]" value="<?=$model->$field?>"/>
+    <input type="hidden" id="<?=$field?>_old_img" name="ImageSizerForm[old_img]" value="<?=$model->$field?>"/>
+    <input type="hidden" id="<?=$field?>_new_img" name="ImageSizerForm[new_img]" value=""/>
+    <input type="hidden" id="<?=$field?>_row_id" name="ImageSizerForm[new_img]" value="<?=$model->id?>"/>
 <div id="<?= $field?>_img_block">
     <?= $model->$field ? Html::img($model->$field): '' ?>
 </div>
@@ -53,16 +28,48 @@ $this-&gt;registerJsFile(&#39;@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl
         $("#<?= $field?>").fileupload({
             dataType: 'json',
+            formData: {width: <?=$width?>,height:<?=$height?>},
             done: function (e, data) {
+                if($("#<?=$field?>_buttons_block").length){
+                    $("#<?=$field?>_buttons_block").remove()
+                }
                 var host = window.location.host.toString();
-                var img = '<img src="http://'+host+data.result.link+'">';
+                var img = '<img src="http://'+host+data.result.link+'">'+
+                    '<div id="<?=$field?>_buttons_block">'+
+                        '<button type="button" id="<?=$field?>_save_img" class="btn btn-success img-action-buttons" >Сохранить</button>'+
+                        '<button type="button" id="<?=$field?>_remove_img" class="btn btn-danger img-action-buttons" >Отмена</button>'+
+                    '</div>';
                 var block = $("#<?= $field?>_img_block");
                 block.find('img').remove();
                 block.append(img);
-                $("#<?= $field?>_picture_link").val(data.result.link);
+
+                $("#<?=$field?>_new_img").val(data.result.link);
             }
         });
+
+        $('body').on('click', '#<?=$field?>_save_img',function(){
+            $("#<?=$field?>_buttons_block").remove();
+            var old_url = $('#<?=$field?>_old_img').val();
+            var new_url = $('#<?=$field?>_new_img').val();
+            var model = '<?=str_replace('\\', '-',$model::className());?>';
+            $.post( "/admin/site/delete-image",{new_url:new_url,old_img: old_url,model:model,field:"<?= $field?>", id:"<?=$model->id?>",action:'save'},  function() {
+            });
+            $("#<?=$field?>_picture_link").val(new_url);
+        });
+
+        $('body').on('click', '#<?=$field?>_remove_img',function(){
+            $("#<?=$field?>_buttons_block").remove();
+            $("#<?=$field?>_buttons_block").remove();
+            var old_url = $('#<?=$field?>_old_img').val();
+            var new_url = $('#<?=$field?>_new_img').val();
+            $.post( "/admin/site/delete-image",{old_img: new_url},  function() {
+            });
+
+            $('#<?= $field?>_img_block').find('img').attr('src',old_url);
+        });
+
+
     })
 </script>
 <?php else:?>
@@ -108,4 +115,4 @@ $this-&gt;registerJsFile(&#39;@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl
         })
     </script>
-<? endif;?>
 \ No newline at end of file
+<?php endif;?>
 \ No newline at end of file
@@ -86,8 +86,7 @@ class AccountsController extends Controller
         $cities = DicCities::find()->all();
         $margin = Margins::find()->all();
         $users = User::find()->all();
-        $model->load(Yii::$app->request->post());
-        die( var_dump($model->validate()));
+
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
@@ -12,7 +12,7 @@ use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use yii\web\UploadedFile;
-use backend\components\ImgResizer;
+use backend\components\ImageResizer;
 /**
  * NewsController implements the CRUD actions for News model.
@@ -146,7 +146,7 @@ class NewsController extends Controller
     public function actionFileUpload(){
-        echo ImgResizer::widget();
+        echo ImageResizer::widget();
     }
@@ -62,6 +62,7 @@ class Accounts extends \yii\db\ActiveRecord
     {
         $date = \DateTime::createFromFormat("Y.m.d" , $this->dt);
         $this->dt = $date->getTimestamp();
+        return true;
     }
@@ -9,17 +9,20 @@ use yii\helpers\ArrayHelper;
 /* @var $form yii\widgets\ActiveForm */
 ?>
-<div  ng-controller="SampleAppCtrl" class="Accounts-form">
+<div  class="Accounts-form">
     <?php $form = ActiveForm::begin(); ?>
     <div >
-        <button ng-repeat="item in buttons" ng-click="ShowMe(item)" type="button" ng-class="item.status ? 'btn btn-primary btn-lg active' : 'btn btn-default btn-lg'" class=>{{item.data}}</button>
+        <div class="btn btn-primary btn-lg active main_user_info">Основные данные</div>
+        <div class="btn btn-default btn-lg entity">Юридическое лицо</div>
     </div>
-    <div  ng-show="buttons[0].status" >
+    <div id="main_user_info" >
         <?= $form->field($model, 'if_manager')->checkbox() ?>
         <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+        <?= $form->field($model, 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
+
         <?= $form->field($model, 'phones')->textInput(['maxlength' => true]) ?>
         <?= $form->field($model, 'pass')->passwordInput(['maxlength' => true]) ?>
@@ -49,8 +52,7 @@ use yii\helpers\ArrayHelper;
         <?= $form->field($model, 'scode')->textInput() ?>
     </div>
-    <div  ng-show="buttons[1].status">
-        <?= $form->field($model, 'is_firm')->textInput() ?>
+    <div id="entity">
         <?= $form->field($model, 'company')->textInput(['maxlength' => true]) ?>
@@ -64,6 +64,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             // 'company',
             ['class' => 'yii\grid\ActionColumn'],
+
+        ],
+        'pager' => [
+            'firstPageLabel' => '<<<',
+            'lastPageLabel' => '>>>',
         ],
     ]); ?>
@@ -9,7 +9,7 @@ use yii\helpers\Html;
 MyAsset::register($this);
 ?>
 <?php $this->beginPage() ?>
-<!DOCTYPE html><html lang="<?= Yii::$app->language ?>" ng-app="BackendApp" >
+<!DOCTYPE html><html lang="<?= Yii::$app->language ?>" >
 <head>
     <meta charset="<?= Yii::$app->charset ?>">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -77,9 +77,6 @@ use \yii\helpers\Url;
     <?= $form->field(new \backend\models\ImageSizerForm(), 'price_list')->widget(FileInput::classname(), [
         'name' => 'file',
-        'options' => [
-            ['accept' => 'image/*']
-        ],
         'pluginOptions' => [
             'initialPreview'=>[
                 Html::img($model->price_list, ['class'=>'file-preview-image']),
@@ -25,20 +25,24 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-            'id',
+            //'id',
             'name',
-            'code',
-            'brief:ntext',
-            'content:ntext',
-            // 'sort_delete',
-            // 'title',
-            // 'kwords',
-            // 'descr',
-            // 'dt',
-            // 'is_active',
-            // 'mail_send',
-            // 'mails_count',
-            // 'img',
+            //'code',
+           // 'brief:ntext',
+            //'content:ntext',
+             //'sort_delete',
+             //'title',
+             //'kwords',
+             //'descr',
+
+             'is_active',
+             //'mail_send',
+             'mails_count',
+            [
+                'attribute' => 'dt',
+                'value' => 'date'
+            ],
+             //'img',
             ['class' => 'yii\grid\ActionColumn'],
         ],
@@ -2,7 +2,8 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-
+use \yii\helpers\ArrayHelper;
+use \common\models\TeamGroup;
 /* @var $this yii\web\View */
 /* @var $model common\models\Team */
 /* @var $form yii\widgets\ActiveForm */
@@ -15,7 +16,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
     <?= $form->field($model, 'group_id')->textInput() ?>
-
+    <?= $form->field($model, 'group_id')->dropDownList(ArrayHelper::map(TeamGroup::find()->all(), 'id', 'name'), ['prompt' => 'Выберие группу']) ?>
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
     <?= $form->field($model, 'img')->textInput(['maxlength' => true]) ?>
@@ -27,7 +27,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'id',
             'email:email',
-            'group_id',
+            [
+                'attribute' => 'Группа',
+                'value' => 'teamGroup.name'
+            ],
             'name',
             'img',
             // 'phone',
@@ -33,7 +33,15 @@ use yii\helpers\ArrayHelper;
     ], 'id', 'name')) ?>
-    <?= \backend\components\ImageSizer::widget(['form'=>$form, 'model'=> $model, 'field'=>'photo','width'=>200,'height'=>200,'multi'=>false, 'gallery' =>$model->photo]); ?>
+    <?= \backend\components\ImageUploader::widget([
+        'form'=>$form,
+        'model'=> $model,
+        'field'=>'photo',
+        'width'=>200,
+        'height'=>200,
+        'multi'=>false,
+        'gallery' =>$model->photo
+    ]); ?>
     <?= $form->field($model, 'contacts')->textInput(['maxlength' => true]) ?>
@@ -13,6 +13,11 @@
 html,
 body {
   min-height: 100%;
+    min-width: 100%;
+
+}
+.row{
+    margin: 0!important;
 }
 .layout-boxed html,
 .layout-boxed body {
@@ -23,14 +28,13 @@ body {
   -moz-osx-font-smoothing: grayscale;
   font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-weight: 400;
-  overflow-x: hidden;
   overflow-y: auto;
+    position: absolute;
 }
 /* Layout */
 .wrapper {
   min-height: 100%;
   position: relative;
-  overflow: hidden!important;
 }
 .wrapper:before,
 .wrapper:after {
@@ -688,7 +692,7 @@ a:focus {
   transition: right 0.3s ease-in-out;
 }
 .control-sidebar {
-  position: absolute;
+  position: fixed;
   padding-top: 50px;
   z-index: 1010;
 }
@@ -146,4 +146,37 @@ a.desc:after {
 .ui-tooltip{
     display: none !important;
+}
+
+#entity{
+    display: none;
+}
+
+.img-action-buttons{
+    margin: 5px;
+}
+
+.gallery_image{
+
+    position: relative;
+    margin-left: 20px;
+    margin-top: 20px;
+    display: inline-block;
+}
+.delete-gallery-item{
+    background-color: #fff;
+    opacity: 0.5;
+    font-size: 20px;
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    cursor: pointer;
+}
+
+.delete-field-item{
+    position: absolute;
+    top: 33%;
+    right: -35px;
+    font-size: 15px;
+    cursor: pointer;
 }
 \ No newline at end of file
+$( document ).ready(function() {
+    $('.main_user_info').click(function(){
+        if(!$(this).hasClass('active')){
+            $('#accounts-is_firm').val('1');
+
+            $(this).removeClass('btn-default').addClass('active').addClass('btn-primary');
+            $('#main_user_info').css('display','block');
+
+            $('.entity').removeClass('active').removeClass('btn-primary').addClass('btn-default');
+            $('#entity').css('display','none');
+
+
+        }
+    });
+
+    $('.entity').click(function(){
+        if(!$(this).hasClass('active')){
+            $('#accounts-is_firm').val('0');
+            $(this).removeClass('btn-default').addClass('active').addClass('btn-primary');
+            $('#entity').css('display','block');
+
+            $('.main_user_info').removeClass('active').removeClass('btn-primary').addClass('btn-default');
+            $('#main_user_info').css('display','none');
+
+
+        }
+    });
+});
 \ No newline at end of file
@@ -3,7 +3,9 @@
 namespace common\models;
 use Yii;
-
+use yii\web\IdentityInterface;
+use yii\base\NotSupportedException;
+use yii\db\ActiveRecord;
 /**
  * This is the model class for table "w_accounts".
  *
@@ -45,12 +47,12 @@ use Yii;
  * @property string $firm_site
  * @property string $company
  */
-class Accounts extends \yii\db\ActiveRecord
+class Accounts extends ActiveRecord implements IdentityInterface
 {
     public $re_pass;
     public $surname;
-    public $verifyCode;
+    public $country_region;
     /**
      * @inheritdoc
@@ -63,8 +65,8 @@ class Accounts extends \yii\db\ActiveRecord
     public function beforeSave()
     {
-        $date = \DateTime::createFromFormat("Y.m.d" , $this->dt);
-        $this->dt = $date->getTimestamp();
+        $this->dt = time();
+        return true;
     }
@@ -87,7 +89,6 @@ class Accounts extends \yii\db\ActiveRecord
             [['email'], 'unique'],
             [['email'], 'email'],
             ['re_pass', 'compare', 'compareAttribute' => 'pass'],
-            ['verifyCode', 'captcha'],
             ['dt', 'date', 'format' => 'Y.m.d']
         ];
     }
@@ -134,6 +135,152 @@ class Accounts extends \yii\db\ActiveRecord
             'firm_mfo' => 'МФО',
             'firm_site' => 'Сайт',
             'company' => 'Название фирмы',
+            'country_region' => 'Регион'
         ];
     }
+
+
+    /**
+     * Signs user up.
+     *
+     * @return User|null the saved model or null if saving fails
+     */
+    public function signup()
+    {
+
+        if ($this->validate()) {
+            $this->name = $this->surname.' '.$this->name;
+
+            if( $this->is_firm ){
+                $this->if_manager = '0';
+                $this->margin_id = '1';
+                $this->address = '';
+                $this->comment = 'Новый пользователь';
+                $this->rating = '0';
+                $this->is_active = '1';
+                $this->last_loginin = '';
+                $this->firm_inn = '';
+                $this->firm_bank ='';
+                $this->balance ='0.00';
+                $this->office_id ='1';
+                $this->is_scribe ='1';
+                $this->set_manager_id ='0';
+                $this->phones2='';
+                $this->phones3 ='';
+                $this->snumb ='';
+                $this->firm_ur_adr ='';
+                $this->firm_fiz_adr = '';
+                $this->firm_code_eg = '';
+                $this->firm_rs = '';
+                $this->firm_mfo = '';
+                $this->firm_site = '';
+            }else{
+
+                $this->if_manager = '0';
+                $this->margin_id = '1';
+                $this->address = '';
+                $this->comment = 'Новый пользователь';
+                $this->rating = '0';
+                $this->is_active = '1';
+                $this->last_loginin = '';
+                $this->firm_inn = '';
+                $this->firm_bank ='';
+                $this->balance ='0.00';
+                $this->office_id ='1';
+                $this->is_scribe ='1';
+                $this->set_manager_id ='0';
+                $this->phones2='';
+                $this->phones3 ='';
+                $this->snumb ='';
+                $this->firm_ur_adr ='';
+                $this->firm_fiz_adr = '';
+                $this->firm_code_eg = '';
+                $this->firm_rs = '';
+                $this->firm_mfo = '';
+                $this->firm_site = '';
+            }
+
+            if ($this->save()) {
+                return $this;
+            }
+        }
+
+        return null;
+    }
+    /**
+     * @inheritdoc
+     */
+    public static function findIdentity($id)
+    {
+        return static::findOne(['id' => $id]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function findIdentityByAccessToken($token, $type = null)
+    {
+        throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.');
+    }
+
+    /**
+     * Finds user by username
+     *
+     * @param string $username
+     * @return static|null
+     */
+    public static function findByUsername($username)
+    {
+        return static::findOne(['name' => $username]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getId()
+    {
+        return $this->getPrimaryKey();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAuthKey()
+    {
+        return $this->auth_key;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validateAuthKey($authKey)
+    {
+        return $this->getAuthKey() === $authKey;
+    }
+
+
+
+    /**
+     * Generates "remember me" authentication key
+     */
+    public function generateAuthKey()
+    {
+        $this->auth_key = Yii::$app->security->generateRandomString();
+    }
+
+    /**
+     * Generates new password reset token
+     */
+    public function generatePasswordResetToken()
+    {
+        $this->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
+    }
+
+    /**
+     * Removes password reset token
+     */
+    public function removePasswordResetToken()
+    {
+        $this->password_reset_token = null;
+    }
 }
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\web\IdentityInterface;
+use yii\base\NotSupportedException;
+use yii\db\ActiveRecord;
+/**
+ * This is the model class for table "w_accounts".
+ *
+ *
+ * @property integer $id
+ * @property integer $if_manager
+ * @property string $email
+ * @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 ActiveRecord
+{
+
+    public $re_pass;
+    public $surname;
+    public $verifyCode;
+    public $country_region;
+
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'w_accounts';
+    }
+
+
+
+    /**
+     * @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']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'if_manager' => 'Статус менеджера',
+            'email' => 'E-mail (Логин)',
+            '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' => 'Регион'
+        ];
+    }
+
+
+}
@@ -47,4 +47,8 @@ class DicCities extends \yii\db\ActiveRecord
             'parent' => Yii::t('app', 'Parent'),
         ];
     }
+
+    public function getCitiesByRegion($region_id){
+        return self::find()->where(['parent'=>$region_id])->all();
+    }
 }
@@ -54,4 +54,9 @@ class Team extends \yii\db\ActiveRecord
             'code' => 'Code',
         ];
     }
+
+    public function getTeamGroup()
+    {
+        return $this->hasOne(TeamGroup::className(), ['id' => 'group_id']);
+    }
 }
@@ -41,4 +41,9 @@ class TeamGroup extends \yii\db\ActiveRecord
             'name' => 'Name',
         ];
     }
+
+    public function getTeam()
+    {
+        return $this->hasMany(Team::className(), ['group_id' => 'id']);
+    }
 }
@@ -31,6 +31,7 @@ class InternalAsset extends AssetBundle
         'css/perfect-scrollbar/js/perfect-scrollbar.js',
         'js/ital_auto.js',
         'js/script.js',
+        'js/main.js',
         'js/selectize.js',
         'js/select.js',
         'js/validation/dist/jquery.validate.js',
@@ -29,6 +29,7 @@ class OuterAsset extends AssetBundle
         'css/perfect-scrollbar/js/perfect-scrollbar.js',
         'js/ital_auto.js',
         'js/script.js',
+        'js/main.js',
         'js/selectize.js',
         'js/select.js',
         'js/validation/dist/jquery.validate.js'
+<?php
+/**
+ * Created by PhpStorm.
+ * User: vitaliy
+ * Date: 08.11.15
+ * Time: 22:06
+ */
+
+namespace frontend\controllers;
+
+use common\models\DicCities;
+use Yii;
+use yii\web\Controller;
+
+class AjaxController extends Controller {
+
+
+    public $enableCsrfValidation = false;
+
+    public function actionGetCity($region_id){
+
+        $model = new DicCities();
+        $cities = $model->getCitiesByRegion($region_id);
+        return $this->renderPartial('cities_list',[
+            'cities' => $cities
+        ]);
+    }
+
+    public function actionGetRegistrationForm($form){
+        return $this->renderPartial($form,[
+        ]);
+    }
+
+
+}
 \ No newline at end of file
 <?php
 namespace frontend\controllers;
+use common\models\Accounts;
+use common\models\AccountsForm;
+use common\models\Team;
+use common\models\TeamGroup;
 use Yii;
 use common\models\LoginForm;
 use frontend\models\PasswordResetRequestForm;
@@ -20,36 +24,7 @@ use common\components\MailWidget;
 class SiteController extends Controller
 {
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'only' => ['logout', 'signup'],
-                'rules' => [
-                    [
-                        'actions' => ['signup'],
-                        'allow' => true,
-                        'roles' => ['?'],
-                    ],
-                    [
-                        'actions' => ['logout'],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
-            ],
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
-        ];
-    }
+   // public $enableCsrfValidation = false;
     /**
      * @inheritdoc
@@ -193,10 +168,10 @@ class SiteController extends Controller
         return $this->render('notepad');
     }
-    public function actionOptovikam()
+    public function actionWholesalers()
     {
         $this->layout = '/internal';
-        return $this->render('optovikam');
+        return $this->render('wholesalers');
     }
     public function actionOriginalCatalog()
@@ -311,27 +286,18 @@ class SiteController extends Controller
         return $this->goHome();
     }
-    /**
-     * Displays contact page.
-     *
-     * @return mixed
-     */
-    public function actionContact()
+
+    public function actionContacts()
     {
-        $model = new ContactForm();
-        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-            if ($model->sendEmail(Yii::$app->params['adminEmail'])) {
-                Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.');
-            } else {
-                Yii::$app->session->setFlash('error', 'There was an error sending email.');
-            }
+        $this->layout = '/internal';
+        return $this->render('contacts');
+    }
-            return $this->refresh();
-        } else {
-            return $this->render('contact', [
-                'model' => $model,
-            ]);
-        }
+
+    public function actionPaymentDelivery()
+    {
+        $this->layout = '/internal';
+        return $this->render('payment_delivery');
     }
     /**
@@ -341,8 +307,12 @@ class SiteController extends Controller
      */
     public function actionAbout()
     {
+        $teamGroups = TeamGroup::find()->all();
+
         $this->layout = '/internal';
-        return $this->render('about');
+        return $this->render('about',[
+           'teamGroups' => $teamGroups,
+        ]);
     }
     /**
@@ -352,9 +322,12 @@ class SiteController extends Controller
      */
     public function actionSignup()
     {
-        $model = new SignupForm();
-        if ($model->load(Yii::$app->request->post())) {
+        $model = new Accounts();
+
+        if ($model->load(Yii::$app->request->post(),'AccountsForm')) {
+
             if ($user = $model->signup()) {
+
                 if (Yii::$app->getUser()->login($user)) {
                     return $this->goHome();
                 }
@@ -414,4 +387,5 @@ class SiteController extends Controller
             'model' => $model,
         ]);
     }
+
 }
+<?php foreach($cities as $city):?>
+    <option value="<?= $city->id ?>"><?= $city->name ?></option>
+<?php endforeach?>
 \ No newline at end of file
+<?php
+use yii\widgets\ActiveForm;
+use \common\models\AccountsForm;
+use \common\models\DicCities;
+use \yii\helpers\ArrayHelper;
+use \common\models\Deliveries;
+use yii\captcha\Captcha;
+?>
+<div class="registration_for_company">
+    <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => 'site/signup']); ?>
+    <?= $form->field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'1'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'company')->textInput(['maxlength' => 45,'placeholder'=>'Компания'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?>
+
+    <?= $form->field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','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 AccountsForm(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+
+    <?= $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 AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+        [],
+        ['prompt' => 'Выберите город']
+    )->label(false);
+    ?>
+
+    <?= $form->field(new AccountsForm(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+        ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'),
+        ['prompt' => 'Выберите тип перевозки']
+    )->label(false);
+    ?>
+
+    <?= $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); ?>
+
+    <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>
+    <?php ActiveForm::end(); ?>
+</div>
 \ No newline at end of file
+<?php
+use yii\widgets\ActiveForm;
+use \common\models\AccountsForm;
+use \common\models\DicCities;
+use \yii\helpers\ArrayHelper;
+use \common\models\Deliveries;
+use yii\captcha\Captcha;
+?>
+<div class="registration_for_person">
+    <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => 'site/signup']); ?>
+    <?= $form->field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
+    <?= $form->field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?>
+
+    <?= $form->field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','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 AccountsForm(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+
+    <?= $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 AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+        [],
+        ['prompt' => 'Выберите город']
+    )->label(false);
+    ?>
+
+    <?= $form->field(new AccountsForm(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+        ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'),
+        ['prompt' => 'Выберите тип перевозки']
+    )->label(false);
+    ?>
+
+    <?= $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); ?>
+
+    <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>
+    <?php ActiveForm::end(); ?>
+</div>
 \ No newline at end of file
@@ -5,7 +5,7 @@ $this-&gt;registerCssFile(&#39;/css/style/busket.css&#39;);
 $this->title = 'Корзина';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="vin">
+<div class="main-vin">
     <p class="vin_article">Корзина</p>
     <div class="choose_tovar">
     <p class="currency  opposite" id="dollars">грн</p>
@@ -7,7 +7,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 ?>
-<div class="vin">
+<div class="main-vin">
 	<p class="vin_article">Корзина</p>
     <div class="choose_tovar">
     <form method="get" class="cmxform" action="" id="profile_form">
@@ -14,6 +14,7 @@ use \yii\widgets\Menu;
 use \yii\helpers\Url;
 use common\models\Callback;
 use \common\models\Accounts;
+use \common\models\AccountsForm;
 use \yii\helpers\ArrayHelper;
 use \common\models\DicCities;
 use \common\models\Deliveries;
@@ -41,10 +42,10 @@ use yii\captcha\Captcha;
             'items' => [
                 ['label' => 'О компании', 'url'=>Url::toRoute('/site/about')],
                 ['label' => 'Каталоги', 'url'=>'/page/FAQ'],
-                ['label' => 'Оптовикам','url'=>'/events/index'],
-                ['label' => 'Поставщикам','url'=>'/articles/index'],
-                ['label' => 'Оплата и доставка', 'url'=>Url::toRoute('/site/contact')],
-                ['label' => 'Контакты', 'url'=>Url::toRoute('/site/contact')],
+                ['label' => 'Оптовикам','url'=>'/site/wholesalers'],
+                ['label' => 'Поставщикам','url'=>'/site/provider'],
+                ['label' => 'Оплата и доставка', 'url'=>Url::toRoute('/site/payment-delivery')],
+                ['label' => 'Контакты', 'url'=>Url::toRoute('/site/contacts')],
             ],
         ]);
         ?>
@@ -399,73 +400,43 @@ use yii\captcha\Captcha;
                             <div class="registration_holder">
                                 <div class="registration_for_person">
-                                    <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => '/']); ?>
-                                    <?= $form->field(new Accounts(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
+                                    <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => 'site/signup']); ?>
-                                    <?= $form->field(new Accounts(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
-                                        ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'),
-                                        ['prompt' => 'Выберите область']
-                                    )->label(false);
-                                    ?>
-
-                                    <?= $form->field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
-                                        [],
-                                        ['prompt' => 'Выберите город']
-                                    )->label(false);
-                                    ?>
-
-                                    <?= $form->field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
-                                        ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'),
-                                        ['prompt' => 'Выберите тип перевозки']
-                                    )->label(false);
-                                    ?>
+                                    <?= $form->field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 'verifyCode')->widget(Captcha::className(), [
-                                        'options'=>['placeholder'=>'Введите код' ],
-                                        'template' => '<div>{input}</div><div class="row"><div class="col-lg-3">{image}</div></div>',
-                                    ])->label(false); ?>
+                                    <?= $form->field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?>
-                                    <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>
-                                    <?php ActiveForm::end(); ?>
-                                </div>
-                                <div class="registration_for_company">
-                                    <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => '/']); ?>
-                                    <?= $form->field(new Accounts(), 'company')->textInput(['maxlength' => 45,'placeholder'=>'Компания'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?>
-                                    <?= $form->field(new Accounts(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','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(), '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(), '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(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+                                    <?= $form->field(new AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
                                         [],
                                         ['prompt' => 'Выберите город']
                                     )->label(false);
                                     ?>
-                                    <?= $form->field(new Accounts(), 'country',['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); ?>
@@ -473,6 +444,7 @@ use yii\captcha\Captcha;
                                     <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>
                                     <?php ActiveForm::end(); ?>
                                 </div>
+
                             </div>
                     </div>
@@ -18,7 +18,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
-<div class="vin">
+<div class="main-vin">
 	<p class="vin_article">Новости</p>
     <div class="choose_tovar">
         <?php
@@ -6,32 +6,33 @@ $this-&gt;title = $model-&gt;name;
 $this->params['breadcrumbs'][] = ['label' => 'Новости', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="vin">
+<div class="main-vin">
 	<p class="vin_article"><?= $model->name ?></p>
-	</div>	    
-<div class="choose_tovar">
-<img src="<?= $model->img ?>" class="big_article">
-<div class="one_article">
-    <?= $model->content ?>
-<div class="download_catalog">
-	<img src="/images/ico_exel.png">
-	<a href="<?= $model->price_list ?>">Скачать список товаров</a>
-</div>
-<div class='long_line'></div>
-<div class="go_news">
-<a href="">
-<div class="back_news">
-	<p class='article'>Приход товара Mecarm</p>
-	<p class="short_news">На склад поступила очередная партия товара MecArm</p>
-</div>	
-</a>
-<a href="">
-<div class="next_news">
-	<p class='article'>Приход товара Mecarm</p>
-	<p class="short_news">На склад поступила очередная партия товара MecArm</p>
-</div>	
-</a>	
-</div>
-</div>
-<img src="/images/lonh_line.png" style="margin-top:-20px;opacity:0">
+
+    <div class="choose_tovar">
+    <img src="<?= $model->img ?>" class="big_article">
+    <div class="one_article">
+        <?= $model->content ?>
+    <div class="download_catalog">
+        <img src="/images/ico_exel.png">
+        <a href="<?= $model->price_list ?>">Скачать список товаров</a>
+    </div>
+    <div class='long_line'></div>
+    <div class="go_news">
+    <a href="">
+    <div class="back_news">
+        <p class='article'>Приход товара Mecarm</p>
+        <p class="short_news">На склад поступила очередная партия товара MecArm</p>
+    </div>
+    </a>
+    <a href="">
+    <div class="next_news">
+        <p class='article'>Приход товара Mecarm</p>
+        <p class="short_news">На склад поступила очередная партия товара MecArm</p>
+    </div>
+    </a>
+    </div>
+    </div>
+    <img src="/images/lonh_line.png" style="margin-top:-20px;opacity:0">
+    </div>
 </div>
 <?php
-use yii\widgets\Menu;
-
-
 $this->registerCssFile('/css/about_company.css');
 $this->title = "О компании";
@@ -9,7 +6,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 ?>
-<div class="vin">
+<div class="main-vin">
     <p class="vin_article">О компании</p>
 <div class='side_menu'>
 <ul class="side_menu-list" role="tablist">
@@ -27,197 +24,16 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 		</p>
 </div>
     <div role="tabpanel" class="tab-pane" id="profile">
-    	<table>
-    		<tr>
-    			<td class='team_header'>Руководитель</td>
-    		</tr>
-    		<tr>
-    			<td class="personal_photo"><img src="/images/bershadskiy.png"></td>
-    		</tr>
-    		<tr>
-    			<td class="personal_name">Олег Бершадский</td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    		</tr>
-    		<tr>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    		</tr>
-
-    	</table>
-
-    	<table>
-    		<tr>
-    			<td class='team_header'>Продажи</td>
-    		</tr>
-    		<tr>
-    			<td class="personal_photo"><img src="/images/ovcharenko.png"></td>
-    			<td class="personal_photo"><img src="/images/ovcharenko1.png"></td>
-    			<td class="personal_photo"><img src="/images/ovcharenko2.png"></td>
-    		</tr>
-    		<tr>
-    			<td class="personal_name">Александр Васильев</td>
-    			<td class="personal_name">Павел Овчаренко</td>
-    			<td class="personal_name">Алексей Чельцов</td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    		</tr>
-    		<tr>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    		</tr>
-
-    	</table>
-    	<table>
-    		<tr>
-    			<td class='team_header'>Учет</td>
-    		</tr>
-    		<tr>
-    			<td class="personal_photo"><img src="/images/nina.png"></td>
-    			<td class="personal_photo"><img src="/images/tanya.png"></td>
-    			
-    		</tr>
-    		<tr>
-    			<td class="personal_name">Нина Носевич</td>
-    			<td class="personal_name">Татьяна Михайленко</td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    			
-    		</tr>
-    		<tr>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    			<td  class='team_contacts'><img src="/images/telephone_ico.png"><a href="">044-593-9051 доб.4201</a></td>
-    			
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    			
-    		</tr>
-
-    	</table>
-    	<table>
-    		<tr>
-    			<td class='team_header'>Склад</td>
-    		</tr>
-    		<tr>
-    			<td class="personal_photo"><img src="/images/sklad1.png"></td>
-    			<td class="personal_photo"><img src="/images/sklad2.png"></td>
-    			
-    		</tr>
-    		<tr>
-    			<td class="personal_name">Александр Буглак</td>
-    			<td class="personal_name">Андрей Гаврилюк</td>
-    		</tr>
-    	
-    		<tr>
-    			<td  class='team_contacts'><img src="/images/telephone_ico.png"><a href="">044-593-9051 доб.4201</a></td>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    			
-    		</tr>
-    	
-
-    	</table>
-    	<table>
-    		<tr>
-    			<td class='team_header'>Транспорт</td>
-    		</tr>
-    		<tr>
-    			<td class="personal_photo"><img src="/images/transport.png"></td>
-    		</tr>
-    		<tr>
-    			<td class="personal_name">Роман Ковтун</td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    		</tr>
-    		<tr>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    		</tr>
-
-    	</table>
-    	  	<table>
-    		<tr>
-    			<td class='team_header'>IT</td>
-    		</tr>
-    		<tr>
-    			<td class="personal_photo"><img src="/images/transport.png"></td>
-    		</tr>
-    		<tr>
-    			<td class="personal_name">Сергей Калиниченко</td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/envelope.png">oleg@italauto.com.ua</a></td>
-    		</tr>
-    		<tr>
-    			<td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png">044-593-9051 доб.4201</a></td>
-    		</tr>
-    		<tr>
-    			<td class='team_contacts'><a href=""><img src="/images/skype.png">oleg-italauto</a></td>
-    		</tr>
-
-    	</table>
-    </div>
-    <div role="tabpanel" class="tab-pane" id="messages">
-    	<div class="first_block">
-				<p style="font-size:19px; margin-bottom:20px;font-weight: normal">Контакты</p><br>
-				<p style="font-size:14px">г.Киев ул.Изюмская 5</p><br><br>
-				<div class="telephone">
-				<span><img src="/images/mts_contacts.png"></span>
-				<p>050-0400-192</p><br>
-				<span><img src="/images/kyiv_contacts.png"></span>
-				<p>097-0400-192</p><br>
-				<span><img src="/images/life_contacts.png"></span>
-				<p>093-0400-192</p><br>
-				</div>
-				<img src="/images/call_back.png">
-				<a href="" data-toggle="modal" data-target="#myModal">обратный звонок</a>		
-			</div>
-			<div class="work_hours">
-			<p style="font-size:19px;font-weight: normal">График работы</p><br>
-			<p>Пн - Пт – с 9:00 до 18:00 (без перерыва)<br>
-			Сб - с 9:00 до 15:00<br>
-			Вс – выходной день</p>
-			</div>
-			<div class="block_contacts">
-				<p style="font-size:19px;font-weight: normal">Обратная связь</p><br>
-				<img src="/images/envelope.png">
-				<a href="">kiev@italauto.com.ua</a><br>
-				<img src="/images/skype.png">
-				<a href="">retror0107</a>
-				
-				
-			</div>
-			<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2542.5526259582884!2d30.51665609999999!3d50.4121746!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x40d4cf3af97c6063%3A0x29c06e78aacc11fc!2z0LLRg9C7LiDQhtC30Y7QvNGB0YzQutCwLCA1LCDQmtC40ZfQsg!5e0!3m2!1sru!2sua!4v1441100203696" width="880" height="297" frameborder="0" style="border:0" allowfullscreen=""></iframe>
-    </div>
-    <div role="tabpanel" class="tab-pane" id="settings">
-    	<p class='payment'><span style="font-size:18px">Реквизиты для оплаты через "Приват Банк" на СПД Бершадский О. В.</span><br>
-
-ЄДРПОУ: 2690914236<br>
-
-Р/р: 26000060840517<br>
-
-Банк: ПАТ  КБ "Приватбанк"<br>
-
-МФО: 300711</p>
+        <?php foreach ($teamGroups as $group): ?>
+            <?=$this->render('team_list_layout', [
+                'group' => $group
+            ]);?>
+        <?php endforeach; ?>
     </div>
+      <?=$this->render('contacts_layout', [
+      ]);?>
+      <?=$this->render('payment_delivery_layout', [
+      ]);?>
   </div>
 </div>
 <img src="/images/lonh_line.png" class='long_line'>	
+<?php
+$this->registerCssFile('/css/about_company.css');
+
+$this->title = "Контакты";
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<div class="main-vin">
+    <?=$this->render('contacts_layout', [
+    ]);?>
+</div>
+<div role="tabpanel" class="tab-pane" id="messages">
+    <div class="first_block">
+        <p style="font-size:19px; margin-bottom:20px;font-weight: normal">Контакты</p><br>
+        <p style="font-size:14px">г.Киев ул.Изюмская 5</p><br><br>
+        <div class="telephone">
+            <span><img src="/images/mts_contacts.png"></span>
+            <p>050-0400-192</p><br>
+            <span><img src="/images/kyiv_contacts.png"></span>
+            <p>097-0400-192</p><br>
+            <span><img src="/images/life_contacts.png"></span>
+            <p>093-0400-192</p><br>
+        </div>
+        <img src="/images/call_back.png">
+        <a href="" data-toggle="modal" data-target="#myModal">обратный звонок</a>
+    </div>
+    <div class="work_hours">
+        <p style="font-size:19px;font-weight: normal">График работы</p><br>
+        <p>Пн - Пт – с 9:00 до 18:00 (без перерыва)<br>
+            Сб - с 9:00 до 15:00<br>
+            Вс – выходной день</p>
+    </div>
+    <div class="block_contacts">
+        <p style="font-size:19px;font-weight: normal">Обратная связь</p><br>
+        <img src="/images/envelope.png">
+        <a href="">kiev@italauto.com.ua</a><br>
+        <img src="/images/skype.png">
+        <a href="">retror0107</a>
+
+
+    </div>
+    <div style="clear: both">
+        <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2542.5526259582884!2d30.51665609999999!3d50.4121746!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x40d4cf3af97c6063%3A0x29c06e78aacc11fc!2z0LLRg9C7LiDQhtC30Y7QvNGB0YzQutCwLCA1LCDQmtC40ZfQsg!5e0!3m2!1sru!2sua!4v1441100203696" width="880" height="297" frameborder="0" style="border:0" allowfullscreen=""></iframe>
+    </div>
+</div>
+<?php
+$this->registerCssFile('/css/about_company.css');
+
+$this->title = "Оплата и доставка";
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<div class="vin">
+    <p class="vin_article">Оплата и доставка</p>
+    <?=$this->render('payment_delivery_layout', [
+    ]);?>
+</div>
+<div role="tabpanel" class="tab-pane" id="settings">
+    <p class='payment'><span style="font-size:18px">Реквизиты для оплаты через "Приват Банк" на СПД Бершадский О. В.</span><br>
+
+        ЄДРПОУ: 2690914236<br>
+
+        Р/р: 26000060840517<br>
+
+        Банк: ПАТ  КБ "Приватбанк"<br>
+
+        МФО: 300711</p>
+</div>
 \ No newline at end of file
 <?php
 $this->registerCssFile('/css/style/optovikam.css');
-
+$this->title = "Поставщикам";
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -9,12 +9,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
-<div class="vin">
-	<a href="" class="navigation">Италавто</a>
-	<img src="/images/arrow_dots.png" class='arrow_go'>
-	<span>Поставщикам</span>
+<div class="main-vin">
+
 	<p class="vin_article">Поставщикам</p>
-	</div>	    
+
 <div class="choose_tovar">
 <p class="choose_tovar-inviting">Приглашаем к сотрудничеству поставщиков товара.</p>
@@ -64,83 +62,4 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     	</tbody></table>
 </div>
 </div>
-
-<div class="slider_block1">
-		<div class="tovars">
-			<p style="display:inline-block">Наши проекты</p>
-			<span><img src="/images/arrow_slider_back.png"></span>
-			<span class="number_of">1/</span>
-		<span class="general_number">5</span>
-			<span><img src="/images/arrow_slider_go.png"></span>
-			<div class="slider_tovars">
-
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-lr-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на Land Rover<br> и Range Rover</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-mersedes-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на<br> Mercedes Benz</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-fiat-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на FIAT</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-lr-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на Land Rover<br> и Range Rover</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-
-			</div>
-			
-		</div>
-	  </div>
-
+</div>
+<table>
+    <tr>
+        <td class='team_header'><?= $group->name ?></td>
+    </tr>
+    <tr>
+        <?php foreach($group->team as $team):?>
+        <td class="personal_photo"><img src="<?= $team->img ?>"></td>
+        <?php endforeach; ?>
+    </tr>
+    <tr>
+        <?php foreach($group->team as $team):?>
+            <td class="personal_name"><?= $team->name ?></td>
+        <?php endforeach; ?>
+    </tr>
+    <tr>
+        <?php foreach($group->team as $team):?>
+            <?php if( $team->email):?>
+                <td class='team_contacts'><a href=""><img src="/images/envelope.png"><?= $team->email ?></a></td>
+            <?php endif;?>
+        <?php endforeach; ?>
+    </tr>
+    <tr>
+        <?php foreach($group->team as $team):?>
+            <?php if( $team->phone):?>
+            <td  class='team_contacts'><a href=""><img src="/images/telephone_ico.png"><?= $team->phone ?></a></td>
+            <?php endif;?>
+        <?php endforeach; ?>
+    </tr>
+    <tr>
+        <?php foreach($group->team as $team):?>
+        <?php if( $team->skype):?>
+        <td class='team_contacts'><a href=""><img src="/images/skype.png"><?= $team->skype ?></a></td>
+            <?php endif;?>
+        <?php endforeach; ?>
+    </tr>
+
+</table>
 \ No newline at end of file
 <?php
 $this->registerCssFile('/css/style/optovikam.css');
-
+$this->title = "Оптовикам";
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="vin">
-	<a href="" class="navigation">Италавто</a>
-	<img src="/images/arrow_dots.png" class='arrow_go'>
-	<span>Оптовикам</span>
+<div class="main-vin">
+
 	<p class="vin_article">Оптовикам</p>
-	</div>	    
+
 <div class="choose_tovar">
 <p class="choose_tovar-inviting">Приглашаем к сотрудничеству СТО, магазины и торгующие организации</p>
@@ -51,81 +49,4 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 </div>
 </div>
-<div class="slider_block1">
-		<div class="tovars">
-			<p style="display:inline-block">Наши проекты</p>
-			<span><img src="/images/arrow_slider_back.png"></span>
-			<span class="number_of">1/</span>
-		<span class="general_number">5</span>
-			<span><img src="/images/arrow_slider_go.png"></span>
-			<div class="slider_tovars">
-
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-lr-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на Land Rover<br> и Range Rover</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-mersedes-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на<br> Mercedes Benz</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-fiat-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на FIAT</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-				<table class="block_project">
-				<tbody><tr><td>
-					<img src="/images/logo-lr-small.png">
-				</td></tr>
-				<tr><td>
-					<a href="">lr.italauto.com.ua</a>
-				</td></tr>
-				<tr><td>	
-					<ul>
-					<h4>Запчасти на Land Rover<br> и Range Rover</h4>
-								<li>Оригинальные запчасти</li>
-								<li>Сертифицированый продавец</li>
-								<li>Более 300 000 товаров</li>
-					</ul>
-				</td></tr>
-				</tbody></table>
-
-			</div>
-			
-		</div>
-	  </div>
+</div>
 \ No newline at end of file
@@ -33,10 +33,7 @@
 	display: inline-block;
 	margin-left: 15px;
 }
-.vin{
-	width: 960px;
-    margin: 40px auto 12px;
-}
+
 #stone-filter-form ul{
 	list-style-type: none;
@@ -3,23 +3,11 @@
 	color: #828282;
 }
-.vin_article{
-	font-size:22px;
-	font-weight: 400;
-	margin-top:17px;
-	font-weight: 500;
-}
-
 .navigation{
 	color: #6b84b5;
     text-decoration: underline;
 }
-.vin{
-	width: 960px!important;
-    margin: 34px auto;
-}
-
 .detail{
     margin-top: -10px;
     width: 460px;
-.vin{
-	width:960px;
-	margin:0 auto;	
-}
-
 .navigation {
     color: #6b84b5;
     text-decoration: underline;
 }
-.vin {
-    margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-}
-.vin_article {
-	  border-bottom:1px solid #dfdfdf;
-      padding-bottom: 4px;
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .side_menu{
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-}
+
 .vin_body {
     padding-bottom: 31px;
@@ -30,11 +25,6 @@
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .choose_catalog{
 	width: 960px;
@@ -730,29 +730,6 @@
     cursor: pointer;
 }
-.registration_holder{
-    padding-top: 32px;
-    width: 432px;
-    height: auto;
-    border: 1px solid #c7c7c7;
-    border-radius: 0 0 12px 12px;
-    margin-bottom: 30px;
-    margin-top: -4px;
-}
-.modal-content1 {
-    position: relative;
-    background-color: #fff;
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box;
-    border: 1px solid #999;
-    border: 1px solid rgba(0,0,0,.2);
-    outline: 0;
-    -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
-    box-shadow: 0 3px 9px rgba(0,0,0,.5);
-    border-bottom: 3px solid #dfdfdf!important;
-
-}
-
 .first_block a:nth-child(12):hover {
     color: #8ca1c8;  
@@ -779,9 +756,6 @@
     margin-right: 5px
         }
-.registration_for_company{
-  display: none;
-}
 .registration_for_company a{
     float:right;
     color: #6b84b5;
@@ -2248,8 +2222,6 @@ left: -444px;
-.vin_article{
-}
 .number_of{
@@ -142,4 +142,43 @@ li a{
     margin-bottom: 10px;
 }
-div.required:after {content: " *"; color: #fec831;}
 \ No newline at end of file
+div.required:after {content: " *"; color: #fec831;}
+
+.registration_holder{
+    padding-top: 32px;
+    width: 432px;
+    border: 1px solid #c7c7c7;
+    border-radius: 0 0 12px 12px;
+    margin-bottom: 30px;
+    margin-top: -4px;
+}
+.modal-content1 {
+    position: relative;
+    background-color: #fff;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid #999;
+
+    outline: 0;
+    -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
+    box-shadow: 0 3px 9px rgba(0,0,0,.5);
+    border-bottom: 3px solid #dfdfdf !important;
+
+}
+.vin_article{
+    font-size: 22px;
+    font-weight: 500;
+    margin-top: 22px;
+    border-bottom: 1px solid #dfdfdf;
+    padding-bottom: 4px;
+}
+.main-vin{
+    width: 960px;
+    border-bottom: 1px solid #dfdfdf;
+    margin: 20px auto;
+}
+
+.vin{
+    width: 960px;
+    margin: 20px auto;
+}
 \ No newline at end of file
@@ -2,14 +2,6 @@ p, a, label, span{
     font-family: "Ubuntu"
 }
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-   
-}
-
 .navigation:hover {
     color: #879cc3;
 }
@@ -27,11 +19,6 @@ p, a, label, span{
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .choose_tovar{
     width: 960px;
@@ -2,13 +2,6 @@
 	padding-bottom: 1px;
 }
-.vin{
-    padding-bottom: 38px;
-	width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-}
-
 .vin img{
 	margin-bottom: 1px;
 }
@@ -17,12 +10,7 @@
     text-decoration: underline;
 }
-.vin_article{
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-    border-bottom: 1px solid #dfdfdf;
-}
+
 .line{
 	margin-bottom: 12px;
 }
-.vin {
-    margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-}
-
 .navigation {
     color: #6b84b5;
     text-decoration: underline;
@@ -14,11 +7,6 @@
     margin-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .choose_catalog{
 	width: 960px;
@@ -68,7 +68,6 @@
 .choose_tovar{
   margin-top: 30px;
-  border-bottom: 1px solid #6b84b5;
   padding-bottom:21px;
 }
@@ -297,7 +296,6 @@ table.trackbar .r div {
 table.trackbar {
     width: 250px;
     margin: 10px 43px;
-    background: repeat-x url() top left;
 }
@@ -2,12 +2,6 @@
 	padding-bottom: 1px;
 }
-.vin{
-	width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-}
-
 .vin1{
     width: 960px;
     margin: 34px auto;
@@ -22,11 +16,6 @@
     text-decoration: underline;
 }
-.vin_article{
-	font-size:22px;
-	font-weight: 500;
-	margin-top:22px;
-}
 .line{
 	margin-bottom: 12px;
 }
@@ -1419,15 +1419,6 @@ input{
     cursor: pointer;
 }
-.registration_holder{
-    padding-top: 32px;
-    width: 432px;
-    height: auto;
-    border: 1px solid #c7c7c7;
-    border-radius: 0 0 12px 12px;
-    margin-bottom: 30px;
-    margin-top: -4px;
-}
 #modal_form_registration #code_input{
@@ -1449,19 +1440,13 @@ input{
     margin-right: 5px
 }
-.registration_for_company{
-    display: none;
-}
 .registration_for_company a{
     float:right;
     color: #6b84b5;
     margin-right: 5px
 }
-.registration_holder p{
-    margin: 41px 0 0 51px;
-    font-size: 18px;
-}
+
 .code_generate{
     float: right;
     margin: -55px 82px;
@@ -2,14 +2,6 @@ p, a, label, span{
     font-family: "Ubuntu"
 }
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-   
-}
-
 .navigation:hover {
     color: #879cc3;
 }
@@ -27,12 +19,6 @@ p, a, label, span{
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
-
 .choose_tovar{
     width: 920px;
     margin: 121px auto 0;
@@ -2,14 +2,6 @@ p, a, label, span{
     font-family: "Ubuntu"
 }
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-
-   
-}
-
 .navigation:hover {
     color: #879cc3;
 }
@@ -27,13 +19,6 @@ p, a, label, span{
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-      border-bottom:1px solid #dfdfdf;
-      padding-bottom: 4px;
-}
 .choose_tovar{
     width: 960px;
@@ -2,14 +2,6 @@ p, a, label, span{
     font-family: "Ubuntu"
 }
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-   
-}
-
 .navigation:hover {
     color: #879cc3;
 }
@@ -27,11 +19,6 @@ p, a, label, span{
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .choose_tovar{
     width: 960px;
@@ -135,7 +135,6 @@
 .choose_tovar{
 	width: 750px!important;
-	border-bottom: none!important;
     margin-left:-36px;
 }
 #notepad .tab-content_header{
@@ -219,11 +218,6 @@ cursor: pointer;
     margin-right:69px;
 }
-.vin{
-	border-bottom: none!important;
-}
-
-
 .search_input {
     background-color: #7b91bd;
     width: 286px;
@@ -2,13 +2,6 @@ p, a, label, span{
     font-family: "Ubuntu"
 }
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-   
-}
 .navigation:hover {
     color: #879cc3;
@@ -27,11 +20,6 @@ p, a, label, span{
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .choose_tovar{
     width: 960px;
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-   
-}
 .navigation:hover {
     color: #879cc3;
@@ -23,16 +16,11 @@
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
+
 .choose_tovar{
     width: 960px;
     margin: 20px auto;
-    border-bottom:1px solid #dfdfdf;
     padding-bottom: 32px;
 }
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-   
-}
 .navigation:hover {
     color: #879cc3;
@@ -23,16 +16,10 @@
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .choose_tovar{
     width: 960px;
     margin: 20px auto;
-    border-bottom:1px solid #dfdfdf;
 }
 .choose_tovar-list{
     margin-bottom: 27px;
@@ -2,14 +2,6 @@ p, a, label, span{
     font-family: "Ubuntu"
 }
-.vin {
-        margin-bottom: 19px!important;
-    width: 960px;
-    margin: 34px auto;
-    border-bottom: 1px solid #dfdfdf;
-   
-}
-
 .navigation:hover {
     color: #879cc3;
 }
@@ -27,11 +19,6 @@ p, a, label, span{
     padding-bottom: 1px;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .choose_tovar{
     width: 920px;
-.vin{
-	width: 960px;
-    margin: 34px auto;
-}
-
 .vin img{
 	margin-bottom: 1px;
 }
@@ -12,11 +7,6 @@
     text-decoration: underline;
 }
-.vin_article {
-    font-size: 22px;
-    font-weight: 500;
-    margin-top: 22px;
-}
 .line{
 	margin-bottom: 12px;
 }
+/**
+ * Created by vitaliy on 23.11.15.
+ */
+$(document).ready(function(){
+    $('#accountsform-country').change(function(){
+        var region_id = $(this).val();
+        if(region_id){
+            $.get( "/ajax/get-city", {region_id:region_id}, function( data ) {
+                var $input =  $('#accountsform-city');
+                $input.empty();
+                $input.append(data);
+            });
+        }
+    });
+
+    $('#company').click(function(){
+
+        $(this).addClass('active_button');
+        $('#person').removeClass('active_button');
+
+        $('#accountsform-company').attr('type', 'text').attr('placeholder', 'Компания').val('');
+        $('.field-accountsform-company').css('display','block');
+        $('#accountsform-is_firm').val('1');
+
+    });
+
+    $('#person').click(function(){
+        $('#company').removeClass('active_button');
+        $(this).addClass('active_button');
+
+        $('.field-accountsform-company').css('display','none');
+        $('#accountsform-company').attr('type', 'hidden').val('Частное лицо');
+        $('#accountsform-is_firm').val('0');
+
+
+    });
+
+});
 \ No newline at end of file
@@ -271,21 +271,7 @@ $(&#39;.phone_control, .phone_placeholder&#39;).click(
 		$('.input1').css({display:'block'});
 		$(this).css({display:'none'});
 	});
-	$('#company').click(function(){
-		$('.registration_for_person').css({display:'none'});
-		$('.registration_for_company').fadeIn(200).css({display:'block'});
-		$(this).addClass('active_button');
-		$('#person').removeClass('active_button');
-		
-	});
-	$('#person').click(function(){
-		$('#company').removeClass('active_button');
-		$('.registration_for_company').css({display:'none'});
-		$('.registration_for_person').fadeIn(200).css({display:'block'});
-		$(this).addClass('active_button');
-		
-		
-	});
+
@@ -813,11 +799,7 @@ $(document).ready(function(){
   	$('.menu_search_down').animate({height:'400px'}, 600, function(){})
   });    
-});
-
-
-$(document).ready(function(){
 	$('html,body').click(function(){
 		$('.phone_placeholder').removeClass('active_placeholder');
 		$('.status').css({display:'none'})
@@ -828,35 +810,30 @@ $(document).ready(function(){
   	// Do something
 	});
-	$( ".statusp" ).click(function( event ) {
-  	event.stopPropagation();
-  	// Do something
-	});
-});
- $(document).ready(function () {
- $('input,textarea').focus(function(){
-   $(this).data('placeholder',$(this).attr('placeholder'))
-   $(this).attr('placeholder','');
- });
- $('input,textarea').blur(function(){
-   $(this).attr('placeholder',$(this).data('placeholder'));
- });
+     $('input,textarea').focus(function(){
+       $(this).data('placeholder',$(this).attr('placeholder'))
+       $(this).attr('placeholder','');
+     });
+     $('input,textarea').blur(function(){
+       $(this).attr('placeholder',$(this).data('placeholder'));
+     });
- $('.own_page3').click(function(){
- 	$('#modal_form').css({'opacity': '0',
-    'top': '45%',
-    'display': 'none'});
-    $('#overlay').css({display:'none'})
- });
- $("#get_user_number").click(function(){
-	var inputdata = $("#get_telephone").val();
-    if(inputdata != ''){
-        $(".telephone_registration").val(inputdata);;
-    }  
-});
+     $('.own_page3').click(function(){
+        $('#modal_form').css({'opacity': '0',
+        'top': '45%',
+        'display': 'none'});
+        $('#overlay').css({display:'none'})
+     });
+
+     $("#get_user_number").click(function(){
+        var inputdata = $("#get_telephone").val();
+        if(inputdata != ''){
+            $(".telephone_registration").val(inputdata);;
+        }
+    });
   $('#go_project').click(function(){
@@ -874,13 +851,11 @@ $(document).ready(function(){
 	// 	$('.menu_block_center1 .menu_search_down .input_search').find('input').css({display:'none'})
 	// });
-});
-
-$(document).ready(function(){
 	$('#footer_third').find('a').attr('rel','external');		
-	$('.statusp').click(function(){
+	$('.statusp').click(function(event){
+        event.stopPropagation();
 		if( $(".status").css('display') == 'none'){
 		$('.status').css({display:'block'});
 	}