Subversion Repositories SmartDukaan

Rev

Rev 13683 | Rev 13769 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 13683 Rev 13768
Line 72... Line 72...
72
				if(!empty($this->request->data['email'])) {
72
				if(!empty($this->request->data['email'])) {
73
					$conditions = array('email'=>$this->request->data['email']);
73
					$conditions = array('email'=>$this->request->data['email']);
74
					$user = $this->SocialProfile->User->find('first',array('conditions'=>$conditions));
74
					$user = $this->SocialProfile->User->find('first',array('conditions'=>$conditions));
75
 
75
 
76
					if(!empty($user)) {
76
					if(!empty($user)) {
-
 
77
						$userData = array('id'=>$user['User']['id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'mobile_number'=>$this->request->data['mobile_number'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
-
 
78
						$this->SocialProfile->User->save($userData);
77
						$data['user_id'] = $user['User']['id'];	
79
						$data['user_id'] = $user['User']['id'];	
78
					}else{
80
					}else{
79
						//Create a new user and then insert user_id in social_profiles table
81
						//Create a new user and then insert user_id in social_profiles table
80
						$userData = array('email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'mobile_number'=>$this->request->data['mobile_number'],'referrer'=>$this->request->data['referrer']);
82
						$userData = array('profile_pic'=> $this->request->data['profile_pic'], 'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'mobile_number'=>$this->request->data['mobile_number'],'referrer'=>$this->request->data['referrer']);
81
						if($this->SocialProfile->User->save($userData)) {
83
						if($this->SocialProfile->User->save($userData)) {
82
							$data['user_id'] = $this->SocialProfile->User->getLastInsertId();
84
							$data['user_id'] = $this->SocialProfile->User->getLastInsertId();
83
						}else{
85
						}else{
84
							$result = array('success' => false, 'message' => $this->SocialProfile->User->validationErrors);
86
							$result = array('success' => false, 'message' => $this->SocialProfile->User->validationErrors);
85
							break;
87
							break;
Line 94... Line 96...
94
				} else {
96
				} else {
95
					$result = array('success' => false, 'message' => "Email is missing");
97
					$result = array('success' => false, 'message' => "Email is missing");
96
					break;
98
					break;
97
				}				
99
				}				
98
			} else {
100
			} else {
-
 
101
				$userData = array('id'=>$socialProfile['SocialProfile']['user_id'],'email'=>$this->request->data['email'],'username'=>$this->request->data['email'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'mobile_number'=>$this->request->data['mobile_number'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
-
 
102
				$this->SocialProfile->User->save($userData);
99
				$data['user_id'] = $socialProfile['SocialProfile']['user_id'];
103
				$data['user_id'] = $socialProfile['SocialProfile']['user_id'];
100
				$result = array('success' => true, 'message' => 'Existing Social Profile','id' => $socialProfile['SocialProfile']['user_id']);
104
				$result = array('success' => true, 'message' => 'Existing Social Profile','id' => $socialProfile['SocialProfile']['user_id']);
101
			}
105
			}
102
		}
106
		}
103
		$this->updateSaholicUser($data['user_id'],$this->request->data['email']);
107
		$this->updateSaholicUser($data['user_id'],$this->request->data['email']);