01.03.16

Administrator
1 parent 2d107e9e
Showing 4 changed files with 43 additions and 15 deletions Show diff stats
common/models/UserInfo.php
frontend/controllers/ChatController.php
frontend/controllers/SiteController.php
frontend/views/site/registration.php
@@ -81,7 +81,6 @@
             return [
                 [
                     [
-                        'city',
                         'email',
                     ],
                     'required',
@@ -39,9 +39,18 @@ class ChatController extends Controller
  
     public function actionList()
     {
+        $user = \Yii::$app->user->identity;
+        $chat = Chat::find()
+            ->where([
+                'or',
+                ['from_user' => $user->id,],
+                ['to_user' =>  $user->id,],
+            ])
+
+            ->with('messages.user');
  
         $chat = new ActiveDataProvider([
-            'query' =>  Chat::find(),
+            'query' =>  $chat,
             'pagination' => [
                 'pageSize' => 5,
             ],
@@ -286,10 +286,12 @@ class SiteController extends Controller
                 }
  
                 if (Yii::$app->getUser()->login($user)) {
+
                     return $this->redirect('/accounts');
                 }
             }
         }
+
         $model = new SignupForm();
         return $this->render('registration', [
             'model' => $model,
@@ -4,7 +4,8 @@
  * @var $user_info common\models\UserInfo
  */
     use yii\captcha\Captcha;
-    use yii\widgets\ActiveForm;
+use yii\web\View;
+use yii\widgets\ActiveForm;
     use kartik\select2\Select2;
     use yii\web\JsExpression;
  
@@ -167,33 +168,50 @@
     </div>
  
 </div>
-<script>
-   var labelName= $('.field-signupform-firstname label').text()
-   var labelLastName= $('.field-signupform-lastname label').text()
-   var newLabelName= 'представителя'
-
-   var registerValCompany =  $('.register-val-company .custom-radio:checked').attr('value');
-   var regHideBlock = $('.register-company-block .form-group')
-   if(registerValCompany==1) {
+<?php
+   $js = "
+    var labelName= $('.field-signupform-firstname label').text()
+    var labelLastName= $('.field-signupform-lastname label').text()
+    var newLabelName= 'представителя'
+
+    var registerValCompany =  $('.register-val-company .custom-radio:checked').attr('value');
+    var regHideBlock = $('.register-company-block .form-group');
+    if(registerValCompany==1) {
        $('.field-signupform-firstname label').html(labelName)
        $('.field-signupform-lastname label').html(labelLastName)
        $('.register-company-block').css('display', 'none');
-   }
-   $('.register-val-company .custom-radio').change(function(){
+       $('#w0').yiiActiveForm('remove','signupform-name');
+    }
+    $('.register-val-company .custom-radio').change(function(){
        var newRegisterValCompany = +$(this).attr('value');
        if(newRegisterValCompany==1){
            //human
                $('.field-signupform-firstname label').html(labelName)
                $('.field-signupform-lastname label').html(labelLastName)
                 $('.register-company-block').css('display', 'none');
+                $('#w0').yiiActiveForm('remove','signupform-name');
+
+
  
        } else {
            //company
                $('.field-signupform-firstname label').html(labelName+' '+newLabelName)
                $('.field-signupform-lastname label').html(labelLastName+' '+newLabelName)
                $('.register-company-block').css('display', 'block');
+               $('#w0').yiiActiveForm('add', {
+                   'container': '.field-signupform-name',
+                   'error': '.help-block',
+                   'id': 'signupform-name',
+                   'input': '#signupform-name',
+                   'name': 'name',
+                   validate: function (attribute, value, messages, deferred, \$form) {yii.validation.required(value, messages, {'message':'Необходимо заполнить «Название компании».'});}
+
+               });
        }
  
-   })
+    })
+";
+
+$this->registerJS($js );
+?>
  
-</script>
 \ No newline at end of file