From 54d398c7d32c1830a6dd1fb78999ab5d9f27bc4d Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Thu, 25 Feb 2016 17:31:45 +0200
Subject: [PATCH] 24.02.16

---
 frontend/controllers/AccountsController.php | 17 +++++++++++++----
 frontend/views/accounts/general.php         |  2 +-
 frontend/views/site/registration.php        | 17 -----------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/frontend/controllers/AccountsController.php b/frontend/controllers/AccountsController.php
index da9a1f5..e0b4c8d 100755
--- a/frontend/controllers/AccountsController.php
+++ b/frontend/controllers/AccountsController.php
@@ -408,15 +408,24 @@
             if(empty( $user_info )) {
                 $user_info = new UserInfo([ 'user_id' => $user->id ]);
             }
+
             if(empty( $company_info )) {
                 $company_info = new CompanyInfo([ 'user_id' => $user->id ]);
             }
+
             $post = \Yii::$app->request->post();
             if(!empty( $post )) {
-                $user_info->load($post);
-                $company_info->load($post);
-                $user->load($post);
-                if($user_info->save() && $user->save() && $company_info->save()) {
+
+
+                if($user_info->load($post)){
+                    $user_info->save();
+                }
+
+                if($company_info->load($post)){
+                    $company_info->save();
+                }
+
+                if($user->load($post) && $user->save() ) {
                     \Yii::$app->session->setFlash('userinfoupdate', 'Информация успешно обновлена');
                 } else {
                     \Yii::$app->session->setFlash('userinfoupdate', 'Ошибка обновления. Проверьте форму');
diff --git a/frontend/views/accounts/general.php b/frontend/views/accounts/general.php
index cd3dc83..3ea036f 100755
--- a/frontend/views/accounts/general.php
+++ b/frontend/views/accounts/general.php
@@ -176,7 +176,7 @@
             ?>
             </div>
             <div class="input-blocks hide-mail-check">
-            <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info', ], 'template' => "{input}{label}\n{hint}\n{error}"])
+            <?= $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group', ], 'template' => "{input}{label}\n{hint}\n{error}"])
                       ->label ('<span></span>не публиковать Email')
                       ->checkbox (['checked'=>'checked', 'class'=> 'custom-check'], false);
             ?>
diff --git a/frontend/views/site/registration.php b/frontend/views/site/registration.php
index 784e269..d9b41e1 100644
--- a/frontend/views/site/registration.php
+++ b/frontend/views/site/registration.php
@@ -168,24 +168,9 @@
 
 </div>
 <script>
-    var labelFirstName = $('.field-signupform-firstname label').text();
-    var labelLastName = $('.field-signupform-lastname label').text();
-    var companyLabel = 'представителя';
-
-    function replaceLabel(){
-        $('.field-signupform-firstname label').html(labelFirstName)
-        $('.field-signupform-lastname label').html(labelLastName)
-    }
-
-    function companyReplaceLabel(){
-        $('.field-signupform-firstname label').html(labelFirstName+' '+companyLabel)
-        $('.field-signupform-lastname label').html(labelLastName+' '+companyLabel)
-    }
-
    var registerValCompany =  $('.register-val-company .custom-radio:checked').attr('value');
    var regHideBlock = $('.register-company-block .form-group')
    if(registerValCompany==1) {
-       replaceLabel()
        $('.register-company-block').css('display', 'none');
    }
 
@@ -195,12 +180,10 @@
        var newRegisterValCompany = +$(this).attr('value');
        if(newRegisterValCompany==1){
            //human
-                replaceLabel()
                 $('.register-company-block').css('display', 'none');
 
        } else {
            //company
-                companyReplaceLabel()
                $('.register-company-block').css('display', 'block');
        }
 
--
libgit2 0.21.4