24.02.16

Administrator
1 parent 5a6471b3
Showing 8 changed files with 78 additions and 29 deletions Show diff stats
common/models/CompanyInfo.php
common/models/Project.php
common/models/User.php
common/models/UserInfo.php
frontend/controllers/SiteController.php
frontend/models/SignupForm.php
frontend/views/site/registration.php
frontend/views/tender/view.php
@@ -33,8 +33,6 @@
                 [
                     [
                         'name',
-                        'street',
-                        'house',
                     ],
                     'required',
                 ],
@@ -177,7 +177,7 @@
         /**
          * @return \yii\db\ActiveQuery
          */
-        public function getOwner()
+        public function getUser()
         {
             return $this->hasOne(User::className(), [ 'id' => 'user_id' ]);
         }
@@ -23,6 +23,7 @@
      * @property integer $created_at
      * @property integer $updated_at
      * @property string  $password write-only password
+     * @property string  $type
      */
     class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
     {
@@ -56,6 +57,9 @@
             ];
         }
  
+
+
+
         /**
          * @inheritdoc
          */
@@ -86,22 +90,10 @@
                     'max' => 255,
                 ],
                 [
-                    [ 'type' ],
-                    'in',
-                    'range' => [
-                        1,
-                        2,
-                    ],
-                ],
-                [
-                    [ 'type' ],
-                    'default',
-                    'value' => '1',
-                ],
-                [
                     [
                         'specializationInput',
                         'paymentInput',
+                        'type'
                     ],
                     'safe',
                 ],
@@ -554,4 +546,19 @@
             return $this->hasMany(Gallery::className(), [ 'user_id' => 'id' ]);
         }
  
+        public function getOwner()
+        {
+            if($this->type == 1){
+                return $this->hasOne(UserInfo::className(), [ 'user_id' => 'id' ]);
+            } else if($this->type == 2) {
+                return $this->hasOne(CompanyInfo::className(), [ 'user_id' => 'id' ]);
+            }
+
+        }
+
+        public function getName(){
+            return $this->firstname. ' '.$this->lastname;
+        }
+
+
     }
@@ -266,6 +266,10 @@
             return parent::beforeSave($insert);
         }
  
+        public function getName(){
+            return $this->user->name();
+        }
+
         public function getGeographies()
         {
             return json_decode($this->geography);
@@ -246,35 +246,51 @@ class SiteController extends Controller
     public function actionRegistration()
     {
  
-        $model = new SignupForm();
+        $post = Yii::$app->request->post();
+
+        if(!empty($post) && isset($post['SignupForm']) && isset($post['SignupForm']['type'])){
+            if($post['SignupForm']['type'] == 1 ){
+
+                $model = new SignupForm(['scenario' => SignupForm::SCENARIO_USER]);
+            } else {
+
+                $model = new SignupForm(['scenario' => SignupForm::SCENARIO_COMPANY]);
+            }
+        } else {
+            $model = new SignupForm();
+        }
+
         if ($model->load(Yii::$app->request->post())) {
  
+
             if ($user = $model->signup()) {
  
+
+
                 $user_info  = new UserInfo();
  
                 $user_info->load(Yii::$app->request->post(),'SignupForm');
  
                 $user_info->user_id = $user->id;
  
-
                 $user_info->save();
  
                 if($user->type == 2 ){
  
                     $company_info  = new CompanyInfo();
                     $company_info->load(Yii::$app->request->post(),'SignupForm');
-                    $company_info->name = $user->id;
+                    $company_info->user_id = $user->id;
  
                     $company_info->save();
+
                 }
  
                 if (Yii::$app->getUser()->login($user)) {
-                    return $this->goHome();
+                    return $this->redirect('/accounts');
                 }
             }
         }
-
+        $model = new SignupForm();
         return $this->render('registration', [
             'model' => $model,
         ]);
@@ -23,6 +23,11 @@ class SignupForm extends Model
     public $city;
     public $name;
  
+
+
+    const SCENARIO_USER = 'user';
+    const SCENARIO_COMPANY = 'company';
+
     /**
      * @inheritdoc
      */
@@ -41,8 +46,6 @@ class SignupForm extends Model
             ['email', 'email'],
             ['email', 'string', 'max' => 255],
             ['email', 'unique', 'targetClass' => '\common\models\User', 'message' => 'This email address has already been taken.'],
-
-            ['name', 'required'],
             ['firstname', 'required'],
  
  
@@ -54,6 +57,21 @@ class SignupForm extends Model
  
             ['password', 'required'],
             ['password', 'string', 'min' => 6],
+            [
+                'name',
+                'required',
+                'on'=>[SignupForm::SCENARIO_COMPANY]
+            ],
+            [
+                'name',
+                'safe',
+                'on'=>[SignupForm::SCENARIO_USER]
+            ],
+            [
+                'name',
+                'required',
+                'on'=>[SignupForm::SCENARIO_DEFAULT]
+            ],
         ];
     }
  
@@ -71,6 +89,7 @@ class SignupForm extends Model
             $user->firstname = $this->firstname;
             $user->lastname = $this->lastname;
             $user->email = $this->email;
+            $user->type = $this->type;
             $user->setPassword($this->password);
             $user->generateAuthKey();
  
@@ -85,7 +85,7 @@
                                             ], false); ?>
                                     </div>
  
-
+                                    <div id="register-company-block-target"></div>
                                     <div class="input-blocks-wrapper register-company-block">
                                         <div class="input-blocks">
                                             <?= $form->field($model, 'name')->textInput(['class'=>'custom-input-2'])?>
@@ -171,15 +171,20 @@
    var registerValCompany =  $('.register-val-company .custom-radio:checked').attr('value');
    var regHideBlock = $('.register-company-block .form-group')
    if(registerValCompany==1) {
-       regHideBlock.css({display:'none'})
+       $('.register-company-block').css('display', 'none');
    }
  
+
+
    $('.register-val-company .custom-radio').change(function(){
-       var newRegisterValCompany = +$(this).attr('value')
+       var newRegisterValCompany = +$(this).attr('value');
        if(newRegisterValCompany==1){
-           regHideBlock.css({display:'none'})
+           //human
+                $('.register-company-block').css('display', 'none');
+
        } else {
-           regHideBlock.css({display:'block'})
+           //company
+               $('.register-company-block').css('display', 'block');
        }
  
    })
@@ -46,7 +46,7 @@ $this-&gt;title = &#39;My Yii Application&#39;;
                             <div class="cabinet-message-read-foto"><img src="/images/ded-foto.jpg" alt=""/></div>
                         </div>
                         <div class="cab-mes-read-cont">
-                            <div class="cab-mes-read-cont-title">Петер Цумтор</div>
+                            <div class="cab-mes-read-cont-title"><?= $model->user->owner->name?></div>
                             <div class="cab-mes-read-cont-stars">
                                 <div class="rating">
                                     <!--оценка-->