dc

application/controllers/User.php

@@ -124,11 +124,7 @@ class User extends CI_Controller {
 	            $flashMsg = array('message'=>'Provide a valid Phone Number..!','class'=>'error');
 	            $this->session->set_flashdata('message', $flashMsg);
 	            redirect(base_url('User/editProfile'));
-	        } else if (!isset($_POST['email']) || empty($_POST['email'])){
-                $flashMsg = array('message'=>'Provide a valid Email ID..!','class'=>'error');
-                $this->session->set_flashdata('message', $flashMsg);
-                redirect(base_url('User/editProfile'));
-            }
+	        }
 	    } else if ($user_type == 3) {
             if (!isset($_POST['name']) || empty($_POST['name'])){
                 $flashMsg = array('message'=>'Provide a Name..!','class'=>'error');

application/models/User_model.php

@@ -41,7 +41,7 @@ class User_model extends CI_Model {
  		}
 
 		$chkUser = $this->db->query("SELECT * FROM users WHERE status!='2' AND id!='".$user_id."' AND 
-			   			 		     username='".$user_data['username']."' AND user_type='".$user_type."'");
+			   			 		     username='".$user_data['username']."'");
 
 		if(!empty($chkUser) && $chkUser->num_rows() > 0) {
 			return 4;
@@ -52,18 +52,11 @@ class User_model extends CI_Model {
 	 		$chkUser = $this->db->query("SELECT * FROM users AS USR 
 	 									   INNER JOIN provider AS PRV ON (USR.id = PRV.provider_id)
 	 									   WHERE USR.status!='2' AND USR.id!='".$user_id."' AND 
-									   			 PRV.email='".$user_data['email']."'");
-
- 			if(!empty($chkUser) && $chkUser->num_rows() > 0) return 5;
-
-	 		$chkUser = $this->db->query("SELECT * FROM users AS USR 
-	 									   INNER JOIN provider AS PRV ON (USR.id = PRV.provider_id)
-	 									   WHERE USR.status!='2' AND USR.id!='".$user_id."' AND 
 									   			 PRV.phone='".$user_data['phone']."'");
  			if(!empty($chkUser) && $chkUser->num_rows() > 0) return 6;
 
  			$status = $this->db->update('provider',array('name'=>$user_data['name'],
-														 'email'=>$user_data['email'],
+														 'email'=>$user_data['username'],
 														 'phone'=>$user_data['phone']),
  												   array('provider_id'=>$user_id));
 
@@ -87,7 +80,7 @@ class User_model extends CI_Model {
  												   array('customer_id'=>$user_id));
  		}
  		
- 		if($user_type == 1 || $user_type == 4){
+ 		if($user_type != 3){
  			$userData['username'] = $user_data['username'];
  			$userData['display_name'] = $user_data['display_name'];
  			if(isset($user_data['password']) && !empty($user_data['password'])){

application/views/User/editProfile.php

@@ -46,7 +46,7 @@
                 </div>
                 
                 <div class="form-group">
-                  <label>User Name</label>
+                  <label>User Name (E-mail) </label>
                   <input type="text" class="form-control required" data-parsley-trigger="change"
                   data-parsley-minlength="2" name="username" required=""
                   data-parsley-pattern="^[a-zA-Z0-9\ . _ @  \/]+$" 
@@ -87,14 +87,7 @@
                       placeholder="Enter First Name">
                       <span class="glyphicon form-control-feedback"></span>
                     </div>  
-                    <div class="form-group">
-                      <label>Email</label>
-                      <input type="email" class="form-control required" data-parsley-trigger="change"  
-                      data-parsley-minlength="2" required="" name="email" placeholder="Enter email ID" 
-                      value="<?= $provider->email ?>" >
-                      <span class="glyphicon form-control-feedback"></span>
-                    </div>
-                  </div>
+                  </div>  
                   <div class="col-md-6">
                     <div class="form-group">
                       <label>Phone</label>

application/views/User/viewProfile.php

@@ -55,7 +55,7 @@
            </div>
          </div>
          <div class="row">
-           <div class="col-md-5"><span>User Name </span></div>
+           <div class="col-md-5"><span>User Name (E-mail) </span></div>
            <div class="col-md-7">
              <span>:</span>
              <label class="padLeft20">
@@ -77,16 +77,6 @@
             </div>
 
             <div class="row">
-              <div class="col-md-5"><span>Email </span></div>
-              <div class="col-md-7">
-                <span>:</span>
-                <label class="padLeft20">
-                  <?= $provider->email ?> 
-                </label>
-              </div>
-            </div>
-
-            <div class="row">
               <div class="col-md-5"><span>Phone Number </span></div>
               <div class="col-md-7">
                 <span>:</span>