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

Mihail
2 parents ed1e700c 878c38e8
Showing 10 changed files with 280 additions and 120 deletions Show diff stats
common/models/UserLoginForm.php
frontend/controllers/SiteController.php
frontend/models/PasswordResetRequestForm.php
frontend/views/accounts/cabinet.php
frontend/views/page/about_view.php
frontend/views/page/view.php
frontend/views/site/login.php
frontend/views/site/requestPasswordResetToken.php
frontend/web/css/main.css
frontend/web/js/script.js
@@ -3,7 +3,7 @@ namespace common\models;
 use Yii;
 use yii\base\Model;
-
+use yii\web\IdentityInterface;
 /**
  * Login form
  */
@@ -26,6 +26,8 @@ class UserLoginForm extends Model
             [['email', 'pass'], 'required'],
             // rememberMe must be a boolean value
             ['rememberMe', 'boolean'],
+            // password is validated by validatePassword()
+            ['pass', 'validatePassword'],
         ];
     }
@@ -40,8 +42,8 @@ class UserLoginForm extends Model
     {
         if (!$this->hasErrors()) {
             $user = $this->getUser();
-            if (!$user || !$user->validatePassword($this->password)) {
-                $this->addError($attribute, 'Incorrect email or password.');
+            if (!$user || $user->pass != $this->pass) {
+                $this->addError($attribute, 'Неправильный логин или пароль');
             }
         }
     }
@@ -59,6 +61,7 @@ class UserLoginForm extends Model
         } else {
             return false;
         }
+
     }
     /**
@@ -15,6 +15,7 @@ use frontend\models\ContactForm;
 use yii\base\InvalidParamException;
 use yii\web\BadRequestHttpException;
 use yii\web\Controller;
+
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use common\models\Callback;
@@ -365,14 +366,17 @@ class SiteController extends Controller
      */
     public function actionRequestPasswordReset()
     {
+        $this->layout = '/internal';
+
         $model = new PasswordResetRequestForm();
         if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+
             if ($model->sendEmail()) {
-                Yii::$app->session->setFlash('success', 'Check your email for further instructions.');
+                Yii::$app->session->setFlash('success', 'Для того, чтобы изменить пароль, перейдите по ссылке, которая придет Вам на email');
                 return $this->goHome();
             } else {
-                Yii::$app->session->setFlash('error', 'Sorry, we are unable to reset password for email provided.');
+                Yii::$app->session->setFlash('error', 'Пользователя с таким e-mail в базе не существует');
             }
         }
 <?php
 namespace frontend\models;
-use common\models\User;
+use common\models\Accounts;
 use yii\base\Model;
-
+use common\models\Emails;
 /**
  * Password reset request form
  */
@@ -21,9 +21,8 @@ class PasswordResetRequestForm extends Model
             ['email', 'required'],
             ['email', 'email'],
             ['email', 'exist',
-                'targetClass' => '\common\models\User',
-                'filter' => ['status' => User::STATUS_ACTIVE],
-                'message' => 'There is no user with such email.'
+                'targetClass' => '\common\models\Accounts',
+                'message' => 'Пользователя с таким e-mail в базе не существует.'
             ],
         ];
     }
@@ -35,23 +34,24 @@ class PasswordResetRequestForm extends Model
      */
     public function sendEmail()
     {
-        /* @var $user User */
-        $user = User::findOne([
-            'status' => User::STATUS_ACTIVE,
+
+        /* @var $user Accounts */
+        $user = Accounts::findOne([
             'email' => $this->email,
         ]);
         if ($user) {
-            if (!User::isPasswordResetTokenValid($user->password_reset_token)) {
+            if (!Accounts::isPasswordResetTokenValid($user->password_reset_token)) {
                 $user->generatePasswordResetToken();
             }
             if ($user->save()) {
-                return \Yii::$app->mailer->compose(['html' => 'passwordResetToken-html', 'text' => 'passwordResetToken-text'], ['user' => $user])
-                    ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name . ' robot'])
-                    ->setTo($this->email)
-                    ->setSubject('Password reset for ' . \Yii::$app->name)
-                    ->send();
+                $form = array();
+                $form ['email'] = $user->email;
+                $form ['name']  = $user->name;
+                $form ['pass']  = $user->pass;
+                return Emails::get('remide',$form,$form ['email']);
+
             }
         }
@@ -3,6 +3,7 @@ use \yii\widgets\ActiveForm;
 use \yii\helpers\ArrayHelper;
 use \common\models\DicCities;
 use \common\models\Deliveries;
+use \yii\helpers\Url;
 $this->registerCssFile('/css/about_company.css');
 $this->registerCssFile('/css/style/notepad.css');
@@ -17,16 +18,19 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 <div class="vin">
 	<p class="vin_article">Мой профиль</p>
 <div class='side_menu'>
-<ul class="side_menu-list" role="tablist">
-	<li class="active"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Личные данные</a></li>
-	<li><a href="#notepad" aria-controls="notepad" role="tab" data-toggle="tab">Блокнот</a></li>
-	<li><a href="#busket" aria-controls="busket" role="tab" data-toggle="tab">Корзина</a></li>
-	<li><a href="#orders" aria-controls="orders" role="tab" data-toggle="tab">Заказы</a></li>
-	<!-- <li><a href="#finance" aria-controls="finance" role="tab" data-toggle="tab">Финансы</a></li>
-	<li><a href="history" aria-controls="history" role="tab" data-toggle="tab">История запросов</a></li>
-	<li><a href="#avto" aria-controls="avto" role="tab" data-toggle="tab">Ваши авто</a></li>
-	<li><a href="#message" aria-controls="message" role="tab" data-toggle="tab">Оставить сообщение<br>об оплате и возврате</a></li> -->			
-</ul>
+    <?php
+    echo \yii\widgets\Menu::widget([
+        'options' => ['class' => 'side_menu-list'],
+        'items' => [
+            ['label' => 'Личные данные', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Блокнот', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Корзина', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Заказы', 'url' => Url::toRoute(['/accounts/cabinet'])],
+            ['label' => 'Выйти', 'url' => Url::toRoute(['/site/logout'])],
+
+        ],
+    ]);
+    ?>
   <div class="tab-content">
     <div role="tabpanel" class="tab-pane active" id="profile">
    	 <p class="tab-content_header">Личные данные</p>
@@ -35,7 +39,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data','class'=>'my_profile'], 'method'=>'post','action' => '/site/signup',]); ?>
-            <?= $form->field($model, 'is_firm')->hiddenInput(['value'=>'0']) ?>
+            <?= $form->field($model, 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
             <?= $form->field($model, 'company')->hiddenInput(['value'=>'Частное лицо']) ?>
@@ -51,19 +55,19 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             <?= $form->field($model, 're_pass',['options'=>['class'=>'input2']])->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration']) ?>
-            <?= $form->field($model, 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+            <?= $form->field($model, 'country',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList(
                 ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'),
                 ['prompt' => 'Выберите область']
             );
             ?>
-            <?= $form->field($model, 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+            <?= $form->field($model, 'city',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList(
                 [],
                 ['prompt' => 'Выберите город']
             );
             ?>
-            <?= $form->field($model, 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+            <?= $form->field($model, 'deliveries',['options'=>['class'=>'selectize_item2 input2' ]])->dropDownList(
                 ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'),
                 ['prompt' => 'Выберите тип перевозки']
             );
@@ -79,7 +83,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         </div>
-</div>
+
 </div>
     <div role="tabpanel" class="tab-pane" id="notepad">
     <p class="tab-content_header">Блокнот</p>
@@ -249,85 +253,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 </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>
-
 <script>
 <?php
-$this->registerCssFile('/css/about_company.css');
 use \yii\helpers\Url;
+$this->registerCssFile('/css/about_company.css');
+$this->registerCssFile('/css/style/optovikam.css');
+
 $this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
 $this->title = $model->title ? $model->title: $model->name;
 $this->params['breadcrumbs'][] = $this->title;
 <?php
 $this->registerCssFile('/css/about_company.css');
+$this->registerCssFile('/css/style/optovikam.css');
 $this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
 $this->title = $model->title ? $model->title: $model->name;
 $this->params['breadcrumbs'][] = $this->title;
-
 ?>
 <div class="main-vin">
@@ -10,13 +10,13 @@ use yii\captcha\Captcha;
 ?>
-<div id="modal_form_registration" >
+<div id="form_login" >
             <?php $form = ActiveForm::begin(['id' => 'enter_form','class'=>'cmxform','action' => '/site/login']); ?>
             <fieldset>
                 <h3>Вход в личный кабинет</h3>
-                <?= $form->field(new UserLoginForm(), 'email')->label(false) ?>
-                <?= $form->field(new UserLoginForm(), 'pass')->passwordInput()->label(false)  ?>
-                <?= $form->field(new UserLoginForm(), 'rememberMe')->checkbox() ?>
+                <?= $form->field($model, 'email')->label(false) ?>
+                <?= $form->field($model, 'pass')->passwordInput()->label(false)  ?>
+                <?= $form->field($model, 'rememberMe')->checkbox() ?>
                 <?= Html::a('Забыли пароль?', ['site/request-password-reset']) ?>
                 <?= Html::submitButton('Submit', ['class' => 'purple', 'name' => 'login-button']) ?>
             </fieldset>
+<?php
+use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $form yii\bootstrap\ActiveForm */
+/* @var $model \frontend\models\PasswordResetRequestForm */
+
+$this->title = 'Запрос на востановление пароля';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="main-vin">
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>Введите ваш e-mail</p>
+
+    <div class="row">
+        <div class="col-lg-5">
+            <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
+                <?= $form->field($model, 'email')->label(false) ?>
+                <div class="form-group">
+                    <?= Html::submitButton('Отправить', ['class' => 'btn btn-primary']) ?>
+                </div>
+            <?php ActiveForm::end(); ?>
+        </div>
+    </div>
+</div>
@@ -264,6 +264,204 @@ div.required:after {    content: &quot; *&quot;;
     background-position: 100% 46%;
 }
+#messages .telephone p{
+    font-size: 24px!important;
+}
+#messages .telephone img{
+    position: relative;
+    top: -4px;
+}
+#messages .first_block :nth-child(2){
+    font-size: 14px;
+}
+#messages .first_block p:first-child{
+    display: block;
+    font-size: 19px!important;
+    margin-bottom: 14px;
+}
+
+#messages .telephone{
+    margin-top: 11px;
+    margin-bottom: 3px;
+}
+
+#messages .work_hours p:first-child{
+    font-size: 19px;
+}
+
+#messages .block_contacts p:first-child{
+    font-size: 19px;
+}
+
+#messages .block_contacts a{
+    color: #333333;
+    display: inline-block;
+    margin-bottom: 3px;
+}
+
+#messages iframe {
+    width: 960px;
+    margin-bottom: 33px;
+}
+
+#enter_form div.required:after{
+    left: 100px;
+}
+
+#modal_form{
+    border-bottom: none!important;
+}
+
+.own_page3{
+    border-bottom: 4px solid #dfdfdf;
+}
+
+#enter_form a{
+    margin-left: 80px;
+    color: #6b84b5;
+    text-decoration: underline;
+    position: relative;
+    top: -18px;
+}
+
+#modal_form input[type="checkbox"], #form_login input[type="checkbox"]{
+    display: inline-block!important;
+    width: 16px;
+    height: 16px;
+    margin-bottom: 16px;
+    background: url('/images/checkbox.png') no-repeat;
+    cursor: pointer;
+    padding: 0;
+    margin: 0 0 16px 0;
+    position: absolute;
+    left: -20px;
+    top: 0;
+    -webkit-transition: background 0.4s linear;
+    -o-transition: background 0.4s linear;
+    -moz-transition: background 0.4s linear;
+    transition: background 0.4s linear;
+}
+
+#modal_form input[type="checkbox"]:checked + label span {
+    background: url('/images/input-type-checked.png') no-repeat;
+}
+
+.form-group{
+    margin-bottom: 0;
+}
+
+.field-userloginform-rememberme{
+    display: inline-block;
+    margin-left: 132px;
+    position: relative;
+    top: -17px;
+}
+
+.field-userloginform-rememberme label{
+    color: #6b84b5;
+    text-decoration: underline;
+    font-weight: 500;
+}
+
+#modal_form .purple {
+    display: table;
+    margin: -6px auto 36px!important;
+}
+
+#modal_form .field-userloginform-email{
+    position: relative;
+}
+
+#modal_form .field-userloginform-email .help-block{
+    top: 28px;
+    left: 115px!important;
+}
+
+#modal_form .field-userloginform-pass{
+    margin-top: -10px;
+    margin-bottom: 12px;
+    position: relative;
+}
+#modal_form .purple{
+    display: table;
+    margin: -6px auto 34px;
+}
+#modal_form .field-userloginform-pass .help-block{
+    top: 26px;
+    left: 114px!important;
+}
+
+.main_search{
+    width: 434px!important;
+}
+
 .field-accounts-company{
     display: none;
+}
+
+
+#form_login{
+    margin: 0 auto;
+    width: 561px;
+    position: relative;
+}
+#form_login input {
+    background-color: #f5f5f5;
+    width: 334px;
+    height: 30px;
+    padding-left: 9px;
+    border-radius: 6px;
+    border: 1px solid #dfdfdf;
+    margin: 0 auto;
+}
+
+#form_login h3{
+    text-align: center;
+    margin-bottom: 29px;
+}
+
+#userloginform-rememberme{
+
+}
+
+#form_login .purple{
+    display: table;
+    margin: 0 auto;
+}
+
+#form_login .field-userloginform-pass{
+    margin-bottom: 24px;
+}
+#form_login .field-userloginform-pass:after{
+    top: -21px;
+}
+
+
+#modal_form_call div.required:after{
+    left: 101px;
+}
+
+.input2 label{
+    top: 8px
+}
+
+.my_profile div.required:after{
+    top: -34px;
+    left: 104px;
+}
+.my_profile .selectize_item2 {
+    background: url("/images/arrow-cart-down.png") no-repeat 100% 61%;
+}
+.form-control{
+    padding-top: 3px;
+}
+
+.my_profile .selectize_item2{
+    display: inherit;
+    margin: 0px 13px 21px 65px!important;
+    width: 371px;
+}
+
+.my_profile .selectize_item2 label{
+    left: -65px;
 }
 \ No newline at end of file
@@ -26,6 +26,7 @@ $(&#39;.phone_control, .phone_placeholder&#39;).click(
 		}
 	)
+
 	$('.kyiv').click(
 		function(){
 			$('.phone_select').empty();
@@ -615,7 +616,7 @@ $(window).scroll(function()
         	$('.purple_menu1').css({'position':'fixed', 'top':'0'});
         	$('.purple_menu1').addClass('purple_shadow');
         	$('.menu_block_center1').css({display:'none'});
-        	$('.main_search').animate({'width':'434px'}, 1000)
+        	//$('.main_search').animate({'width':'434px'}, 1000)
         	$('.dropdown_menu').addClass('active_menu');
         	$('.menu_block_center2 .dropdown_menu').css({'left':'-447px'});