Subversion Repositories SmartDukaan

Rev

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

Rev 14424 Rev 14425
Line 77... Line 77...
77 
					if(!empty($user)) {
 77 
					if(!empty($user)) {
78 
						//Existing user
 78 
						//Existing user
79 
						if(!empty($user['User']['mobile_number'])){
 79 
						if(!empty($user['User']['mobile_number'])){
80 
							$mobileRequired = false;
 80 
							$mobileRequired = false;
81 
						}
 81 
						}
82 
						if(empty($user['User']['referrer'])) {
 82 
						if(strlen(trim($this->request->data['referrer']))>0) {
83 
							$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']);
 83 
							$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']);
84 
						} else{
 84 
						} else{
85 
							$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']);
 85 
							$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']);
86 
						}
 86 
						}
87 
						$this->SocialProfile->User->save($userData);
 87 
						$this->SocialProfile->User->save($userData);
Line 105... Line 105...
105 
				} else {
 105 
				} else {
106 
					$result = array('success' => false, 'message' => "Email is missing",'mobileRequired'=>$mobileRequired);
 106 
					$result = array('success' => false, 'message' => "Email is missing",'mobileRequired'=>$mobileRequired);
107 
					break;
 107 
					break;
108 
				}
108 
				}
109 
			} else {
 109 
			} else {
- 
 
 110 
				if(strlen(trim($this->request->data['referrer']))>0) {
110 
				$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'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
 111 
					$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'],'referrer'=>$this->request->data['referrer'],'profile_pic'=> $this->request->data['profile_pic']);
- 
 
 112 
				} else{
- 
 
 113 
					$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']);
- 
 
 114 
				}
111 
				$this->SocialProfile->User->save($userData);
 115 
				$this->SocialProfile->User->save($userData);
112 
				//Check for mobile number
 116 
				//Check for mobile number
113 
				$mobilenumber = $this->SocialProfile->User->find('first',array('conditions'=>array('id'=>$socialProfile['SocialProfile']['user_id']),'recursive'=>-1));
 117 
				$mobilenumber = $this->SocialProfile->User->find('first',array('conditions'=>array('id'=>$socialProfile['SocialProfile']['user_id']),'recursive'=>-1));
114 
				$this->log(print_r($mobilenumber->User,1),'registration');
 - 
 
115 
				if(!empty($mobilenumber['User']['mobile_number'])){
 118 
				if(!empty($mobilenumber['User']['mobile_number'])){
116 
					$mobileRequired = false;
 119 
					$mobileRequired = false;
117 
				}
 120 
				}
118 
				$data['user_id'] = $socialProfile['SocialProfile']['user_id'];
 121 
				$data['user_id'] = $socialProfile['SocialProfile']['user_id'];
119 
				$result = array('success' => true, 'message' => 'Existing Social Profile','id' => $socialProfile['SocialProfile']['user_id'],'mobileRequired'=>$mobileRequired);
 122 
				$result = array('success' => true, 'message' => 'Existing Social Profile','id' => $socialProfile['SocialProfile']['user_id'],'mobileRequired'=>$mobileRequired);
Line 123... Line 126...
123 
		$this->set(array(
 126 
		$this->set(array(
124 
		    'result' => $result,
 127 
		    'result' => $result,
125 
		    'callback' => $callback,
 128 
		    'callback' => $callback,
126 
		    '_serialize' => array('result')
 129 
		    '_serialize' => array('result')
127 
		));
 130 
		));
128 
		//$this->render('/Elements/jsonp');
 131 
		$this->log(print_r($result,1),'registration');
129 
		$this->render('/Elements/json');
 132 
		$this->render('/Elements/json');
130 
	}
 133 
	}
131 
 
 134 
 
132 
	private function updateSaholicUser($userId,$email=null) {
 135 
	private function updateSaholicUser($userId,$email=null) {
133 
		if(!$email){
 136 
		if(!$email){