t : label change in staff page : uat

application/controllers/Webservice.php

@@ -604,6 +604,17 @@ class Webservice extends CI_Controller {
     }
   }
 
+  public function get_nearby_users(){
+    $data = (array)json_decode(file_get_contents('php://input'));
+    $data['auth_token'] = $this->auth_token;
+    $res = $this->Webservice_model->get_nearby_users($data);
+    if($res['status'] == 'success'){
+      $this->response($res['data']);
+    }else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
+
   public function get_hotel_city_list(){
     $data = $_GET;
     $data['auth_token'] = $this->auth_token;

application/models/Organizer_model.php

@@ -485,11 +485,18 @@ class Organizer_model extends CI_Model {
  				$res = array('status'=>0,'message'=>'New Password and Confirm Password Doesnot Match','code'=>'ER10');
  				return $res;
  			}
+ 			$usrData = $this->db->get_where('provider',array('phone'=>$data['phone_number']));
+ 			if(empty($usrData)|| empty($usrData = $usrData->row_array())){
+ 				$res = array('status'=>0,'message'=>'Provider Doesnot Exist','code'=>'ER08');
+ 				return $res;
+ 			}
+
  			if($data['user_type'] == '2'){
-				$status = $this->db->query("UPDATE users SET password='".md5($data['confirm_password'])."' WHERE id='".$data['user_id']."' AND user_type='".$data['user_type']."'");
- 			}else{
- 				$status = $this->db->query("UPDATE checker SET password ='".md5($data['confirm_password'])."' WHERE id='".$data['user_id']."'");
+				$status = $this->db->query("UPDATE users SET password='".md5($data['confirm_password'])."' WHERE id='".$usrData['provider_id']."' AND user_type='".$data['user_type']."'");
  			}
+ 			// else{
+ 			// 	$status = $this->db->query("UPDATE checker SET password ='".md5($data['confirm_password'])."' WHERE id='".$data['user_id']."'");
+ 			// }
  			if($status){
 				$res = array('status'=>1,'message'=>'Password Updated Successfully');
  			}
@@ -854,7 +861,7 @@ class Organizer_model extends CI_Model {
 
     public function getCountryCode(){
     	try{
-    		$sql = "SELECT country_id,country_name,country_code,phone_code FROM country WHERE status='1'";
+    		$sql = "SELECT country_id,country_name,country_code,phone_code FROM country WHERE status=1";
     		$ctryData = $this->db->query($sql);
     		if(empty($ctryData) || empty($ctryData = $ctryData->result_array())){
     			$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');

application/models/Validation_app_model.php

@@ -925,6 +925,26 @@ class Validation_app_model extends CI_Model {
 				)
 			),
 		),
+		'get_nearby_users'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			),
+			'latitude' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Latitude Field is null or empty'
+				)
+			),
+			'longitude' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Longitude Field is null or empty'
+				)
+			),
+		),
 		'flight_book'=>array(
 			'auth_token' => array(
 				'required' => array(

application/models/Validation_organizer_model.php

@@ -166,10 +166,10 @@ class Validation_organizer_model extends CI_Model {
 					'message' => 'Confirm Password is null or empty'
 				)
 			),
-			'user_id' => array(
+			'phone_number' => array(
 				'required' => array(
 					'code' => 'ER18',
-					'message' => 'User Id is null or empty'
+					'message' => 'Phone Number is null or empty'
 				)
 			),
 			'user_type' => array(

application/models/Webservice_model.php

@@ -2140,6 +2140,31 @@ class Webservice_model extends CI_Model {
  		return $res;
  	}
 
+ 	public function get_nearby_users($data){
+ 		$res = array('status'=>'error','message'=>'Ohh No!! Something Went South!!','code'=>'ER06');
+ 		try{
+ 			$user_id = $this->auth_token_get($data['auth_token']);
+ 			if($user_id > 0){
+ 				$sql = "SELECT CUST.customer_id AS user_id,CUST.name,CUST.profile_image AS user_image,CUST.cust_lat AS latitude,CUST.cust_lng AS longitude, (((acos(sin((".$data['latitude']."*pi()/180)) * sin((CUST.cust_lat*pi()/180)) + cos((".$data['latitude']."*pi()/180)) * cos((CUST.cust_lat*pi()/180)) * cos(((".$data['longitude']." - CUST.cust_lng)*pi()/180))))*180/pi())*60*1.1515) as distance 
+		 				FROM customer AS CUST 
+		 				INNER JOIN users AS USR ON (USR.id = CUST.customer_id) 
+		 				WHERE USR.user_type='3' AND USR.status='1' AND CUST.customer_id != '$user_id'
+		 				HAVING distance < 5";
+		 		$result = $this->db->query($sql);
+		 		if(!empty($result) && !empty($result = $result->result_array())){
+		 			$res = array('status'=>'success','data'=>$result);	
+		 		} else {
+		 			$res = array('status'=>'error','message'=>'No Data Found','code'=>'ER12');	
+		 		}
+ 			}else{
+ 				$res = array('status'=>'error','message'=>'Invalid User','code'=>'ER010');
+ 			}
+ 		}catch(Exception $e){
+ 			$res = array('status'=>'error','message'=>'Ohh No!! Something Went South','code'=>'ER08');
+ 		}
+ 		return $res;
+ 	}
+
     public function get_hotel_city_list($data){ 
     	try{
     		$user_id = $this->auth_token_get($data['auth_token']);

application/views/Host/viewHostCategories.php

@@ -68,7 +68,7 @@
                         <?= ($host->status == 1)?'Active':'De-activate' ?>
                       </th>
                       <?php if(in_array('2',$pAccess)||in_array('3',$pAccess)||in_array('4',$pAccess)){?>  <td class="center">  
-                          <?php if(in_array('2',$pAccess)){ ?> 
+                          <?php if(in_array('NILL',$pAccess)){ ?> 
                             <a class="btn btn-sm btn-primary" 
                                href="<?= base_url('Host/editHostCategory/'.encode_param($host->host_cat_id))?>">
                               <i class="fa fa-fw fa-edit"></i>Edit

application/views/Staff/staffForm.php

@@ -64,7 +64,7 @@
                       <div class="col-md-5">
                         <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
                         required value="5" name="user_type">
-                        <label class="padLeft10">Customer</label>
+                        <label class="padLeft10">Customer Care</label>
                       </div>
                     </div> 
                   </div>