Subversion Repositories SmartDukaan

Rev

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

Rev 15767 Rev 17205
Line 84... Line 84...
84
							$mobileRequired = false;
84
							$mobileRequired = false;
85
						}
85
						}
86
						if(!empty($user['User']['activated']) && $user['User']['activated']==1) {
86
						if(!empty($user['User']['activated']) && $user['User']['activated']==1) {
87
							$referrerRequired = false;
87
							$referrerRequired = false;
88
						}
88
						}
89
						//Don't update referrer
-
 
90
						// if(strlen(trim($this->request->data['referrer']))>0) {
-
 
91
							// $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'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
89
						//We don't need to update the user 
92
						// } else{
-
 
93
							$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'],'profile_pic'=> $this->request->data['profile_pic']);
90
						//$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'],'profile_pic'=> $this->request->data['profile_pic']);
94
						// }
-
 
95
						$this->SocialProfile->User->save($userData);
91
						//$this->SocialProfile->User->save($userData);
96
						$data['user_id'] = $user['User']['id'];	
92
						$data['user_id'] = $user['User']['id'];	
97
					} else {						
93
					} else {						
98
						//Create a new user and then insert user_id in social_profiles table
94
						//Create a new user and then insert user_id in social_profiles table
99
						$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'],'referrer'=>$this->request->data['referrer']);
95
						$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'],'referrer'=>$this->request->data['referrer']);
100
						//Check for utm parameters
96
						//Check for utm parameters
Line 149... Line 145...
149
				} else {
145
				} else {
150
					$result = array('success' => false, 'message' => "Email is missing",'mobileRequired'=>$mobileRequired,'referrerRequired'=>$referrerRequired);
146
					$result = array('success' => false, 'message' => "Email is missing",'mobileRequired'=>$mobileRequired,'referrerRequired'=>$referrerRequired);
151
					break;
147
					break;
152
				}				
148
				}				
153
			} else {
149
			} else {
154
				//If Social Profile exists, do not update referrer
150
				//If Social Profile exists, do not update referrer and email
155
				$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'],'profile_pic'=> $this->request->data['profile_pic']);
151
				$userData = array('id'=>$socialProfile['SocialProfile']['user_id'],'first_name'=>$this->request->data['name'],'gender'=>$this->request->data['gender'],'profile_pic'=> $this->request->data['profile_pic']);
156
				//Check for utm parameters
152
				//Check for utm parameters
157
				if(!empty($this->request->data['utm_source'])){
153
				if(!empty($this->request->data['utm_source'])){
158
					$userData['utm_source'] = $this->request->data['utm_source'];
154
					$userData['utm_source'] = $this->request->data['utm_source'];
159
				}
155
				}
160
				if(!empty($this->request->data['utm_medium'])){
156
				if(!empty($this->request->data['utm_medium'])){